FINERACT-2380: move retrofit client based test to feign

Author: budaidev

.github/workflows/build-mariadb.yml

@@ -25,7 +25,7 @@ jobs:
         options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3
 
       mock-oauth2-server:
-        image: ghcr.io/navikt/mock-oauth2-server:3.0.1
+        image: ghcr.io/navikt/mock-oauth2-server:2.1.10
         ports:
           - 9000:9000
         env:

.github/workflows/build-mysql.yml

@@ -25,7 +25,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
       mock-oauth2-server:
-        image: ghcr.io/navikt/mock-oauth2-server:3.0.1
+        image: ghcr.io/navikt/mock-oauth2-server:2.1.10
         ports:
           - 9000:9000
         env:

.github/workflows/build-postgresql.yml

@@ -26,7 +26,7 @@ jobs:
         options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3
 
       mock-oauth2-server:
-        image: ghcr.io/navikt/mock-oauth2-server:3.0.1
+        image: ghcr.io/navikt/mock-oauth2-server:2.1.10
         ports:
           - 9000:9000
         env:

.github/workflows/run-integration-test-sequentially-postgresql.yml

@@ -22,7 +22,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
         options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3
       mock-oauth2-server:
-        image: ghcr.io/navikt/mock-oauth2-server:3.0.1
+        image: ghcr.io/navikt/mock-oauth2-server:2.1.10
         ports:
           - 9000:9000
         env:

.github/workflows/stale.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
+    - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         # stale-issue-message: 'Stale issue message'

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractFeignClient.java

@@ -61,6 +61,7 @@
 import org.apache.fineract.client.feign.services.EntityFieldConfigurationApi;
 import org.apache.fineract.client.feign.services.ExternalAssetOwnerLoanProductAttributesApi;
 import org.apache.fineract.client.feign.services.ExternalAssetOwnersApi;
+import org.apache.fineract.client.feign.services.ExternalAssetOwnersApiExtension;
 import org.apache.fineract.client.feign.services.ExternalEventConfigurationApi;
 import org.apache.fineract.client.feign.services.ExternalServicesApi;
 import org.apache.fineract.client.feign.services.FetchAuthenticatedUserDetailsApi;
@@ -95,10 +96,13 @@
 import org.apache.fineract.client.feign.services.LoanCollateralApi;
 import org.apache.fineract.client.feign.services.LoanCollateralManagementApi;
 import org.apache.fineract.client.feign.services.LoanDisbursementDetailsApi;
+import org.apache.fineract.client.feign.services.LoanDisbursementDetailsApiExtension;
 import org.apache.fineract.client.feign.services.LoanInterestPauseApi;
 import org.apache.fineract.client.feign.services.LoanProductsApi;
+import org.apache.fineract.client.feign.services.LoanProductsApiExtension;
 import org.apache.fineract.client.feign.services.LoanReschedulingApi;
 import org.apache.fineract.client.feign.services.LoanTransactionsApi;
+import org.apache.fineract.client.feign.services.LoanTransactionsApiExtension;
 import org.apache.fineract.client.feign.services.LoansApi;
 import org.apache.fineract.client.feign.services.LoansPointInTimeApi;
 import org.apache.fineract.client.feign.services.MakerCheckerOr4EyeFunctionalityApi;
@@ -392,6 +396,10 @@ public ExternalAssetOwnersApi externalAssetOwners() {
         return create(ExternalAssetOwnersApi.class);
     }
 
+    public ExternalAssetOwnersApiExtension externalAssetOwnersExtension() {
+        return create(ExternalAssetOwnersApiExtension.class);
+    }
+
     public ExternalEventConfigurationApi externalEventConfiguration() {
         return create(ExternalEventConfigurationApi.class);
     }
@@ -528,6 +536,10 @@ public LoanDisbursementDetailsApi loanDisbursementDetails() {
         return create(LoanDisbursementDetailsApi.class);
     }
 
+    public LoanDisbursementDetailsApiExtension loanDisbursementDetailsExtension() {
+        return create(LoanDisbursementDetailsApiExtension.class);
+    }
+
     public LoanInterestPauseApi loanInterestPause() {
         return create(LoanInterestPauseApi.class);
     }
@@ -536,6 +548,10 @@ public LoanProductsApi loanProducts() {
         return create(LoanProductsApi.class);
     }
 
+    public LoanProductsApiExtension loanProductsExtension() {
+        return create(LoanProductsApiExtension.class);
+    }
+
     public LoanReschedulingApi loanRescheduling() {
         return create(LoanReschedulingApi.class);
     }
@@ -544,6 +560,10 @@ public LoanTransactionsApi loanTransactions() {
         return create(LoanTransactionsApi.class);
     }
 
+    public LoanTransactionsApiExtension loanTransactionsExtension() {
+        return create(LoanTransactionsApiExtension.class);
+    }
+
     public LoansApi loans() {
         return create(LoansApi.class);
     }

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractFeignClientConfig.java

@@ -41,6 +41,7 @@
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import org.apache.fineract.client.feign.support.HeaderCapturingDecoder;
 
 /**
  * Configuration class for Feign client.
@@ -95,7 +96,8 @@ public <T> T createClient(Class<T> apiType) {
         Encoder multipartEncoder = new FineractMultipartEncoder(jacksonEncoder);
 
         return Feign.builder().client(getOrCreateHttpClient()).encoder(multipartEncoder)
-                .decoder(new JacksonDecoder(ObjectMapperFactory.getShared())).errorDecoder(new FineractErrorDecoder())
+                .decoder(new HeaderCapturingDecoder(new JacksonDecoder(ObjectMapperFactory.getShared())))
+                .errorDecoder(new FineractErrorDecoder())
                 .options(new Request.Options(connectTimeout, TimeUnit.MILLISECONDS, readTimeout, TimeUnit.MILLISECONDS, true))
                 .retryer(Retryer.NEVER_RETRY).requestInterceptor(new BasicAuthRequestInterceptor(username, password))
                 .requestInterceptor(new TenantIdRequestInterceptor(tenantId)).logger(new Slf4jLogger(apiType))

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/util/CallFailedRuntimeException.java

@@ -18,13 +18,9 @@
  */
 package org.apache.fineract.client.feign.util;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import feign.FeignException;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.client.feign.FeignException;
 
 /**
  * Exception thrown by {@link FeignCalls} utility when Feign calls fail.
@@ -49,7 +45,7 @@ private static String createMessage(FeignException e) {
             sb.append(", request=").append(e.request().url());
         }
 
-        String contentString = e.contentUTF8();
+        String contentString = e.responseBodyAsString();
         if (contentString != null && !contentString.isEmpty()) {
             sb.append(", errorBody=").append(contentString);
         }
@@ -58,34 +54,9 @@ private static String createMessage(FeignException e) {
     }
 
     private static String extractDeveloperMessage(FeignException e) {
-        try {
-            byte[] content = e.content();
-            if (content == null || content.length == 0) {
-                return e.getMessage();
-            }
-
-            String contentString = new String(content, StandardCharsets.UTF_8);
-            ObjectMapper mapper = new ObjectMapper();
-            JsonNode root = mapper.readTree(contentString);
-
-            if (root.has("developerMessage")) {
-                return root.get("developerMessage").asText();
-            }
-
-            if (root.has("errors")) {
-                JsonNode errors = root.get("errors");
-                if (errors.isArray() && errors.size() > 0) {
-                    JsonNode firstError = errors.get(0);
-                    if (firstError.has("developerMessage")) {
-                        return firstError.get("developerMessage").asText();
-                    }
-                }
-            }
-
-            return contentString;
-        } catch (IOException ex) {
-            log.warn("Failed to extract developer message from error response", ex);
-            return e.getMessage();
+        if (e.getDeveloperMessage() != null) {
+            return e.getDeveloperMessage();
         }
+        return e.getMessage();
     }
 }

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/util/FeignCalls.java

@@ -18,8 +18,8 @@
  */
 package org.apache.fineract.client.feign.util;
 
-import feign.FeignException;
 import java.util.function.Supplier;
+import org.apache.fineract.client.feign.FeignException;
 
 /**
  * Extension methods for Feign calls. This class is recommended to be statically imported.
@@ -77,4 +77,41 @@ public static void executeVoid(Runnable feignCall) throws CallFailedRuntimeExcep
     public static <T> T execute(Supplier<T> feignCall) throws FeignException {
         return feignCall.get();
     }
+
+    /**
+     * Execute a Feign call expecting failure (for negative tests). Returns the exception with error details.
+     *
+     * @param feignCall
+     *            the Feign call to execute
+     * @return CallFailedRuntimeException containing status code and error message
+     * @throws AssertionError
+     *             if the call succeeds when failure was expected
+     */
+    public static CallFailedRuntimeException fail(Supplier<?> feignCall) {
+        try {
+            Object result = feignCall.get();
+            throw new AssertionError("Expected call to fail, but it succeeded with result: " + result);
+        } catch (FeignException e) {
+            return new CallFailedRuntimeException(e);
+        }
+    }
+
+    /**
+     * Execute a Feign call expecting failure with void return (for negative tests). Returns the exception with error
+     * details.
+     *
+     * @param feignCall
+     *            the Feign call to execute
+     * @return CallFailedRuntimeException containing status code and error message
+     * @throws AssertionError
+     *             if the call succeeds when failure was expected
+     */
+    public static CallFailedRuntimeException failVoid(Runnable feignCall) {
+        try {
+            feignCall.run();
+            throw new AssertionError("Expected call to fail, but it succeeded");
+        } catch (FeignException e) {
+            return new CallFailedRuntimeException(e);
+        }
+    }
 }

fineract-core/src/main/java/org/apache/fineract/infrastructure/event/external/jobs/SendAsynchronousEventsTasklet.java

@@ -75,18 +75,24 @@ public class SendAsynchronousEventsTasklet implements Tasklet {
     @Override
     public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) {
         try {
-            if (isDownstreamChannelEnabled()) {
+            boolean isEnabled = isDownstreamChannelEnabled();
+            log.info("DEBUG: isDownstreamChannelEnabled={}, jms.enabled={}, kafka.enabled={}", isEnabled,
+                    fineractProperties.getEvents().getExternal().getProducer().getJms().isEnabled(),
+                    fineractProperties.getEvents().getExternal().getProducer().getKafka().isEnabled());
+            if (isEnabled) {
                 List<ExternalEventView> events = getQueuedEventsBatch();
                 log.debug("Queued events size: {}", events.size());
                 sendEvents(events);
+            } else {
+                log.info("DEBUG: Downstream channel is DISABLED - skipping event sending");
             }
         } catch (Exception e) {
             log.error("Error occurred while processing events: ", e);
         }
         return RepeatStatus.FINISHED;
     }
 
-    protected boolean isDownstreamChannelEnabled() {
+    private boolean isDownstreamChannelEnabled() {
         return fineractProperties.getEvents().getExternal().getProducer().getJms().isEnabled()
                 || fineractProperties.getEvents().getExternal().getProducer().getKafka().isEnabled();
     }