diff --git a/pom.xml b/pom.xml index 361f19f..8ed4231 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,10 @@ - 2.39.0 + 2.40.0 + + true + diff --git a/src/main/java/elf4j/engine/NativeLogServiceProvider.java b/src/main/java/elf4j/engine/NativeLogServiceProvider.java index b70eb56..f5ffca8 100644 --- a/src/main/java/elf4j/engine/NativeLogServiceProvider.java +++ b/src/main/java/elf4j/engine/NativeLogServiceProvider.java @@ -44,14 +44,10 @@ import lombok.NonNull; import org.slf4j.MdcAdapterInitializer; -/** - * - */ +/** */ public class NativeLogServiceProvider implements LogServiceProvider, NativeLogServiceManager.Refreshable { private static final Level DEFAULT_LOGGER_SEVERITY_LEVEL = Level.INFO; - /** - * Made injectable for extensions other than this native ELF4J implementation - */ + /** Made injectable for extensions other than this native ELF4J implementation */ @NonNull private final Level defaultLoggerLevel; private final Map> nativeLoggers = @@ -59,8 +55,8 @@ public class NativeLogServiceProvider implements LogServiceProvider, NativeLogSe /** * The class or interface that the API client calls first to get a logger instance. The client caller class of this * class will be the declaring class of the logger instances this factory produces. - *

- * For this native implementation, the service access class is the {@link Logger} interface itself as the client + * + *

For this native implementation, the service access class is the {@link Logger} interface itself as the client * calls the static factory method {@link Logger#instance()} first to get a logger instance. If this library is used * as the engine of another logging API, then this access class would be the class in that API that the client calls * first to get a logger instance of that API. @@ -69,16 +65,13 @@ public class NativeLogServiceProvider implements LogServiceProvider, NativeLogSe @NonNull private final NativeLogServiceProvider.NativeLoggerServiceFactory nativeLoggerServiceFactory; - /** - * Default constructor required by {@link java.util.ServiceLoader} - */ + /** Default constructor required by {@link java.util.ServiceLoader} */ public NativeLogServiceProvider() { this(Logger.class); } /** - * @param serviceAccessClass the class or interface that the API client application calls first to a logger - * instance + * @param serviceAccessClass the class or interface that the API client application calls first to a logger instance */ public NativeLogServiceProvider(@NonNull Class serviceAccessClass) { this(DEFAULT_LOGGER_SEVERITY_LEVEL, serviceAccessClass, new ConfiguredNativeLoggerServiceFactory()); diff --git a/src/main/java/elf4j/engine/NativeLogger.java b/src/main/java/elf4j/engine/NativeLogger.java index b66a58e..5fca5f6 100644 --- a/src/main/java/elf4j/engine/NativeLogger.java +++ b/src/main/java/elf4j/engine/NativeLogger.java @@ -43,13 +43,13 @@ public class NativeLogger implements Logger { * Name of this logger's declaring class - the logging service client class that first requested this logger * instance via the {@link Logger#instance()} service access method. The declaring class is usually the same as the * "caller class" - the client class that calls the service interface methods such as {@link Logger#log(Object)}. - *

- * In rare and not-recommended scenarios, the declaring class can be different from the caller class: e.g. the + * + *

In rare and not-recommended scenarios, the declaring class can be different from the caller class: e.g. the * declaring class could pass a reference of this logger instance out to a different/caller class. Once set, though, * the value of this field will never change even when the declaring class is different from the caller class. - *

- * To reduce the frequency of having to walk the call stack in order to locate the caller class, this native ELF4J - * implementation assumes the declaring and caller class to be one and the same. Thus, for logging output that + * + *

To reduce the frequency of having to walk the call stack in order to locate the caller class, this native + * ELF4J implementation assumes the declaring and caller class to be one and the same. Thus, for logging output that * requires only the caller class name, this field will be used in liu of checking the stack trace; i.e. the stack * trace walking is needed only when more caller details (e.g. method name, file name, line number) are required. */ @@ -62,7 +62,7 @@ public class NativeLogger implements Logger { * Constructor only meant to be used by {@link NativeLogServiceProvider} and this class itself * * @param declaringClassName name of the declaring class that requested this instance via the - * {@link Logger#instance()} method + * {@link Logger#instance()} method * @param level severity level of this logger instance * @param nativeLogServiceProvider log service access point from this instance, not reloadable */ @@ -115,16 +115,12 @@ public void log(Throwable throwable, String message, Object... arguments) { this.service(throwable, message, arguments); } - /** - * @return directly callable log service, useful for other logging frameworks to use this engine - */ + /** @return directly callable log service, useful for other logging frameworks to use this engine */ public NativeLoggerService getLogService() { return this.nativeLogServiceProvider.getLogService(); } - /** - * @return declaring/caller class of this logger instance - */ + /** @return declaring/caller class of this logger instance */ public @NonNull String getDeclaringClassName() { return this.declaringClassName; } diff --git a/src/main/java/elf4j/engine/service/EventingNativeLoggerService.java b/src/main/java/elf4j/engine/service/EventingNativeLoggerService.java index 9f48821..0536e49 100644 --- a/src/main/java/elf4j/engine/service/EventingNativeLoggerService.java +++ b/src/main/java/elf4j/engine/service/EventingNativeLoggerService.java @@ -37,9 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; import lombok.NonNull; -/** - * converts a log request into an event for async processing - */ +/** converts a log request into an event for async processing */ public class EventingNativeLoggerService implements NativeLoggerService { private final boolean noop; private final LogWriter logWriter; diff --git a/src/main/java/elf4j/engine/service/LogEvent.java b/src/main/java/elf4j/engine/service/LogEvent.java index 02cdba9..0cf3b47 100644 --- a/src/main/java/elf4j/engine/service/LogEvent.java +++ b/src/main/java/elf4j/engine/service/LogEvent.java @@ -34,9 +34,7 @@ import lombok.NonNull; import lombok.Value; -/** - * Source data to be rendered to a final log message - */ +/** Source data to be rendered to a final log message */ @Value @Builder public class LogEvent { @@ -86,23 +84,17 @@ public class LogEvent { return o instanceof Supplier ? ((Supplier) o).get() : o; } - /** - * @return the name of the application client class calling the logging method of this logger instance - */ + /** @return the name of the application client class calling the logging method of this logger instance */ public String getCallerClassName() { return callerFrame != null ? callerFrame.getClassName() : nativeLogger.getDeclaringClassName(); } - /** - * @return log message text with all placeholder arguments resolved and replaced by final values - */ + /** @return log message text with all placeholder arguments resolved and replaced by final values */ public CharSequence getResolvedMessage() { return resolve(this.message, this.arguments); } - /** - * - */ + /** */ @Value @Builder public static class StackFrameValue { @@ -124,9 +116,7 @@ public static StackFrameValue from(StackTraceElement stackTraceElement) { } } - /** - * - */ + /** */ @Value public static class ThreadValue { @NonNull String name; diff --git a/src/main/java/elf4j/engine/service/NativeLogServiceManager.java b/src/main/java/elf4j/engine/service/NativeLogServiceManager.java index d666777..74422c7 100644 --- a/src/main/java/elf4j/engine/service/NativeLogServiceManager.java +++ b/src/main/java/elf4j/engine/service/NativeLogServiceManager.java @@ -35,14 +35,10 @@ import lombok.NonNull; import lombok.ToString; -/** - * - */ +/** */ @ToString public enum NativeLogServiceManager { - /** - * - */ + /** */ INSTANCE; private final Set refreshables = new HashSet<>(); @@ -51,25 +47,19 @@ public enum NativeLogServiceManager { @ToString.Exclude private final Lock lock = new ReentrantLock(); - /** - * @param refreshable added to be accessible for management - */ + /** @param refreshable added to be accessible for management */ public void register(Refreshable refreshable) { lockAndRun(() -> refreshables.add(refreshable)); IeLogger.INFO.log("Registered Refreshable {} in {}", refreshable, this); } - /** - * @param stoppable added to be accessible for management - */ + /** @param stoppable added to be accessible for management */ public void register(Stoppable stoppable) { lockAndRun(() -> stoppables.add(stoppable)); IeLogger.INFO.log("Registered Stoppable {} in {}", stoppable, this); } - /** - * reloads properties source for each refreshable - */ + /** reloads properties source for each refreshable */ public void refresh() { IeLogger.INFO.log("Refreshing elf4j service by {} via reloading properties", this); lockAndRun(() -> { @@ -81,7 +71,7 @@ public void refresh() { /** * @param properties if non-null, replaces current configuration with the specified properties, instead of reloading - * from the original properties source; otherwise, reloads the original properties source for each refreshable. + * from the original properties source; otherwise, reloads the original properties source for each refreshable. */ public void refresh(Properties properties) { IeLogger.INFO.log("Refreshing elf4j service by {} with properties {}", this, properties); @@ -92,9 +82,7 @@ public void refresh(Properties properties) { IeLogger.INFO.log("Refreshed elf4j service by {} with properties {}", this, properties); } - /** - * - */ + /** */ public void shutdown() { IeLogger.INFO.log("Start shutting down elf4j service by {}", this); lockAndRun(() -> { @@ -106,7 +94,7 @@ public void shutdown() { /** * @return a thread that orderly stops the entire log service. As an alternative to calling {@link #shutdown()}, the - * returned thread can be registered as a JVM shutdown hook. + * returned thread can be registered as a JVM shutdown hook. */ @NonNull public Thread getShutdownHookThread() { return new Thread(this::shutdown); @@ -126,30 +114,22 @@ private void lockAndRun(@NonNull Runnable runnable) { } } - /** - * - */ + /** */ public interface Refreshable { /** * @param properties used to refresh the logging configuration. If null, only properties reloaded - * from the configuration file will be used. Otherwise, the specified properties will replace all current - * properties and configuration file is ignored. + * from the configuration file will be used. Otherwise, the specified properties will replace all current + * properties and configuration file is ignored. */ void refresh(@Nullable Properties properties); - /** - * reloads from original source of properties - */ + /** reloads from original source of properties */ void refresh(); } - /** - * - */ + /** */ public interface Stoppable { - /** - * - */ + /** */ void stop(); } } diff --git a/src/main/java/elf4j/engine/service/NativeLoggerService.java b/src/main/java/elf4j/engine/service/NativeLoggerService.java index ce1a027..e490aba 100644 --- a/src/main/java/elf4j/engine/service/NativeLoggerService.java +++ b/src/main/java/elf4j/engine/service/NativeLoggerService.java @@ -27,9 +27,7 @@ import elf4j.engine.NativeLogger; -/** - * - */ +/** */ public interface NativeLoggerService extends PerformanceSensitive { /** * @param nativeLogger to check for enablement @@ -40,10 +38,11 @@ public interface NativeLoggerService extends PerformanceSensitive { /** * @param nativeLogger the serviced logger * @param serviceInterfaceClass The concrete logging service (logger) implementation class that the client calls - * directly at runtime to make log requests. For the native ELF4J service implementation, this is always the - * {@link NativeLogger} class; may be a different class if this core library is used to service other logging API. - * i.e. the real-time caller of this class is the logging service's "caller class" whose details (such as method and - * line number) if required by configuration, may need to be resolved by walking the runtime calling stack trace. + * directly at runtime to make log requests. For the native ELF4J service implementation, this is always the + * {@link NativeLogger} class; may be a different class if this core library is used to service other logging + * API. i.e. the real-time caller of this class is the logging service's "caller class" whose details (such as + * method and line number) if required by configuration, may need to be resolved by walking the runtime calling + * stack trace. * @param throwable to log * @param message to log, can have argument placeholders to be replaced by the values of the specified arguments * @param arguments arguments whose values will replace the placeholders in the specified message diff --git a/src/main/java/elf4j/engine/service/PerformanceSensitive.java b/src/main/java/elf4j/engine/service/PerformanceSensitive.java index a9b1538..5d0f463 100644 --- a/src/main/java/elf4j/engine/service/PerformanceSensitive.java +++ b/src/main/java/elf4j/engine/service/PerformanceSensitive.java @@ -25,12 +25,8 @@ package elf4j.engine.service; -/** - * - */ +/** */ public interface PerformanceSensitive { - /** - * @return true if log should include caller detail such as method, line number... - */ + /** @return true if log should include caller detail such as method, line number... */ boolean includeCallerDetail(); } diff --git a/src/main/java/elf4j/engine/service/configuration/LogServiceConfiguration.java b/src/main/java/elf4j/engine/service/configuration/LogServiceConfiguration.java index cd32191..a7462a2 100644 --- a/src/main/java/elf4j/engine/service/configuration/LogServiceConfiguration.java +++ b/src/main/java/elf4j/engine/service/configuration/LogServiceConfiguration.java @@ -29,7 +29,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -37,9 +42,7 @@ import lombok.NonNull; import lombok.ToString; -/** - * The type Log service configuration. - */ +/** The type Log service configuration. */ @ToString(doNotUseGetters = true) @EqualsAndHashCode public class LogServiceConfiguration { @@ -84,7 +87,7 @@ public boolean isAbsent() { * * @param name full key in properties * @return Integer value of the specified name in the given properties, null if named entry missing or the - * corresponding value contains no digit + * corresponding value contains no digit */ @Nullable public Integer getAsInteger(String name) { String value = getProperties().getProperty(name); @@ -119,7 +122,7 @@ public int getIntOrDefault(String name, int defaultValue) { * * @param prefix key prefix to search for * @return all properties entries whose original keys start with the specified prefix. The prefix is removed from - * the keys of the returned map. + * the keys of the returned map. * @see #getPropertiesGroupOfType(String) */ public Map getChildProperties(String prefix) { @@ -139,7 +142,7 @@ public Map getChildProperties(String prefix) { * * @param type the value whose keys are each used as a parent key prefix of a child properties map * @return a child properties map group whose every member is a properties map having a common parent key prefix of - * the specified type + * the specified type * @see #getChildProperties(String) */ public List> getPropertiesGroupOfType(String type) { @@ -173,21 +176,15 @@ public boolean isTrue(String name) { return Boolean.parseBoolean(getProperties().getProperty(name)); } - /** - * The type Properties file loader. - */ + /** The type Properties file loader. */ static class PropertiesFileLoader { - /** - * - */ + /** */ static final String ELF4J_PROPERTIES_LOCATION = "elf4j.properties.location"; private static final String[] DEFAULT_PROPERTIES_LOCATIONS = new String[] {"/elf4j-test.properties", "/elf4j.properties"}; - /** - * @return configuration properties loaded from either the default or specified location - */ + /** @return configuration properties loaded from either the default or specified location */ @Nullable public Properties load() { Properties properties = new Properties(); InputStream propertiesInputStream; diff --git a/src/main/java/elf4j/engine/service/configuration/LoggerOutputLevelThreshold.java b/src/main/java/elf4j/engine/service/configuration/LoggerOutputLevelThreshold.java index 2dd024a..697e859 100644 --- a/src/main/java/elf4j/engine/service/configuration/LoggerOutputLevelThreshold.java +++ b/src/main/java/elf4j/engine/service/configuration/LoggerOutputLevelThreshold.java @@ -28,15 +28,19 @@ import elf4j.Level; import elf4j.engine.NativeLogger; import elf4j.util.IeLogger; -import java.util.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Optional; +import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import lombok.NonNull; import lombok.ToString; -/** - * - */ +/** */ @ToString public class LoggerOutputLevelThreshold { private static final String CONFIGURED_ROOT_LOGGER_NAME_SPACE = ""; @@ -80,7 +84,7 @@ private static Optional getAsLevel(String levelKey, @NonNull Properties p * * @param nativeLogger to search for configured threshold output level * @return If the threshold level is configured for the nativeLogger's caller class, return the configured level. - * Otherwise, if no threshold level configured, return the default threshold level. + * Otherwise, if no threshold level configured, return the default threshold level. */ public Level getThresholdOutputLevel(@NonNull NativeLogger nativeLogger) { return this.sortedCallerClassNameSpaces.stream() @@ -98,8 +102,7 @@ private static int getPackageLevels(@NonNull String classNameSpace) { /** * More specific name space goes first. * - *

- * Note: this comparator imposes orderings that are inconsistent with equals. + *

Note: this comparator imposes orderings that are inconsistent with equals. * * @param classNameSpace1 can be fqcn or just package name * @param classNameSpace2 can be fqcn or just package name diff --git a/src/main/java/elf4j/engine/service/pattern/ClassElement.java b/src/main/java/elf4j/engine/service/pattern/ClassElement.java index 7afd03b..b29c76d 100644 --- a/src/main/java/elf4j/engine/service/pattern/ClassElement.java +++ b/src/main/java/elf4j/engine/service/pattern/ClassElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class ClassElement implements PatternElement { private static final DisplayOption DEFAULT_DISPLAY_OPTION = DisplayOption.SIMPLE; @@ -52,8 +50,8 @@ public static ClassElement from(@NonNull String patternSegment) { /** * @return false assuming the logger's declaring class is the same as the caller class. Therefore, - * unlike the {@link MethodElement}, it does not take a stack trace walk to locate the caller class - the declaring - * class is taken instead. + * unlike the {@link MethodElement}, it does not take a stack trace walk to locate the caller class - the + * declaring class is taken instead. */ @Override public boolean includeCallerDetail() { diff --git a/src/main/java/elf4j/engine/service/pattern/ContextElement.java b/src/main/java/elf4j/engine/service/pattern/ContextElement.java index f9a2271..1d46ecc 100644 --- a/src/main/java/elf4j/engine/service/pattern/ContextElement.java +++ b/src/main/java/elf4j/engine/service/pattern/ContextElement.java @@ -22,7 +22,6 @@ public boolean includeCallerDetail() { .orElseThrow(() -> new NoSuchElementException("No key configured in 'context' pattern element"))); } /** - * * @param logEvent entire log content data source to render * @param target logging text aggregator of the final log message */ diff --git a/src/main/java/elf4j/engine/service/pattern/FileNameElement.java b/src/main/java/elf4j/engine/service/pattern/FileNameElement.java index 62cec3c..8c68e5b 100644 --- a/src/main/java/elf4j/engine/service/pattern/FileNameElement.java +++ b/src/main/java/elf4j/engine/service/pattern/FileNameElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class FileNameElement implements PatternElement { diff --git a/src/main/java/elf4j/engine/service/pattern/JsonElement.java b/src/main/java/elf4j/engine/service/pattern/JsonElement.java index 00bc638..c2021e5 100644 --- a/src/main/java/elf4j/engine/service/pattern/JsonElement.java +++ b/src/main/java/elf4j/engine/service/pattern/JsonElement.java @@ -38,7 +38,11 @@ import java.nio.charset.StandardCharsets; import java.time.OffsetDateTime; import java.time.ZoneId; -import java.util.*; +import java.util.Arrays; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import lombok.Builder; import lombok.NonNull; @@ -46,9 +50,7 @@ import lombok.Value; import org.slf4j.MDC; -/** - * - */ +/** */ @Value @Builder class JsonElement implements PatternElement { diff --git a/src/main/java/elf4j/engine/service/pattern/LevelElement.java b/src/main/java/elf4j/engine/service/pattern/LevelElement.java index 4a2d485..e9a0ba6 100644 --- a/src/main/java/elf4j/engine/service/pattern/LevelElement.java +++ b/src/main/java/elf4j/engine/service/pattern/LevelElement.java @@ -29,9 +29,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class LevelElement implements PatternElement { private static final int UNSPECIFIED = -1; diff --git a/src/main/java/elf4j/engine/service/pattern/LineNumberElement.java b/src/main/java/elf4j/engine/service/pattern/LineNumberElement.java index 59b17dc..75a057a 100644 --- a/src/main/java/elf4j/engine/service/pattern/LineNumberElement.java +++ b/src/main/java/elf4j/engine/service/pattern/LineNumberElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class LineNumberElement implements PatternElement { @Override diff --git a/src/main/java/elf4j/engine/service/pattern/LogPattern.java b/src/main/java/elf4j/engine/service/pattern/LogPattern.java index 0a75226..44b6a95 100644 --- a/src/main/java/elf4j/engine/service/pattern/LogPattern.java +++ b/src/main/java/elf4j/engine/service/pattern/LogPattern.java @@ -32,9 +32,7 @@ import lombok.NonNull; import lombok.Value; -/** - * Composite of individual patterns, intended to form the entire log layout - */ +/** Composite of individual patterns, intended to form the entire log layout */ @Value public class LogPattern implements PatternElement { List patternElements; diff --git a/src/main/java/elf4j/engine/service/pattern/MessageAndExceptionElement.java b/src/main/java/elf4j/engine/service/pattern/MessageAndExceptionElement.java index 854db50..28b949c 100644 --- a/src/main/java/elf4j/engine/service/pattern/MessageAndExceptionElement.java +++ b/src/main/java/elf4j/engine/service/pattern/MessageAndExceptionElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class MessageAndExceptionElement implements PatternElement { @Override diff --git a/src/main/java/elf4j/engine/service/pattern/MethodElement.java b/src/main/java/elf4j/engine/service/pattern/MethodElement.java index 89a5bcf..ed7a8cc 100644 --- a/src/main/java/elf4j/engine/service/pattern/MethodElement.java +++ b/src/main/java/elf4j/engine/service/pattern/MethodElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class MethodElement implements PatternElement { @Override diff --git a/src/main/java/elf4j/engine/service/pattern/PatternElement.java b/src/main/java/elf4j/engine/service/pattern/PatternElement.java index 1e3709e..a11fcc4 100644 --- a/src/main/java/elf4j/engine/service/pattern/PatternElement.java +++ b/src/main/java/elf4j/engine/service/pattern/PatternElement.java @@ -29,9 +29,7 @@ import elf4j.engine.service.PerformanceSensitive; import javax.annotation.concurrent.ThreadSafe; -/** - * Implementation should be thread-safe - */ +/** Implementation should be thread-safe */ @ThreadSafe public interface PatternElement extends PerformanceSensitive { diff --git a/src/main/java/elf4j/engine/service/pattern/PatternElements.java b/src/main/java/elf4j/engine/service/pattern/PatternElements.java index ce160cf..55ddd35 100644 --- a/src/main/java/elf4j/engine/service/pattern/PatternElements.java +++ b/src/main/java/elf4j/engine/service/pattern/PatternElements.java @@ -10,7 +10,7 @@ private PatternElements() {} /** * @param patternElement entire text of an individual pattern element, including pattern element name and possibly - * options + * options * @return the option portion of the pattern element text if present; otherwise, empty Optional */ static Optional getPatternElementDisplayOption(@NonNull String patternElement) { @@ -31,49 +31,37 @@ static PatternElement parsePredefinedPatternELement(String predefinedPatternElem return patternElement.split(":", 2)[0].trim(); } - /** - * - */ + /** */ enum PredefinedPatternElement { - /** - * - */ + /** */ TIMESTAMP { @Override PatternElement parse(String patternElement) { return TimestampElement.from(patternElement); } }, - /** - * - */ + /** */ LEVEL { @Override PatternElement parse(String patternElement) { return LevelElement.from(patternElement); } }, - /** - * - */ + /** */ THREAD { @Override PatternElement parse(String patternElement) { return ThreadElement.from(patternElement); } }, - /** - * - */ + /** */ CLASS { @Override PatternElement parse(String patternElement) { return ClassElement.from(patternElement); } }, - /** - * - */ + /** */ METHOD { @Override PatternElement parse(String patternElement) { @@ -93,18 +81,14 @@ PatternElement parse(String patternElement) { } }, - /** - * - */ + /** */ MESSAGE { @Override PatternElement parse(String patternElement) { return new MessageAndExceptionElement(); } }, - /** - * - */ + /** */ JSON { @Override PatternElement parse(String patternElement) { diff --git a/src/main/java/elf4j/engine/service/pattern/SystemEnvironmentElement.java b/src/main/java/elf4j/engine/service/pattern/SystemEnvironmentElement.java index 0f75129..f03adc4 100644 --- a/src/main/java/elf4j/engine/service/pattern/SystemEnvironmentElement.java +++ b/src/main/java/elf4j/engine/service/pattern/SystemEnvironmentElement.java @@ -30,9 +30,7 @@ import javax.annotation.Nonnull; import lombok.Value; -/** - * - */ +/** */ @Value class SystemEnvironmentElement implements PatternElement { String key; diff --git a/src/main/java/elf4j/engine/service/pattern/SystemPropertyElement.java b/src/main/java/elf4j/engine/service/pattern/SystemPropertyElement.java index 155b7a8..853c6d1 100644 --- a/src/main/java/elf4j/engine/service/pattern/SystemPropertyElement.java +++ b/src/main/java/elf4j/engine/service/pattern/SystemPropertyElement.java @@ -30,9 +30,7 @@ import javax.annotation.Nonnull; import lombok.Value; -/** - * - */ +/** */ @Value class SystemPropertyElement implements PatternElement { String key; diff --git a/src/main/java/elf4j/engine/service/pattern/ThreadElement.java b/src/main/java/elf4j/engine/service/pattern/ThreadElement.java index fc7cf31..dc21e7b 100644 --- a/src/main/java/elf4j/engine/service/pattern/ThreadElement.java +++ b/src/main/java/elf4j/engine/service/pattern/ThreadElement.java @@ -31,9 +31,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class ThreadElement implements PatternElement { @NonNull ThreadElement.DisplayOption threadDisplayOption; diff --git a/src/main/java/elf4j/engine/service/pattern/TimestampElement.java b/src/main/java/elf4j/engine/service/pattern/TimestampElement.java index 6cf0a1b..faeaf35 100644 --- a/src/main/java/elf4j/engine/service/pattern/TimestampElement.java +++ b/src/main/java/elf4j/engine/service/pattern/TimestampElement.java @@ -33,9 +33,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class TimestampElement implements PatternElement { private static final String DEFAULT_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"; diff --git a/src/main/java/elf4j/engine/service/pattern/VerbatimElement.java b/src/main/java/elf4j/engine/service/pattern/VerbatimElement.java index b0417c7..71a8680 100644 --- a/src/main/java/elf4j/engine/service/pattern/VerbatimElement.java +++ b/src/main/java/elf4j/engine/service/pattern/VerbatimElement.java @@ -30,9 +30,7 @@ import lombok.NonNull; import lombok.Value; -/** - * - */ +/** */ @Value class VerbatimElement implements PatternElement { @NonNull String text; diff --git a/src/main/java/elf4j/engine/service/util/Elf4jPostTestProcessor.java b/src/main/java/elf4j/engine/service/util/Elf4jPostTestProcessor.java index 0f5e547..510666b 100644 --- a/src/main/java/elf4j/engine/service/util/Elf4jPostTestProcessor.java +++ b/src/main/java/elf4j/engine/service/util/Elf4jPostTestProcessor.java @@ -30,9 +30,7 @@ import org.junit.platform.launcher.TestExecutionListener; import org.junit.platform.launcher.TestPlan; -/** - * - */ +/** */ public class Elf4jPostTestProcessor implements TestExecutionListener { @Override diff --git a/src/main/java/elf4j/engine/service/util/StackTraceUtils.java b/src/main/java/elf4j/engine/service/util/StackTraceUtils.java index 0f39f27..6f5bfb5 100644 --- a/src/main/java/elf4j/engine/service/util/StackTraceUtils.java +++ b/src/main/java/elf4j/engine/service/util/StackTraceUtils.java @@ -30,9 +30,7 @@ import java.util.NoSuchElementException; import lombok.NonNull; -/** - * - */ +/** */ public class StackTraceUtils { private StackTraceUtils() {} diff --git a/src/main/java/elf4j/engine/service/writer/ConseqWriterGroup.java b/src/main/java/elf4j/engine/service/writer/ConseqWriterGroup.java index c780b96..714d898 100644 --- a/src/main/java/elf4j/engine/service/writer/ConseqWriterGroup.java +++ b/src/main/java/elf4j/engine/service/writer/ConseqWriterGroup.java @@ -32,7 +32,13 @@ import elf4j.engine.service.configuration.LogServiceConfiguration; import elf4j.util.IeLogger; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Properties; import java.util.stream.Collectors; import lombok.NonNull; import lombok.ToString; diff --git a/src/main/java/elf4j/engine/service/writer/LogWriter.java b/src/main/java/elf4j/engine/service/writer/LogWriter.java index 4cb49bf..00aa79c 100644 --- a/src/main/java/elf4j/engine/service/writer/LogWriter.java +++ b/src/main/java/elf4j/engine/service/writer/LogWriter.java @@ -32,24 +32,16 @@ import java.util.List; import javax.annotation.concurrent.ThreadSafe; -/** - * Implementation should be thread-safe - */ +/** Implementation should be thread-safe */ @ThreadSafe public interface LogWriter extends PerformanceSensitive { - /** - * @return the threshold output level of this writer - */ + /** @return the threshold output level of this writer */ Level getThresholdOutputLevel(); - /** - * @param logEvent the log data entry to write out - */ + /** @param logEvent the log data entry to write out */ void write(LogEvent logEvent); - /** - * - */ + /** */ interface LogWriterType { /** * @param logServiceConfiguration entire configuration diff --git a/src/main/java/elf4j/engine/service/writer/StandardStreamWriter.java b/src/main/java/elf4j/engine/service/writer/StandardStreamWriter.java index 01a5253..2d47e5e 100644 --- a/src/main/java/elf4j/engine/service/writer/StandardStreamWriter.java +++ b/src/main/java/elf4j/engine/service/writer/StandardStreamWriter.java @@ -30,7 +30,11 @@ import elf4j.engine.service.configuration.LogServiceConfiguration; import elf4j.engine.service.pattern.LogPattern; import elf4j.engine.service.pattern.PatternElement; -import java.io.*; +import java.io.FileDescriptor; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; @@ -42,9 +46,7 @@ import lombok.NonNull; import lombok.ToString; -/** - * - */ +/** */ @Builder @ToString public class StandardStreamWriter implements LogWriter { @@ -87,25 +89,17 @@ enum OutStreamType { STDERR } - /** - * - */ + /** */ @ThreadSafe public interface StandardOutput { - /** - * @param bytes to be written to the out stream - */ + /** @param bytes to be written to the out stream */ void out(byte[] bytes); - /** - * @param bytes to be written to the out stream - */ + /** @param bytes to be written to the out stream */ void err(byte[] bytes); } - /** - * - */ + /** */ @ToString public static class FileStreamStandardOutput implements StandardOutput { private final OutputStream stdout = new FileOutputStream(FileDescriptor.out); @@ -134,9 +128,7 @@ private void write(byte[] bytes, @NonNull OutputStream outputStream) { } } - /** - * - */ + /** */ static class Type implements LogWriterType { private static StandardStreamWriter getDefaultWriter(@NonNull LogServiceConfiguration logServiceConfiguration) { Properties properties = logServiceConfiguration.getProperties(); diff --git a/src/test/java/elf4j/engine/NativeLoggerServiceProviderTest.java b/src/test/java/elf4j/engine/NativeLoggerServiceProviderTest.java index 8bde0f8..78ff0eb 100644 --- a/src/test/java/elf4j/engine/NativeLoggerServiceProviderTest.java +++ b/src/test/java/elf4j/engine/NativeLoggerServiceProviderTest.java @@ -25,7 +25,9 @@ package elf4j.engine; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/src/test/java/elf4j/engine/NativeLoggerTest.java b/src/test/java/elf4j/engine/NativeLoggerTest.java index 336909f..b67c729 100644 --- a/src/test/java/elf4j/engine/NativeLoggerTest.java +++ b/src/test/java/elf4j/engine/NativeLoggerTest.java @@ -27,7 +27,9 @@ import static elf4j.Level.INFO; import static elf4j.Level.WARN; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.same; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/elf4j/engine/service/EventingNativeLoggerServiceTest.java b/src/test/java/elf4j/engine/service/EventingNativeLoggerServiceTest.java index 4eb8b38..47f06ba 100644 --- a/src/test/java/elf4j/engine/service/EventingNativeLoggerServiceTest.java +++ b/src/test/java/elf4j/engine/service/EventingNativeLoggerServiceTest.java @@ -25,10 +25,16 @@ package elf4j.engine.service; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; import elf4j.Level; import elf4j.engine.NativeLogger; diff --git a/src/test/java/elf4j/engine/service/util/PropertiesUtilsTest.java b/src/test/java/elf4j/engine/service/util/PropertiesUtilsTest.java index de35f4e..fd1e6d6 100644 --- a/src/test/java/elf4j/engine/service/util/PropertiesUtilsTest.java +++ b/src/test/java/elf4j/engine/service/util/PropertiesUtilsTest.java @@ -25,7 +25,9 @@ package elf4j.engine.service.util; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import elf4j.engine.service.configuration.LogServiceConfiguration; import java.util.List;