fix(convertBody): replace convertBodyTo by unmarshal (#64)

Author: carlosthe19916

core/src/main/java/io/github/project/openubl/xsender/camel/routes/RestSunatErrorResponseProcessor.java

@@ -24,7 +24,9 @@
 import org.apache.camel.Processor;
 import org.apache.camel.http.base.HttpOperationFailedException;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class RestSunatErrorResponseProcessor implements Processor {
@@ -34,21 +36,29 @@ public void process(Exchange exchange) throws Exception {
         HttpOperationFailedException httpException = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, HttpOperationFailedException.class);
         ResponseDocumentErrorDto responseDocumentErrorDto = exchange.getIn().getBody(ResponseDocumentErrorDto.class);
 
-        int errorCodeInt = Integer.parseInt(responseDocumentErrorDto.getCod());
-        List<String> notes = responseDocumentErrorDto.getErrors().stream()
+        String responseCode = Optional.ofNullable(responseDocumentErrorDto.getCod())
+                .orElse(responseDocumentErrorDto.getStatus());
+        int responseCodeInt = Integer.parseInt(responseCode);
+
+        String responseDescription = Optional.ofNullable(responseDocumentErrorDto.getMsg())
+                .orElse(responseDocumentErrorDto.getMessage());
+
+        List<String> notes = Optional.ofNullable(responseDocumentErrorDto.getErrors())
+                .orElse(Collections.emptyList())
+                .stream()
                 .map(error -> error.getCod() + " - " + error.getMsg())
                 .collect(Collectors.toList());
 
-        Metadata metadata = Metadata.builder()
-                .notes(notes)
-                .responseCode(Integer.parseInt(responseDocumentErrorDto.getCod()))
-                .description(responseDocumentErrorDto.getMsg())
-                .build();
-
         SunatResponse sunatResponse = SunatResponse.builder()
-                .status(Status.fromCode(errorCodeInt))
-                .metadata(metadata)
+                .status(Status.fromCode(responseCodeInt))
+                .metadata(Metadata.builder()
+                        .notes(notes)
+                        .responseCode(responseCodeInt)
+                        .description(responseDescription)
+                        .build()
+                )
                 .build();
+
         exchange.getIn().setBody(sunatResponse);
     }
 

core/src/main/java/io/github/project/openubl/xsender/camel/routes/SunatRouteBuilder.java

@@ -26,6 +26,7 @@
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.component.http.HttpConstants;
 import org.apache.camel.component.http.HttpMethods;
+import org.apache.camel.component.jackson.JacksonDataFormat;
 import org.apache.camel.http.base.HttpOperationFailedException;
 import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.camel.util.URISupport;
@@ -53,7 +54,7 @@ public void configure() {
                     .when(header(HttpConstants.HTTP_METHOD).isNotNull())
                         .marshal().json(JsonLibrary.Jackson)
                         .to("https://api-cpe.sunat.gob.pe")
-                        .convertBodyTo(ResponseDocumentSuccessDto.class)
+                        .unmarshal(new JacksonDataFormat(ResponseDocumentSuccessDto.class))
                         .process(new RestSunatResponseProcessor())
                     .endChoice()
                     // Otherwise
@@ -73,12 +74,17 @@ public void configure() {
                         HttpOperationFailedException httpException = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, HttpOperationFailedException.class);
                         String contentType = httpException.getResponseHeaders().getOrDefault("Content-Type", "");
 
+                        boolean isResponseJson = Objects.equals(contentType, "application/json");
+                        if (isResponseJson) {
+                            exchange.getIn().setBody(httpException.getResponseBody());
+                        }
+
                         exchange.getIn().setHeader("HttpResponseHeader_ContentType", contentType);
-                        return Objects.equals(contentType, "application/json");
+                        return isResponseJson;
                     })
                     .choice()
                         .when(header("HttpResponseHeader_ContentType").isEqualTo("application/json"))
-                            .convertBodyTo(ResponseDocumentErrorDto.class)
+                            .unmarshal(new JacksonDataFormat(ResponseDocumentErrorDto.class))
                             .process(new RestSunatErrorResponseProcessor())
                         .endChoice()
                         .otherwise()
@@ -124,7 +130,7 @@ public void configure() {
                             }
                         })
                         .to("https://api-seguridad.sunat.gob.pe")
-                        .convertBodyTo(ResponseAccessTokenSuccessDto.class)
+                        .unmarshal(new JacksonDataFormat(ResponseAccessTokenSuccessDto.class))
                         .process(exchange -> {
                             ResponseAccessTokenSuccessDto response = exchange.getIn().getBody(ResponseAccessTokenSuccessDto.class);
                             response.setCreated_in(ZonedDateTime.now());

core/src/main/java/io/github/project/openubl/xsender/models/rest/ResponseDocumentErrorDto.java

@@ -33,6 +33,9 @@ public class ResponseDocumentErrorDto {
     private String msg;
     private String exc;
 
+    private String status;
+    private String message;
+
     @Singular
     private List<Error> errors;