Skip to content

Commit 10f6433

Browse files
NumichiNumichi
committed
v1.0.0
1 parent bc15dd9 commit 10f6433

22 files changed

+174
-84
lines changed

‎build.gradle.kts

Lines changed: 88 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1+
import kotlin.text.Regex
2+
13
plugins {
24
java
35
jacoco
46
id("com.adarshr.test-logger") version "3.1.0"
57
kotlin("jvm") version "1.6.10"
8+
id("java-library")
9+
id("maven-publish")
10+
id("signing")
611
}
712

8-
group = "org.example"
9-
version = "1.1.2-SNAPSHOT"
10-
11-
java.sourceCompatibility = JavaVersion.VERSION_1_8
12-
java.targetCompatibility = JavaVersion.VERSION_1_8
13+
group = project.property("group") as String
14+
version = project.property("version") as String as String
1315

14-
repositories {
15-
mavenCentral()
16+
java {
17+
sourceCompatibility = JavaVersion.VERSION_1_8
18+
targetCompatibility = JavaVersion.VERSION_1_8
19+
withSourcesJar()
20+
withJavadocJar()
1621
}
1722

1823
dependencies {
@@ -33,6 +38,82 @@ dependencies {
3338
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
3439
}
3540

41+
repositories {
42+
mavenCentral()
43+
}
44+
45+
publishing {
46+
publications {
47+
create<MavenPublication>("main") {
48+
groupId = project.property("group") as String
49+
artifactId = "reactive-logger"
50+
version = project.property("version") as String
51+
from(components["java"])
52+
53+
pom {
54+
name.set("Reactive logger layer for slf4j")
55+
description.set("A Java & Korlin library adapting slf4j for reactive applications")
56+
url.set("https://github.com/Numichi/reactive-logger")
57+
inceptionYear.set("2022")
58+
59+
developers {
60+
developer {
61+
id.set(project.property("developerId") as String)
62+
name.set(project.property("developerName") as String)
63+
email.set(project.property("developerEmail") as String)
64+
}
65+
}
66+
67+
licenses {
68+
license {
69+
name.set("Apache License 2.0")
70+
url.set("https://opensource.org/licenses/Apache-2.0")
71+
}
72+
}
73+
74+
scm {
75+
connection.set("scm:git:git:github.com/Numichi/reactive-logger.git")
76+
developerConnection.set("scm:git:ssh://github.com/Numichi/reactive-logger.git")
77+
url.set("https://github.com/Numichi/reactive-logger")
78+
}
79+
}
80+
}
81+
}
82+
83+
repositories {
84+
maven {
85+
name = "OSSRH"
86+
credentials {
87+
username = if (project.hasProperty("ossrhUsername")) {
88+
project.property("ossrhUsername") as String
89+
} else {
90+
"N/A"
91+
}
92+
93+
password = if (project.hasProperty("ossrhPassword")) {
94+
project.property("ossrhPassword") as String
95+
} else {
96+
"N/A"
97+
}
98+
}
99+
100+
val releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
101+
val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
102+
val isReleaseVersion = !version.toString().contains(Regex("(SNAPSHOT|BETA|ALPHA|DEVELOP|DEV)"))
103+
104+
url = if (isReleaseVersion) {
105+
uri(releasesRepoUrl)
106+
} else {
107+
uri(snapshotsRepoUrl)
108+
}
109+
}
110+
}
111+
}
112+
113+
signing {
114+
sign(publishing.publications["main"])
115+
}
116+
36117
tasks.getByName<Test>("test") {
37118
useJUnitPlatform()
38119
}

‎gradle.properties

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
kotlin.code.style=official
1+
kotlin.code.style=official
2+
version=1.0.0
3+
group=io.github.numichi
4+
developerId=numichi
5+
developerName=Donát Csongor
6+
developerEmail[email protected]

‎src/main/java/hu/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/main/java/hu/numichi/reactive/logger/MDC.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/MDC.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package hu.numichi.reactive.logger;
1+
package io.github.numichi.reactive.logger;
22

3-
import hu.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport;
3+
import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport;
44
import reactor.util.annotation.NonNull;
55

66
import java.util.Collection;
@@ -9,26 +9,25 @@
99
import java.util.Objects;
1010
import java.util.Set;
1111

12-
import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
13-
import static hu.numichi.reactive.logger.exception.Messages.KEY_NOT_NULL;
14-
import static hu.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
15-
import static hu.numichi.reactive.logger.exception.Messages.VALUE_NOT_NULL;
12+
import static io.github.numichi.reactive.logger.exception.Messages.KEY_NOT_NULL;
13+
import static io.github.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
14+
import static io.github.numichi.reactive.logger.exception.Messages.VALUE_NOT_NULL;
1615

1716
@JacocoSkipGeneratedReport
1817
public class MDC implements Map<String, String> {
1918
private final Map<String, String> mdcMap;
2019
private final String mdcContextKey;
2120

2221
public MDC() {
23-
this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, new HashMap<>());
22+
this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, new HashMap<>());
2423
}
2524

2625
public MDC(String mdcContextKey) {
2726
this(mdcContextKey, new HashMap<>());
2827
}
2928

3029
public MDC(Map<String, String> mdc) {
31-
this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
30+
this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
3231
}
3332

3433
public MDC(String mdcContextKey, Map<String, String> mdc) {

‎src/main/java/hu/numichi/reactive/logger/Values.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/Values.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package hu.numichi.reactive.logger;
1+
package io.github.numichi.reactive.logger;
22

33
import reactor.core.scheduler.Scheduler;
44
import reactor.core.scheduler.Schedulers;

‎src/main/java/io/github/numichi/reactive/logger/annotations/JacocoSkipGeneratedReport.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package io.github.numichi.reactive.logger.annotations;
2+
3+
public @interface JacocoSkipGeneratedReport {
4+
}

‎src/main/java/hu/numichi/reactive/logger/exception/ContextNotExistException.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/exception/ContextNotExistException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package hu.numichi.reactive.logger.exception;
1+
package io.github.numichi.reactive.logger.exception;
22

33
public class ContextNotExistException extends RuntimeException {
44
public ContextNotExistException(String message) {

‎src/main/java/hu/numichi/reactive/logger/exception/InvalidContextDataException.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/exception/InvalidContextDataException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package hu.numichi.reactive.logger.exception;
1+
package io.github.numichi.reactive.logger.exception;
22

33
public class InvalidContextDataException extends RuntimeException {
44
public InvalidContextDataException(Throwable throwable) {

‎src/main/java/hu/numichi/reactive/logger/exception/Messages.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/exception/Messages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package hu.numichi.reactive.logger.exception;
1+
package io.github.numichi.reactive.logger.exception;
22

33
public class Messages {
44
private Messages() {

‎src/main/java/hu/numichi/reactive/logger/java/MDCContext.java renamed to ‎src/main/java/io/github/numichi/reactive/logger/java/MDCContext.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package hu.numichi.reactive.logger.java;
1+
package io.github.numichi.reactive.logger.java;
22

3-
import hu.numichi.reactive.logger.exception.InvalidContextDataException;
4-
import hu.numichi.reactive.logger.MDC;
3+
import io.github.numichi.reactive.logger.exception.InvalidContextDataException;
4+
import io.github.numichi.reactive.logger.MDC;
5+
import io.github.numichi.reactive.logger.Values;
56
import reactor.core.publisher.Mono;
67
import reactor.util.annotation.NonNull;
78
import reactor.util.context.Context;
@@ -10,12 +11,11 @@
1011
import java.util.Map;
1112
import java.util.Objects;
1213

13-
import static hu.numichi.reactive.logger.exception.Messages.CTXK_NOT_NULL;
14-
import static hu.numichi.reactive.logger.exception.Messages.CTXW_NOT_NULL;
15-
import static hu.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL;
16-
import static hu.numichi.reactive.logger.Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY;
17-
import static hu.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
18-
import static hu.numichi.reactive.logger.exception.Messages.MDC_NOT_NULL;
14+
import static io.github.numichi.reactive.logger.exception.Messages.CTXK_NOT_NULL;
15+
import static io.github.numichi.reactive.logger.exception.Messages.CTXW_NOT_NULL;
16+
import static io.github.numichi.reactive.logger.exception.Messages.CTX_NOT_NULL;
17+
import static io.github.numichi.reactive.logger.exception.Messages.MAP_NOT_NULL;
18+
import static io.github.numichi.reactive.logger.exception.Messages.MDC_NOT_NULL;
1919

2020
public final class MDCContext {
2121
private MDCContext() {
@@ -30,7 +30,7 @@ public static Context put(Context context, Map<String, String> mdc) {
3030
throw new IllegalArgumentException(exception);
3131
}
3232

33-
return context.put(DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
33+
return context.put(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
3434
}
3535

3636
@NonNull
@@ -60,7 +60,7 @@ public static Context put(Context context, MDC mdc) {
6060

6161
@NonNull
6262
public static Mono<MDC> read() {
63-
return read(DEFAULT_REACTOR_CONTEXT_MDC_KEY);
63+
return read(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY);
6464
}
6565

6666
@NonNull
@@ -70,7 +70,7 @@ public static Mono<MDC> read(String mdcContextKey) {
7070

7171
@NonNull
7272
public static Mono<MDC> read(ContextView context) {
73-
return read(context, DEFAULT_REACTOR_CONTEXT_MDC_KEY);
73+
return read(context, Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY);
7474
}
7575

7676
@NonNull

0 commit comments

Comments
 (0)