From 621f6d2bbe5c49475812debf89c3249b43a21934 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 29 Aug 2022 09:04:06 -0500 Subject: [PATCH 01/53] Added extensionProperties to legal tag properties --- .../legal/middleware/GlobalErrorHandler.java | 1 - .../interfaces/ILegalTagRepository.java | 1 + .../osdu/legal/tags/LegalTagService.java | 1 + .../osdu/legal/tags/dto/UpdateLegalTag.java | 4 ++++ .../osdu/legal/tags/LegalTagServiceTests.java | 1 + .../osdu/legal/tags/LegalTestUtils.java | 22 +++++++++++++++++++ .../osdu/legal/tags/model/LegalTagTests.java | 10 +++++++++ .../legal/tags/model/PropertiesTests.java | 9 ++++++++ .../validation/PropertiesValidatorTests.java | 12 ++++++++++ pom.xml | 2 +- 10 files changed, 61 insertions(+), 2 deletions(-) diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index 901ec513..dd14ee0e 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,7 +34,6 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } - @Override public String getErrorPath() { return "/error"; } diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java index de0afe8b..6bd611f0 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java @@ -18,6 +18,7 @@ public interface ILegalTagRepository { String SECURITY_CLASSIFICATION = "securityClassification"; String EXPORT_CLASSIFICATION = "exportClassification"; String PERSONAL_DATA = "personalData"; + String EXTENSION_PROPERTIES = "extensionProperties"; String DESCRIPTION = "description"; String NAME = "name"; diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java index 6ca294ee..e7cca25a 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java @@ -166,6 +166,7 @@ public class LegalTagService { currentLegalTag.getProperties().setContractId(newLegalTag.getContractId()); currentLegalTag.getProperties().setExpirationDate(newLegalTag.getExpirationDate()); + currentLegalTag.getProperties().setExtensionProperties(newLegalTag.getExtensionProperties()); currentLegalTag.setDescription(newLegalTag.getDescription()); validator.isValidThrows(currentLegalTag); diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java index b4cc4a4e..d8cd24cd 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java @@ -1,6 +1,8 @@ package org.opengroup.osdu.legal.tags.dto; import java.sql.Date; +import java.util.Map; + import org.opengroup.osdu.core.common.model.legal.validation.ValidDescription; import org.opengroup.osdu.core.common.model.legal.validation.ValidName; import lombok.AllArgsConstructor; @@ -24,4 +26,6 @@ public class UpdateLegalTag { private String description = ""; private Date expirationDate; + + private Map extensionProperties; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java index fb1420ba..bf849ff6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java @@ -264,6 +264,7 @@ public class LegalTagServiceTests { assertEquals(result.getName(), updateTag.getName()); assertEquals(result.getProperties().getContractId(), updateTag.getContractId()); assertEquals(result.getProperties().getExpirationDate(), updateTag.getExpirationDate()); + assertEquals(result.getProperties().getExtensionProperties(), updateTag.getExtensionProperties()); assertEquals(result.getDescription(), updateTag.getDescription()); verify(validator, times(1)).isValidThrows(any()); } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java index 6cd22cf9..1d29c6d6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java @@ -7,6 +7,9 @@ import org.opengroup.osdu.core.common.model.legal.LegalTag; import org.opengroup.osdu.core.common.model.legal.Properties; import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; public class LegalTestUtils { public static LegalTag createValidLegalTag(String name){ @@ -27,6 +30,16 @@ public class LegalTestUtils { properties.setPersonalData("Sensitive Personal Information"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("ECCN"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } public static UpdateLegalTag createUpdateLegalTag(String name){ @@ -35,6 +48,15 @@ public class LegalTestUtils { legalTag.setContractId("abc123"); legalTag.setName(name); legalTag.setDescription("myDescription"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", false); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "PurchaseOrganisation"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + return legalTag; } public static LegalTagDto createValidLegalTagDto(String name){ diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java index bff50675..1226db0b 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java @@ -109,6 +109,16 @@ public class LegalTagTests { properties.setPersonalData("Personally Identifiable"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("EAR99"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + LegalTag legalTag = new LegalTag(); legalTag.setProperties(properties); legalTag.setId(1L); diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java index c7e15429..b5ec0de0 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java @@ -152,6 +152,15 @@ public class PropertiesTests { sut.setSecurityClassification("Confidential"); sut.setExportClassification("EAR99"); sut.setExpirationDate(Properties.DEFAULT_EXPIRATIONDATE); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + sut.setExtensionProperties(extensionProperties); return sut; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java index ba8b974d..0309e823 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java @@ -14,6 +14,8 @@ import java.sql.Date; import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; @@ -217,6 +219,16 @@ public class PropertiesValidatorTests { properties.setOriginator(originator); properties.setExpirationDate(ts); properties.setCountryOfOrigin(new ArrayList(){{add("FR");}}); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } } diff --git a/pom.xml b/pom.xml index 0130d7b2..e96913f8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.16.0 + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 -- GitLab From 3893984f9969e3fe5d1f3e9442978b1fa452b892 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 08:48:02 -0500 Subject: [PATCH 02/53] Workaround to pass Byoc unit testing for SpringBoot 2.7.2 --- .../org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index ef442084..66f86013 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,6 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -30,6 +31,10 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestPropertySource(properties= { + "management.endpoints.web.discovery.enabled=false", + "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", + "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; -- GitLab From dcd1d8de8895a9d8edf7dae757ebb9def8594e02 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 09:02:47 -0500 Subject: [PATCH 03/53] Workaround to pass legal aws mongo unit testing for SpringBoot 2.7.2 --- provider/legal-aws/src/test/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index 70c98bd5..b53b9adc 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,4 +3,5 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb \ No newline at end of file +repository.implementation=mongodb +spring.mongodb.embedded.version=3.5.5 \ No newline at end of file -- GitLab From 52d6ef85a39686f285e5be9ce8417e3047b8e303 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 14:32:31 -0500 Subject: [PATCH 04/53] Override the springboot version in legal service to 2.4.12 for now --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e96913f8..a847aca6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ opendes UTF-8 0.17.0-SNAPSHOT + 2.4.12 1.26 1.7.0 3.0.0 @@ -68,6 +69,13 @@ pom import + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.opengroup.osdu os-core-common -- GitLab From 492fdce111f55ea755cfeaa5840f0f14689d2722 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 20:22:43 -0500 Subject: [PATCH 05/53] Override the springboot version in legal service to 2.4.12 --- pom.xml | 8 ----- provider/legal-aws/pom.xml | 17 ++++++++++ .../src/test/resources/application.properties | 3 +- provider/legal-byoc/pom.xml | 33 +++++++++++++++++++ .../osdu/legal/byoc/api/LegalTagApiTest.java | 5 --- provider/legal-ibm/pom.xml | 17 ++++++++++ 6 files changed, 68 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a847aca6..e96913f8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ opendes UTF-8 0.17.0-SNAPSHOT - 2.4.12 1.26 1.7.0 3.0.0 @@ -69,13 +68,6 @@ pom import - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - org.opengroup.osdu os-core-common diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 61d19933..d6f2e922 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -34,6 +34,23 @@ 2.13.2 5.3.22 + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index b53b9adc..70c98bd5 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,5 +3,4 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb -spring.mongodb.embedded.version=3.5.5 \ No newline at end of file +repository.implementation=mongodb \ No newline at end of file diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index 643f5721..a7e48e4f 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -10,6 +10,23 @@ legal-byoc jar + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + @@ -26,6 +43,22 @@ spring-boot-starter-security + + com.fasterxml.jackson.core + jackson-core + 2.13.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.2 + + javax.inject diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index 66f86013..ef442084 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -31,10 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@TestPropertySource(properties= { - "management.endpoints.web.discovery.enabled=false", - "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", - "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index bc499e74..71eab38c 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -15,6 +15,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu.legal -- GitLab From 296ee58b9769555af3409390751e01eb8b7b8c8f Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 09:49:26 -0500 Subject: [PATCH 06/53] Added logging for failed test --- .../acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index d90d741d..e8f59c49 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -3,11 +3,15 @@ package org.opengroup.osdu.legal.acceptanceTests; import org.opengroup.osdu.legal.util.AcceptanceBaseTest; import org.opengroup.osdu.legal.util.LegalTagUtils; import com.sun.jersey.api.client.ClientResponse; + +import lombok.extern.java.Log; + import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +@Log public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBaseTest { protected String name; @@ -58,6 +62,7 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); + log.info("invalidTagsWithReason: " + invalidTagsWithReason); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 20208eccdce79d3191985076e63c193a2cd404cc Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 10:51:37 -0500 Subject: [PATCH 07/53] Override the springboot version in legal service to 2.4.12 --- legal-core/pom.xml | 17 +++++++++++++++++ .../legal/middleware/GlobalErrorHandler.java | 1 + .../ValidateLegalTagsApiAcceptanceTests.java | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 179d03e1..3463d6c5 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -21,6 +21,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index dd14ee0e..901ec513 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,6 +34,7 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } + @Override public String getErrorPath() { return "/error"; } diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index e8f59c49..6ae75dc0 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -62,7 +62,8 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); - log.info("invalidTagsWithReason: " + invalidTagsWithReason); + log.info("invalidTagsWithReason: " + invalidTagsWithReason.invalidLegalTags[0]); + log.info("MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 6a98cf6111c4a799bada38c99644858556840508 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 12:26:22 -0500 Subject: [PATCH 08/53] Override the springboot version in legal service to 2.4.12 --- testing/legal-test-aws/pom.xml | 8 +++++++- .../TestValidateLegalTagsApiAcceptance.java | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index a415ab6e..691edddf 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,7 +128,13 @@ junit 4.12 test - + + + org.projectlombok + lombok + 1.18.24 + provided + diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java index 8da500e2..6af71cfb 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java @@ -19,18 +19,25 @@ import org.junit.After; import org.junit.Before; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; +import lombok.extern.java.Log; + +@Log public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests { @Before @Override public void setup() throws Exception { AwsLegalTagUtils legalTagUtils = new AwsLegalTagUtils(); + + log.info(" setup MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); // Insert expired legal tag directly for should_return200_withLegalTagNamesAndInvalidExpirationDateReason_when_GivenExistingInvalidLegalTagNames if (StringUtils.isBlank(System.getenv("MONGO_DB_TEST"))) { legalTagUtils.insertExpiredLegalTag(); }else { + log.info("insertExpiredLegalTagMongoDb before:" + AwsLegalTagUtils.getMyDataPartition()); legalTagUtils.insertExpiredLegalTagMongoDb(); + log.info("insertExpiredLegalTagMongoDb after"); } this.legalTagUtils = legalTagUtils; -- GitLab From 117d1d40bb329680ed48c774f5e5b8f8bd84cb9f Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 29 Aug 2022 09:04:06 -0500 Subject: [PATCH 09/53] Added extensionProperties to legal tag properties --- .../legal/middleware/GlobalErrorHandler.java | 1 - .../interfaces/ILegalTagRepository.java | 1 + .../osdu/legal/tags/LegalTagService.java | 1 + .../osdu/legal/tags/dto/UpdateLegalTag.java | 4 ++++ .../osdu/legal/tags/LegalTagServiceTests.java | 1 + .../osdu/legal/tags/LegalTestUtils.java | 22 +++++++++++++++++++ .../osdu/legal/tags/model/LegalTagTests.java | 10 +++++++++ .../legal/tags/model/PropertiesTests.java | 9 ++++++++ .../validation/PropertiesValidatorTests.java | 12 ++++++++++ pom.xml | 2 +- 10 files changed, 61 insertions(+), 2 deletions(-) diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index 901ec513..dd14ee0e 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,7 +34,6 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } - @Override public String getErrorPath() { return "/error"; } diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java index de0afe8b..6bd611f0 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java @@ -18,6 +18,7 @@ public interface ILegalTagRepository { String SECURITY_CLASSIFICATION = "securityClassification"; String EXPORT_CLASSIFICATION = "exportClassification"; String PERSONAL_DATA = "personalData"; + String EXTENSION_PROPERTIES = "extensionProperties"; String DESCRIPTION = "description"; String NAME = "name"; diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java index 6ca294ee..e7cca25a 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java @@ -166,6 +166,7 @@ public class LegalTagService { currentLegalTag.getProperties().setContractId(newLegalTag.getContractId()); currentLegalTag.getProperties().setExpirationDate(newLegalTag.getExpirationDate()); + currentLegalTag.getProperties().setExtensionProperties(newLegalTag.getExtensionProperties()); currentLegalTag.setDescription(newLegalTag.getDescription()); validator.isValidThrows(currentLegalTag); diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java index b4cc4a4e..d8cd24cd 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java @@ -1,6 +1,8 @@ package org.opengroup.osdu.legal.tags.dto; import java.sql.Date; +import java.util.Map; + import org.opengroup.osdu.core.common.model.legal.validation.ValidDescription; import org.opengroup.osdu.core.common.model.legal.validation.ValidName; import lombok.AllArgsConstructor; @@ -24,4 +26,6 @@ public class UpdateLegalTag { private String description = ""; private Date expirationDate; + + private Map extensionProperties; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java index fb1420ba..bf849ff6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java @@ -264,6 +264,7 @@ public class LegalTagServiceTests { assertEquals(result.getName(), updateTag.getName()); assertEquals(result.getProperties().getContractId(), updateTag.getContractId()); assertEquals(result.getProperties().getExpirationDate(), updateTag.getExpirationDate()); + assertEquals(result.getProperties().getExtensionProperties(), updateTag.getExtensionProperties()); assertEquals(result.getDescription(), updateTag.getDescription()); verify(validator, times(1)).isValidThrows(any()); } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java index 6cd22cf9..1d29c6d6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java @@ -7,6 +7,9 @@ import org.opengroup.osdu.core.common.model.legal.LegalTag; import org.opengroup.osdu.core.common.model.legal.Properties; import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; public class LegalTestUtils { public static LegalTag createValidLegalTag(String name){ @@ -27,6 +30,16 @@ public class LegalTestUtils { properties.setPersonalData("Sensitive Personal Information"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("ECCN"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } public static UpdateLegalTag createUpdateLegalTag(String name){ @@ -35,6 +48,15 @@ public class LegalTestUtils { legalTag.setContractId("abc123"); legalTag.setName(name); legalTag.setDescription("myDescription"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", false); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "PurchaseOrganisation"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + return legalTag; } public static LegalTagDto createValidLegalTagDto(String name){ diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java index bff50675..1226db0b 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java @@ -109,6 +109,16 @@ public class LegalTagTests { properties.setPersonalData("Personally Identifiable"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("EAR99"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + LegalTag legalTag = new LegalTag(); legalTag.setProperties(properties); legalTag.setId(1L); diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java index c7e15429..b5ec0de0 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java @@ -152,6 +152,15 @@ public class PropertiesTests { sut.setSecurityClassification("Confidential"); sut.setExportClassification("EAR99"); sut.setExpirationDate(Properties.DEFAULT_EXPIRATIONDATE); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + sut.setExtensionProperties(extensionProperties); return sut; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java index ba8b974d..0309e823 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java @@ -14,6 +14,8 @@ import java.sql.Date; import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; @@ -217,6 +219,16 @@ public class PropertiesValidatorTests { properties.setOriginator(originator); properties.setExpirationDate(ts); properties.setCountryOfOrigin(new ArrayList(){{add("FR");}}); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } } diff --git a/pom.xml b/pom.xml index 09bff37c..e035da48 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.16.0 + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 -- GitLab From 8083bd61c194d4de903ef8046c6ee07b5c7fc22b Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 08:48:02 -0500 Subject: [PATCH 10/53] Workaround to pass Byoc unit testing for SpringBoot 2.7.2 --- .../org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index ef442084..66f86013 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,6 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -30,6 +31,10 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestPropertySource(properties= { + "management.endpoints.web.discovery.enabled=false", + "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", + "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; -- GitLab From e4d91e408bfb6f9895d4a8374282d11a1ef370db Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 09:02:47 -0500 Subject: [PATCH 11/53] Workaround to pass legal aws mongo unit testing for SpringBoot 2.7.2 --- provider/legal-aws/src/test/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index 70c98bd5..b53b9adc 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,4 +3,5 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb \ No newline at end of file +repository.implementation=mongodb +spring.mongodb.embedded.version=3.5.5 \ No newline at end of file -- GitLab From a309f2baa47dc37792502d7042cd9808aaa08517 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 14:32:31 -0500 Subject: [PATCH 12/53] Override the springboot version in legal service to 2.4.12 for now --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e035da48..18ee553b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ opendes UTF-8 0.17.0-SNAPSHOT + 2.4.12 1.26 1.7.0 3.0.0 @@ -68,6 +69,13 @@ pom import + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.opengroup.osdu os-core-common -- GitLab From 8fecec9184fda265a39f4345737af411e4f1bf16 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 20:22:43 -0500 Subject: [PATCH 13/53] Override the springboot version in legal service to 2.4.12 --- pom.xml | 8 ----- provider/legal-aws/pom.xml | 17 ++++++++++ .../src/test/resources/application.properties | 3 +- provider/legal-byoc/pom.xml | 33 +++++++++++++++++++ .../osdu/legal/byoc/api/LegalTagApiTest.java | 5 --- provider/legal-ibm/pom.xml | 17 ++++++++++ 6 files changed, 68 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 18ee553b..e035da48 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ opendes UTF-8 0.17.0-SNAPSHOT - 2.4.12 1.26 1.7.0 3.0.0 @@ -69,13 +68,6 @@ pom import - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - org.opengroup.osdu os-core-common diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 61d19933..d6f2e922 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -34,6 +34,23 @@ 2.13.2 5.3.22 + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index b53b9adc..70c98bd5 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,5 +3,4 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb -spring.mongodb.embedded.version=3.5.5 \ No newline at end of file +repository.implementation=mongodb \ No newline at end of file diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index 643f5721..a7e48e4f 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -10,6 +10,23 @@ legal-byoc jar + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + @@ -26,6 +43,22 @@ spring-boot-starter-security + + com.fasterxml.jackson.core + jackson-core + 2.13.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.2 + + javax.inject diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index 66f86013..ef442084 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -31,10 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@TestPropertySource(properties= { - "management.endpoints.web.discovery.enabled=false", - "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", - "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index bc499e74..71eab38c 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -15,6 +15,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu.legal -- GitLab From f72da105740ddd10483306b349f57f323b73b6c5 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 09:49:26 -0500 Subject: [PATCH 14/53] Added logging for failed test --- .../acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index d90d741d..e8f59c49 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -3,11 +3,15 @@ package org.opengroup.osdu.legal.acceptanceTests; import org.opengroup.osdu.legal.util.AcceptanceBaseTest; import org.opengroup.osdu.legal.util.LegalTagUtils; import com.sun.jersey.api.client.ClientResponse; + +import lombok.extern.java.Log; + import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +@Log public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBaseTest { protected String name; @@ -58,6 +62,7 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); + log.info("invalidTagsWithReason: " + invalidTagsWithReason); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 13948b7c076fbcba7e99a487f12a18ce8a510b2a Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 10:51:37 -0500 Subject: [PATCH 15/53] Override the springboot version in legal service to 2.4.12 --- legal-core/pom.xml | 17 +++++++++++++++++ .../legal/middleware/GlobalErrorHandler.java | 1 + .../ValidateLegalTagsApiAcceptanceTests.java | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 179d03e1..3463d6c5 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -21,6 +21,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index dd14ee0e..901ec513 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,6 +34,7 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } + @Override public String getErrorPath() { return "/error"; } diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index e8f59c49..6ae75dc0 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -62,7 +62,8 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); - log.info("invalidTagsWithReason: " + invalidTagsWithReason); + log.info("invalidTagsWithReason: " + invalidTagsWithReason.invalidLegalTags[0]); + log.info("MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 64748da5f1e4064571270a22aa0b71782a2b24a9 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 12:26:22 -0500 Subject: [PATCH 16/53] Override the springboot version in legal service to 2.4.12 --- testing/legal-test-aws/pom.xml | 8 +++++++- .../TestValidateLegalTagsApiAcceptance.java | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index a415ab6e..691edddf 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,7 +128,13 @@ junit 4.12 test - + + + org.projectlombok + lombok + 1.18.24 + provided + diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java index 8da500e2..6af71cfb 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java @@ -19,18 +19,25 @@ import org.junit.After; import org.junit.Before; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; +import lombok.extern.java.Log; + +@Log public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests { @Before @Override public void setup() throws Exception { AwsLegalTagUtils legalTagUtils = new AwsLegalTagUtils(); + + log.info(" setup MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); // Insert expired legal tag directly for should_return200_withLegalTagNamesAndInvalidExpirationDateReason_when_GivenExistingInvalidLegalTagNames if (StringUtils.isBlank(System.getenv("MONGO_DB_TEST"))) { legalTagUtils.insertExpiredLegalTag(); }else { + log.info("insertExpiredLegalTagMongoDb before:" + AwsLegalTagUtils.getMyDataPartition()); legalTagUtils.insertExpiredLegalTagMongoDb(); + log.info("insertExpiredLegalTagMongoDb after"); } this.legalTagUtils = legalTagUtils; -- GitLab From 184ce2a8bc39e94e1239459d01e9e496c3515974 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 16:35:13 -0500 Subject: [PATCH 17/53] undo logging --- testing/legal-test-aws/pom.xml | 8 +------- .../TestValidateLegalTagsApiAcceptance.java | 7 ------- .../ValidateLegalTagsApiAcceptanceTests.java | 6 ------ 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index 691edddf..ece86cf3 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,13 +128,7 @@ junit 4.12 test - - - org.projectlombok - lombok - 1.18.24 - provided - + diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java index 6af71cfb..8da500e2 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java @@ -19,25 +19,18 @@ import org.junit.After; import org.junit.Before; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; -import lombok.extern.java.Log; - -@Log public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests { @Before @Override public void setup() throws Exception { AwsLegalTagUtils legalTagUtils = new AwsLegalTagUtils(); - - log.info(" setup MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); // Insert expired legal tag directly for should_return200_withLegalTagNamesAndInvalidExpirationDateReason_when_GivenExistingInvalidLegalTagNames if (StringUtils.isBlank(System.getenv("MONGO_DB_TEST"))) { legalTagUtils.insertExpiredLegalTag(); }else { - log.info("insertExpiredLegalTagMongoDb before:" + AwsLegalTagUtils.getMyDataPartition()); legalTagUtils.insertExpiredLegalTagMongoDb(); - log.info("insertExpiredLegalTagMongoDb after"); } this.legalTagUtils = legalTagUtils; diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index 6ae75dc0..d90d741d 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -3,15 +3,11 @@ package org.opengroup.osdu.legal.acceptanceTests; import org.opengroup.osdu.legal.util.AcceptanceBaseTest; import org.opengroup.osdu.legal.util.LegalTagUtils; import com.sun.jersey.api.client.ClientResponse; - -import lombok.extern.java.Log; - import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Log public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBaseTest { protected String name; @@ -62,8 +58,6 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); - log.info("invalidTagsWithReason: " + invalidTagsWithReason.invalidLegalTags[0]); - log.info("MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 7df440a232a6237c2e7cbb45480ac7c016d99503 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 16:37:36 -0500 Subject: [PATCH 18/53] undo logging --- testing/legal-test-aws/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index ece86cf3..a415ab6e 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,7 +128,7 @@ junit 4.12 test - + -- GitLab From 0ca0bd56d10c3a128e2dd7edf81eced61ef380bf Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 19:17:48 -0500 Subject: [PATCH 19/53] Override the springboot version in legal service to 2.4.12 --- provider/legal-ibm/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 71eab38c..b3d18d43 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -60,6 +60,21 @@ json-smart 2.4.7 + + com.fasterxml.jackson.core + jackson-core + 2.13.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.2 + org.projectlombok -- GitLab From b04f3b354d89a45f60d3e2f241bbb281b3c92654 Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Tue, 27 Sep 2022 01:46:22 +0000 Subject: [PATCH 20/53] Update pom.xml os-core-common version to 0.17.0-rc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e035da48..8f5a0fe3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-SNAPSHOT + 0.17.0-rc 1.26 1.7.0 3.0.0 -- GitLab From e985076f514b7096f2996efe8ce52bb7cb03bdcb Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 20:45:45 -0500 Subject: [PATCH 21/53] Override the springboot version in legal service parent pom file to 2.4.12 --- legal-core/pom.xml | 17 ----------------- pom.xml | 27 +++++++++++++++++++++++++-- provider/legal-aws/pom.xml | 17 ----------------- provider/legal-byoc/pom.xml | 33 --------------------------------- provider/legal-ibm/pom.xml | 32 -------------------------------- 5 files changed, 25 insertions(+), 101 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 3463d6c5..3666813f 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -20,23 +20,6 @@ 2.13.2 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - diff --git a/pom.xml b/pom.xml index 8f5a0fe3..4a7380a8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,14 @@ 1.8 opendes UTF-8 - 0.17.0-rc + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 2.17.1 2.4.7 2.13.2.2 + 2.13.2 @@ -60,7 +61,19 @@ - + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + org.opengroup.osdu os-core-common @@ -108,6 +121,16 @@ json-smart ${json-smart.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + com.fasterxml.jackson.core jackson-databind diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index d6f2e922..61d19933 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -34,23 +34,6 @@ 2.13.2 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index a7e48e4f..643f5721 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -10,23 +10,6 @@ legal-byoc jar - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - @@ -43,22 +26,6 @@ spring-boot-starter-security - - com.fasterxml.jackson.core - jackson-core - 2.13.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.13.2.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.13.2 - - javax.inject diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index b3d18d43..76f81bad 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -14,23 +14,6 @@ 0.16.0 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - @@ -60,21 +43,6 @@ json-smart 2.4.7 - - com.fasterxml.jackson.core - jackson-core - 2.13.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.13.2.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.13.2 - org.projectlombok -- GitLab From d09b857fd7980e5ce44ae60200732820c8f6ffe2 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 21:47:26 -0500 Subject: [PATCH 22/53] Removed empty spaces --- legal-core/pom.xml | 2 +- provider/legal-ibm/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 3666813f..179d03e1 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -20,7 +20,7 @@ 2.13.2 5.3.22 - + org.opengroup.osdu diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 76f81bad..bc499e74 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -14,7 +14,7 @@ 0.16.0 5.3.22 - + org.opengroup.osdu.legal -- GitLab From b1250214a78ea0e4f38d22d17b02bf3d8861f0b4 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 22:50:50 -0500 Subject: [PATCH 23/53] Updated docs --- docs/api/compliance_openapi.yaml | 10 +++++++++- docs/tutorial/ComplianceService.md | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/api/compliance_openapi.yaml b/docs/api/compliance_openapi.yaml index c7860916..c256b1c8 100644 --- a/docs/api/compliance_openapi.yaml +++ b/docs/api/compliance_openapi.yaml @@ -478,6 +478,10 @@ definitions: type: string example: EAR99 description: The ECCN value of the data if one applies. + extensionProperties: + type: object + additionalProperties: true + description: The optional object field to attach any company specific attributes. description: LegalTag properties UpdateLegalTag: type: object @@ -498,7 +502,11 @@ definitions: expirationDate: type: string example: '2025-12-25' - description: The optional expiration date of the contract in the format YYYY-MM-DD + description: The optional expiration date of the contract in the format YYYY-MM-DD. + extensionProperties: + type: object + additionalProperties: true + description: The optional object field to attach any company specific attributes. description: The model to update an existing LegalTag VersionInfo: type: "object" diff --git a/docs/tutorial/ComplianceService.md b/docs/tutorial/ComplianceService.md index 1e093882..75d66eaf 100644 --- a/docs/tutorial/ComplianceService.md +++ b/docs/tutorial/ComplianceService.md @@ -101,7 +101,10 @@ curl --request POST \ "originator":"OSDU", "securityClassification":"Public", "exportClassification":"EAR99", - "personalData":"No Personal Data" + "personalData":"No Personal Data", + "extensionProperties": { + "anyCompanySpecificAttributes": "anyJsonTypeOfvalue" + } } }' ``` @@ -110,6 +113,8 @@ curl --request POST \ It is good practice for LegalTag names to be clear and descriptive of the properties it represents, so it would be easy to discover and to associate to the correct data with it. Also, the description field is a free form optional field to allow for you to add context to the LegalTag, making easier to understand and retrieve over time. +The "extensionProperties" field is an optional json object field and you may add any company specific attributes inside this field. + When creating LegalTags, the name is automatically prefixed with the data-partition-name that is assigned to the partition. So in the example above, if the given data-partition-name is **mypartition**, then the actual name of the LegalTag would be **mypartition-demo-legaltag**. Valid values: The legalTag name needs to be between 3 and 100 characters and only alphanumeric characters and hyphens are allowed @@ -435,7 +440,7 @@ Ingestion services forward the request to the LegalTag API using the same _SAuth ## Updating a LegalTag One of the main cases where a LegalTag can become invalid is if a contract expiration date passes. This makes both the LegalTag invalid and *all* data associated with that LegalTag including derivatives. -In these situations we can update LegalTags to make them valid again and so make the associated data accessible. Currently we only allow the update of the *description*, *contract ID* and *expiration date* properties. +In these situations we can update LegalTags to make them valid again and so make the associated data accessible. Currently we only allow the update of the *description*, *contract ID*, *expiration date* and *extensionProperties* properties. PUT /api/legal/v1/legaltags @@ -450,8 +455,11 @@ curl --request PUT \ --header 'data-partition-id: opendes' \ --data '{ "name": "opendes-demo-legaltag", - "contractId": "AE12345" - "expirationDate": "2099-12-21" + "contractId": "AE12345", + "expirationDate": "2099-12-21", + "extensionProperties": { + "anyCompanySpecificAttributes": "anyJsonTypeOfvalue" + } } }' ``` -- GitLab From b49f3ce237375441c5056ac4f7a40c121d46d911 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Wed, 28 Sep 2022 22:17:46 -0500 Subject: [PATCH 24/53] Update NOTICE --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index b89aa621..1c0c8aff 100644 --- a/NOTICE +++ b/NOTICE @@ -439,7 +439,7 @@ The following software have components provided under the terms of this license: - Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base) -- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome) +- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding, https://github.com/FasterXML/jackson-dataformat-xml) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text) @@ -606,7 +606,7 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java) - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) -- GitLab From 3dd9387db75c50d933d403e6ee9add420f7addbb Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Wed, 28 Sep 2022 23:01:51 -0500 Subject: [PATCH 25/53] Update NOTICE --- NOTICE | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 1c0c8aff..55fd5e32 100644 --- a/NOTICE +++ b/NOTICE @@ -1168,6 +1168,8 @@ The following software have components provided under the terms of this license: ======================================================================== unknown ======================================================================== +The following software have components provided under the terms of this license: + - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) @@ -1181,7 +1183,10 @@ unknown - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) -- xml-apis +- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna, https://repo1.maven.org/maven2/net/java/dev/jna/jna) +- Java Native Access Platform (from https://github.com/java-native-access/jna) +- System Rules (from http://stefanbirkner.github.com/system-rules/, http://stefanbirkner.github.io/system-rules/) +- xml-apis (from https://repo1.maven.org/maven2/xml-apis/xml-apis) ======================================================================== xpp -- GitLab From 660c1ae83f27027f8fc7474338171a7d161abe82 Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Fri, 30 Sep 2022 00:54:30 +0000 Subject: [PATCH 26/53] Update pom.xml - change 0.17.0-SNAPSHOT to 0.17.0-rc4 for common core library --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a7380a8..2b6941c2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-SNAPSHOT + 0.17.0-rc4 1.26 1.7.0 3.0.0 -- GitLab From c536e50286e7ea3bcfe684eb5a93385aefc02d09 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 29 Aug 2022 09:04:06 -0500 Subject: [PATCH 27/53] Added extensionProperties to legal tag properties --- .../legal/middleware/GlobalErrorHandler.java | 1 - .../interfaces/ILegalTagRepository.java | 1 + .../osdu/legal/tags/LegalTagService.java | 1 + .../osdu/legal/tags/dto/UpdateLegalTag.java | 4 ++++ .../osdu/legal/tags/LegalTagServiceTests.java | 1 + .../osdu/legal/tags/LegalTestUtils.java | 22 +++++++++++++++++++ .../osdu/legal/tags/model/LegalTagTests.java | 10 +++++++++ .../legal/tags/model/PropertiesTests.java | 9 ++++++++ .../validation/PropertiesValidatorTests.java | 12 ++++++++++ pom.xml | 2 +- 10 files changed, 61 insertions(+), 2 deletions(-) diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index 901ec513..dd14ee0e 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,7 +34,6 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } - @Override public String getErrorPath() { return "/error"; } diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java index de0afe8b..6bd611f0 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/provider/interfaces/ILegalTagRepository.java @@ -18,6 +18,7 @@ public interface ILegalTagRepository { String SECURITY_CLASSIFICATION = "securityClassification"; String EXPORT_CLASSIFICATION = "exportClassification"; String PERSONAL_DATA = "personalData"; + String EXTENSION_PROPERTIES = "extensionProperties"; String DESCRIPTION = "description"; String NAME = "name"; diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java index 6ca294ee..e7cca25a 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/LegalTagService.java @@ -166,6 +166,7 @@ public class LegalTagService { currentLegalTag.getProperties().setContractId(newLegalTag.getContractId()); currentLegalTag.getProperties().setExpirationDate(newLegalTag.getExpirationDate()); + currentLegalTag.getProperties().setExtensionProperties(newLegalTag.getExtensionProperties()); currentLegalTag.setDescription(newLegalTag.getDescription()); validator.isValidThrows(currentLegalTag); diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java index b4cc4a4e..d8cd24cd 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/dto/UpdateLegalTag.java @@ -1,6 +1,8 @@ package org.opengroup.osdu.legal.tags.dto; import java.sql.Date; +import java.util.Map; + import org.opengroup.osdu.core.common.model.legal.validation.ValidDescription; import org.opengroup.osdu.core.common.model.legal.validation.ValidName; import lombok.AllArgsConstructor; @@ -24,4 +26,6 @@ public class UpdateLegalTag { private String description = ""; private Date expirationDate; + + private Map extensionProperties; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java index fb1420ba..bf849ff6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTagServiceTests.java @@ -264,6 +264,7 @@ public class LegalTagServiceTests { assertEquals(result.getName(), updateTag.getName()); assertEquals(result.getProperties().getContractId(), updateTag.getContractId()); assertEquals(result.getProperties().getExpirationDate(), updateTag.getExpirationDate()); + assertEquals(result.getProperties().getExtensionProperties(), updateTag.getExtensionProperties()); assertEquals(result.getDescription(), updateTag.getDescription()); verify(validator, times(1)).isValidThrows(any()); } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java index 6cd22cf9..1d29c6d6 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/LegalTestUtils.java @@ -7,6 +7,9 @@ import org.opengroup.osdu.core.common.model.legal.LegalTag; import org.opengroup.osdu.core.common.model.legal.Properties; import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; public class LegalTestUtils { public static LegalTag createValidLegalTag(String name){ @@ -27,6 +30,16 @@ public class LegalTestUtils { properties.setPersonalData("Sensitive Personal Information"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("ECCN"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } public static UpdateLegalTag createUpdateLegalTag(String name){ @@ -35,6 +48,15 @@ public class LegalTestUtils { legalTag.setContractId("abc123"); legalTag.setName(name); legalTag.setDescription("myDescription"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", false); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "PurchaseOrganisation"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + return legalTag; } public static LegalTagDto createValidLegalTagDto(String name){ diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java index bff50675..1226db0b 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/LegalTagTests.java @@ -109,6 +109,16 @@ public class LegalTagTests { properties.setPersonalData("Personally Identifiable"); properties.setSecurityClassification("Confidential"); properties.setExportClassification("EAR99"); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + LegalTag legalTag = new LegalTag(); legalTag.setProperties(properties); legalTag.setId(1L); diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java index c7e15429..b5ec0de0 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/model/PropertiesTests.java @@ -152,6 +152,15 @@ public class PropertiesTests { sut.setSecurityClassification("Confidential"); sut.setExportClassification("EAR99"); sut.setExpirationDate(Properties.DEFAULT_EXPIRATIONDATE); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + sut.setExtensionProperties(extensionProperties); return sut; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java index ba8b974d..0309e823 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/PropertiesValidatorTests.java @@ -14,6 +14,8 @@ import java.sql.Date; import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; @@ -217,6 +219,16 @@ public class PropertiesValidatorTests { properties.setOriginator(originator); properties.setExpirationDate(ts); properties.setCountryOfOrigin(new ArrayList(){{add("FR");}}); + + Map extensionProperties = new LinkedHashMap (); + extensionProperties.put("EffectiveDate", "2022-06-01T00:00:00"); + extensionProperties.put("AffiliateEnablementIndicator", true); + Map agreementParty = new LinkedHashMap (); + agreementParty.put("AgreementPartyType", "EnabledAffiliate"); + agreementParty.put("AgreementParty", "osdu:master-data--Organisation:TestCompany"); + extensionProperties.put("AgreementParties", Arrays.asList(agreementParty)); + properties.setExtensionProperties(extensionProperties); + return properties; } } diff --git a/pom.xml b/pom.xml index 09bff37c..e035da48 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.16.0 + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 -- GitLab From 542598d7e82613374918000872a5e74893151c34 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 08:48:02 -0500 Subject: [PATCH 28/53] Workaround to pass Byoc unit testing for SpringBoot 2.7.2 --- .../org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index ef442084..66f86013 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,6 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -30,6 +31,10 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestPropertySource(properties= { + "management.endpoints.web.discovery.enabled=false", + "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", + "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; -- GitLab From 9802f206ad66f6cecaa767636cabbb005645c101 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 09:02:47 -0500 Subject: [PATCH 29/53] Workaround to pass legal aws mongo unit testing for SpringBoot 2.7.2 --- provider/legal-aws/src/test/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index 70c98bd5..b53b9adc 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,4 +3,5 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb \ No newline at end of file +repository.implementation=mongodb +spring.mongodb.embedded.version=3.5.5 \ No newline at end of file -- GitLab From 4fd60cc3766999a95c60db2bbcda02722c7785bb Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 14:32:31 -0500 Subject: [PATCH 30/53] Override the springboot version in legal service to 2.4.12 for now --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e035da48..18ee553b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ opendes UTF-8 0.17.0-SNAPSHOT + 2.4.12 1.26 1.7.0 3.0.0 @@ -68,6 +69,13 @@ pom import + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.opengroup.osdu os-core-common -- GitLab From 086d5fd05619b22b1b5cfb5390bf6d39ec763c53 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 20:22:43 -0500 Subject: [PATCH 31/53] Override the springboot version in legal service to 2.4.12 --- pom.xml | 8 ----- provider/legal-aws/pom.xml | 17 ++++++++++ .../src/test/resources/application.properties | 3 +- provider/legal-byoc/pom.xml | 33 +++++++++++++++++++ .../osdu/legal/byoc/api/LegalTagApiTest.java | 5 --- provider/legal-ibm/pom.xml | 17 ++++++++++ 6 files changed, 68 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 18ee553b..e035da48 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ opendes UTF-8 0.17.0-SNAPSHOT - 2.4.12 1.26 1.7.0 3.0.0 @@ -69,13 +68,6 @@ pom import - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - org.opengroup.osdu os-core-common diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 15917c85..a7c80b6a 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -34,6 +34,23 @@ 2.13.2 5.3.22 + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index b53b9adc..70c98bd5 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,5 +3,4 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb -spring.mongodb.embedded.version=3.5.5 \ No newline at end of file +repository.implementation=mongodb \ No newline at end of file diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index 643f5721..a7e48e4f 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -10,6 +10,23 @@ legal-byoc jar + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + @@ -26,6 +43,22 @@ spring-boot-starter-security + + com.fasterxml.jackson.core + jackson-core + 2.13.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.2 + + javax.inject diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index 66f86013..ef442084 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -31,10 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@TestPropertySource(properties= { - "management.endpoints.web.discovery.enabled=false", - "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", - "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index bc499e74..71eab38c 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -15,6 +15,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu.legal -- GitLab From 4ddb541acfd7f40dab7628e0d82c9c14d55bc113 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 09:49:26 -0500 Subject: [PATCH 32/53] Added logging for failed test --- .../acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index d90d741d..e8f59c49 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -3,11 +3,15 @@ package org.opengroup.osdu.legal.acceptanceTests; import org.opengroup.osdu.legal.util.AcceptanceBaseTest; import org.opengroup.osdu.legal.util.LegalTagUtils; import com.sun.jersey.api.client.ClientResponse; + +import lombok.extern.java.Log; + import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +@Log public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBaseTest { protected String name; @@ -58,6 +62,7 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); + log.info("invalidTagsWithReason: " + invalidTagsWithReason); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 35c0369fcaffc01141d46207265e27ef2016fbc6 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 10:51:37 -0500 Subject: [PATCH 33/53] Override the springboot version in legal service to 2.4.12 --- legal-core/pom.xml | 17 +++++++++++++++++ .../legal/middleware/GlobalErrorHandler.java | 1 + .../ValidateLegalTagsApiAcceptanceTests.java | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 179d03e1..3463d6c5 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -21,6 +21,23 @@ 5.3.22 + + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + + + + org.opengroup.osdu diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index dd14ee0e..901ec513 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,6 +34,7 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } + @Override public String getErrorPath() { return "/error"; } diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index e8f59c49..6ae75dc0 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -62,7 +62,8 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); - log.info("invalidTagsWithReason: " + invalidTagsWithReason); + log.info("invalidTagsWithReason: " + invalidTagsWithReason.invalidLegalTags[0]); + log.info("MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From 80c65e1a220fce419a4a262804473db4189a9141 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 12:26:22 -0500 Subject: [PATCH 34/53] Override the springboot version in legal service to 2.4.12 --- testing/legal-test-aws/pom.xml | 8 +++++++- .../TestValidateLegalTagsApiAcceptance.java | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index a415ab6e..691edddf 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,7 +128,13 @@ junit 4.12 test - + + + org.projectlombok + lombok + 1.18.24 + provided + diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java index 8da500e2..6af71cfb 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java @@ -19,18 +19,25 @@ import org.junit.After; import org.junit.Before; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; +import lombok.extern.java.Log; + +@Log public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests { @Before @Override public void setup() throws Exception { AwsLegalTagUtils legalTagUtils = new AwsLegalTagUtils(); + + log.info(" setup MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); // Insert expired legal tag directly for should_return200_withLegalTagNamesAndInvalidExpirationDateReason_when_GivenExistingInvalidLegalTagNames if (StringUtils.isBlank(System.getenv("MONGO_DB_TEST"))) { legalTagUtils.insertExpiredLegalTag(); }else { + log.info("insertExpiredLegalTagMongoDb before:" + AwsLegalTagUtils.getMyDataPartition()); legalTagUtils.insertExpiredLegalTagMongoDb(); + log.info("insertExpiredLegalTagMongoDb after"); } this.legalTagUtils = legalTagUtils; -- GitLab From efee0d71398904c5cd44c67b513b0dfff1db034a Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 29 Aug 2022 09:04:06 -0500 Subject: [PATCH 35/53] Added extensionProperties to legal tag properties --- .../org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index 901ec513..dd14ee0e 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,7 +34,6 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } - @Override public String getErrorPath() { return "/error"; } -- GitLab From 948f18d3fa0b4758bb39d615dc12732fce55b48e Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 08:48:02 -0500 Subject: [PATCH 36/53] Workaround to pass Byoc unit testing for SpringBoot 2.7.2 --- .../org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index ef442084..66f86013 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,6 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -30,6 +31,10 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestPropertySource(properties= { + "management.endpoints.web.discovery.enabled=false", + "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", + "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; -- GitLab From 6860b48cb7be62e7407a1089311d0ebb3f923f08 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 6 Sep 2022 09:02:47 -0500 Subject: [PATCH 37/53] Workaround to pass legal aws mongo unit testing for SpringBoot 2.7.2 --- provider/legal-aws/src/test/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index 70c98bd5..b53b9adc 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,4 +3,5 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb \ No newline at end of file +repository.implementation=mongodb +spring.mongodb.embedded.version=3.5.5 \ No newline at end of file -- GitLab From 267e33609b645c937cafc29e53fd0aa7bc4c1232 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 14:32:31 -0500 Subject: [PATCH 38/53] Override the springboot version in legal service to 2.4.12 for now --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e035da48..18ee553b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ opendes UTF-8 0.17.0-SNAPSHOT + 2.4.12 1.26 1.7.0 3.0.0 @@ -68,6 +69,13 @@ pom import + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.opengroup.osdu os-core-common -- GitLab From d83dad550bea3e1298880cbb02333adcb8917697 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Mon, 19 Sep 2022 20:22:43 -0500 Subject: [PATCH 39/53] Override the springboot version in legal service to 2.4.12 --- pom.xml | 8 -------- .../legal-aws/src/test/resources/application.properties | 3 +-- .../opengroup/osdu/legal/byoc/api/LegalTagApiTest.java | 5 ----- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 18ee553b..e035da48 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ opendes UTF-8 0.17.0-SNAPSHOT - 2.4.12 1.26 1.7.0 3.0.0 @@ -69,13 +68,6 @@ pom import - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - org.opengroup.osdu os-core-common diff --git a/provider/legal-aws/src/test/resources/application.properties b/provider/legal-aws/src/test/resources/application.properties index b53b9adc..70c98bd5 100644 --- a/provider/legal-aws/src/test/resources/application.properties +++ b/provider/legal-aws/src/test/resources/application.properties @@ -3,5 +3,4 @@ spring.data.mongodb.port=27019 #testing context configuration spring.main.allow-bean-definition-overriding=true -repository.implementation=mongodb -spring.mongodb.embedded.version=3.5.5 \ No newline at end of file +repository.implementation=mongodb \ No newline at end of file diff --git a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java index 66f86013..ef442084 100644 --- a/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java +++ b/provider/legal-byoc/src/test/java/org/opengroup/osdu/legal/byoc/api/LegalTagApiTest.java @@ -20,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.inject.Inject; @@ -31,10 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks; @RunWith(SpringRunner.class) @SpringBootTest(classes={LegalApplication.class}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@TestPropertySource(properties= { - "management.endpoints.web.discovery.enabled=false", - "spring.mvc.pathmatch.matching-strategy=ant-path-matcher", - "management.endpoints.enabled-by-default=false"}) public class LegalTagApiTest { @Mock TenantInfo tenantInfo; -- GitLab From c2bb5241a10f917081cd2ce056193e9a93f9a633 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 09:49:26 -0500 Subject: [PATCH 40/53] Added logging for failed test --- .../ValidateLegalTagsApiAcceptanceTests.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java index 6ae75dc0..d90d741d 100644 --- a/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java +++ b/testing/legal-test-core/src/main/java/org/opengroup/osdu/legal/acceptanceTests/ValidateLegalTagsApiAcceptanceTests.java @@ -3,15 +3,11 @@ package org.opengroup.osdu.legal.acceptanceTests; import org.opengroup.osdu.legal.util.AcceptanceBaseTest; import org.opengroup.osdu.legal.util.LegalTagUtils; import com.sun.jersey.api.client.ClientResponse; - -import lombok.extern.java.Log; - import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Log public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBaseTest { protected String name; @@ -62,8 +58,6 @@ public abstract class ValidateLegalTagsApiAcceptanceTests extends AcceptanceBase ClientResponse response = send(LegalTagUtils.createRetrieveBatchBody(legalTagUtils.getMyDataPartition() + "-" + name), 200); LegalTagUtils.InvalidTagsWithReason invalidTagsWithReason = legalTagUtils.getResult(response, 200, LegalTagUtils.InvalidTagsWithReason.class); - log.info("invalidTagsWithReason: " + invalidTagsWithReason.invalidLegalTags[0]); - log.info("MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); assertEquals(1, invalidTagsWithReason.invalidLegalTags.length); LegalTagUtils.InvalidTagWithReason invalidTagWithReason = invalidTagsWithReason.invalidLegalTags[0]; -- GitLab From adece30ced0c3f00c1bb3182d241c2deba3d413a Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 10:51:37 -0500 Subject: [PATCH 41/53] Override the springboot version in legal service to 2.4.12 --- .../org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java index dd14ee0e..901ec513 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalErrorHandler.java @@ -34,6 +34,7 @@ public class GlobalErrorHandler implements ErrorController { throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error", "An unknown error has occurred."); } + @Override public String getErrorPath() { return "/error"; } -- GitLab From 9d0e725befe132fa6fe682a7f258aea511979212 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 16:35:13 -0500 Subject: [PATCH 42/53] undo logging --- testing/legal-test-aws/pom.xml | 8 +------- .../TestValidateLegalTagsApiAcceptance.java | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index 691edddf..ece86cf3 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,13 +128,7 @@ junit 4.12 test - - - org.projectlombok - lombok - 1.18.24 - provided - + diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java index 6af71cfb..8da500e2 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java @@ -19,25 +19,18 @@ import org.junit.After; import org.junit.Before; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; -import lombok.extern.java.Log; - -@Log public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests { @Before @Override public void setup() throws Exception { AwsLegalTagUtils legalTagUtils = new AwsLegalTagUtils(); - - log.info(" setup MONGO_DB_TEST: " + System.getenv("MONGO_DB_TEST")); // Insert expired legal tag directly for should_return200_withLegalTagNamesAndInvalidExpirationDateReason_when_GivenExistingInvalidLegalTagNames if (StringUtils.isBlank(System.getenv("MONGO_DB_TEST"))) { legalTagUtils.insertExpiredLegalTag(); }else { - log.info("insertExpiredLegalTagMongoDb before:" + AwsLegalTagUtils.getMyDataPartition()); legalTagUtils.insertExpiredLegalTagMongoDb(); - log.info("insertExpiredLegalTagMongoDb after"); } this.legalTagUtils = legalTagUtils; -- GitLab From 98dcf7f951eeeeec6214e0af10d66165fdfc81cc Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 16:37:36 -0500 Subject: [PATCH 43/53] undo logging --- testing/legal-test-aws/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index ece86cf3..a415ab6e 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -128,7 +128,7 @@ junit 4.12 test - + -- GitLab From b619e4eb1cb54425f5d29b6fade2c19d0694d96d Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 20 Sep 2022 19:17:48 -0500 Subject: [PATCH 44/53] Override the springboot version in legal service to 2.4.12 --- provider/legal-ibm/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 71eab38c..b3d18d43 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -60,6 +60,21 @@ json-smart 2.4.7 + + com.fasterxml.jackson.core + jackson-core + 2.13.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.2 + org.projectlombok -- GitLab From 8e3f213284d6c8f121c533ed34223d05988f786b Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Tue, 27 Sep 2022 01:46:22 +0000 Subject: [PATCH 45/53] Update pom.xml os-core-common version to 0.17.0-rc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e035da48..8f5a0fe3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-SNAPSHOT + 0.17.0-rc 1.26 1.7.0 3.0.0 -- GitLab From 28b5a83429e4becbc35bebe6b6419246534fd24d Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 20:45:45 -0500 Subject: [PATCH 46/53] Override the springboot version in legal service parent pom file to 2.4.12 --- legal-core/pom.xml | 17 ----------------- pom.xml | 27 +++++++++++++++++++++++++-- provider/legal-aws/pom.xml | 17 ----------------- provider/legal-byoc/pom.xml | 33 --------------------------------- provider/legal-ibm/pom.xml | 32 -------------------------------- 5 files changed, 25 insertions(+), 101 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 3463d6c5..3666813f 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -20,23 +20,6 @@ 2.13.2 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - diff --git a/pom.xml b/pom.xml index 8f5a0fe3..4a7380a8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,14 @@ 1.8 opendes UTF-8 - 0.17.0-rc + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 2.17.1 2.4.7 2.13.2.2 + 2.13.2 @@ -60,7 +61,19 @@ - + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 2.4.12 + org.opengroup.osdu os-core-common @@ -108,6 +121,16 @@ json-smart ${json-smart.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + com.fasterxml.jackson.core jackson-databind diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index a7c80b6a..15917c85 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -34,23 +34,6 @@ 2.13.2 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index a7e48e4f..643f5721 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -10,23 +10,6 @@ legal-byoc jar - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - @@ -43,22 +26,6 @@ spring-boot-starter-security - - com.fasterxml.jackson.core - jackson-core - 2.13.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.13.2.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.13.2 - - javax.inject diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index b3d18d43..76f81bad 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -14,23 +14,6 @@ 0.16.0 5.3.22 - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.4.12 - - - @@ -60,21 +43,6 @@ json-smart 2.4.7 - - com.fasterxml.jackson.core - jackson-core - 2.13.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.13.2.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.13.2 - org.projectlombok -- GitLab From b986164bee583ef584b7eb9fa5d54f66964633d3 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 21:47:26 -0500 Subject: [PATCH 47/53] Removed empty spaces --- legal-core/pom.xml | 2 +- provider/legal-ibm/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 3666813f..179d03e1 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -20,7 +20,7 @@ 2.13.2 5.3.22 - + org.opengroup.osdu diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 76f81bad..bc499e74 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -14,7 +14,7 @@ 0.16.0 5.3.22 - + org.opengroup.osdu.legal -- GitLab From 40ba4bcd15a18d066911a63e56143a7d983e35fb Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Tue, 27 Sep 2022 22:50:50 -0500 Subject: [PATCH 48/53] Updated docs --- docs/api/compliance_openapi.yaml | 10 +++++++++- docs/tutorial/ComplianceService.md | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/api/compliance_openapi.yaml b/docs/api/compliance_openapi.yaml index c7860916..c256b1c8 100644 --- a/docs/api/compliance_openapi.yaml +++ b/docs/api/compliance_openapi.yaml @@ -478,6 +478,10 @@ definitions: type: string example: EAR99 description: The ECCN value of the data if one applies. + extensionProperties: + type: object + additionalProperties: true + description: The optional object field to attach any company specific attributes. description: LegalTag properties UpdateLegalTag: type: object @@ -498,7 +502,11 @@ definitions: expirationDate: type: string example: '2025-12-25' - description: The optional expiration date of the contract in the format YYYY-MM-DD + description: The optional expiration date of the contract in the format YYYY-MM-DD. + extensionProperties: + type: object + additionalProperties: true + description: The optional object field to attach any company specific attributes. description: The model to update an existing LegalTag VersionInfo: type: "object" diff --git a/docs/tutorial/ComplianceService.md b/docs/tutorial/ComplianceService.md index 1e093882..75d66eaf 100644 --- a/docs/tutorial/ComplianceService.md +++ b/docs/tutorial/ComplianceService.md @@ -101,7 +101,10 @@ curl --request POST \ "originator":"OSDU", "securityClassification":"Public", "exportClassification":"EAR99", - "personalData":"No Personal Data" + "personalData":"No Personal Data", + "extensionProperties": { + "anyCompanySpecificAttributes": "anyJsonTypeOfvalue" + } } }' ``` @@ -110,6 +113,8 @@ curl --request POST \ It is good practice for LegalTag names to be clear and descriptive of the properties it represents, so it would be easy to discover and to associate to the correct data with it. Also, the description field is a free form optional field to allow for you to add context to the LegalTag, making easier to understand and retrieve over time. +The "extensionProperties" field is an optional json object field and you may add any company specific attributes inside this field. + When creating LegalTags, the name is automatically prefixed with the data-partition-name that is assigned to the partition. So in the example above, if the given data-partition-name is **mypartition**, then the actual name of the LegalTag would be **mypartition-demo-legaltag**. Valid values: The legalTag name needs to be between 3 and 100 characters and only alphanumeric characters and hyphens are allowed @@ -435,7 +440,7 @@ Ingestion services forward the request to the LegalTag API using the same _SAuth ## Updating a LegalTag One of the main cases where a LegalTag can become invalid is if a contract expiration date passes. This makes both the LegalTag invalid and *all* data associated with that LegalTag including derivatives. -In these situations we can update LegalTags to make them valid again and so make the associated data accessible. Currently we only allow the update of the *description*, *contract ID* and *expiration date* properties. +In these situations we can update LegalTags to make them valid again and so make the associated data accessible. Currently we only allow the update of the *description*, *contract ID*, *expiration date* and *extensionProperties* properties. PUT /api/legal/v1/legaltags @@ -450,8 +455,11 @@ curl --request PUT \ --header 'data-partition-id: opendes' \ --data '{ "name": "opendes-demo-legaltag", - "contractId": "AE12345" - "expirationDate": "2099-12-21" + "contractId": "AE12345", + "expirationDate": "2099-12-21", + "extensionProperties": { + "anyCompanySpecificAttributes": "anyJsonTypeOfvalue" + } } }' ``` -- GitLab From 0733f02c67ecb998bd89f200984d406660e3ee1a Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Wed, 28 Sep 2022 22:17:46 -0500 Subject: [PATCH 49/53] Update NOTICE --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index b89aa621..1c0c8aff 100644 --- a/NOTICE +++ b/NOTICE @@ -439,7 +439,7 @@ The following software have components provided under the terms of this license: - Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base) -- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome) +- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding, https://github.com/FasterXML/jackson-dataformat-xml) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text) @@ -606,7 +606,7 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java) - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) -- GitLab From 606478215e8cf797934deaef5ed1c3dd4eece9d5 Mon Sep 17 00:00:00 2001 From: dadong-shell Date: Wed, 28 Sep 2022 23:01:51 -0500 Subject: [PATCH 50/53] Update NOTICE --- NOTICE | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 1c0c8aff..55fd5e32 100644 --- a/NOTICE +++ b/NOTICE @@ -1168,6 +1168,8 @@ The following software have components provided under the terms of this license: ======================================================================== unknown ======================================================================== +The following software have components provided under the terms of this license: + - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) @@ -1181,7 +1183,10 @@ unknown - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) -- xml-apis +- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna, https://repo1.maven.org/maven2/net/java/dev/jna/jna) +- Java Native Access Platform (from https://github.com/java-native-access/jna) +- System Rules (from http://stefanbirkner.github.com/system-rules/, http://stefanbirkner.github.io/system-rules/) +- xml-apis (from https://repo1.maven.org/maven2/xml-apis/xml-apis) ======================================================================== xpp -- GitLab From 2616d790aac52fcadb32f165d38ccc83482f4b1f Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Fri, 30 Sep 2022 00:54:30 +0000 Subject: [PATCH 51/53] Update pom.xml - change 0.17.0-SNAPSHOT to 0.17.0-rc4 for common core library --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a7380a8..2b6941c2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-SNAPSHOT + 0.17.0-rc4 1.26 1.7.0 3.0.0 -- GitLab From 6753eadff0734504d4c1743dab726833bc8a5926 Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Fri, 30 Sep 2022 04:54:44 +0000 Subject: [PATCH 52/53] Update pom.xml - change os-core-common version from 0.17.0-rc4 to 0.17.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b6941c2..4a7380a8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-rc4 + 0.17.0-SNAPSHOT 1.26 1.7.0 3.0.0 -- GitLab From 0e134c0a34c292f0a4e79d94c5ae43f4aae7c005 Mon Sep 17 00:00:00 2001 From: Dadong Zhou Date: Fri, 30 Sep 2022 05:33:41 +0000 Subject: [PATCH 53/53] Update pom.xml - change os-core-common version from 0.17.0-SNAPSHOT to 0.17.0-rc4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a7380a8..2b6941c2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.17.0-SNAPSHOT + 0.17.0-rc4 1.26 1.7.0 3.0.0 -- GitLab