FINERACT-1420: Idempotency improvement for test and edge cases

Author: elnafateh

fineract-core/src/main/java/org/apache/fineract/commands/service/DeterministicIdempotencyKeyGenerator.java

@@ -30,7 +30,6 @@
 import java.util.Collections;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.apache.fineract.commands.domain.CommandWrapper;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -102,8 +101,4 @@ private String currentTimeWindow() {
         long window = now.getEpochSecond() / (5 * 60);
         return String.valueOf(window);
     }
-
-    private String buildContext(CommandWrapper wrapper) {
-        return (wrapper.getActionName() + ":" + wrapper.getEntityName() + ":" + wrapper.getHref());
-    }
 }

fineract-provider/src/test/java/org/apache/fineract/commands/service/IdempotencyKeyResolverTest.java

@@ -89,7 +89,6 @@ void shouldGenerateKeyUsingContextWhenHeaderMissing() {
         when(wrapper.getEntityId()).thenReturn(null);
         when(wrapper.getJobName()).thenReturn(null);
 
-
         when(deterministicIdempotencyKeyGenerator.generate(anyString(), anyString())).thenReturn("generated-key");
 
         String result = underTest.resolve(wrapper);
@@ -209,12 +208,10 @@ void shouldUseDeterministicKeyWhenJobNamePresentEvenWithoutClientOrEntity() {
 
         Assertions.assertEquals("job-key", result.key());
         Assertions.assertTrue(result.isDeterministic());
-        verify(deterministicIdempotencyKeyGenerator).generate(anyString(),
-                contains("LOAN_CLOSE_OF_BUSINESS"));
+        verify(deterministicIdempotencyKeyGenerator).generate(anyString(), contains("LOAN_CLOSE_OF_BUSINESS"));
         // Verify the key is stored in context for internal retry reuse
         Assertions.assertEquals("job-key",
-                fineractRequestContextHolder.getAttribute(
-                        SynchronousCommandProcessingService.IDEMPOTENCY_KEY_ATTRIBUTE));
+                fineractRequestContextHolder.getAttribute(SynchronousCommandProcessingService.IDEMPOTENCY_KEY_ATTRIBUTE));
 
     }
 

integration-tests/src/test/java/org/apache/fineract/integrationtests/IdempotencyTest.java

@@ -154,58 +154,6 @@ public void shouldTheSecondRequestWithSameIdempotencyKeyWillFailureToo() {
         assertEquals((Map) body1.jsonPath().get(""), response2.getBody().jsonPath().get(""));
     }
 
-    // @Test
-    // public void shouldReuseDeterministicIdempotencyKeyWhenHeaderMissing() {
-    // ResponseSpecification updateResponseSpec = new ResponseSpecBuilder().expectStatusCode(204).build();
-    // JobBusinessStepConfigData originalStepConfig = IdempotencyHelper.getConfiguredBusinessStepsByJobName(requestSpec,
-    // responseSpec,
-    // LOAN_JOB_NAME);
-    //
-    // try {
-    // String requestBody = "{\"businessSteps\":[{\"stepName\":\"APPLY_CHARGE_TO_OVERDUE_LOANS\",\"order\":1}]}";
-    // Response response = IdempotencyHelper.updateBusinessStepOrderWithoutIdempotencyKey(requestSpec,
-    // updateResponseSpec,
-    // LOAN_JOB_NAME, requestBody);
-    // Response responseSecond = IdempotencyHelper.updateBusinessStepOrderWithoutIdempotencyKey(requestSpec,
-    // updateResponseSpec,
-    // LOAN_JOB_NAME, requestBody);
-    //
-    // assertEquals(response.getBody().asString(), responseSecond.getBody().asString());
-    // assertNull(response.header(AbstractIdempotentCommandException.IDEMPOTENT_CACHE_HEADER));
-    // assertNotNull(responseSecond.header(AbstractIdempotentCommandException.IDEMPOTENT_CACHE_HEADER));
-    // } finally {
-    // restoreOriginalStepConfig(updateResponseSpec, originalStepConfig);
-    // }
-    // }
-
-    // @Test
-    // public void shouldReuseDeterministicIdempotencyKeyForReorderedJsonWhenHeaderMissing() {
-    // ResponseSpecification updateResponseSpec = new ResponseSpecBuilder().expectStatusCode(204).build();
-    // JobBusinessStepConfigData originalStepConfig = IdempotencyHelper.getConfiguredBusinessStepsByJobName(requestSpec,
-    // responseSpec,
-    // LOAN_JOB_NAME);
-    //
-    // try {
-    // String firstRequestBody = "{\"businessSteps\":[{\"stepName\":\"APPLY_CHARGE_TO_OVERDUE_LOANS\",\"order\":1},"
-    // + "{\"stepName\":\"LOAN_DELINQUENCY_CLASSIFICATION\",\"order\":2}]}";
-    // String secondRequestBody = "{\"businessSteps\":[{\"order\":1,\"stepName\":\"APPLY_CHARGE_TO_OVERDUE_LOANS\"},"
-    // + "{\"order\":2,\"stepName\":\"LOAN_DELINQUENCY_CLASSIFICATION\"}]}";
-    //
-    // Response response = IdempotencyHelper.updateBusinessStepOrderWithoutIdempotencyKey(requestSpec,
-    // updateResponseSpec,
-    // LOAN_JOB_NAME, firstRequestBody);
-    // Response responseSecond = IdempotencyHelper.updateBusinessStepOrderWithoutIdempotencyKey(requestSpec,
-    // updateResponseSpec,
-    // LOAN_JOB_NAME, secondRequestBody);
-    //
-    // assertEquals(response.getBody().asString(), responseSecond.getBody().asString());
-    // assertNull(response.header(AbstractIdempotentCommandException.IDEMPOTENT_CACHE_HEADER));
-    // assertNotNull(responseSecond.header(AbstractIdempotentCommandException.IDEMPOTENT_CACHE_HEADER));
-    // } finally {
-    // restoreOriginalStepConfig(updateResponseSpec, originalStepConfig);
-    // }
-    // }
-
     @Test
     public void shouldCacheFailedRequestWhenHeaderMissing() {
         ResponseSpecification responseSpecForError = new ResponseSpecBuilder().expectStatusCode(400).build();