From 41b793b7198c46a75bcccdfb01cf3b8c2cd388c7 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Tue, 20 Feb 2024 17:32:54 +0100 Subject: [PATCH] refactor: DRY for logging-category from io.projectreactor --- .../kafka/chat/backend/api/ChatBackendController.java | 3 ++- .../chat/backend/storage/files/FilesStorageStrategy.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java index 47ae6a5d..6c7cff7d 100644 --- a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java +++ b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java @@ -18,6 +18,7 @@ public class ChatBackendController { private final ChatHomeService chatHomeService; private final StorageStrategy storageStrategy; + private final String loggingCategory = ChatBackendController.class.getSimpleName(); private final Level loggingLevel; private final boolean showOperatorLine; @@ -133,7 +134,7 @@ public class ChatBackendController return chatRoomData .listen() .log( - ChatBackendController.class.getSimpleName(), + loggingCategory, loggingLevel, showOperatorLine) .map(message -> MessageTo.from(message)) diff --git a/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java b/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java index aaa61598..7c1fef02 100644 --- a/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java +++ b/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java @@ -33,6 +33,7 @@ public class FilesStorageStrategy implements StorageStrategy private final Path storagePath; private final ShardingStrategy shardingStrategy; private final ObjectMapper mapper; + private final String loggingCategory = FilesStorageStrategy.class.getSimpleName(); private final Level loggingLevel; private final boolean showOperatorLine; @@ -53,7 +54,7 @@ public class FilesStorageStrategy implements StorageStrategy return chatRoomInfoFlux .log( - FilesStorageStrategy.class.getSimpleName(), + loggingCategory, loggingLevel, showOperatorLine) .doFirst(() -> @@ -107,7 +108,7 @@ public class FilesStorageStrategy implements StorageStrategy return Flux .from(new JsonFilePublisher(chatroomsPath(), mapper, type)) .log( - FilesStorageStrategy.class.getSimpleName(), + loggingCategory, loggingLevel, showOperatorLine) .map(chatRoomInfoTo -> @@ -146,7 +147,7 @@ public class FilesStorageStrategy implements StorageStrategy return messageFlux .log( - FilesStorageStrategy.class.getSimpleName(), + loggingCategory, loggingLevel, showOperatorLine) .doFirst(() -> @@ -200,7 +201,7 @@ public class FilesStorageStrategy implements StorageStrategy return Flux .from(new JsonFilePublisher(chatroomPath(chatRoomId), mapper, type)) .log( - FilesStorageStrategy.class.getSimpleName(), + loggingCategory, loggingLevel, showOperatorLine) .map(MessageTo::toMessage); -- 2.20.1