Merge pull request #330 from AAFC-BICoE/28321_Update_dina-base_0.91

28321 Update dina-base 0.91

Author: brandonandre

pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.6.6</version>
+    <version>2.7.2</version>
   </parent>
 
   <properties>
@@ -32,18 +32,16 @@
     <pdfbox.version>2.0.25</pdfbox.version>
     <imageio.version>3.8.2</imageio.version>
 
-    <spotbugs-maven-plugin.version>4.5.3.0</spotbugs-maven-plugin.version>
-    <spotbugs.version>4.5.3</spotbugs.version>
+    <spotbugs-maven-plugin.version>4.6.0.0</spotbugs-maven-plugin.version>
+    <spotbugs.version>4.7.1</spotbugs.version>
     <jcip-annotations.version>1.0</jcip-annotations.version>
-    <dependency-check.version>6.5.3</dependency-check.version>
+    <dependency-check.version>7.1.1</dependency-check.version>
     <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <checkstyle.version>8.45.1</checkstyle.version>
+    <checkstyle.version>9.3</checkstyle.version>
     <asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
     <asciidoctorj.diagram.version>2.0.2</asciidoctorj.diagram.version>
-    <dina-base-api.version>0.86</dina-base-api.version>
-
-    <liquibase.version>4.9.0</liquibase.version>
+    <dina-base-api.version>0.91</dina-base-api.version>
 
     <!-- Override to avoid NoClassDefFoundError: org/apache/maven/doxia/siterenderer/DocumentContent -->
     <maven-site-plugin.version>3.7.1</maven-site-plugin.version>

src/test/java/ca/gc/aafc/objectstore/api/openapi/DerivativeOpenApiIT.java

@@ -1,19 +1,16 @@
 package ca.gc.aafc.objectstore.api.openapi;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.UUID;
-import java.util.Map;
 
 import javax.inject.Inject;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaDelete;
 import javax.persistence.criteria.Root;
 import javax.transaction.Transactional;
 
-import org.apache.http.client.utils.URIBuilder;
+import ca.gc.aafc.dina.testsupport.jsonapi.JsonAPIRelationship;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -85,17 +82,18 @@ public void setup() {
 
     ObjectStoreMetadataDto osMetadata = buildObjectStoreMetadataDto();
 
-    metadataUuid = sendPost("metadata", JsonAPITestHelper.toJsonAPIMap("metadata", JsonAPITestHelper.toAttributeMap(osMetadata), null, null)).extract().body().jsonPath().get("data.id");
+    metadataUuid = JsonAPITestHelper.extractId(sendPost("metadata",
+            JsonAPITestHelper.toJsonAPIMap("metadata", JsonAPITestHelper.toAttributeMap(osMetadata), null, null)));
 
     DerivativeDto derivative = buildDerivativeDto(objectUpload_generatedFrom.getFileIdentifier());
 
-    derivativeUuid = sendPost(RESOURCE_UNDER_TEST, JsonAPITestHelper.toJsonAPIMap(
-      RESOURCE_UNDER_TEST, 
-      JsonAPITestHelper.toAttributeMap(derivative),
-      Map.of(
-          "acDerivedFrom", getRelationshipType("metadata", metadataUuid)),
-      null)).extract().body().jsonPath().get("data.id");
-
+    derivativeUuid = JsonAPITestHelper.extractId(sendPost(RESOURCE_UNDER_TEST, JsonAPITestHelper.toJsonAPIMap(
+            DerivativeDto.TYPENAME,
+                    JsonAPITestHelper.toAttributeMap(derivative),
+                    JsonAPITestHelper.toRelationshipMap(
+                                    JsonAPIRelationship.of("acDerivedFrom", "metadata", metadataUuid)
+                    ),
+      null)));
   }
 
   /**
@@ -116,20 +114,15 @@ public void tearDown() {
   void derivative_SpecValid() {
     DerivativeDto derivativeDto = buildDerivativeDto(objectUpload.getFileIdentifier());
     OpenAPI3Assertions.assertRemoteSchema(OpenAPIConstants.OBJECT_STORE_API_SPECS_URL, SCHEMA_NAME,
+
     sendPost(RESOURCE_UNDER_TEST, JsonAPITestHelper.toJsonAPIMap(
       RESOURCE_UNDER_TEST, 
       JsonAPITestHelper.toAttributeMap(derivativeDto),
-      Map.of(
-          "acDerivedFrom", getRelationshipType("metadata", metadataUuid),
-          "generatedFromDerivative", getRelationshipType("derivative", derivativeUuid)),
-      null))
-      .extract().asString());
-  }
-
-  private Map<String, Object> getRelationshipType(String type, String uuid) {
-    return Map.of("data", Map.of(
-      "id", uuid,
-      "type", type));
+            JsonAPITestHelper.toRelationshipMap(
+                    List.of(
+                            JsonAPIRelationship.of("acDerivedFrom", "metadata", metadataUuid),
+                            JsonAPIRelationship.of("generatedFromDerivative", "derivative", derivativeUuid))),
+      null)).extract().asString());
   }
 
   private DerivativeDto buildDerivativeDto(UUID fileIdentifier) {