Merge branch 'fix/841-fill-bpn-in-tombstone' into fix/841-fix-getRoot…

…ErrorMessages
eclipse-tractusx · Aug 2, 2024 · 2e7f4ad · 2e7f4ad
2 parents 913d0a6 + 1a6a677
commit 2e7f4ad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/.../main/java/org/eclipse/tractusx/irs/testing/wiremock/DiscoveryServiceWiremockSupport.java b/.../main/java/org/eclipse/tractusx/irs/testing/wiremock/DiscoveryServiceWiremockSupport.java
@@ -33,6 +33,7 @@
 /**
  * WireMock configurations and requests used for testing the Discovery Service flow.
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public final class DiscoveryServiceWiremockSupport {
     public static final String CONTROLPLANE_PUBLIC_URL = "https://test.edc.io";
     public static final String EDC_DISCOVERY_PATH = "/edcDiscovery";

diff --git a/...rc/main/java/org/eclipse/tractusx/irs/testing/wiremock/SubmodelFacadeWiremockSupport.java b/...rc/main/java/org/eclipse/tractusx/irs/testing/wiremock/SubmodelFacadeWiremockSupport.java
@@ -29,6 +29,7 @@
 /**
  * WireMock configurations and requests used for testing the EDC Flow.
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public final class SubmodelFacadeWiremockSupport {
     public static final String PATH_CATALOG = "/catalog/request";
     public static final String PATH_NEGOTIATE = "/contractnegotiations";
@@ -125,30 +126,30 @@ public static void prepareEmptyCatalog(final String bpn, final String edcUrl) {
         stubFor(post(urlPathEqualTo(PATH_CATALOG)).willReturn(
                 WireMockConfig.responseWithStatus(STATUS_CODE_OK).withBody("""
                         {
-                        	"@id": "6af0d267-aaed-4d2e-86bb-adf391597fbe",
-                        	"@type": "dcat:Catalog",
-                        	"dspace:participantId": "%s",
-                        	"dcat:dataset": [],
-                        	"dcat:service": {
-                        		"@id": "75b09a2c-e7f9-4d15-bd67-334c50f35c48",
-                        		"@type": "dcat:DataService",
-                        		"dcat:endpointDescription": "dspace:connector",
-                        		"dcat:endpointUrl": "%s",
-                        		"dct:terms": "dspace:connector",
-                        		"dct:endpointUrl": "%s"
-                        	},
-                        	"participantId": "%s",
-                        	"@context": {
-                        		"@vocab": "https://w3id.org/edc/v0.0.1/ns/",
-                        		"edc": "https://w3id.org/edc/v0.0.1/ns/",
-                        		"tx": "https://w3id.org/tractusx/v0.0.1/ns/",
-                        		"tx-auth": "https://w3id.org/tractusx/auth/",
-                        		"cx-policy": "https://w3id.org/catenax/policy/",
-                        		"dcat": "http://www.w3.org/ns/dcat#",
-                        		"dct": "http://purl.org/dc/terms/",
-                        		"odrl": "http://www.w3.org/ns/odrl/2/",
-                        		"dspace": "https://w3id.org/dspace/v0.8/"
-                        	}
+                            "@id": "6af0d267-aaed-4d2e-86bb-adf391597fbe",
+                            "@type": "dcat:Catalog",
+                            "dspace:participantId": "%s",
+                            "dcat:dataset": [],
+                            "dcat:service": {
+                                "@id": "75b09a2c-e7f9-4d15-bd67-334c50f35c48",
+                                "@type": "dcat:DataService",
+                                "dcat:endpointDescription": "dspace:connector",
+                                "dcat:endpointUrl": "%s",
+                                "dct:terms": "dspace:connector",
+                                "dct:endpointUrl": "%s"
+                            },
+                            "participantId": "%s",
+                            "@context": {
+                                "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
+                                "edc": "https://w3id.org/edc/v0.0.1/ns/",
+                                "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+                                "tx-auth": "https://w3id.org/tractusx/auth/",
+                                "cx-policy": "https://w3id.org/catenax/policy/",
+                                "dcat": "http://www.w3.org/ns/dcat#",
+                                "dct": "http://purl.org/dc/terms/",
+                                "odrl": "http://www.w3.org/ns/odrl/2/",
+                                "dspace": "https://w3id.org/dspace/v0.8/"
+                            }
                         }
                         """.formatted(bpn, edcUrl, edcUrl, bpn))));
     }