diff --git a/src/main/java/com/banesco/common/domain/model/BaseResponse.java b/src/main/java/com/banesco/common/domain/model/BaseResponse.java index ca920bd..f97f366 100644 --- a/src/main/java/com/banesco/common/domain/model/BaseResponse.java +++ b/src/main/java/com/banesco/common/domain/model/BaseResponse.java @@ -1,8 +1,9 @@ package com.banesco.common.domain.model; +public class BaseResponse { -public class BaseResponse { protected StatusResponse statusResponse; + protected T dataResponse; public BaseResponse() { } @@ -11,6 +12,11 @@ public class BaseResponse { this.statusResponse = statusResponse; } + public BaseResponse(StatusResponse statusResponse, T dataResponse) { + this.statusResponse = statusResponse; + this.dataResponse = dataResponse; + } + public StatusResponse getStatusResponse() { return statusResponse; } @@ -18,4 +24,13 @@ public class BaseResponse { public void setStatusResponse(StatusResponse statusResponse) { this.statusResponse = statusResponse; } + + public T getDataResponse() { + return dataResponse; + } + + public void setDataResponse(T dataResponse) { + this.dataResponse = dataResponse; + } + } diff --git a/src/main/java/com/banesco/common/infraestructure/helpers/LoggerHelper.java b/src/main/java/com/banesco/common/infraestructure/helpers/LoggerHelper.java index 33820b6..8593f5e 100644 --- a/src/main/java/com/banesco/common/infraestructure/helpers/LoggerHelper.java +++ b/src/main/java/com/banesco/common/infraestructure/helpers/LoggerHelper.java @@ -1,5 +1,8 @@ package com.banesco.common.infraestructure.helpers; +import java.util.Map; +import java.util.stream.Collectors; + /** * Clase utilitaria para la generación de mensajes de registro (logging). * Facilita la creación de cadenas formateadas para registrar información de @@ -9,6 +12,23 @@ package com.banesco.common.infraestructure.helpers; */ public class LoggerHelper { + /** + * Formatea un mapa de headers en un String con un header por línea. + * Ejemplo: "Header1: valor1\nHeader2: valor2" + * + * @param headers El mapa de headers a formatear. + * @return Un String formateado y listo para ser logueado. + */ + public static String formatHeaders(Map headers) { + if(headers == null) { + return "Headers: [vacios]"; + } + + return headers.entrySet().stream() + .map(entry -> entry.getKey() + ": " + entry.getValue()) + .collect(Collectors.joining("\n", "\n Headers: \n", "")); + } + /** * Construye una cadena de información para una solicitud pública. * @@ -18,7 +38,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoRequest(String requestId, T request) { - return String.format("[PUB RQ: %s] [%s]", requestId, JsonHelper.getJsonFromObject(request)); + return String.format("[PUB RQ: %s] %s", requestId, JsonHelper.getJsonFromObject(request)); } /** @@ -29,7 +49,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoRequest(String requestId, String request) { - return String.format("[PUB RQ: %s] [%s]", requestId, request); + return String.format("[PUB RQ: %s] %s", requestId, request); } /** @@ -41,7 +61,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoResponse(String requestId, T response) { - return String.format("[PUB RS: %s] [%s]", requestId, JsonHelper.getJsonFromObject(response)); + return String.format("[PUB RS: %s] %s", requestId, JsonHelper.getJsonFromObject(response)); } /** @@ -52,7 +72,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoResponse(String requestId, String response) { - return String.format("[PUB RS: %s] [%s]", requestId, response); + return String.format("[PUB RS: %s] %s", requestId, response); } /** @@ -65,7 +85,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateRequest(String requestId, String name, T request) { - return String.format("[PRV RQ %s: %s] [%s]", requestId, name, JsonHelper.getJsonFromObject(request)); + return String.format("[PRV RQ %s: %s] %s", requestId, name, JsonHelper.getJsonFromObject(request)); } /** @@ -76,7 +96,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateRequest(String requestId, String request) { - return String.format("[PRV RQ: %s] [%s]", requestId, request); + return String.format("[PRV RQ: %s] %s", requestId, request); } /** @@ -88,7 +108,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateRequest(String requestId, String name, String request) { - return String.format("[PRV RQ %s: %s] [%s]", requestId, name, request); + return String.format("[PRV RQ %s: %s] %s", requestId, name, request); } /** @@ -101,7 +121,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateResponse(String requestId, String name, T response) { - return String.format("[PRV RS %s: %s] [%s]", requestId, name, JsonHelper.getJsonFromObject(response)); + return String.format("[PRV RS %s: %s] %s", requestId, name, JsonHelper.getJsonFromObject(response)); } /** @@ -112,7 +132,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateResponse(String requestId, String response) { - return String.format("[PRV RS: %s] [%s]", requestId, response); + return String.format("[PRV RS: %s] %s", requestId, response); } /** @@ -124,7 +144,7 @@ public class LoggerHelper { * @return Una cadena de información formateada. */ public static String buildInfoPrivateResponse(String requestId, String name, String response) { - return String.format("[PRV RS %s: %s] [%s]", requestId, name, response); + return String.format("[PRV RS %s: %s] %s", requestId, name, response); } /** @@ -135,6 +155,6 @@ public class LoggerHelper { * @return Una cadena de error formateada. */ public static String buildError(String requestId, String out) { - return String.format("[ERROR %s] [%s]", requestId, out); + return String.format("[ERROR %s] %s", requestId, out); } }