FINERACT-2380: move retrofit client based test to feign

Author: budaidev

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

@@ -32,6 +32,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
+import org.apache.fineract.client.feign.support.HeaderCapturingDecoder;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
@@ -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/services/ExternalAssetOwnersApiExtension.java

@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.client.feign.services;
+
+import feign.Headers;
+import feign.Param;
+import feign.QueryMap;
+import feign.RequestLine;
+import java.util.Map;
+import org.apache.fineract.client.models.ExternalAssetOwnerRequest;
+import org.apache.fineract.client.models.PostInitiateTransferResponse;
+
+public interface ExternalAssetOwnersApiExtension {
+
+    @RequestLine("POST /v1/external-asset-owners/transfers/{id}")
+    @Headers("Content-Type: application/json")
+    PostInitiateTransferResponse transferRequestWithIdWithBody(@Param("id") Long id, ExternalAssetOwnerRequest body,
+            @QueryMap Map<String, Object> queryParams);
+
+    @RequestLine("POST /v1/external-asset-owners/transfers/external-id/{externalId}")
+    @Headers("Content-Type: application/json")
+    PostInitiateTransferResponse transferRequestWithId1WithBody(@Param("externalId") String externalId, ExternalAssetOwnerRequest body,
+            @QueryMap Map<String, Object> queryParams);
+}

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanProductsCustomApi.java renamed to fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/LoanDisbursementDetailsApiExtension.java

@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.test.stepdef.loan;
+package org.apache.fineract.client.feign.services;
 
-import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
-import retrofit2.Call;
-import retrofit2.http.GET;
+import feign.Param;
+import feign.RequestLine;
+import org.apache.fineract.client.models.PostAddAndDeleteDisbursementDetailRequest;
 
-public interface LoanProductsCustomApi {
+public interface LoanDisbursementDetailsApiExtension {
+
+    @RequestLine("PUT /v1/loans/{loanId}/disbursements/editDisbursements")
+    PostAddAndDeleteDisbursementDetailRequest addAndDeleteDisbursementDetail(@Param("loanId") Long loanId,
+            PostAddAndDeleteDisbursementDetailRequest postAddAndDeleteDisbursementDetailRequest);
 
-    @GET("v1/loanproducts/{productId}")
-    Call<GetLoanProductsProductIdResponse> retrieveLoanProductDetails(@retrofit2.http.Path("productId") Long productId,
-            @retrofit2.http.Query("template") String isTemplate);
 }

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/LoanProductsApiExtension.java

@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.client.feign.services;
+
+import feign.Param;
+import feign.QueryMap;
+import feign.RequestLine;
+import java.util.Map;
+import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
+
+public interface LoanProductsApiExtension {
+
+    /**
+     * Retrieve Loan Product Details with query parameters
+     *
+     * @param productId
+     *            Loan Product ID
+     * @param queryParams
+     *            Query parameters (e.g., template=true)
+     * @return GetLoanProductsProductIdResponse
+     */
+    @RequestLine("GET /v1/loanproducts/{productId}")
+    GetLoanProductsProductIdResponse retrieveLoanProductDetails(@Param("productId") Long productId,
+            @QueryMap Map<String, Object> queryParams);
+}

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/LoanTransactionsApiExtension.java

@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.client.feign.services;
+
+import feign.HeaderMap;
+import feign.Param;
+import feign.QueryMap;
+import feign.RequestLine;
+import java.util.Map;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
+
+public interface LoanTransactionsApiExtension {
+
+    @RequestLine("POST /v1/loans/{loanId}/transactions")
+    PostLoansLoanIdTransactionsResponse executeLoanTransaction(@Param("loanId") Long loanId,
+            PostLoansLoanIdTransactionsRequest postLoansLoanIdTransactionsRequest, @QueryMap Map<String, Object> queryParams,
+            @HeaderMap Map<String, String> headers);
+
+    @RequestLine("POST /v1/loans/external-id/{loanExternalId}/transactions")
+    PostLoansLoanIdTransactionsResponse executeLoanTransaction1(@Param("loanExternalId") String loanExternalId,
+            PostLoansLoanIdTransactionsRequest postLoansLoanIdTransactionsRequest, @QueryMap Map<String, Object> queryParams,
+            @HeaderMap Map<String, String> headers);
+
+}

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/FeignResponseHeaderHolder.java

@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.client.feign.support;
+
+import feign.Response;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Thread-local holder for the last Feign response headers. This is primarily used by E2E tests that need to assert on
+ * HTTP headers when using Feign clients that otherwise only expose the deserialized body.
+ */
+public final class FeignResponseHeaderHolder {
+
+    private static final ThreadLocal<Map<String, Collection<String>>> LAST_HEADERS = new ThreadLocal<>();
+
+    private FeignResponseHeaderHolder() {}
+
+    public static void store(Response response) {
+        LAST_HEADERS.set(response != null ? response.headers() : null);
+    }
+
+    public static Map<String, Collection<String>> getHeaders() {
+        Map<String, Collection<String>> headers = LAST_HEADERS.get();
+        return headers == null ? Collections.emptyMap() : headers;
+    }
+}

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/HeaderCapturingDecoder.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.client.feign.support;
+
+import feign.Response;
+import feign.codec.Decoder;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+/**
+ * Decorator that captures response headers into a thread-local holder before delegating decoding.
+ */
+public final class HeaderCapturingDecoder implements Decoder {
+
+    private final Decoder delegate;
+
+    public HeaderCapturingDecoder(Decoder delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object decode(Response response, Type type) throws IOException {
+        FeignResponseHeaderHolder.store(response);
+        return delegate.decode(response, type);
+    }
+}

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();
     }
 }