This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 97d997d16d Inline Lazy::value into Lazy::get
97d997d16d is described below
commit 97d997d16dcf1c1db1cd95dce788c3067f8e73a3
Author: Matt Sicker <[email protected]>
AuthorDate: Tue Nov 21 19:04:09 2023 -0600
Inline Lazy::value into Lazy::get
This way, there's only one method for this instead of two.
Signed-off-by: Matt Sicker <[email protected]>
---
.../test/java/org/apache/logging/log4j/util/LazyTest.java | 4 ++--
.../java/org/apache/logging/log4j/spi/LoggingSystem.java | 14 +++++++-------
.../src/main/java/org/apache/logging/log4j/util/Lazy.java | 11 ++---------
.../main/java/org/apache/logging/log4j/util/LazyUtil.java | 12 ++++++------
.../java/org/apache/logging/log4j/util/PropertiesUtil.java | 2 +-
.../log4j/core/config/DefaultConfigurationFactory.java | 10 +++++-----
.../log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java | 2 +-
.../logging/log4j/core/selector/BasicContextSelector.java | 2 +-
.../log4j/core/selector/ClassLoaderContextSelector.java | 2 +-
.../org/apache/logging/log4j/core/time/ClockFactory.java | 2 +-
.../logging/log4j/core/time/internal/CachedClock.java | 2 +-
.../log4j/core/time/internal/CoarseCachedClock.java | 2 +-
.../java/org/apache/logging/log4j/core/util/JsonUtils.java | 2 +-
.../log4j/layout/template/json/util/JsonWriter.java | 4 ++--
.../apache/logging/log4j/plugins/model/PluginRegistry.java | 2 +-
.../org/apache/logging/log4j/plugins/model/PluginType.java | 2 +-
16 files changed, 34 insertions(+), 41 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LazyTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LazyTest.java
index d1c1e8b3df..770965a9b6 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LazyTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LazyTest.java
@@ -120,7 +120,7 @@ class LazyTest {
final AtomicInteger counter = new AtomicInteger();
return Lazy.lazy(counter::incrementAndGet);
},
- (lazy, ignored) -> lazy.value(),
+ (lazy, ignored) -> lazy.get(),
result -> result.stream().allMatch(i -> i == 1));
}
@@ -130,7 +130,7 @@ class LazyTest {
3,
5000,
() -> Lazy.relaxed(() -> Thread.currentThread().getId()),
- (lazy, ignored) -> lazy.value(),
+ (lazy, ignored) -> lazy.get(),
result -> result.stream().allMatch(v -> Objects.equals(v,
result.get(0))));
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
index 12d2a63f21..e9de03ae4a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
@@ -157,7 +157,7 @@ public class LoggingSystem {
* Gets the LoggingSystem instance.
*/
public static LoggingSystem getInstance() {
- return SYSTEM.value();
+ return SYSTEM.get();
}
/**
@@ -165,33 +165,33 @@ public class LoggingSystem {
* requested.
*/
public static LoggerContextFactory getLoggerContextFactory() {
- return getInstance().loggerContextFactoryLazy.value();
+ return getInstance().loggerContextFactoryLazy.get();
}
public static MessageFactory getMessageFactory() {
- return getInstance().messageFactoryLazy.value();
+ return getInstance().messageFactoryLazy.get();
}
public static FlowMessageFactory getFlowMessageFactory() {
- return getInstance().flowMessageFactoryLazy.value();
+ return getInstance().flowMessageFactoryLazy.get();
}
/**
* Creates a new ThreadContextMap.
*/
public static ThreadContextMap createContextMap() {
- return getInstance().threadContextMapFactoryLazy.value().get();
+ return getInstance().threadContextMapFactoryLazy.get().get();
}
/**
* Creates a new ThreadContextStack.
*/
public static ThreadContextStack createContextStack() {
- return getInstance().threadContextStackFactoryLazy.value().get();
+ return getInstance().threadContextStackFactoryLazy.get().get();
}
public static RecyclerFactory getRecyclerFactory() {
- return getInstance().recyclerFactoryLazy.value();
+ return getInstance().recyclerFactoryLazy.get();
}
private static List<Provider> loadDefaultProviders() {
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Lazy.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Lazy.java
index f5558a5227..108528da3d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Lazy.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Lazy.java
@@ -26,24 +26,17 @@ import java.util.function.Supplier;
* @param <T> type of value
*/
public interface Lazy<T> extends Supplier<T> {
- /**
- * Returns the value held by this lazy. This may cause the value to
initialize if it hasn't been already.
- */
- T value();
-
/**
* Returns the value held by this lazy. This may cause the value to
initialize if it hasn't been already.
*/
@Override
- default T get() {
- return value();
- }
+ T get();
/**
* Creates a new lazy value derived from this lazy value using the
provided value mapping function.
*/
default <R> Lazy<R> map(final Function<? super T, ? extends R> function) {
- return lazy(() -> function.apply(value()));
+ return lazy(() -> function.apply(get()));
}
/**
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LazyUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LazyUtil.java
index 31af46114e..a4eb0e459d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LazyUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LazyUtil.java
@@ -47,7 +47,7 @@ final class LazyUtil {
}
@Override
- public T value() {
+ public T get() {
return value;
}
@@ -75,7 +75,7 @@ final class LazyUtil {
}
@Override
- public T value() {
+ public T get() {
return reference.get();
}
@@ -91,7 +91,7 @@ final class LazyUtil {
@Override
public String toString() {
- return String.valueOf(value());
+ return String.valueOf(get());
}
}
@@ -105,7 +105,7 @@ final class LazyUtil {
}
@Override
- public T value() {
+ public T get() {
Object value = this.value;
if (value == null) {
lock.lock();
@@ -161,7 +161,7 @@ final class LazyUtil {
}
@Override
- public T value() {
+ public T get() {
final var currentValue = VALUE.getAcquire(this);
if (currentValue != null) {
return unwrapNull(currentValue);
@@ -198,7 +198,7 @@ final class LazyUtil {
}
@Override
- public T value() {
+ public T get() {
Object value = this.value;
if (value == null) {
value = supplier.get();
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index d63ea06455..cf4e011ab5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -168,7 +168,7 @@ public class PropertiesUtil implements PropertyEnvironment {
if (props != null) {
return props;
}
- return COMPONENT_PROPERTIES.value();
+ return COMPONENT_PROPERTIES.get();
}
public static PropertyEnvironment getProperties(final String namespace) {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java
index a3169d10e2..47fe7133da 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java
@@ -107,7 +107,7 @@ public class DefaultConfigurationFactory extends
ConfigurationFactory {
return getConfiguration(LOG4J1_VERSION, loggerContext,
log4j1ConfigStr);
}
}
- for (final ConfigurationFactory factory :
configurationFactories.value()) {
+ for (final ConfigurationFactory factory :
configurationFactories.get()) {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
@@ -137,7 +137,7 @@ public class DefaultConfigurationFactory extends
ConfigurationFactory {
return new CompositeConfiguration(configs);
}
final String configLocationStr = configLocation.toString();
- for (final ConfigurationFactory factory :
configurationFactories.value()) {
+ for (final ConfigurationFactory factory :
configurationFactories.get()) {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
@@ -190,7 +190,7 @@ public class DefaultConfigurationFactory extends
ConfigurationFactory {
LOGGER.catching(Level.DEBUG, ex);
}
if (source != null) {
- for (final ConfigurationFactory factory :
configurationFactories.value()) {
+ for (final ConfigurationFactory factory :
configurationFactories.get()) {
if (requiredVersion != null &&
!factory.getVersion().equals(requiredVersion)) {
continue;
}
@@ -213,7 +213,7 @@ public class DefaultConfigurationFactory extends
ConfigurationFactory {
private Configuration getConfiguration(final LoggerContext loggerContext,
final boolean isTest, final String name) {
final boolean named = Strings.isNotEmpty(name);
final ClassLoader loader = LoaderUtil.getThreadContextClassLoader();
- for (final ConfigurationFactory factory :
configurationFactories.value()) {
+ for (final ConfigurationFactory factory :
configurationFactories.get()) {
String configName;
final String prefix = isTest ? factory.getTestPrefix() :
factory.getDefaultPrefix();
final String[] types = factory.getSupportedTypes();
@@ -251,7 +251,7 @@ public class DefaultConfigurationFactory extends
ConfigurationFactory {
public Configuration getConfiguration(final LoggerContext loggerContext,
final ConfigurationSource source) {
if (source != null) {
final String config = source.getLocation();
- for (final ConfigurationFactory factory :
configurationFactories.value()) {
+ for (final ConfigurationFactory factory :
configurationFactories.get()) {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
index 8e24a788fb..564df60579 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
@@ -41,7 +41,7 @@ public class JmxRuntimeInputArgumentsLookup extends MapLookup
{
@PluginFactory
public static JmxRuntimeInputArgumentsLookup getInstance() {
- return INSTANCE.value();
+ return INSTANCE.get();
}
/**
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
index 94e9be2eb6..ef49ecde74 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
@@ -110,7 +110,7 @@ public class BasicContextSelector implements
ContextSelector, LoggerContextShutd
@Override
public List<LoggerContext> getLoggerContexts() {
- return List.of(context.value());
+ return List.of(context.get());
}
protected LoggerContext createContext() {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
index 03a8675c24..acae3a3dbd 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
@@ -294,7 +294,7 @@ public class ClassLoaderContextSelector implements
ContextSelector, LoggerContex
}
protected LoggerContext getDefault() {
- return defaultContext.value();
+ return defaultContext.get();
}
protected String defaultContextName() {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
index 7b673c3a9d..3edf466dcc 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
@@ -70,7 +70,7 @@ public final class ClockFactory {
*/
@Deprecated
public static Clock getClock() {
- return FALLBACK.value();
+ return FALLBACK.get();
}
@ConditionalOnMissingBinding
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
index 83640e1663..c421aeafef 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
@@ -54,7 +54,7 @@ public final class CachedClock implements Clock {
@Factory
public static CachedClock instance() {
// LOG4J2-819: use lazy initialization of threads
- return INSTANCE.value();
+ return INSTANCE.get();
}
/**
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CoarseCachedClock.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CoarseCachedClock.java
index f5f3b99310..2bb56c35eb 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CoarseCachedClock.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CoarseCachedClock.java
@@ -53,7 +53,7 @@ public final class CoarseCachedClock implements Clock {
*/
public static CoarseCachedClock instance() {
// LOG4J2-819: use lazy initialization of threads
- return INSTANCE.value();
+ return INSTANCE.get();
}
/**
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
index eac3828220..e2a3c74213 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
@@ -72,7 +72,7 @@ public final class JsonUtils {
public static void quoteAsString(final CharSequence input, final
StringBuilder output) {
final char[] qbuf = qbufRecycler.acquire();
try {
- final int[] escCodes = ESC_CODES.value();
+ final int[] escCodes = ESC_CODES.get();
final int escCodeCount = escCodes.length;
int inPtr = 0;
final int inputLen = input.length();
diff --git
a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
index e0dc71ded8..765fcdf8e2 100644
---
a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
+++
b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
@@ -582,7 +582,7 @@ public final class JsonWriter implements AutoCloseable,
Cloneable {
length > 0 && Character.isHighSurrogate(seq.charAt(offset +
length - 1)) ? -1 : 0;
final int limit = offset + length + surrogateCorrection;
int i = offset;
- final int[] escCodes = ESC_CODES.value();
+ final int[] escCodes = ESC_CODES.get();
outer:
while (i < limit) {
while (true) {
@@ -646,7 +646,7 @@ public final class JsonWriter implements AutoCloseable,
Cloneable {
final int surrogateCorrection = length > 0 &&
Character.isHighSurrogate(buffer[offset + length - 1]) ? -1 : 0;
final int limit = offset + length + surrogateCorrection;
int i = offset;
- final int[] escCodes = ESC_CODES.value();
+ final int[] escCodes = ESC_CODES.get();
outer:
while (i < limit) {
while (true) {
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginRegistry.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginRegistry.java
index 68f01a8a9e..d762431970 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginRegistry.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginRegistry.java
@@ -143,7 +143,7 @@ public class PluginRegistry {
final var pluginNamespace = new PluginNamespace(namespace);
// First, iterate the PluginService services
- final Namespaces builtInPlugins = namespacesLazy.value();
+ final Namespaces builtInPlugins = namespacesLazy.get();
if (builtInPlugins != null) {
pluginNamespace.mergeAll(builtInPlugins.get(namespace));
}
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginType.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginType.java
index a2dd8217d2..1fc115c124 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginType.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/model/PluginType.java
@@ -71,7 +71,7 @@ public class PluginType<T> {
}
public Class<T> getPluginClass() {
- return pluginClass.value();
+ return pluginClass.get();
}
public String getElementType() {
