Updated log4j libraries, and extensionList err code, added status end…

…point
infitx-org · Jan 20, 2022 · 856ba75 · 856ba75
1 parent f162a90
commit 856ba75
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/...onnectors-camel-common-1.1.0-SNAPSHOT.jar → ...onnectors-camel-common-1.1.1-SNAPSHOT.jar b/...onnectors-camel-common-1.1.0-SNAPSHOT.jar → ...onnectors-camel-common-1.1.1-SNAPSHOT.jar
diff --git a/core-connector/pom.xml b/core-connector/pom.xml
@@ -189,7 +189,7 @@
             <artifactId>cbs-adapters-exception-handling</artifactId>
             <version>1.1.0-SNAPSHOT</version>
             <scope>system</scope>
-            <systemPath>${basedir}/lib/core-connectors-camel-common-1.1.0-SNAPSHOT.jar</systemPath>
+            <systemPath>${basedir}/lib/core-connectors-camel-common-1.1.1-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

diff --git a/core-connector/src/main/java/com/modusbox/client/processor/CustomErrorProcessor.java b/core-connector/src/main/java/com/modusbox/client/processor/CustomErrorProcessor.java
@@ -94,8 +94,8 @@ public void process(Exchange exchange) throws Exception {
                     errorMessage = errorResponse.getString("description");
                     reasonText = "{ \"statusCode\": \"" + statusCode + "\"," +
                                     "\"message\": \"" + errorMessage +  "\"," +
-                                    "\"localeMessage\": \"" + errorMessageLocale + "\"," +
-                                    "\"detailedDescription\": \"" +   detailedDescription + "\"" +
+                                    "\"localeMessage\": \"" + errorMessageLocale + "\"" + // + "\"," +
+//                                    "\"detailedDescription\": \"" +   detailedDescription + "\"" +
                             "} ";
                 }
             }
@@ -104,7 +104,7 @@ public void process(Exchange exchange) throws Exception {
                     "Processing the exception at CustomErrorProcessor", null, null,
                     exception.getMessage());
         }
-        System.out.println("Reason Text: " + reasonText);
+        System.out.println("Erro reason text: " + reasonText);
         exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, httpResponseCode);
         exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "application/json");
         exchange.getMessage().setBody(reasonText);

diff --git a/core-connector/src/main/java/com/modusbox/client/router/SendMoneyRouter.java b/core-connector/src/main/java/com/modusbox/client/router/SendMoneyRouter.java
@@ -32,7 +32,7 @@ public class SendMoneyRouter extends RouteBuilder {
             .register();
 
     private final RouteExceptionHandlingConfigurer exceptionHandlingConfigurer = new RouteExceptionHandlingConfigurer();
-    private final CorsFilter corsFilter = new CorsFilter();
+//    private final CorsFilter corsFilter = new CorsFilter();
 
     public void configure() {
         // Add our global exception handling strategy
@@ -139,7 +139,7 @@ public void configure() {
                         "'Tracking the response', 'Verify the response', null)")
 
                 // Add CORS headers
-                .process(corsFilter)
+//                .process(corsFilter)
 
                 .process(exchange -> {
                     ((Histogram.Timer) exchange.getProperty(TIMER_NAME_PUT)).observeDuration(); // stop Prometheus Histogram metric
@@ -156,7 +156,7 @@ public void configure() {
 
                 // Conditional whether errorMessage was found
                 .choice()
-                    .when(simple("${body.get('statusCode')} == '3241'"))
+                    .when(simple("${body.get('statusCode')} == '3242'"))
                         .setHeader(Exchange.HTTP_RESPONSE_CODE, constant(409))
                 .end()
         ;

diff --git a/core-connector/src/main/java/com/modusbox/client/router/TransfersRouter.java b/core-connector/src/main/java/com/modusbox/client/router/TransfersRouter.java
@@ -80,7 +80,7 @@ public void configure() {
                 .setHeader(Exchange.HTTP_METHOD, constant("GET"))
 
                 .to("bean:customJsonMessage?method=logJsonMessage('info', ${header.X-CorrelationId}, " +
-                        "'Calling Hub API, get transfers, GET {{dfsp.host}}', " +
+                        "'Calling Hub API, get transfers, GET {{ml-conn.outbound.host}}', " +
                         "'Tracking the request', 'Track the response', 'Input Payload: ${body}')")
                 .toD("{{ml-conn.outbound.host}}/transfers/${header.transferId}?bridgeEndpoint=true&throwExceptionOnFailure=false")
                 .unmarshal().json()

diff --git a/core-connector/src/main/resources/log4j2.xml b/core-connector/src/main/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
+<Configuration status="WARN" packages="com.modusbox.log4j2.layout">
     <Appenders>
         <Console name="JsonConsole">
             <CustomJsonLayout applicationName="ayapay-core-connector"/>

diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
 
 
             <!-- logging -->
-            <!-- vulnerability in log4j found, need to use only version 2.15.0 or above!!! -->
+            <!-- vulnerability in log4j found, need to use only version 2.17.0 or above!!! -->
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>