Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into KON-199_Sonstiges_RequiredArgs_Declaration
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressDto.java
index df3b6e0..eaa7d4d 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -44,6 +46,9 @@
//fromAddressType
@JsonProperty("addressTypeId")
private UUID addressTypeUuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'adressTypeType' is mandatory")
private String addressTypeType;
private String addressTypeDescription;
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressTypeDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressTypeDto.java
index 0bab6ac..4a88825 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressTypeDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AddressTypeDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -25,6 +27,10 @@
@JsonProperty("id")
private UUID uuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'type' is mandatory")
private String type;
+
private String description;
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationDto.java
index 4d75be8..bc88b77 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -33,7 +35,11 @@
//fromCommunicationType
@JsonProperty("communicationTypeId")
private UUID communicationTypeUuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'communicationTypeType' is mandatory")
private String communicationTypeType;
+
private String communicationTypeDescription;
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationTypeDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationTypeDto.java
index 066480f..7b8c083 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationTypeDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CommunicationTypeDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -25,7 +27,11 @@
@JsonProperty("id")
private UUID uuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'type' is mandatory")
private String type;
+
private String description;
private boolean editable;
private boolean mappingLdap;
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CompanyDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CompanyDto.java
index 834d699..ff000d3 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CompanyDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/CompanyDto.java
@@ -15,14 +15,19 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@Data
public class CompanyDto implements Serializable {
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Company name is mandatory")
private String companyName;
+
private String companyType;
private String hrNumber;
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ContactPersonDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ContactPersonDto.java
index 976567e..3e4e99b 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ContactPersonDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ContactPersonDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -24,7 +26,11 @@
public class ContactPersonDto implements Serializable {
private String firstName;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Lastname is mandatory")
private String lastName;
+
private String title;
//from Contact
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ExternalPersonDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ExternalPersonDto.java
index 8dcf590..6720bc7 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ExternalPersonDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/ExternalPersonDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -24,7 +26,11 @@
public class ExternalPersonDto implements Serializable {
private String firstName;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Lastname is mandatory")
private String lastName;
+
private String title;
//from Contact
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/InternalPersonDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/InternalPersonDto.java
index 9da4ff6..5325aca 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/InternalPersonDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/InternalPersonDto.java
@@ -15,15 +15,21 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@Data
public class InternalPersonDto implements Serializable {
private String firstName;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Lastname is mandatory")
private String lastName;
+
private String title;
private String department;
private String uid;
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/PersonTypeDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/PersonTypeDto.java
index d4e2454..4e6053f 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/PersonTypeDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/PersonTypeDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -25,6 +27,9 @@
@JsonProperty("id")
private UUID uuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'type' is mandatory")
private String type;
private String description;
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/SalutationDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/SalutationDto.java
index adb0f81..4c8a843 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/SalutationDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/SalutationDto.java
@@ -15,8 +15,10 @@
package org.eclipse.openk.contactbasedata.viewmodel;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.UUID;
@@ -25,6 +27,10 @@
@JsonProperty("id")
private UUID uuid;
+
+ @ApiModelProperty(required = true)
+ @NotBlank(message = "Field 'type' is mandatory")
private String type;
+
private String description;
}
