DEVX-786 don't retry delete requests on concurrent modification (#1062)

* don't retry delete requests on concurrent modification

* spotless: Fix code style

* spotless: add commit to blame ignore revs file

---------

Co-authored-by: ct-sdks[bot] <153784748+ct-sdks[bot]@users.noreply.github.com>

Author: jenschude

.git-blame-ignore-revs

@@ -26,3 +26,4 @@ c4e2bf407aa0b7a3d34605134791013ba8a2d376
 f00f4fe6ed5e22cdd2e3f68370c2da96e6bbc8e7
 899ed51a7b6607161fcda5c1000115a076cc4fe7
 53b9d9cc4fc4091b89f84effb6e526371d3bae68
+4822581aeff072b7649c7aec56a13a95bd58c249

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/ConcurrentModificationTest.java

@@ -242,6 +242,36 @@ public void concurrentModMiddleware() {
         });
     }
 
+    @Test
+    public void concurrentModMiddlewareDelete() {
+        String projectKey = CommercetoolsTestUtils.getProjectKey();
+
+        ProjectApiRoot projectApiRoot = ApiRootBuilder.of()
+                .defaultClient(ClientCredentials.of()
+                        .withClientId(CommercetoolsTestUtils.getClientId())
+                        .withClientSecret(CommercetoolsTestUtils.getClientSecret())
+                        .build(),
+                    ServiceRegion.GCP_EUROPE_WEST1)
+                .addConcurrentModificationMiddleware(3)
+                .build(projectKey);
+
+        CartsFixtures.withUpdateableCart(cart -> {
+
+            final ApiHttpResponse<Cart> deCart = projectApiRoot.carts()
+                    .withId(cart.getId())
+                    .post(CartUpdateBuilder.of()
+                            .version(cart.getVersion())
+                            .actions(CartSetCountryActionBuilder.of().country("DE").build())
+                            .build())
+                    .executeBlocking();
+
+            Assertions.assertThatExceptionOfType(ConcurrentModificationException.class)
+                    .isThrownBy(() -> projectApiRoot.carts().delete(cart).executeBlocking());
+
+            return deCart.getBody();
+        });
+    }
+
     @Test
     public void testInfoLoggerException() {
 

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ConcurrentModificationMiddlewareImpl.java

@@ -65,6 +65,14 @@ public ConcurrentModificationMiddlewareImpl(final int maxRetries, final long del
                 .withMaxRetries(maxRetries)
                 .onRetry(this::logEventFailure)
                 .handle(ConcurrentModificationException.class)
+                .abortIf((result, exception) -> {
+                    if (exception instanceof ConcurrentModificationException
+                            && ((ConcurrentModificationException) exception).getRequest() != null) {
+                        return ((ConcurrentModificationException) exception).getRequest()
+                                .getMethod() == ApiHttpMethod.DELETE;
+                    }
+                    return false;
+                })
                 .build();
         this.executor = Failsafe.with(retryPolicy);
     }