Merge branch 'SI-153-SARIS-Schnittstelle' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-153-SARIS-Schnittstelle
diff --git a/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/dtos/ForeignFailureDataDto.java b/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/dtos/ForeignFailureDataDto.java
index 21881be..b6d4e1e 100644
--- a/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/dtos/ForeignFailureDataDto.java
+++ b/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/dtos/ForeignFailureDataDto.java
@@ -18,7 +18,11 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
-import javax.validation.constraints.*;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -33,7 +37,7 @@
private String description;
@NotNull
- @Pattern(regexp = "^$|(S|W|F|G|TK|ST)")
+ @Pattern(regexp = "^$|(S|W|F|G|TK|ST|OS)")
private String branch;
@Pattern(regexp="^$|(NS|MS|HS)")
@@ -77,7 +81,7 @@
private String stationId;
@Size(max=200)
- @Pattern(regexp="^$|[A-Za-z0-9ÄäÖöÜüß\\s_/()-]+")
+ @Pattern(regexp="^$|[A-Za-z0-9ÄäÖöÜüß\\s_/(),.;:-]+")
private String stationDescription;
private BigDecimal longitude;
diff --git a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
index 1c5e998..382e464 100644
--- a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
+++ b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
@@ -31,7 +31,6 @@
@NotNull
private boolean isPlanned;
- @Size(max=255)
@JsonProperty("description")
private String description;
@@ -56,7 +55,7 @@
private Date failureEndResupplied;
@Size(max=10)
- @Pattern(regexp="^$|[A-Za-z0-9ÄäÖöÜüß_/-]+")
+ @Pattern(regexp="^$|[A-Za-z0-9_/-]+")
private String postcode;
@Size(max=200)
