diff --git a/build.gradle.kts b/build.gradle.kts index 803755c..7e03fb9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,18 +1,23 @@ +import kotlin.text.Regex + plugins { java jacoco id("com.adarshr.test-logger") version "3.1.0" kotlin("jvm") version "1.6.10" + id("java-library") + id("maven-publish") + id("signing") } -group = "org.example" -version = "1.1.2-SNAPSHOT" - -java.sourceCompatibility = JavaVersion.VERSION_1_8 -java.targetCompatibility = JavaVersion.VERSION_1_8 +group = project.property("group") as String +version = project.property("version") as String as String -repositories { - mavenCentral() +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() + withJavadocJar() } dependencies { @@ -33,6 +38,82 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } +repositories { + mavenCentral() +} + +publishing { + publications { + create("main") { + groupId = project.property("group") as String + artifactId = "reactive-logger" + version = project.property("version") as String + from(components["java"]) + + pom { + name.set("Reactive logger layer for slf4j") + description.set("A Java & Korlin library adapting slf4j for reactive applications") + url.set("https://github.com/Numichi/reactive-logger") + inceptionYear.set("2022") + + developers { + developer { + id.set(project.property("developerId") as String) + name.set(project.property("developerName") as String) + email.set(project.property("developerEmail") as String) + } + } + + licenses { + license { + name.set("Apache License 2.0") + url.set("https://opensource.org/licenses/Apache-2.0") + } + } + + scm { + connection.set("scm:git:git:github.com/Numichi/reactive-logger.git") + developerConnection.set("scm:git:ssh://github.com/Numichi/reactive-logger.git") + url.set("https://github.com/Numichi/reactive-logger") + } + } + } + } + + repositories { + maven { + name = "OSSRH" + credentials { + username = if (project.hasProperty("ossrhUsername")) { + project.property("ossrhUsername") as String + } else { + "N/A" + } + + password = if (project.hasProperty("ossrhPassword")) { + project.property("ossrhPassword") as String + } else { + "N/A" + } + } + + val releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/" + val isReleaseVersion = !version.toString().contains(Regex("(SNAPSHOT|BETA|ALPHA|DEVELOP|DEV)")) + + url = if (isReleaseVersion) { + uri(releasesRepoUrl) + } else { + uri(snapshotsRepoUrl) + } + } + } +} + +signing { + sign(publishing.publications["main"]) +} + tasks.getByName("test") { useJUnitPlatform() } diff --git a/gradle.properties b/gradle.properties index 29e08e8..c2fd091 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,6 @@ -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +version=1.0.0 +group=io.github.numichi +developerId=numichi +developerName=Donát Csongor +developerEmail=csdonat1@gmail.com \ No newline at end of file diff --git a/src/main/java/hu/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java b/src/main/java/hu/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java deleted file mode 100644 index d4f86d0..0000000 --- a/src/main/java/hu/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java +++ /dev/null @@ -1,4 +0,0 @@ -package hu.numichi.reactive.logger.annotations; - -public @interface JacocoSkipGeneratedReport { -} diff --git a/src/main/java/hu/numichi/reactive/logger/MDC.java b/src/main/java/io/github/numichi/reactive/logger/MDC.java similarity index 83% rename from src/main/java/hu/numichi/reactive/logger/MDC.java rename to src/main/java/io/github/numichi/reactive/logger/MDC.java index 9caddf4..bf39ccb 100644 --- a/src/main/java/hu/numichi/reactive/logger/MDC.java +++ b/src/main/java/io/github/numichi/reactive/logger/MDC.java @@ -1,6 +1,6 @@ -package hu.numichi.reactive.logger; +package io.github.numichi.reactive.logger; -import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport; +import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport; import reactor.util.annotation.NonNull; import java.util.Collection; @@ -9,10 +9,9 @@ import java.util.Objects; import java.util.Set; -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; +import static io.github.numichi.reactive.logger.exception.Messages.KEY_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.VALUE_NOT_NULL; @JacocoSkipGeneratedReport public class MDC implements Map { @@ -20,7 +19,7 @@ public class MDC implements Map { private final String mdcContextKey; public MDC() { - this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, new HashMap<>()); + this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, new HashMap<>()); } public MDC(String mdcContextKey) { @@ -28,7 +27,7 @@ public MDC(String mdcContextKey) { } public MDC(Map mdc) { - this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc); + this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc); } public MDC(String mdcContextKey, Map mdc) { diff --git a/src/main/java/hu/numichi/reactive/logger/Values.java b/src/main/java/io/github/numichi/reactive/logger/Values.java similarity index 88% rename from src/main/java/hu/numichi/reactive/logger/Values.java rename to src/main/java/io/github/numichi/reactive/logger/Values.java index 6ec2714..f50a532 100644 --- a/src/main/java/hu/numichi/reactive/logger/Values.java +++ b/src/main/java/io/github/numichi/reactive/logger/Values.java @@ -1,4 +1,4 @@ -package hu.numichi.reactive.logger; +package io.github.numichi.reactive.logger; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; diff --git a/src/main/java/io/github/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java b/src/main/java/io/github/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java new file mode 100644 index 0000000..2cc8caa --- /dev/null +++ b/src/main/java/io/github/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java @@ -0,0 +1,4 @@ +package io.github.numichi.reactive.logger.annotations; + +public @interface JacocoSkipGeneratedReport { +} diff --git a/src/main/java/hu/numichi/reactive/logger/exception/ContextNotExistException.java b/src/main/java/io/github/numichi/reactive/logger/exception/ContextNotExistException.java similarity index 74% rename from src/main/java/hu/numichi/reactive/logger/exception/ContextNotExistException.java rename to src/main/java/io/github/numichi/reactive/logger/exception/ContextNotExistException.java index e5642dd..27c354c 100644 --- a/src/main/java/hu/numichi/reactive/logger/exception/ContextNotExistException.java +++ b/src/main/java/io/github/numichi/reactive/logger/exception/ContextNotExistException.java @@ -1,4 +1,4 @@ -package hu.numichi.reactive.logger.exception; +package io.github.numichi.reactive.logger.exception; public class ContextNotExistException extends RuntimeException { public ContextNotExistException(String message) { diff --git a/src/main/java/hu/numichi/reactive/logger/exception/InvalidContextDataException.java b/src/main/java/io/github/numichi/reactive/logger/exception/InvalidContextDataException.java similarity index 79% rename from src/main/java/hu/numichi/reactive/logger/exception/InvalidContextDataException.java rename to src/main/java/io/github/numichi/reactive/logger/exception/InvalidContextDataException.java index 511841b..72f236a 100644 --- a/src/main/java/hu/numichi/reactive/logger/exception/InvalidContextDataException.java +++ b/src/main/java/io/github/numichi/reactive/logger/exception/InvalidContextDataException.java @@ -1,4 +1,4 @@ -package hu.numichi.reactive.logger.exception; +package io.github.numichi.reactive.logger.exception; public class InvalidContextDataException extends RuntimeException { public InvalidContextDataException(Throwable throwable) { diff --git a/src/main/java/hu/numichi/reactive/logger/exception/Messages.java b/src/main/java/io/github/numichi/reactive/logger/exception/Messages.java similarity index 91% rename from src/main/java/hu/numichi/reactive/logger/exception/Messages.java rename to src/main/java/io/github/numichi/reactive/logger/exception/Messages.java index 0c84f27..d1ab457 100644 --- a/src/main/java/hu/numichi/reactive/logger/exception/Messages.java +++ b/src/main/java/io/github/numichi/reactive/logger/exception/Messages.java @@ -1,4 +1,4 @@ -package hu.numichi.reactive.logger.exception; +package io.github.numichi.reactive.logger.exception; public class Messages { private Messages() { diff --git a/src/main/java/hu/numichi/reactive/logger/java/MDCContext.java b/src/main/java/io/github/numichi/reactive/logger/java/MDCContext.java similarity index 75% rename from src/main/java/hu/numichi/reactive/logger/java/MDCContext.java rename to src/main/java/io/github/numichi/reactive/logger/java/MDCContext.java index 0f5747c..e477797 100644 --- a/src/main/java/hu/numichi/reactive/logger/java/MDCContext.java +++ b/src/main/java/io/github/numichi/reactive/logger/java/MDCContext.java @@ -1,7 +1,8 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; -import hu.numichi.reactive.logger.exception.InvalidContextDataException; -import hu.numichi.reactive.logger.MDC; +import io.github.numichi.reactive.logger.exception.InvalidContextDataException; +import io.github.numichi.reactive.logger.MDC; +import io.github.numichi.reactive.logger.Values; import reactor.core.publisher.Mono; import reactor.util.annotation.NonNull; import reactor.util.context.Context; @@ -10,12 +11,11 @@ import java.util.Map; import java.util.Objects; -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; +import static io.github.numichi.reactive.logger.exception.Messages.CTXK_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.CTXW_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL; +import static io.github.numichi.reactive.logger.exception.Messages.MDC_NOT_NULL; public final class MDCContext { private MDCContext() { @@ -30,7 +30,7 @@ public static Context put(Context context, Map mdc) { throw new IllegalArgumentException(exception); } - return context.put(DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc); + return context.put(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc); } @NonNull @@ -60,7 +60,7 @@ public static Context put(Context context, MDC mdc) { @NonNull public static Mono read() { - return read(DEFAULT_REACTOR_CONTEXT_MDC_KEY); + return read(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY); } @NonNull @@ -70,7 +70,7 @@ public static Mono read(String mdcContextKey) { @NonNull public static Mono read(ContextView context) { - return read(context, DEFAULT_REACTOR_CONTEXT_MDC_KEY); + return read(context, Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY); } @NonNull diff --git a/src/main/java/hu/numichi/reactive/logger/java/MDCSnapshot.java b/src/main/java/io/github/numichi/reactive/logger/java/MDCSnapshot.java similarity index 94% rename from src/main/java/hu/numichi/reactive/logger/java/MDCSnapshot.java rename to src/main/java/io/github/numichi/reactive/logger/java/MDCSnapshot.java index fd26f8e..478a527 100644 --- a/src/main/java/hu/numichi/reactive/logger/java/MDCSnapshot.java +++ b/src/main/java/io/github/numichi/reactive/logger/java/MDCSnapshot.java @@ -1,4 +1,4 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; import org.slf4j.MDC; import reactor.util.annotation.NonNull; diff --git a/src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java b/src/main/java/io/github/numichi/reactive/logger/java/ReactiveLogger.java similarity index 95% rename from src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java rename to src/main/java/io/github/numichi/reactive/logger/java/ReactiveLogger.java index c6d4a9f..926d668 100644 --- a/src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java +++ b/src/main/java/io/github/numichi/reactive/logger/java/ReactiveLogger.java @@ -1,7 +1,8 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; -import hu.numichi.reactive.logger.MDC; -import hu.numichi.reactive.logger.exception.ContextNotExistException; +import io.github.numichi.reactive.logger.MDC; +import io.github.numichi.reactive.logger.exception.ContextNotExistException; +import io.github.numichi.reactive.logger.Values; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.Marker; @@ -14,9 +15,7 @@ import java.util.Objects; import java.util.Optional; -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; +import static io.github.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL; public final class ReactiveLogger { @@ -308,9 +307,9 @@ private Mono wrap(final Runnable runnable) { } public static class Builder { - private Scheduler scheduler = DEFAULT_SCHEDULER; + private Scheduler scheduler = Values.DEFAULT_SCHEDULER; private Logger logger = DEFAULT_LOGGER; - private String mdcContextKey = DEFAULT_REACTOR_CONTEXT_MDC_KEY; + private String mdcContextKey = Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY; private static final String LOGGER_MUST_NOT_BE_NULL = "logger must not be null"; private boolean enableError = false; diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt b/src/main/java/io/github/numichi/reactive/logger/kotlin/ReactiveLogger.kt similarity index 97% rename from src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt rename to src/main/java/io/github/numichi/reactive/logger/kotlin/ReactiveLogger.kt index dc614ca..1a415c7 100644 --- a/src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt +++ b/src/main/java/io/github/numichi/reactive/logger/kotlin/ReactiveLogger.kt @@ -1,9 +1,9 @@ -package hu.numichi.reactive.logger.kotlin +package io.github.numichi.reactive.logger.kotlin -import hu.numichi.reactive.logger.java.ReactiveLogger as JReactiveLogger -import hu.numichi.reactive.logger.Values -import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport -import hu.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.java.ReactiveLogger as JReactiveLogger +import io.github.numichi.reactive.logger.Values +import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport +import io.github.numichi.reactive.logger.MDC import kotlinx.coroutines.reactor.ReactorContext import kotlinx.coroutines.reactor.awaitSingleOrNull import org.slf4j.Logger diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt b/src/main/java/io/github/numichi/reactive/logger/kotlin/helper.kt similarity index 84% rename from src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt rename to src/main/java/io/github/numichi/reactive/logger/kotlin/helper.kt index 8d2cc2c..712997f 100644 --- a/src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt +++ b/src/main/java/io/github/numichi/reactive/logger/kotlin/helper.kt @@ -1,7 +1,7 @@ -package hu.numichi.reactive.logger.kotlin +package io.github.numichi.reactive.logger.kotlin -import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport -import hu.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport +import io.github.numichi.reactive.logger.MDC import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.reactor.ReactorContext import kotlinx.coroutines.reactor.asCoroutineContext diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/putMDC.kt b/src/main/java/io/github/numichi/reactive/logger/kotlin/putMDC.kt similarity index 62% rename from src/main/java/hu/numichi/reactive/logger/kotlin/putMDC.kt rename to src/main/java/io/github/numichi/reactive/logger/kotlin/putMDC.kt index 7af22f8..3223767 100644 --- a/src/main/java/hu/numichi/reactive/logger/kotlin/putMDC.kt +++ b/src/main/java/io/github/numichi/reactive/logger/kotlin/putMDC.kt @@ -1,6 +1,6 @@ -package hu.numichi.reactive.logger.kotlin +package io.github.numichi.reactive.logger.kotlin -import hu.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.MDC import reactor.util.context.Context fun putMdc(context: Context, vararg mdc: MDC): Context { diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt b/src/main/java/io/github/numichi/reactive/logger/kotlin/readMDC.kt similarity index 77% rename from src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt rename to src/main/java/io/github/numichi/reactive/logger/kotlin/readMDC.kt index e91bd74..2d2cb10 100644 --- a/src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt +++ b/src/main/java/io/github/numichi/reactive/logger/kotlin/readMDC.kt @@ -1,8 +1,8 @@ -package hu.numichi.reactive.logger.kotlin +package io.github.numichi.reactive.logger.kotlin -import hu.numichi.reactive.logger.Values -import hu.numichi.reactive.logger.exception.InvalidContextDataException -import hu.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.Values +import io.github.numichi.reactive.logger.exception.InvalidContextDataException +import io.github.numichi.reactive.logger.MDC import reactor.util.context.ContextView suspend fun readMDC(): MDC { diff --git a/src/main/java/hu/numichi/reactive/logger/kotlin/withMDCContext.kt b/src/main/java/io/github/numichi/reactive/logger/kotlin/withMDCContext.kt similarity index 83% rename from src/main/java/hu/numichi/reactive/logger/kotlin/withMDCContext.kt rename to src/main/java/io/github/numichi/reactive/logger/kotlin/withMDCContext.kt index 868eee9..49f1912 100644 --- a/src/main/java/hu/numichi/reactive/logger/kotlin/withMDCContext.kt +++ b/src/main/java/io/github/numichi/reactive/logger/kotlin/withMDCContext.kt @@ -1,6 +1,6 @@ -package hu.numichi.reactive.logger.kotlin +package io.github.numichi.reactive.logger.kotlin -import hu.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.MDC import kotlinx.coroutines.CoroutineScope import reactor.util.context.Context diff --git a/src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java b/src/test/java/io/github/numichi/reactive/logger/java/MDCContextTest.java similarity index 95% rename from src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java rename to src/test/java/io/github/numichi/reactive/logger/java/MDCContextTest.java index b926bc2..25c95d5 100644 --- a/src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java +++ b/src/test/java/io/github/numichi/reactive/logger/java/MDCContextTest.java @@ -1,7 +1,8 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; -import hu.numichi.reactive.logger.MDC; -import hu.numichi.reactive.logger.exception.InvalidContextDataException; +import io.github.numichi.reactive.logger.MDC; +import io.github.numichi.reactive.logger.exception.InvalidContextDataException; +import io.github.numichi.reactive.logger.java.MDCContext; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -11,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY; +import static io.github.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/MDCSnapshotTest.java b/src/test/java/io/github/numichi/reactive/logger/java/MDCSnapshotTest.java similarity index 90% rename from src/test/java/hu/numichi/reactive/logger/java/MDCSnapshotTest.java rename to src/test/java/io/github/numichi/reactive/logger/java/MDCSnapshotTest.java index 1313b29..d327061 100644 --- a/src/test/java/hu/numichi/reactive/logger/java/MDCSnapshotTest.java +++ b/src/test/java/io/github/numichi/reactive/logger/java/MDCSnapshotTest.java @@ -1,5 +1,6 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; +import io.github.numichi.reactive.logger.java.MDCSnapshot; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/src/test/java/hu/numichi/reactive/logger/java/ReactiveLoggerTest.java b/src/test/java/io/github/numichi/reactive/logger/java/ReactiveLoggerTest.java similarity index 98% rename from src/test/java/hu/numichi/reactive/logger/java/ReactiveLoggerTest.java rename to src/test/java/io/github/numichi/reactive/logger/java/ReactiveLoggerTest.java index da54024..528ac3e 100644 --- a/src/test/java/hu/numichi/reactive/logger/java/ReactiveLoggerTest.java +++ b/src/test/java/io/github/numichi/reactive/logger/java/ReactiveLoggerTest.java @@ -1,7 +1,7 @@ -package hu.numichi.reactive.logger.java; +package io.github.numichi.reactive.logger.java; -import hu.numichi.reactive.logger.exception.ContextNotExistException; -import hu.numichi.reactive.logger.MDC; +import io.github.numichi.reactive.logger.exception.ContextNotExistException; +import io.github.numichi.reactive.logger.MDC; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -21,8 +21,7 @@ import java.util.Optional; import java.util.UUID; -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 io.github.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -118,7 +117,7 @@ void snapshot() { Context context2 = Context.empty(); - context2 = context2.put(ANOTHER_CONTEXT_KEY, mdc.asMap()); + context2 = context2.put(MDCContextTest.ANOTHER_CONTEXT_KEY, mdc.asMap()); Mono snapshot2 = logger.snapshot(context2); diff --git a/src/test/java/hu/numichi/reactive/logger/kotlin/MDCContextTest.kt b/src/test/java/io/github/numichi/reactive/logger/kotlin/MDCContextTest.kt similarity index 93% rename from src/test/java/hu/numichi/reactive/logger/kotlin/MDCContextTest.kt rename to src/test/java/io/github/numichi/reactive/logger/kotlin/MDCContextTest.kt index 250bcfa..8fb30e1 100644 --- a/src/test/java/hu/numichi/reactive/logger/kotlin/MDCContextTest.kt +++ b/src/test/java/io/github/numichi/reactive/logger/kotlin/MDCContextTest.kt @@ -1,8 +1,11 @@ -package hu.numichi.reactive.logger.kotlin - -import hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY -import hu.numichi.reactive.logger.MDC -import hu.numichi.reactive.logger.exception.InvalidContextDataException +package io.github.numichi.reactive.logger.kotlin + +import io.github.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY +import io.github.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.exception.InvalidContextDataException +import io.github.numichi.reactive.logger.kotlin.putMdc +import io.github.numichi.reactive.logger.kotlin.readMDC +import io.github.numichi.reactive.logger.kotlin.withMDCContext import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.reactor.ReactorContext import kotlinx.coroutines.reactor.asCoroutineContext diff --git a/src/test/java/hu/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt b/src/test/java/io/github/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt similarity index 97% rename from src/test/java/hu/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt rename to src/test/java/io/github/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt index c755087..1f555b7 100644 --- a/src/test/java/hu/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt +++ b/src/test/java/io/github/numichi/reactive/logger/kotlin/ReactiveLoggerTest.kt @@ -1,10 +1,12 @@ -package hu.numichi.reactive.logger.kotlin - -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 +package io.github.numichi.reactive.logger.kotlin + +import io.github.numichi.reactive.logger.Values +import io.github.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY +import io.github.numichi.reactive.logger.MDC +import io.github.numichi.reactive.logger.exception.ContextNotExistException +import io.github.numichi.reactive.logger.kotlin.MDCContextTest.Companion.ANOTHER_CONTEXT_KEY +import io.github.numichi.reactive.logger.kotlin.ReactiveLogger +import io.github.numichi.reactive.logger.kotlin.withMDCContext import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk