From 6ed7d7f571860c3c21a7e107669aaf79421db13e Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Mon, 13 Jan 2025 16:33:47 +0200 Subject: [PATCH] Cosmetic changes after PR#868 --- .../main/java/io/scalecube/services/ServiceCall.java | 12 +++++------- .../services/methods/ServiceMethodInvoker.java | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/services-api/src/main/java/io/scalecube/services/ServiceCall.java b/services-api/src/main/java/io/scalecube/services/ServiceCall.java index 67cadf553..8b3cded04 100644 --- a/services-api/src/main/java/io/scalecube/services/ServiceCall.java +++ b/services-api/src/main/java/io/scalecube/services/ServiceCall.java @@ -212,16 +212,14 @@ public Mono requestOne(ServiceMessage request, Type responseType if (logger != null && logger.isLoggable(level)) { logger.log( level, - "[{0}] request: {1}, response: {2}", - request.qualifier(), - request, - response); + "[{0}] request: " + request + ", response: " + response, + request.qualifier()); } }) .doOnError( ex -> { if (logger != null) { - logger.log(Level.ERROR, "[{0}] request: {1}", request.qualifier(), request, ex); + logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex); } }); } @@ -266,13 +264,13 @@ public Flux requestMany(ServiceMessage request, Type responseTyp .doOnSubscribe( s -> { if (logger != null && logger.isLoggable(level)) { - logger.log(level, "[{0}] request: {1}", request.qualifier(), request); + logger.log(level, "[{0}] request: " + request, request.qualifier()); } }) .doOnError( ex -> { if (logger != null) { - logger.log(Level.ERROR, "[{0}] request: {1}", request.qualifier(), request, ex); + logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex); } }); } diff --git a/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java b/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java index 79c2a58a5..7fbbd049d 100644 --- a/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java +++ b/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java @@ -83,16 +83,14 @@ private Mono invokeOne(ServiceMessage message, Object authData) { if (logger != null && logger.isLoggable(level)) { logger.log( level, - "[{0}] request: {1}, response: {2}", - qualifier, - request, - response); + "[{0}] request: " + request + ", response: " + response, + qualifier); } }) .doOnError( ex -> { if (logger != null) { - logger.log(Level.ERROR, "[{0}] request: {1}", qualifier, request, ex); + logger.log(Level.ERROR, "[{0}] request: " + request, qualifier, ex); } }); }) @@ -124,13 +122,13 @@ private Flux invokeMany(ServiceMessage message, Object authData) { .doOnSubscribe( s -> { if (logger != null && logger.isLoggable(level)) { - logger.log(level, "[{0}] request: {1}", qualifier, request); + logger.log(level, "[{0}] request: " + request, qualifier); } }) .doOnError( ex -> { if (logger != null) { - logger.log(Level.ERROR, "[{0}] request: {1}", qualifier, request, ex); + logger.log(Level.ERROR, "[{0}] request: " + request, qualifier, ex); } }); })