package org.openecomp.sdc.logging.api;
-import org.openecomp.sdc.logging.provider.LoggerCreationService;
+import org.openecomp.sdc.logging.spi.LoggerCreationService;
import java.util.Objects;
package org.openecomp.sdc.logging.api;
-import org.openecomp.sdc.logging.provider.LoggingContextService;
+import org.openecomp.sdc.logging.spi.LoggingContextService;
import java.util.Objects;
import java.util.concurrent.Callable;
SERVICE.clear();
}
- public static Runnable toRunnable(Runnable runnable) {
- return SERVICE.toRunnable(runnable);
+ public static Runnable copyToRunnable(Runnable runnable) {
+ return SERVICE.copyToRunnable(runnable);
}
- public static <V> Callable<V> toCallable(Callable<V> callable) {
- return SERVICE.toCallable(callable);
+ public static <V> Callable<V> copyToCallable(Callable<V> callable) {
+ return SERVICE.copyToCallable(callable);
}
private static class NoOpLoggingContextService implements LoggingContextService {
}
@Override
- public Runnable toRunnable(Runnable runnable) {
+ public Runnable copyToRunnable(Runnable runnable) {
Objects.requireNonNull(runnable, "Runnable cannot be null");
return runnable;
}
@Override
- public <V> Callable<V> toCallable(Callable<V> callable) {
+ public <V> Callable<V> copyToCallable(Callable<V> callable) {
Objects.requireNonNull(callable, "Callable cannot be null");
return callable;
}
package org.openecomp.sdc.logging.api;
-import org.openecomp.sdc.logging.provider.LoggerCreationService;
-import org.openecomp.sdc.logging.provider.LoggingContextService;
-import org.openecomp.sdc.logging.provider.LoggingServiceProvider;
+import org.openecomp.sdc.logging.spi.LoggerCreationService;
+import org.openecomp.sdc.logging.spi.LoggingContextService;
+import org.openecomp.sdc.logging.spi.LoggingServiceProvider;
import java.util.Iterator;
import java.util.Optional;
* limitations under the License.
*/
-package org.openecomp.sdc.logging.provider;
+package org.openecomp.sdc.logging.spi;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
* limitations under the License.
*/
-package org.openecomp.sdc.logging.provider;
+package org.openecomp.sdc.logging.spi;
import java.util.concurrent.Callable;
* Copies logging context of current thread onto a {@link Runnable}, so that the context is available
* when this {@link Runnable} runs in another thread.
*/
- Runnable toRunnable(Runnable runnable);
+ Runnable copyToRunnable(Runnable runnable);
/**
* Copies logging context of current thread onto a {@link Callable}, so that the context is available
* when this {@link Callable} runs in another thread
*/
- <V> Callable<V> toCallable(Callable<V> callable);
+ <V> Callable<V> copyToCallable(Callable<V> callable);
}
* limitations under the License.
*/
-package org.openecomp.sdc.logging.provider;
+package org.openecomp.sdc.logging.spi;
/**
* <p>From the application code (consumer) perspective, logger creation (factory) and logging context are independent
@Test
public void toRunnableReturnsSameInstance() {
Runnable test = () -> { /* do nothing */ };
- assertTrue(test == LoggingContext.toRunnable(test));
+ assertTrue(test == LoggingContext.copyToRunnable(test));
}
@Test(expectedExceptions = NullPointerException.class)
public void throwNpeWhenToRunnableWithNull() {
- LoggingContext.toRunnable(null);
+ LoggingContext.copyToRunnable(null);
}
@Test
public void toCallableReturnsSameInstance() {
Callable<String> test = () -> "";
- assertTrue(test == LoggingContext.toCallable(test));
+ assertTrue(test == LoggingContext.copyToCallable(test));
}
@Test(expectedExceptions = NullPointerException.class)
public void throwNpeWhenToCallableWithNull() {
- LoggingContext.toCallable(null);
+ LoggingContext.copyToCallable(null);
}
}
\ No newline at end of file
package org.openecomp.sdc.logging.slf4j;
import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.provider.LoggingServiceProvider;
+import org.openecomp.sdc.logging.spi.LoggingServiceProvider;
import org.slf4j.MDC;
import java.util.Objects;
}
@Override
- public Runnable toRunnable(Runnable runnable) {
+ public Runnable copyToRunnable(Runnable runnable) {
Objects.requireNonNull(runnable, "Runnable cannot be null");
return new MDCRunnableWrapper(runnable);
}
@Override
- public <V> Callable<V> toCallable(Callable<V> callable) {
+ public <V> Callable<V> copyToCallable(Callable<V> callable) {
Objects.requireNonNull(callable, "Runnable cannot be null");
return new MDCCallableWrapper<>(callable);
}
package org.openecomp.sdc.logging.slf4j;
import org.openecomp.sdc.logging.api.LoggingContext;
-import org.openecomp.sdc.logging.provider.LoggingContextService;
+import org.openecomp.sdc.logging.spi.LoggingContextService;
import org.testng.annotations.DataProvider;
import java.util.concurrent.Callable;
}
@Override
- public Runnable toRunnable(Runnable runnable) {
- return LoggingContext.toRunnable(runnable);
+ public Runnable copyToRunnable(Runnable runnable) {
+ return LoggingContext.copyToRunnable(runnable);
}
@Override
- public <V> Callable<V> toCallable(Callable<V> callable) {
- return LoggingContext.toCallable(callable);
+ public <V> Callable<V> copyToCallable(Callable<V> callable) {
+ return LoggingContext.copyToCallable(callable);
}
@Override
package org.openecomp.sdc.logging.slf4j;
-import org.openecomp.sdc.logging.provider.LoggingContextService;
+import org.openecomp.sdc.logging.spi.LoggingContextService;
import org.testng.annotations.Test;
import java.util.UUID;
AtomicBoolean complete = new AtomicBoolean(false);
// pass the callable to the context service first
- execute(ctx.toCallable(() -> {
+ execute(ctx.copyToCallable(() -> {
assertEquals(ctx.get(KEY), uuid, EXPECT_PROPAGATED_TO_CHILD);
complete.set(true);
return null;
AtomicBoolean innerComplete = new AtomicBoolean(false);
// should run with the context of main thread
- Callable inner = ctx.toCallable(() -> {
+ Callable inner = ctx.copyToCallable(() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
return null;
assertNull(ctx.get(KEY), EXPECT_EMPTY);
final AtomicBoolean complete = new AtomicBoolean(false);
- execute(ctx.toCallable(() -> {
+ execute(ctx.copyToCallable(() -> {
assertNull(ctx.get(KEY), EXPECT_EMPTY);
complete.set(true);
return null;
AtomicBoolean innerComplete = new AtomicBoolean(false);
// should run with the context of main thread
- Callable inner = ctx.toCallable((() -> {
+ Callable inner = ctx.copyToCallable((() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
return null;
// should run with the context of main thread
AtomicBoolean innerComplete = new AtomicBoolean(false);
- Callable inner = ctx.toCallable(() -> {
+ Callable inner = ctx.copyToCallable(() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
throw new IllegalArgumentException();
@Test
public void returnMdcWrapperWhenToRunnableCalled() {
- assertEquals(LoggingContext.toRunnable(() -> {}).getClass(), MDCRunnableWrapper.class);
+ assertEquals(LoggingContext.copyToRunnable(() -> {}).getClass(), MDCRunnableWrapper.class);
}
@Test(expectedExceptions = NullPointerException.class)
public void throwNpeWhenToRunnableWithNull() {
- LoggingContext.toRunnable(null);
+ LoggingContext.copyToRunnable(null);
}
@Test
public void returnMdcWrapperWhenToCallableCalled() {
- assertEquals(LoggingContext.toCallable(() -> "").getClass(), MDCCallableWrapper.class);
+ assertEquals(LoggingContext.copyToCallable(() -> "").getClass(), MDCCallableWrapper.class);
}
@Test(expectedExceptions = NullPointerException.class)
public void throwNpeWhenToCallableWithNull() {
- LoggingContext.toCallable(null);
+ LoggingContext.copyToCallable(null);
}
@Test
package org.openecomp.sdc.logging.slf4j;
-import org.openecomp.sdc.logging.provider.LoggingContextService;
+import org.openecomp.sdc.logging.spi.LoggingContextService;
import org.testng.annotations.Test;
import java.util.UUID;
AtomicBoolean complete = new AtomicBoolean(false);
// pass the runnable to the context service first
- Thread thread = new Thread(ctx.toRunnable(() -> {
+ Thread thread = new Thread(ctx.copyToRunnable(() -> {
assertEquals(ctx.get(KEY), uuid, EXPECT_PROPAGATED_TO_CHILD);
complete.set(true);
}));
AtomicBoolean innerComplete = new AtomicBoolean(false);
// should run with the context of main thread
- Runnable inner = ctx.toRunnable(() -> {
+ Runnable inner = ctx.copyToRunnable(() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
});
assertNull(ctx.get(KEY), EXPECT_EMPTY);
final AtomicBoolean complete = new AtomicBoolean(false);
- Runnable runnable = ctx.toRunnable(() -> {
+ Runnable runnable = ctx.copyToRunnable(() -> {
assertNull(ctx.get(KEY), EXPECT_EMPTY);
complete.set(true);
});
AtomicBoolean innerComplete = new AtomicBoolean(false);
// should run with the context of main thread
- Runnable inner = ctx.toRunnable(() -> {
+ Runnable inner = ctx.copyToRunnable(() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
});
// should run with the context of main thread
AtomicBoolean innerComplete = new AtomicBoolean(false);
- Runnable inner = ctx.toRunnable(() -> {
+ Runnable inner = ctx.copyToRunnable(() -> {
assertEquals(ctx.get(KEY), innerRandom, EXPECT_PROPAGATED_TO_CHILD);
innerComplete.set(true);
throw new IllegalArgumentException();