Skip to content

Commit

Permalink
remove old packages and can be configuration default values
Browse files Browse the repository at this point in the history
  • Loading branch information
Numichi committed Jan 28, 2022
1 parent 37e1caa commit 2edb460
Show file tree
Hide file tree
Showing 28 changed files with 126 additions and 2,509 deletions.
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
kotlin.code.style=official
version=1.1.1
version=1.2.0
group=io.github.numichi
developerId=numichi
developerName=Donát Csongor
Expand Down
84 changes: 84 additions & 0 deletions src/main/java/io/github/numichi/reactive/logger/DefaultValues.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package io.github.numichi.reactive.logger;

import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport;
import io.github.numichi.reactive.logger.exception.AlreadyConfigurationException;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;

@JacocoSkipGeneratedReport
public class DefaultValues {
private static final String DEFAULT_REACTOR_CONTEXT_MDC_KEY = "EFAULT_REACTOR_CONTEXT_MDC_KEY";
private static final Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();
private static DefaultValues instance = null;
private final String defaultReactorContextMdcKey;
private final Scheduler defaultScheduler;

private DefaultValues() {
this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, DEFAULT_SCHEDULER);
}

private DefaultValues(Scheduler defaultScheduler) {
this(DEFAULT_REACTOR_CONTEXT_MDC_KEY, defaultScheduler);
}

private DefaultValues(String defaultReactorContextMdcKey) {
this(defaultReactorContextMdcKey, DEFAULT_SCHEDULER);
}

private DefaultValues(String defaultReactorContextMdcKey, Scheduler defaultScheduler) {
this.defaultReactorContextMdcKey = defaultReactorContextMdcKey;
this.defaultScheduler = defaultScheduler;
}

public static DefaultValues getInstance() {
if (instance == null) {
instance = configuration();
}

return instance;
}

public static DefaultValues configuration() throws AlreadyConfigurationException {
if (instance == null) {
instance = new DefaultValues();
return instance;
} else {
throw new AlreadyConfigurationException();
}
}

public static DefaultValues configuration(Scheduler defaultScheduler) throws AlreadyConfigurationException {
if (instance == null) {
instance = new DefaultValues(defaultScheduler);
return instance;
} else {
throw new AlreadyConfigurationException();
}
}

public static DefaultValues configuration(String defaultReactorContextMdcKey) throws AlreadyConfigurationException {
if (instance == null) {
instance = new DefaultValues(defaultReactorContextMdcKey);
return instance;
} else {
throw new AlreadyConfigurationException();
}
}

public static DefaultValues configuration(String defaultReactorContextMdcKey, Scheduler defaultScheduler) throws AlreadyConfigurationException {
if (instance == null) {
instance = new DefaultValues(defaultReactorContextMdcKey, defaultScheduler);
return instance;
} else {
throw new AlreadyConfigurationException();
}
}

public String getDefaultReactorContextMdcKey() {
return defaultReactorContextMdcKey;
}

public Scheduler getDefaultScheduler() {
return defaultScheduler;
}
}
4 changes: 2 additions & 2 deletions src/main/java/io/github/numichi/reactive/logger/MDC.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ public class MDC implements Map<String, String> {
private final String mdcContextKey;

public MDC() {
this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, new HashMap<>());
this(DefaultValues.getInstance().getDefaultReactorContextMdcKey(), new HashMap<>());
}

public MDC(String mdcContextKey) {
this(mdcContextKey, new HashMap<>());
}

public MDC(Map<String, String> mdc) {
this(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY, mdc);
this(DefaultValues.getInstance().getDefaultReactorContextMdcKey(), mdc);
}

public MDC(String mdcContextKey, Map<String, String> mdc) {
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/io/github/numichi/reactive/logger/Values.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.numichi.reactive.logger.coroutine

import io.github.numichi.reactive.logger.reactor.ReactiveLogger as JReactiveLogger
import io.github.numichi.reactive.logger.Values
import io.github.numichi.reactive.logger.DefaultValues
import io.github.numichi.reactive.logger.annotations.JacocoSkipGeneratedReport
import io.github.numichi.reactive.logger.MDC
import kotlinx.coroutines.reactor.ReactorContext
Expand Down Expand Up @@ -259,9 +259,9 @@ class ReactiveLogger private constructor(
}

class Builder<T : CoroutineContext.Element>(private val contextKey: CoroutineContext.Key<T>) {
private var scheduler = Values.DEFAULT_SCHEDULER
private var scheduler: Scheduler = DefaultValues.getInstance().defaultScheduler
private var logger = LoggerFactory.getLogger(ReactiveLogger::class.java)
private var mdcContextKey = Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY
private var mdcContextKey: String = DefaultValues.getInstance().defaultReactorContextMdcKey!!
private var contextExtractive: suspend (CoroutineContext.Key<out T>) -> Context?
private var enableError: Boolean = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package io.github.numichi.reactive.logger.coroutine

import io.github.numichi.reactive.logger.Values
import io.github.numichi.reactive.logger.DefaultValues
import io.github.numichi.reactive.logger.exception.InvalidContextDataException
import io.github.numichi.reactive.logger.MDC
import reactor.util.context.ContextView

suspend fun readMDC(): MDC {
return readMDC(Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
return readMDC(DefaultValues.getInstance().defaultReactorContextMdcKey)
}

suspend fun readMDC(mdcContextKey: String): MDC {
return readMDC(rectorContext(), mdcContextKey)
}

fun readMDC(contextView: ContextView?): MDC {
return readMDC(contextView, Values.DEFAULT_REACTOR_CONTEXT_MDC_KEY)
return readMDC(contextView, DefaultValues.getInstance().defaultReactorContextMdcKey)
}

fun readMDC(contextView: ContextView?, mdcContextKey: String): MDC {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ suspend fun <T> withMDCContext(vararg mdc: MDC, block: suspend CoroutineScope.()
}

suspend fun <T> withMDCContext(context: Context?, vararg mdc: MDC, block: suspend CoroutineScope.() -> T): T {
requireNotNull(context) { "context must not be null"}
requireNotNull(context) { "context must not be null" }
return withContextBlock(context, mdc.iterator(), block)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.github.numichi.reactive.logger.exception;

public class AlreadyConfigurationException extends RuntimeException {
public AlreadyConfigurationException() {
super("DefaultValues have already configurated!");
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2edb460

Please sign in to comment.