Feature: add validation for contract definition id #1372

CHANGELOG.md

@@ -62,6 +62,7 @@ in the detailed section referring to by linking pull requests or issues.
 * Add signing/publishing config (#1147)
 * Verify OpenAPI definitions (#1312)
 * Documentation for CosmosDB (#1334)
+* Add validation to contract definition id (#1347)
 
 #### Changed
 

extensions/api/api-core/build.gradle.kts

@@ -28,12 +28,12 @@ dependencies {
     implementation(project(":common:util"))
     implementation("jakarta.ws.rs:jakarta.ws.rs-api:${rsApi}")
     implementation("jakarta.validation:jakarta.validation-api:${jakartaValidationApi}")
+    implementation("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 
     testImplementation("org.glassfish.jersey.core:jersey-common:${jerseyVersion}")
     testImplementation("org.glassfish.jersey.core:jersey-server:${jerseyVersion}")
 
     testImplementation(testFixtures(project(":launchers:junit")))
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/asset/build.gradle.kts

@@ -38,7 +38,6 @@ dependencies {
     testImplementation(testFixtures(project(":common:util")))
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/contractagreement/build.gradle.kts

@@ -36,7 +36,6 @@ dependencies {
     testImplementation(testFixtures(project(":common:util")))
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/contractdefinition/build.gradle.kts

@@ -35,7 +35,6 @@ dependencies {
     testImplementation(testFixtures(project(":common:util")))
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/contractdefinition/src/main/java/org/eclipse/dataspaceconnector/api/datamanagement/contractdefinition/model/ContractDefinitionDto.java

@@ -16,8 +16,10 @@
 package org.eclipse.dataspaceconnector.api.datamanagement.contractdefinition.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.NotNull;
 import org.eclipse.dataspaceconnector.spi.query.Criterion;
 
@@ -35,6 +37,12 @@ public class ContractDefinitionDto {
     @NotNull
     private String id;
 
+    @AssertTrue
+    @JsonIgnore
+    public boolean isIdValid() {
+        return id != null && !id.contains(":");
+    }
+
     private ContractDefinitionDto() {
     }
 

extensions/api/data-management/contractdefinition/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractdefinition/model/ContractDefinitionDtoValidationTest.java

@@ -54,7 +54,7 @@ void validate_invalidProperty(String id, String accessPolicyId, String contractP
                 .contractPolicyId(contractPolicyId)
                 .criteria(crit)
                 .build();
-        assertThat(validator.validate(dto)).hasSize(1);
+        assertThat(validator.validate(dto)).hasSizeGreaterThan(0);
     }
 
     @Test
@@ -74,7 +74,8 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) th
             return Stream.of(
                     Arguments.of(null, "accessPolicy", "contractPolicy"),
                     Arguments.of("id", null, "contractPolicy"),
-                    Arguments.of("id", "accessPolicy", null)
+                    Arguments.of("id", "accessPolicy", null),
+                    Arguments.of("id:123", "accessPolicy", "contractPolicy")
             );
         }
     }

extensions/api/data-management/contractnegotiation/build.gradle.kts

@@ -37,7 +37,6 @@ dependencies {
     testImplementation(project(":core:defaults"))
 
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/transferprocess/build.gradle.kts

@@ -40,7 +40,6 @@ dependencies {
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation(testFixtures(project(":common:util")))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
-    testRuntimeOnly("org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}") //for validation
 }
 
 publishing {

extensions/api/data-management/transferprocess/src/main/java/org/eclipse/dataspaceconnector/api/datamanagement/transferprocess/model/TransferRequestDto.java

@@ -29,7 +29,6 @@ public class TransferRequestDto {
 
     @NotNull
     private String connectorAddress;
-    @NotNull
     private String id;
     @NotNull
     private String contractId;

extensions/api/data-management/transferprocess/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/transferprocess/model/TransferRequestDtoValidationTest.java

@@ -69,7 +69,6 @@ private static class InvalidPropertiesProvider implements ArgumentsProvider {
         @Override
         public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
             return Stream.of(
-                    Arguments.of(null, "connectorAddress", "contractId", destination(), transferType(), "ids-multipart", "connectorId", "assetId"),
                     Arguments.of("id", null, "contractId", destination(), transferType(), "ids-multipart", "connectorId", "assetId"),
                     Arguments.of("id", "connectorAddress", null, destination(), transferType(), "ids-multipart", "connectorId", "assetId"),
                     Arguments.of("id", "connectorAddress", "contractId", null, transferType(), "ids-multipart", "connectorId", "assetId"),

resources/openapi/openapi.yaml

@@ -1377,7 +1377,6 @@ components:
       - connectorId
       - contractId
       - dataDestination
-      - id
       - protocol
       - transferType
       type: object

resources/openapi/yaml/transferprocess.yaml

@@ -206,7 +206,6 @@ components:
       - connectorId
       - contractId
       - dataDestination
-      - id
       - protocol
       - transferType
     TransferState: