release: prepare v6.1.0 (#516)

* chore: update infomodel version

* chore: increase connector version

* chore: add PaymentMethod undefined

* fix: add payment modality null check

* test: update ResourceFactory default value

Co-authored-by: Brian-Frederik Jahnke <[email protected]>

charts/dataspace-connector/Chart.yaml

@@ -31,13 +31,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.6
+version: 0.1.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "6.0.0"
+appVersion: "6.1.0"
 
 dependencies:
   - name: postgresql

charts/dataspace-connector/config.json

@@ -34,8 +34,8 @@
         "@id" : "https://localhost:8080/api/ids/data"
       }
     },
-    "ids:outboundModelVersion" : "4.1.0",
-    "ids:inboundModelVersion" : [ "4.0.0", "4.1.0" ],
+    "ids:outboundModelVersion" : "4.1.2",
+    "ids:inboundModelVersion" : [ "4.0.0", "4.1.0", "4.1.2" ],
     "ids:title" : [ {
       "@value" : "Dataspace Connector",
       "@type" : "http://www.w3.org/2001/XMLSchema#string"

docs/pages/communication/v6/provider.md

@@ -74,8 +74,8 @@ The values `title`, `description`, `keywords`, `publisher`, `sovereign`, `licens
 the data resource and will be used to fill in the IDS Information Model attributes for IDS
 communication with a connector as data consumer.
 
-**New**: You can add a payment modality to your resource (one of `free`, `fixedPrice`, or
-`negotiationBasis`). On top of that, you can add a list of resources as a sample of another
+**New**: You can add a payment modality to your resource (one of `undefined`, `free`, `fixedPrice`,
+or `negotiationBasis`). On top of that, you can add a list of resources as a sample of another
 resource. For this, add the IDs to the sample list. The connector checks if the values are valid
 uri and match known resource offers. If this is not the case, you will get a code 400 as a response.
 

scripts/ci/e2e/certificates/consumer-config.json

@@ -34,8 +34,8 @@
           "@id" : "https://localhost:8080/api/ids/data"
         }
       },
-      "ids:outboundModelVersion" : "4.1.0",
-      "ids:inboundModelVersion" : [ "4.0.0", "4.1.0" ],
+      "ids:outboundModelVersion" : "4.1.2",
+      "ids:inboundModelVersion" : [ "4.0.0", "4.1.0", "4.1.2" ],
       "ids:title" : [ {
         "@value" : "Dataspace Connector",
         "@type" : "http://www.w3.org/2001/XMLSchema#string"

scripts/ci/e2e/certificates/provider-config.json

@@ -34,8 +34,8 @@
           "@id" : "https://localhost:8080/api/ids/data"
         }
       },
-      "ids:outboundModelVersion" : "4.1.0",
-      "ids:inboundModelVersion" : [ "4.0.0", "4.1.0" ],
+      "ids:outboundModelVersion" : "4.1.2",
+      "ids:inboundModelVersion" : [ "4.0.0", "4.1.0", "4.1.2" ],
       "ids:title" : [ {
         "@value" : "Dataspace Connector",
         "@type" : "http://www.w3.org/2001/XMLSchema#string"

src/main/java/io/dataspaceconnector/common/ids/mapping/FromIdsObjectMapper.java

@@ -663,6 +663,10 @@ private static ProxyDesc fromIdsProxy(final List<Proxy> proxyList) {
 
     private static PaymentMethod fromIdsPaymentModality(final List<PaymentModality> modalities) {
         final var paymentModality = modalities.get(0);
+        if (paymentModality == null) {
+            return PaymentMethod.UNDEFINED;
+        }
+
         switch (paymentModality) {
             case FIXED_PRICE:
                 return PaymentMethod.FIXED_PRICE;

src/main/java/io/dataspaceconnector/common/ids/mapping/ToIdsObjectMapper.java

@@ -261,6 +261,10 @@ private static SecurityProfile getSecurityProfile(
      * @return The ids payment modality.
      */
     public static PaymentModality getPaymentModality(final PaymentMethod paymentMethod) {
+        if (paymentMethod == null) {
+            return null;
+        }
+
         switch (paymentMethod) {
             case FREE:
                 return PaymentModality.FREE;

src/main/java/io/dataspaceconnector/config/ConnectorConfig.java

@@ -68,10 +68,10 @@ public class ConnectorConfig {
     /**
      * The outbound model version.
      */
-    private final String outboundVersion = "4.1.0";
+    private final String outboundVersion = "4.1.2";
 
     /**
      * The inbound model versions.
      */
-    private final List<String> inboundVersions = List.of("4.0.0", "4.1.0");
+    private final List<String> inboundVersions = List.of("4.0.0", "4.1.0", "4.1.2");
 }

src/main/java/io/dataspaceconnector/model/resource/PaymentMethod.java

@@ -22,6 +22,12 @@
  */
 public enum PaymentMethod {
 
+    /**
+     * To express that the payment method is not set.
+     */
+    @JsonProperty("undefined")
+    UNDEFINED,
+
     /**
      * To express that the exchange of resource is with a fixed price.
      */

src/main/java/io/dataspaceconnector/model/resource/ResourceFactory.java

@@ -64,7 +64,7 @@ public abstract class ResourceFactory<T extends Resource, D extends ResourceDesc
     /**
      * The default payment modality assigned to all resources.
      */
-    public static final PaymentMethod DEFAULT_PAYMENT_MODALITY = PaymentMethod.FREE;
+    public static final PaymentMethod DEFAULT_PAYMENT_MODALITY = PaymentMethod.UNDEFINED;
 
     /**
      * The default sample list assigned to all resources.

src/main/resources/conf/config.json

@@ -34,8 +34,8 @@
         "@id" : "https://localhost:8080/api/ids/data"
       }
     },
-    "ids:outboundModelVersion" : "4.1.0",
-    "ids:inboundModelVersion" : [ "4.0.0", "4.1.0" ],
+    "ids:outboundModelVersion" : "4.1.2",
+    "ids:inboundModelVersion" : [ "4.0.0", "4.1.0", "4.1.2" ],
     "ids:title" : [ {
       "@value" : "Dataspace Connector",
       "@type" : "http://www.w3.org/2001/XMLSchema#string"

src/test/java/io/dataspaceconnector/model/resource/ResourceTest.java

@@ -58,6 +58,6 @@ public void default_paymentMethod_is_free() {
         // Nothing to arrange here.
 
         /* ACT && ASSERT */
-        assertEquals(PaymentMethod.FREE, ResourceFactory.DEFAULT_PAYMENT_MODALITY);
+        assertEquals(PaymentMethod.UNDEFINED, ResourceFactory.DEFAULT_PAYMENT_MODALITY);
     }
 }