Merge branch 'master' into 'remove-snapshot-dependencies'

Master

See merge request !90

dataset-core/src/main/java/org/opengroup/osdu/dataset/model/response/GetCreateUpdateDatasetRegistryResponse.java

@@ -16,11 +16,14 @@ package org.opengroup.osdu.dataset.model.response;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import org.opengroup.osdu.core.common.model.storage.Record;
 
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GetCreateUpdateDatasetRegistryResponse {
 
 	private List<Record> datasetRegistries;

testing/dataset-test-aws/src/test/java/org/opengroup/osdu/dataset/model/IntTestCredentials.java

@@ -16,6 +16,7 @@ package org.opengroup.osdu.dataset.model;
 
 import com.amazonaws.auth.AWSSessionCredentials;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -28,6 +29,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestCredentials implements AWSSessionCredentials {
 
     @JsonProperty("accessKeyId")

testing/dataset-test-aws/src/test/java/org/opengroup/osdu/dataset/model/IntTestFileCollectionDeliveryItemAWSImpl.java

@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.dataset.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
@@ -23,6 +24,7 @@ import java.time.Instant;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestFileCollectionDeliveryItemAWSImpl implements IntTestFileDeliveryItem {
 
     @JsonProperty("unsignedUrl")

testing/dataset-test-aws/src/test/java/org/opengroup/osdu/dataset/model/IntTestFileDeliveryItemAWSImpl.java

@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.dataset.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
@@ -25,6 +26,7 @@ import java.util.Date;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestFileDeliveryItemAWSImpl implements IntTestFileDeliveryItem {
 
     @JsonProperty("signedUrl")

testing/dataset-test-aws/src/test/java/org/opengroup/osdu/dataset/model/IntTestFileUploadLocationAWSImpl.java

@@ -16,12 +16,15 @@ package org.opengroup.osdu.dataset.model;
 
 import java.time.Instant;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Data;
 // import com.amazonaws.auth;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestFileUploadLocationAWSImpl implements IntTestFileUploadLocation {
 
     private String unsignedUrl;

testing/dataset-test-aws/src/test/java/org/opengroup/osdu/dataset/model/IntTestS3Location.java

@@ -14,10 +14,13 @@
 
 package org.opengroup.osdu.dataset.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestS3Location {
 
   @Getter

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/response/IntTestDatasetRetrievalDeliveryItem.java

@@ -16,11 +16,14 @@ package org.opengroup.osdu.dataset.model.response;
 
 import java.util.HashMap;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestDatasetRetrievalDeliveryItem {
 
     String datasetRegistryId;

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/response/IntTestGetDatasetRetrievalInstructionsResponse.java

@@ -16,11 +16,14 @@ package org.opengroup.osdu.dataset.model.response;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestGetDatasetRetrievalInstructionsResponse {
 
     List<IntTestDatasetRetrievalDeliveryItem> delivery;

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/response/IntTestGetDatasetStorageInstructionsResponse.java

@@ -14,11 +14,14 @@
 
 package org.opengroup.osdu.dataset.model.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IntTestGetDatasetStorageInstructionsResponse<T> {
     
     T storageLocation;

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/shared/TestGetCreateUpdateDatasetRegistryRequest.java

@@ -21,8 +21,11 @@ import org.opengroup.osdu.core.common.model.storage.Record;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TestGetCreateUpdateDatasetRegistryRequest{
 
 	private List<Record> datasetRegistries;

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/shared/TestGetCreateUpdateDatasetRegistryResponse.java

@@ -19,7 +19,10 @@ import org.opengroup.osdu.core.common.model.storage.Record;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TestGetCreateUpdateDatasetRegistryResponse {
 
 	private List<Record> datasetRegistries;

testing/dataset-test-core/src/main/java/org/opengroup/osdu/dataset/model/shared/TestGetRecordsResponse.java

@@ -22,7 +22,10 @@ import org.opengroup.osdu.core.common.model.storage.Record;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TestGetRecordsResponse {
     private List<Record> records;
     private List<Record> invalidRecords;