Merge pull request #427 from catenax-ng/main

Extension of edc client library
eclipse-tractusx · Feb 20, 2024 · 301023e · 301023e
2 parents 910bed2 + 799e2fb
commit 301023e
Show file tree

Hide file tree

Showing 39 changed files with 2,039 additions and 127 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -17,4 +17,5 @@ The following people have contributed to this repository:
 - Zied Belkhiria, MHP, https://github.com/Zied-Belkhiria-Mhp
 - Adam Bugajewski, doubleSlash Net-Business GmbH, https://github.com/ds-ext-abugajewski
 - Matthias Fischer, doubleSlash Net-Business GmbH, https://github.com/dsmf
-
+- Sebastian Ceronik, doubleSlash Net-Business GmbH, https://github.com/ds-ext-sceronik
+- Maximilian Wesener, doubleSlash Net-Business GmbH, https://github.com/ds-mwesener
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Added concept to conform with IndustryCore Changes CX-0126 and CX-127
+- EdcAssetService capable to create assets inside EDC
+- EdcPolicyDefinitionService capable to create polices inside EDC
+- EdcContractDefinitionService capable to create contracts inside EDC
+
+### Changed
+- Updated AUTHORS.md
 
 ## [4.5.1] - 2024-02-07
 ### Changed

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -150,6 +150,16 @@ The plugin will be disabled by default. To enable it in the current project, go
 More info:  
 https://github.com/google/google-java-format/blob/master/README.md#intellij-jre-config
 
+### Create a release
+
+1. Choose a release version. Use semantic versioning!
+2. Add release notes for new version in [CHANGELOG.md](CHANGELOG.md) and [charts/irs-helm/CHANGELOG.md](charts/irs-helm/CHANGELOG.md) (e.g. https://github.com/catenax-ng/tx-item-relationship-service/pull/328)
+3. Update [COMPATIBILITY_MATRIX.md](COMPATIBILITY_MATRIX.md)
+4. Create Git tag for the desired release version `git tag x.x.x`
+5. Push Git tag to repository `git push origin x.x.x`
+6. Wait for release workflow to complete
+7. Merge the automatically opened PR by github-actions bot
+8. Notify about the release in IRS Matrix Chat 
 
 ## Contact
 

diff --git a/...t/#367-adapt-to-changes-of-industry-core/#367-adapt-to-changes-industry-core.md b/...t/#367-adapt-to-changes-of-industry-core/#367-adapt-to-changes-industry-core.md
diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java
@@ -186,7 +186,7 @@ public void setMeasuredMethodExecutionTime(final String tag, final long duration
     }
 
     public void setStateSnapShot(final JobState state, final long value) {
-        log.debug("Update State {} snapshot to {} ", state, value);
+        log.trace("Update State {} snapshot to {} ", state, value);
         switch (state) {
             case COMPLETED:
                 snapshotCompletedValue.set(value);
@@ -201,7 +201,7 @@ public void setStateSnapShot(final JobState state, final long value) {
                 snapshotFailedValue.set(value);
                 break;
             default:
-                log.debug("Unused State {} value {} ", state, value);
+                log.trace("Unused State {} value {} ", state, value);
                 break;
         }
     }

diff --git a/irs-api/src/main/resources/application.yml b/irs-api/src/main/resources/application.yml
@@ -59,13 +59,7 @@ management: # Spring management API config, see https://spring.io/guides/gs/cent
   server:
     port: 4004
 
-logging:
-  pattern:
-    console: "%d %-5level %logger : %msg%n"
-  level:
-    root: WARN
-    org.springframework: INFO
-    org.eclipse.tractusx.irs: INFO
+logging.config: "classpath:log4j2.xml"
 
 springdoc: # API docs configuration
   api-docs:

diff --git a/irs-api/src/main/resources/log4j2.xml b/irs-api/src/main/resources/log4j2.xml
@@ -8,7 +8,7 @@
     </Appenders>
 
     <Loggers>
-        <Root level="debug">
+        <Root level="info">
             <AppenderRef ref="Console"/>
         </Root>
 

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json
@@ -1,8 +1,9 @@
 {
     "submodels": [
         {
-            "identification": "urn:uuid:06564726-8032-417f-9583-5385632c980e",
+            "identification": "urn:uuid:662f3a1b-de56-4cbb-8fb4-51779643126d",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [
@@ -15,8 +16,9 @@
             }
         },
         {
-            "identification": "urn:uuid:2dc2f65e-e2e5-4939-9624-3d2be4c76884",
+            "identification": "urn:uuid:73068d1b-e846-4a22-a0ae-b6310f5b0a36",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [
@@ -29,8 +31,9 @@
             }
         },
         {
-            "identification": "urn:uuid:76fe719c-cfc9-4247-9882-4460fe0166f0",
+            "identification": "urn:uuid:b5933d6b-f005-4a9a-996e-a55501b2d651",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [
@@ -43,8 +46,9 @@
             }
         },
         {
-            "identification": "urn:uuid:edb31207-09b1-4570-b5d4-f753d8463915",
+            "identification": "urn:uuid:ab703fb6-7869-439b-aedf-43c3f21f8060",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [
@@ -57,8 +61,9 @@
             }
         },
         {
-            "identification": "urn:uuid:987c584b-afa7-4ace-9a00-d63867a781e9",
+            "identification": "urn:uuid:26aa986b-a443-4b8d-aec5-bc0da9757cbe",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [
@@ -71,8 +76,24 @@
             }
         },
         {
-            "identification": "urn:uuid:003c7b24-5860-4b47-87f9-bb5366c237c0",
+            "identification": "urn:uuid:1753b174-8212-429d-9f37-cfa2e0d6a07c",
             "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
+            "payload": {
+                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+                "subcomponents": [
+                    {
+                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+                        "productType": "module"
+                    }
+                ],
+                "productType": "module"
+            }
+        },
+        {
+            "identification": "urn:uuid:6e6f7237-982e-4359-accf-e3b9c0fb4f0e",
+            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+            "contractAgreementId": null,
             "payload": {
                 "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
                 "subcomponents": [

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json
@@ -56,25 +56,6 @@
             },
             "aspectType": "SingleLevelBomAsBuilt",
             "bpn": "BPNL00000003AYRE"
-        },
-        {
-            "catenaXId": "urn:uuid:d57a0374-45bc-4d9e-b44c-e6e75cfe84c0",
-            "linkedItem": {
-                "quantity": {
-                    "quantityNumber": 0.1908,
-                    "measurementUnit": {
-                        "datatypeURI": null,
-                        "lexicalValue": "unit:kilogram"
-                    }
-                },
-                "lifecycleContext": "asBuilt",
-                "assembledOn": "2022-02-03T14:48:54.709Z",
-                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:6cae0932-05e2-467d-98d0-7d580938a23e",
-                "hasAlternatives": true
-            },
-            "aspectType": "SingleLevelBomAsBuilt",
-            "bpn": "BPNL00000003B0Q0"
         }
     ]
 }
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json
@@ -1,8 +1,9 @@
 {
     "submodels" : [
         {
-            "identification": "urn:uuid:7a3ba22d-a6e1-4096-b34a-f2afc42fe17f",
+            "identification": "urn:uuid:5fbf0548-8119-4550-852e-3c58eac4a36c",
             "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+            "contractAgreementId": null,
             "payload": {
                 "component": [
                     {
@@ -40,88 +41,6 @@
                     }
                 ]
             }
-        },
-        {
-            "identification": "urn:uuid:8178ed3b-9c23-4dea-b252-d37338934eb4",
-            "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-            "payload": {
-                "materialName": "Engineering Plastics",
-                "materialClass": "5.1",
-                "component": [
-                    {
-                        "materialName": "PA66",
-                        "recycledContent": 33,
-                        "materialClass": "5.1",
-                        "quantity": {
-                            "unit": "unit:percent",
-                            "value": 70
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": "PA66"
-                    },
-                    {
-                        "materialName": "GF-Faser",
-                        "recycledContent": 20,
-                        "materialClass": "5.1",
-                        "quantity": {
-                            "unit": "unit:percent",
-                            "value": 30
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": "GF30"
-                    }
-                ]
-            }
-        },
-        {
-            "identification": "urn:uuid:b24ed803-9cf0-4b5c-bbea-5e518f2764cb",
-            "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-            "payload": {
-                "materialName": "NTIER Product",
-                "materialClass": "5.5",
-                "component": [
-                    {
-                        "materialName": "Aluminium oxide",
-                        "recycledContent": 83,
-                        "materialClass": "5.5.1",
-                        "quantity": {
-                            "unit": "unit:percent",
-                            "value": 60
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": ""
-                    },
-                    {
-                        "materialName": "Other",
-                        "recycledContent": 4,
-                        "materialClass": "5.5.2",
-                        "quantity": {
-                            "unit": "unit:percent",
-                            "value": 40
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": ""
-                    }
-                ]
-            }
-        },
-        {
-            "identification": "urn:uuid:07bddbb1-df63-4a25-81c0-f1d6d7a4273c",
-            "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-            "payload": {
-                "component": [
-                    {
-                        "materialName": "Glue",
-                        "materialClass": "6.2",
-                        "quantity": {
-                            "unit": "unit:kilogram",
-                            "value": 2.5
-                        },
-                        "weight": "0.2341",
-                        "materialAbbreviation": "GL338"
-                    }
-                ]
-            }
         }
     ]
 }
diff --git a/irs-edc-client/pom.xml b/irs-edc-client/pom.xml
@@ -230,6 +230,12 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>${jsonassert.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcConfiguration.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcConfiguration.java
@@ -67,6 +67,9 @@ public static class EndpointConfig {
             private String data;
             private String catalog;
             private String contractNegotiation;
+            private String asset;
+            private String contractDefinition;
+            private String policyDefinition;
             private String transferProcess;
             private String stateSuffix;