From 7b7ea604ccea0c4ee9d30d59b347824154ca0a17 Mon Sep 17 00:00:00 2001
From: Maximilian Wesener <124587888+ds-mwesener@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:39:29 +0200
Subject: [PATCH] chore: [TRX-30] removing subjectId since it is not existing
 in dtr. (#27)

(cherry picked from commit 5f9428a42e2110b7f1766fb3b606155439a9a297)
---
 CHANGELOG.md                                              | 3 +++
 docs/src/api/irs-api.yaml                                 | 2 --
 .../assetadministrationshell/IdentifierKeyValuePair.java  | 5 +----
 .../DigitalTwinRegistryCreateShellServiceTest.java        | 8 --------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 939be8c908..0748c27972 100644
--- 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
index f73475178b..e930735d91 100644
--- 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/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java
index 1e9671aaf9..70d3830d60 100644
--- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java
+++ b/irs-models/src/main/java/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/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DigitalTwinRegistryCreateShellServiceTest.java b/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DigitalTwinRegistryCreateShellServiceTest.java
index 89ae49c5fd..bac67e680c 100644
--- a/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DigitalTwinRegistryCreateShellServiceTest.java
+++ b/irs-registry-client/src/test/java/org/eclipse/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(