Merge pull request #886 from Cofinity-X/chore/TRX-30-sync-upstream

chore: [TRX-30] removing subjectId since it is not existing in dtr. (…
eclipse-tractusx · Oct 15, 2024 · 1ac6c94 · 1ac6c94
2 parents 5791722 + 7b7ea60
commit 1ac6c94
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,9 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 - Added the discovery type configurable, with a default value of bpnl in (ConnectorEndpointsService) (#12)
 
+### Removed
+- Removed subjectId from AssetAdministrationShellDescriptor object
+
 ## [5.4.1] - 2024-08-19
 
 ### Fixed

diff --git a/docs/src/api/irs-api.yaml b/docs/src/api/irs-api.yaml
@@ -2232,8 +2232,6 @@ components:
           example: engineserialid
         semanticId:
           $ref: '#/components/schemas/Reference'
-        subjectId:
-          $ref: '#/components/schemas/Reference'
         value:
           type: string
           example: "12309481209312"

diff --git a/...a/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java b/...a/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java
@@ -41,10 +41,7 @@ public class IdentifierKeyValuePair {
      */
     @Schema(implementation = String.class, example = "engineserialid")
     private String name;
-    /**
-     * subjectId
-     */
-    private Reference subjectId;
+
     /**
      * externalSubjectId
      */

diff --git a/...ipse/tractusx/irs/registryclient/decentral/DigitalTwinRegistryCreateShellServiceTest.java b/...ipse/tractusx/irs/registryclient/decentral/DigitalTwinRegistryCreateShellServiceTest.java
@@ -117,14 +117,6 @@ private AssetAdministrationShellDescriptor testShell() {
                                                  .specificAssetIds(List.of(IdentifierKeyValuePair.builder()
                                                                                                  .name("manufacturerId")
                                                                                                  .value("BPNL00000003CNKC")
-                                                                                                 .subjectId(
-                                                                                                         Reference.builder()
-                                                                                                                  .keys(List.of(
-                                                                                                                          SemanticId.builder()
-                                                                                                                                    .type("GlobalReference")
-                                                                                                                                    .value("PUBLIC_READABLE")
-                                                                                                                                    .build()))
-                                                                                                                  .build())
                                                                                                  .build()))
                                                  .submodelDescriptors(List.of(SubmodelDescriptor.builder()
                                                                                                 .idShort(