This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/rebase-on-log4j-api-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0ca03caebb96d523ba5aaa08381b171d257eab3e Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Mar 22 16:59:56 2024 +0100 Inline missing `String.trimToOptional` --- .../main/java/org/apache/logging/log4j/core/test/junit/Named.java | 6 ++++-- .../log4j/core/config/plugins/util/PluginAttributeNameProvider.java | 6 ++++-- .../config/plugins/util/PluginBuilderAttributeNameProvider.java | 6 ++++-- .../log4j/core/config/plugins/util/PluginElementNameProvider.java | 6 ++++-- .../log4j/core/config/plugins/util/PluginValueNameProvider.java | 6 ++++-- .../java/org/apache/logging/log4j/plugins/model/PluginType.java | 3 ++- .../org/apache/logging/log4j/plugins/name/CategoryNameProvider.java | 6 ++++-- .../logging/log4j/plugins/name/NamedQualifierNameProvider.java | 6 ++++-- .../logging/log4j/plugins/name/PluginAttributeNameProvider.java | 6 ++++-- .../log4j/plugins/name/PluginBuilderAttributeNameProvider.java | 6 ++++-- .../logging/log4j/plugins/name/PluginElementNameProvider.java | 6 ++++-- .../org/apache/logging/log4j/plugins/name/PluginNameProvider.java | 5 ++++- .../apache/logging/log4j/plugins/name/PluginValueNameProvider.java | 6 ++++-- 13 files changed, 50 insertions(+), 24 deletions(-) diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Named.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Named.java index 872b042f39..9fe8f7493a 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Named.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Named.java @@ -16,6 +16,9 @@ */ package org.apache.logging.log4j.core.test.junit; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -24,7 +27,6 @@ import java.lang.annotation.Target; import java.util.Optional; import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider; import org.apache.logging.log4j.plugins.name.NameProvider; -import org.apache.logging.log4j.util.Strings; /** * Specifies the name of an {@link org.apache.logging.log4j.core.Appender} to inject into JUnit 5 tests from the specified @@ -46,7 +48,7 @@ public @interface Named { class Provider implements AnnotatedElementNameProvider<Named> { @Override public Optional<String> getSpecifiedName(final Named annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginAttributeNameProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginAttributeNameProvider.java index 93c5925cbe..91b34613db 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginAttributeNameProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginAttributeNameProvider.java @@ -16,16 +16,18 @@ */ package org.apache.logging.log4j.core.config.plugins.util; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider; -import org.apache.logging.log4j.util.Strings; @Deprecated(since = "3.0", forRemoval = true) @SuppressWarnings("removal") public class PluginAttributeNameProvider implements AnnotatedElementNameProvider<PluginAttribute> { @Override public Optional<String> getSpecifiedName(final PluginAttribute annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilderAttributeNameProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilderAttributeNameProvider.java index c6488c1560..e4a3747722 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilderAttributeNameProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilderAttributeNameProvider.java @@ -16,16 +16,18 @@ */ package org.apache.logging.log4j.core.config.plugins.util; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute; import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider; -import org.apache.logging.log4j.util.Strings; @Deprecated(since = "3.0", forRemoval = true) @SuppressWarnings("removal") public class PluginBuilderAttributeNameProvider implements AnnotatedElementNameProvider<PluginBuilderAttribute> { @Override public Optional<String> getSpecifiedName(final PluginBuilderAttribute annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginElementNameProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginElementNameProvider.java index 0127ed20d5..e4efb370c7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginElementNameProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginElementNameProvider.java @@ -16,16 +16,18 @@ */ package org.apache.logging.log4j.core.config.plugins.util; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider; -import org.apache.logging.log4j.util.Strings; @Deprecated(since = "3.0", forRemoval = true) @SuppressWarnings("removal") public class PluginElementNameProvider implements AnnotatedElementNameProvider<PluginElement> { @Override public Optional<String> getSpecifiedName(final PluginElement annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginValueNameProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginValueNameProvider.java index 7c79508820..18d849066e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginValueNameProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginValueNameProvider.java @@ -16,16 +16,18 @@ */ package org.apache.logging.log4j.core.config.plugins.util; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.core.config.plugins.PluginValue; import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider; -import org.apache.logging.log4j.util.Strings; @Deprecated(since = "3.0", forRemoval = true) @SuppressWarnings("removal") public class PluginValueNameProvider implements AnnotatedElementNameProvider<PluginValue> { @Override public Optional<String> getSpecifiedName(final PluginValue annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } 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 529b656352..b55f372895 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 @@ -17,6 +17,7 @@ package org.apache.logging.log4j.plugins.model; import java.lang.ref.WeakReference; +import java.util.Optional; import org.apache.logging.log4j.util.Cast; import org.apache.logging.log4j.util.Lazy; import org.apache.logging.log4j.util.Strings; @@ -109,7 +110,7 @@ public class PluginType<T> { } public String getElementName() { - return Strings.trimToOptional(getElementType()).orElseGet(this::getName); + return Optional.ofNullable(Strings.trimToNull(getElementType())).orElseGet(this::getName); } @Override diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/CategoryNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/CategoryNameProvider.java index 44d88e5bb4..8772f7d217 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/CategoryNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/CategoryNameProvider.java @@ -16,13 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.Namespace; -import org.apache.logging.log4j.util.Strings; public class CategoryNameProvider implements AnnotatedElementNameProvider<Namespace> { @Override public Optional<String> getSpecifiedName(final Namespace annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java index 47309fd5b7..edeb7a6d93 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java @@ -16,11 +16,13 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Collection; import java.util.List; import java.util.Optional; import org.apache.logging.log4j.plugins.Named; -import org.apache.logging.log4j.util.Strings; public class NamedQualifierNameProvider implements AnnotatedElementNameProvider<Named>, AnnotatedElementAliasesProvider<Named> { @@ -30,7 +32,7 @@ public class NamedQualifierNameProvider if (names == null || names.length == 0) { return Optional.empty(); } - return Strings.trimToOptional(names[0]); + return ofNullable(trimToNull(names[0])); } @Override diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginAttributeNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginAttributeNameProvider.java index c86f606439..37f8a1544b 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginAttributeNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginAttributeNameProvider.java @@ -16,13 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.PluginAttribute; -import org.apache.logging.log4j.util.Strings; public class PluginAttributeNameProvider implements AnnotatedElementNameProvider<PluginAttribute> { @Override public Optional<String> getSpecifiedName(final PluginAttribute annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginBuilderAttributeNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginBuilderAttributeNameProvider.java index e1c2975dbd..c61cb4dd4c 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginBuilderAttributeNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginBuilderAttributeNameProvider.java @@ -16,13 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.PluginBuilderAttribute; -import org.apache.logging.log4j.util.Strings; public class PluginBuilderAttributeNameProvider implements AnnotatedElementNameProvider<PluginBuilderAttribute> { @Override public Optional<String> getSpecifiedName(final PluginBuilderAttribute annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginElementNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginElementNameProvider.java index 5272c69bdd..ec3c3dd10d 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginElementNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginElementNameProvider.java @@ -16,13 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.PluginElement; -import org.apache.logging.log4j.util.Strings; public class PluginElementNameProvider implements AnnotatedElementNameProvider<PluginElement> { @Override public Optional<String> getSpecifiedName(final PluginElement annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginNameProvider.java index 84e8881764..5072ed6347 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginNameProvider.java @@ -16,12 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.Plugin; public class PluginNameProvider implements AnnotatedElementNameProvider<Plugin> { @Override public Optional<String> getSpecifiedName(final Plugin annotation) { - return Optional.of(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginValueNameProvider.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginValueNameProvider.java index 3d0f8734a5..2bcaa27d07 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginValueNameProvider.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginValueNameProvider.java @@ -16,13 +16,15 @@ */ package org.apache.logging.log4j.plugins.name; +import static java.util.Optional.ofNullable; +import static org.apache.logging.log4j.util.Strings.trimToNull; + import java.util.Optional; import org.apache.logging.log4j.plugins.PluginValue; -import org.apache.logging.log4j.util.Strings; public class PluginValueNameProvider implements AnnotatedElementNameProvider<PluginValue> { @Override public Optional<String> getSpecifiedName(final PluginValue annotation) { - return Strings.trimToOptional(annotation.value()); + return ofNullable(trimToNull(annotation.value())); } }
