tidying up

Numichi · Jan 23, 2022 · bc15dd9 · bc15dd9
1 parent c77fee4
commit bc15dd9
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 40 deletions.
diff --git a/src/main/java/hu/numichi/reactive/logger/MDC.java b/src/main/java/hu/numichi/reactive/logger/MDC.java
@@ -1,5 +1,6 @@
 package hu.numichi.reactive.logger;
 
+import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport;
 import reactor.util.annotation.NonNull;
 
 import java.util.Collection;
@@ -8,10 +9,10 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
-import static hu.numichi.reactive.logger.Consts.KEY_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.MAP_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.VALUE_NOT_NULL;
+import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
+import static hu.numichi.reactive.logger.exception.Messages.KEY_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.VALUE_NOT_NULL;
 
 @JacocoSkipGeneratedReport
 public class MDC implements Map<String, String> {

diff --git a/src/main/java/hu/numichi/reactive/logger/Values.java b/src/main/java/hu/numichi/reactive/logger/Values.java
@@ -0,0 +1,11 @@
+package hu.numichi.reactive.logger;
+
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+public class Values {
+    private Values() {}
+
+    public static final String DEFAULT_REACTOR_CONTEXT_MDC_KEY = "DEFAULT_REACTOR_CONTEXT_MDC_KEY";
+    public static final Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();
+}
diff --git a/...ive/logger/JacocoSkipGeneratedReport.java → ...nnotations/JacocoSkipGeneratedReport.java b/...ive/logger/JacocoSkipGeneratedReport.java → ...nnotations/JacocoSkipGeneratedReport.java
@@ -1,4 +1,4 @@
-package hu.numichi.reactive.logger;
+package hu.numichi.reactive.logger.annotations;
 
 public @interface JacocoSkipGeneratedReport {
 }
diff --git a/...va/hu/numichi/reactive/logger/Consts.java → ...i/reactive/logger/exception/Messages.java b/...va/hu/numichi/reactive/logger/Consts.java → ...i/reactive/logger/exception/Messages.java
@@ -1,19 +1,14 @@
-package hu.numichi.reactive.logger;
+package hu.numichi.reactive.logger.exception;
 
-import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
-
-public class Consts {
+public class Messages {
+    private Messages() {
+    }
+    
     public static final String KEY_NOT_NULL = "key must not be null";
     public static final String VALUE_NOT_NULL = "value must not be null";
     public static final String CTXK_NOT_NULL = "mdcContextKey must not be null";
     public static final String CTXW_NOT_NULL = "contextView must not be null";
     public static final String CTX_NOT_NULL = "context must not be null";
     public static final String MDC_NOT_NULL = "mdc must not be null";
     public static final String MAP_NOT_NULL = "map must not be null";
-
-    public static final String DEFAULT_REACTOR_CONTEXT_MDC_KEY = "DEFAULT_REACTOR_CONTEXT_MDC_KEY";
-    public static final Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();
-
-    private Consts() {}
 }
diff --git a/src/main/java/hu/numichi/reactive/logger/java/MDCContext.java b/src/main/java/hu/numichi/reactive/logger/java/MDCContext.java
@@ -10,12 +10,12 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static hu.numichi.reactive.logger.Consts.CTXK_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.CTXW_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.CTX_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
-import static hu.numichi.reactive.logger.Consts.MAP_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.MDC_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.CTXK_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.CTXW_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL;
+import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
+import static hu.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
+import static hu.numichi.reactive.logger.exception.Messages.MDC_NOT_NULL;
 
 public final class MDCContext {
     private MDCContext() {

diff --git a/src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java b/src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java
@@ -14,9 +14,9 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static hu.numichi.reactive.logger.Consts.CTX_NOT_NULL;
-import static hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
-import static hu.numichi.reactive.logger.Consts.DEFAULT_SCHEDULER;
+import static hu.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL;
+import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
+import static hu.numichi.reactive.logger.Values.DEFAULT_SCHEDULER;
 
 public final class ReactiveLogger {
 

diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt b/src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt
@@ -1,12 +1,10 @@
 package hu.numichi.reactive.logger.kotlin
 
 import hu.numichi.reactive.logger.java.ReactiveLogger as JReactiveLogger
-import hu.numichi.reactive.logger.Consts
-import hu.numichi.reactive.logger.JacocoSkipGeneratedReport
+import hu.numichi.reactive.logger.Values
+import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport
 import hu.numichi.reactive.logger.MDC
-import kotlinx.coroutines.reactive.awaitSingle
 import kotlinx.coroutines.reactor.ReactorContext
-import kotlinx.coroutines.reactor.awaitSingle
 import kotlinx.coroutines.reactor.awaitSingleOrNull
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -261,9 +259,9 @@ class ReactiveLogger private constructor(
     }
 
     class Builder<T : CoroutineContext.Element>(private val contextKey: CoroutineContext.Key<T>) {
-        private var scheduler = Consts.DEFAULT_SCHEDULER
+        private var scheduler = Values.DEFAULT_SCHEDULER
         private var logger = LoggerFactory.getLogger(ReactiveLogger::class.java)
-        private var mdcContextKey = Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY
+        private var mdcContextKey = Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY
         private var contextExtractive: suspend (CoroutineContext.Key<out T>) -> Context?
         private var enableError: Boolean = false
 

diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt b/src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt
@@ -1,6 +1,6 @@
 package hu.numichi.reactive.logger.kotlin
 
-import hu.numichi.reactive.logger.JacocoSkipGeneratedReport
+import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport
 import hu.numichi.reactive.logger.MDC
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.reactor.ReactorContext

diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt b/src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt
@@ -1,20 +1,20 @@
 package hu.numichi.reactive.logger.kotlin
 
-import hu.numichi.reactive.logger.Consts
+import hu.numichi.reactive.logger.Values
 import hu.numichi.reactive.logger.exception.InvalidContextDataException
 import hu.numichi.reactive.logger.MDC
 import reactor.util.context.ContextView
 
 suspend fun readMDC(): MDC {
-    return readMDC(Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
+    return readMDC(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
 }
 
 suspend fun readMDC(mdcContextKey: String): MDC {
     return readMDC(rectorContext(), mdcContextKey)
 }
 
 fun readMDC(contextView: ContextView?): MDC {
-    return readMDC(contextView, Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
+    return readMDC(contextView, Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
 }
 
 fun readMDC(contextView: ContextView?, mdcContextKey: String): MDC {

diff --git a/src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java b/src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java
@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
+import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class MDCContextTest {

diff --git a/src/test/java/hu/numichi/reactive/logger/java/ReactiveLoggerTest.java b/src/test/java/hu/numichi/reactive/logger/java/ReactiveLoggerTest.java
@@ -21,7 +21,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
+import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
 import static hu.numichi.reactive.logger.java.MDCContextTest.ANOTHER_CONTEXT_KEY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/src/test/java/hu/numichi/reactive/logger/kotlin/MDCContextTest.kt b/src/test/java/hu/numichi/reactive/logger/kotlin/MDCContextTest.kt
@@ -1,6 +1,6 @@
 package hu.numichi.reactive.logger.kotlin
 
-import hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY
+import hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY
 import hu.numichi.reactive.logger.MDC
 import hu.numichi.reactive.logger.exception.InvalidContextDataException
 import kotlinx.coroutines.ExperimentalCoroutinesApi

diff --git a/src/test/java/hu/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt b/src/test/java/hu/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt
@@ -1,7 +1,7 @@
 package hu.numichi.reactive.logger.kotlin
 
-import hu.numichi.reactive.logger.Consts
-import hu.numichi.reactive.logger.Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY
+import hu.numichi.reactive.logger.Values
+import hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY
 import hu.numichi.reactive.logger.MDC
 import hu.numichi.reactive.logger.exception.ContextNotExistException
 import hu.numichi.reactive.logger.kotlin.MDCContextTest.Companion.ANOTHER_CONTEXT_KEY
@@ -128,7 +128,7 @@ internal class ReactiveLoggerTest {
     @Test
     fun readMDC() {
         val mdc: Map<String, String> = randomMap(1)
-        val context = Context.of(Consts.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc)
+        val context = Context.of(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc)
         assertEquals(Optional.of(mdc), logger.readMDC(context))
         assertEquals(Optional.of(mdc).get(), logger.readMDC(context).get())
     }