reactify-core

Author: hoangtien2k3

reactify-core/pom.xml

@@ -27,9 +27,9 @@
     <!-- =========================================== -->
     <!-- The maven central for all the library       -->
     <!-- =========================================== -->
-    <groupId>com.ezbuy.platform</groupId>
+    <groupId>io.github.hoangtien2k3</groupId>
     <artifactId>reactify-core</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.7</version>
     <name>reactify-core</name>
     <description>Java library for developing reactive programming(reactor-core) backend systems in microservices</description>
     <url>https://github.com/hoangtien2k3/reactify-core</url>

reactify-core/src/main/java/com/reactify/annotations/logging/LoggerAspectUtils.java

@@ -123,11 +123,11 @@ public Mono<Object> logAround(ProceedingJoinPoint joinPoint) throws Throwable {
 
         Span newSpan = tracer.nextSpan().name(name);
         var result = joinPoint.proceed();
-        if (result instanceof Mono) {
+        if (result instanceof Mono<?> monoResult) {
             return logMonoResult(
                     joinPoint,
                     start,
-                    (Mono<Object>) result,
+                    monoResult.cast(Object.class),
                     newSpan,
                     name,
                     logType,
@@ -136,11 +136,11 @@ public Mono<Object> logAround(ProceedingJoinPoint joinPoint) throws Throwable {
                     logInput,
                     title);
         }
-        if (result instanceof Flux) {
+        if (result instanceof Flux<?> fluxResult) {
             return logFluxResult(
                             joinPoint,
                             start,
-                            (Flux<Object>) result,
+                            fluxResult.cast(Object.class),
                             newSpan,
                             name,
                             logType,
@@ -149,7 +149,7 @@ public Mono<Object> logAround(ProceedingJoinPoint joinPoint) throws Throwable {
                             logInput,
                             title)
                     .collectList()
-                    .map(list -> (Object) list);
+                    .map(list -> list);
         } else {
             return Mono.just(result);
         }
@@ -264,13 +264,30 @@ private Flux<Object> logFluxResult(
             boolean logInput,
             String title) {
         var contextRef = new AtomicReference<Context>();
-        return result.doFinally(
-                        o -> logPerf(contextRef, newSpan, name, start, "1", null, logType, actionType, null, title))
-                .contextWrite(context -> {
-                    contextRef.set(context);
-                    return context;
+        if (logInput) {
+            Object[] args = joinPoint.getArgs();
+            logPerf(contextRef, newSpan, name, start, "INPUT", null, logType, actionType, args, title);
+        }
+        return result.doOnNext(output -> {
+                    if (logOutput) {
+                        logPerf(
+                                contextRef,
+                                newSpan,
+                                name,
+                                start,
+                                "OUTPUT",
+                                null,
+                                logType,
+                                actionType,
+                                new Object[] {output},
+                                title);
+                    }
                 })
-                .doOnError(o -> logPerf(contextRef, newSpan, name, start, "0", o, logType, actionType, null, title));
+                .doOnError(error ->
+                        logPerf(contextRef, newSpan, name, start, "0", error, logType, actionType, null, title))
+                .doFinally(signalType ->
+                        logPerf(contextRef, newSpan, name, start, "1", null, logType, actionType, null, title))
+                .contextWrite(context -> contextRef.updateAndGet(ctx -> context));
     }
 
     /**
@@ -290,15 +307,45 @@ private Flux<Object> logFluxResult(
      * @param result
      *            a string indicating the result status ("0" for success, "1" for
      *            failure)
-     * @param o
+     * @param data
      *            the output object from the method execution, may be {@code null}
      */
     private void logPerf(
-            AtomicReference<Context> contextRef, Span newSpan, String name, Long start, String result, Object o) {
-        newSpan.finish();
+            AtomicReference<Context> contextRef,
+            Span newSpan,
+            String name,
+            long start,
+            String result,
+            Object data,
+            String logType,
+            String actionType,
+            String title) {
+        if (newSpan != null) {
+            newSpan.finish();
+        }
         long duration = System.currentTimeMillis() - start;
         if (duration < 50) return;
-        logPerf.info("{} {} {} M2 {}", name, duration, result, o == null ? "-" : o.toString());
+
+        Context context = contextRef != null ? contextRef.get() : Context.empty();
+        String contextInfo = context != null ? context.toString() : "-";
+        String dataInfo = "-";
+        if (data != null) {
+            if (data instanceof Throwable error) {
+                dataInfo = String.format("Error: %s - %s", error.getClass().getSimpleName(), error.getMessage());
+            } else {
+                dataInfo = data.toString();
+            }
+        }
+        logPerf.info(
+                "{} | {} | {} | {} | {} | {} | {} | {}",
+                title,
+                name,
+                duration,
+                result,
+                logType,
+                actionType,
+                contextInfo,
+                dataInfo);
     }
 
     /**

reactify-core/src/main/java/com/reactify/annotations/logging/LoggerQueue.java

@@ -55,8 +55,7 @@
 @Slf4j
 public class LoggerQueue {
     private static LoggerQueue mMe = null;
-    private ArrayBlockingQueue<LoggerDTO> myQueue = null;
-    private static final Object myLock = new Object();
+    private final ArrayBlockingQueue<LoggerDTO> myQueue;
 
     @Getter
     private int countFalse = 0;
@@ -183,9 +182,7 @@ public void addQueue(
      */
     public List<LoggerDTO> getRecords() {
         List<LoggerDTO> records = new ArrayList<>();
-        if (myQueue != null) {
-            myQueue.drainTo(records, 100000);
-        }
+        myQueue.drainTo(records, 100000);
         return records;
     }
 

reactify-core/src/main/java/com/reactify/client/BaseSoapClient.java

@@ -66,37 +66,6 @@ public interface BaseSoapClient<T> {
      */
     Mono<String> callRaw(WebClient webClient, Map<String, String> headerList, String payload);
 
-    /**
-     * Parses the SOAP response data into an instance of the specified class type.
-     *
-     * @param realData
-     *            the raw response data as a string.
-     * @param clz
-     *            the class to which the data should be converted.
-     * @return an instance of type {@code T} containing the parsed response data.
-     */
-    T parseData(String realData, Class<?> clz);
-
-    /**
-     * Calls a specific API to retrieve the customer profile data using the provided
-     * WebClient instance, HTTP headers, and payload. The response is returned as an
-     * optional result wrapped in a reactive Mono.
-     *
-     * @param webClient
-     *            the WebClient instance used to make the SOAP call.
-     * @param headerList
-     *            a map of HTTP headers to include in the request.
-     * @param payload
-     *            the SOAP request payload as a string.
-     * @param resultClass
-     *            the class of the expected response object type.
-     * @return a Mono containing an Optional result of type {@code T}, representing
-     *         the customer profile data, or an empty Optional if no data was
-     *         returned.
-     */
-    Mono<Optional<T>> callApiGetProfileKHDN(
-            WebClient webClient, Map<String, String> headerList, String payload, Class<?> resultClass);
-
     /**
      * Makes a SOAP call using version 2 of the API configuration, with the provided
      * WebClient instance, HTTP headers, and payload. Returns an optional result

reactify-core/src/main/java/com/reactify/client/impl/BaseRestClientImpl.java

@@ -94,10 +94,12 @@ public Mono<Optional<T>> get(
                 .map(response -> {
                     log.info("Rest response {}", response);
                     if (DataUtil.isNullOrEmpty(response)) {
-                        return this.getDefaultValue();
+                        return Optional.<T>empty();
                     }
                     if (DataUtil.safeEqual(resultClass.getSimpleName(), "String")) {
-                        return Optional.of((T) response);
+                        @SuppressWarnings("unchecked")
+                        T stringResponse = (T) response;
+                        return Optional.of(stringResponse);
                     }
                     T result = DataUtil.parseStringToObject(response, resultClass);
                     return Optional.ofNullable(result);
@@ -210,7 +212,7 @@ public Mono<Optional<T>> postFormData(
     @Override
     public Optional<T> processReturn(String response, Class<?> resultClass) {
         if (DataUtil.isNullOrEmpty(response)) {
-            return this.getDefaultValue();
+            return Optional.empty();
         }
         T result = DataUtil.parseStringToObject(response, resultClass);
         return Optional.ofNullable(result);
@@ -462,15 +464,6 @@ public Mono<String> getRawWithFixedUri(WebClient webClient, String uri, MultiVal
                 });
     }
 
-    /**
-     * Provides a default empty Optional value.
-     *
-     * @return an Optional containing no value.
-     */
-    private Optional<T> getDefaultValue() {
-        return Optional.empty();
-    }
-
     /**
      * Ensures a safe MultiValueMap for headers, with a default "Content-Type:
      * application/json" if empty.