v1.0.0

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<MavenPublication>("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>("test") {
     useJUnitPlatform()
 }

gradle.properties

@@ -1 +1,6 @@
-kotlin.code.style=official
+kotlin.code.style=official
+version=1.0.0
+group=io.github.numichi
+developerId=numichi
+developerName=Donát Csongor
+developerEmail[email protected]

src/main/java/hu/numichi/reactive/logger/MDC.java → 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,26 +9,25 @@
 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<String, String> {
     private final Map<String, String> mdcMap;
     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) {
         this(mdcContextKey, new HashMap<>());
     }
 
     public MDC(Map<String, String> mdc) {
-        this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
+        this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
     }
 
     public MDC(String mdcContextKey, Map<String, String> mdc) {

src/main/java/hu/numichi/reactive/logger/Values.java → 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;

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 {
+}

src/main/java/hu/numichi/reactive/logger/exception/ContextNotExistException.java → 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) {

src/main/java/hu/numichi/reactive/logger/exception/InvalidContextDataException.java → 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) {

src/main/java/hu/numichi/reactive/logger/exception/Messages.java → 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() {

src/main/java/hu/numichi/reactive/logger/java/MDCContext.java → 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<String, String> 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<MDC> read() {
-        return read(DEFAULT_REACTOR_CONTEXT_MDC_KEY);
+        return read(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY);
     }
 
     @NonNull
@@ -70,7 +70,7 @@ public static Mono<MDC> read(String mdcContextKey) {
 
     @NonNull
     public static Mono<MDC> read(ContextView context) {
-        return read(context, DEFAULT_REACTOR_CONTEXT_MDC_KEY);
+        return read(context, Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY);
     }
 
     @NonNull

src/main/java/hu/numichi/reactive/logger/java/MDCSnapshot.java → 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;

src/main/java/hu/numichi/reactive/logger/java/ReactiveLogger.java → 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<Context> 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;
 

src/main/java/hu/numichi/reactive/logger/kotlin/ReactiveLogger.kt → 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

src/main/java/hu/numichi/reactive/logger/kotlin/helper.kt → 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

src/main/java/hu/numichi/reactive/logger/kotlin/putMDC.kt → 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 {

src/main/java/hu/numichi/reactive/logger/kotlin/readMDC.kt → 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 {

src/main/java/hu/numichi/reactive/logger/kotlin/withMDCContext.kt → 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

src/test/java/hu/numichi/reactive/logger/java/MDCContextTest.java → 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 {

src/test/java/hu/numichi/reactive/logger/java/MDCSnapshotTest.java → 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;