fix(irs-api):[eclipse-tractusx#538] fix code-smells

ds-pweick · Jul 10, 2024 · dbc501a · dbc501a
1 parent 8f918af
commit dbc501a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsWireMockIntegrationTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsWireMockIntegrationTest.java
@@ -299,9 +299,9 @@ void shouldCreateDetailedTombstoneForMissmatchPolicy() {
         final Jobs jobForJobId = irsService.getJobForJobId(jobHandle.getId(), false);
 
         assertThat(jobForJobId.getJob().getState()).isEqualTo(JobState.COMPLETED);
-        assertThat(jobForJobId.getShells()).hasSize(0);
-        assertThat(jobForJobId.getRelationships()).hasSize(0);
-        assertThat(jobForJobId.getSubmodels()).hasSize(0);
+        assertThat(jobForJobId.getShells()).isEmpty();
+        assertThat(jobForJobId.getRelationships()).isEmpty();
+        assertThat(jobForJobId.getSubmodels()).isEmpty();
         assertThat(jobForJobId.getTombstones()).hasSize(1);
         final Tombstone actualTombstone = jobForJobId.getTombstones().get(0);
         assertThat(actualTombstone.getProcessingError().getRootCauses()).hasSize(1);
@@ -331,9 +331,9 @@ void shouldCreateDetailedTombstoneForEdcErrors() {
         final Jobs jobForJobId = irsService.getJobForJobId(jobHandle.getId(), false);
 
         assertThat(jobForJobId.getJob().getState()).isEqualTo(JobState.COMPLETED);
-        assertThat(jobForJobId.getShells()).hasSize(0);
-        assertThat(jobForJobId.getRelationships()).hasSize(0);
-        assertThat(jobForJobId.getSubmodels()).hasSize(0);
+        assertThat(jobForJobId.getShells()).isEmpty();
+        assertThat(jobForJobId.getRelationships()).isEmpty();
+        assertThat(jobForJobId.getSubmodels()).isEmpty();
         assertThat(jobForJobId.getTombstones()).hasSize(1);
         final Tombstone actualTombstone = jobForJobId.getTombstones().get(0);
         assertThat(actualTombstone.getProcessingError().getRootCauses()).hasSize(1);
@@ -363,9 +363,9 @@ void shouldCreateDetailedTombstoneForDiscoveryErrors() {
         final Jobs jobForJobId = irsService.getJobForJobId(jobHandle.getId(), false);
 
         assertThat(jobForJobId.getJob().getState()).isEqualTo(JobState.COMPLETED);
-        assertThat(jobForJobId.getShells()).hasSize(0);
-        assertThat(jobForJobId.getRelationships()).hasSize(0);
-        assertThat(jobForJobId.getSubmodels()).hasSize(0);
+        assertThat(jobForJobId.getShells()).isEmpty();
+        assertThat(jobForJobId.getRelationships()).isEmpty();
+        assertThat(jobForJobId.getSubmodels()).isEmpty();
         assertThat(jobForJobId.getTombstones()).hasSize(1);
         final Tombstone actualTombstone = jobForJobId.getTombstones().get(0);
         assertThat(actualTombstone.getProcessingError().getRootCauses()).hasSize(1);

diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcSubmodelClientImpl.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcSubmodelClientImpl.java
@@ -261,16 +261,6 @@ public List<CompletableFuture<EndpointDataReference>> getEndpointReferencesForAs
 
                 final String storageId = getStorageId(endpointDataReferenceStatus, negotiationResponse);
 
-                // TODO (#538) Remove this comment and code later. 
-                //    This is just for quickly simulating and experimenting with negotiation
-                //    failed during development.
-                //    It should later be replaced with a real automated test in
-                //    IrsWireMockIntegrationTest that simulates this
-                //    (this test could probably be based on shouldStartRecursiveProcesses
-                //    but needs different setup throwing an exception during negotiation).
-                //       if (true) {
-                //           throw new EdcClientException("negotiation failed");
-                //       }
                 return pollingService.<EndpointDataReference>createJob()
                                      .action(() -> retrieveEndpointReference(storageId, stopWatch))
                                      .timeToLive(config.getSubmodel().getRequestTtl())