Removing Lombok

provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java

@@ -18,18 +18,13 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class HandshakeRequestData {
-    @NotEmpty
-    @NotNull
-    String validationCode;
 
-    @NotEmpty
-    @NotNull
-    String validationUrl;
+    private String validationCode;
+
+    private String validationUrl;
 }
+

provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java

@@ -13,35 +13,27 @@
 // limitations under the License.
 
 package org.opengroup.osdu.notification.provider.azure.models;
-import lombok.*;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.Map;
 
-@Getter
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-@RequiredArgsConstructor
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class NotificationData {
 
-    @NotEmpty
-    @NonNull
     private String data;
 
-    @NotEmpty
-    @NonNull
     private Map<String,String> attributes;
 
-    @NotEmpty
-    @NonNull
     private String messageId;
 
-    @NotEmpty
-    @NotNull
     String validationCode;
 
-    @NotEmpty
-    @NotNull
     String validationUrl;
 }
 

provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java

@@ -14,39 +14,25 @@
 
 package org.opengroup.osdu.notification.provider.azure.models;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.JsonObject;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-
 public class NotificationRequest {
-    @NotNull
-    @NotEmpty
-    String id;
 
-    @NotNull
-    @NotEmpty
-    String eventType;
+    private String id;
+
+    private String eventType;
 
-    @NotNull
-    @NotEmpty
-    String subject;
+    private String subject;
 
-    @NotNull
-    @JsonProperty("data")
-    JsonObject data;
+    private JsonObject data;
 
-    @NotNull
-    @NotEmpty
-    String eventTime;
+    private String eventTime;
 }