You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/10 08:58:05 UTC
logging-log4j2 git commit: [LOG4J2-1017] Update Java platform from
Java 6 to 7. Reuse stock Java 7 method. Use Java 7 Objects.requireNonNull(T,
String) instead of the now deprecated
org.apache.logging.log4j.core.util.Assert.requireNonNull(T, String).
Repository: logging-log4j2
Updated Branches:
refs/heads/master 85576a653 -> cd717915d
[LOG4J2-1017] Update Java platform from Java 6 to 7. Reuse stock Java 7
method. Use Java 7 Objects.requireNonNull(T, String) instead of the now
deprecated
org.apache.logging.log4j.core.util.Assert.requireNonNull(T, String).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cd717915
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cd717915
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cd717915
Branch: refs/heads/master
Commit: cd717915d6c941584a96316f85d21dd9e53c6157
Parents: 85576a6
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Jun 9 23:58:02 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Jun 9 23:58:02 2015 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/LoggerContext.java | 5 +++--
.../log4j/core/appender/MemoryMappedFileManager.java | 3 ++-
.../log4j/core/config/AbstractConfiguration.java | 3 ++-
.../logging/log4j/core/config/ConfigurationSource.java | 11 ++++++-----
.../logging/log4j/core/config/CustomLevelConfig.java | 4 +++-
.../logging/log4j/core/config/OrderComparator.java | 5 +++--
.../config/plugins/convert/TypeConverterRegistry.java | 3 ++-
.../log4j/core/config/plugins/util/PluginBuilder.java | 6 +++---
.../config/plugins/visitors/AbstractPluginVisitor.java | 7 ++++---
.../logging/log4j/core/impl/Log4jContextFactory.java | 6 +++---
.../apache/logging/log4j/core/jmx/AppenderAdmin.java | 6 ++++--
.../logging/log4j/core/jmx/AsyncAppenderAdmin.java | 6 ++++--
.../logging/log4j/core/jmx/ContextSelectorAdmin.java | 4 +++-
.../logging/log4j/core/jmx/LoggerConfigAdmin.java | 5 +++--
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 3 ++-
.../apache/logging/log4j/core/jmx/RingBufferAdmin.java | 4 +++-
.../log4j/core/net/server/AbstractSocketServer.java | 3 ++-
.../logging/log4j/core/osgi/BundleContextSelector.java | 3 ++-
.../apache/logging/log4j/core/util/ReflectionUtil.java | 13 +++++++------
.../org/apache/logging/log4j/core/util/TypeUtil.java | 5 +++--
.../config/plugins/validation/ValidatingPlugin.java | 4 +++-
.../java/org/apache/logging/log4j/jmx/gui/Client.java | 3 ++-
.../org/apache/logging/log4j/jmx/gui/ClientGui.java | 4 +++-
23 files changed, 72 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 0110c50..ea58a65 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -21,6 +21,7 @@ import java.beans.PropertyChangeListener;
import java.io.File;
import java.net.URI;
import java.util.Collection;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -344,7 +345,7 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi
* @return The previous Configuration.
*/
private Configuration setConfiguration(final Configuration config) {
- Assert.requireNonNull(config, "No Configuration was provided");
+ Objects.requireNonNull(config, "No Configuration was provided");
configLock.lock();
try {
final Configuration prev = this.config;
@@ -387,7 +388,7 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi
}
public void addPropertyChangeListener(final PropertyChangeListener listener) {
- propertyChangeListeners.add(Assert.requireNonNull(listener, "listener"));
+ propertyChangeListeners.add(Objects.requireNonNull(listener, "listener"));
}
public void removePropertyChangeListener(final PropertyChangeListener listener) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
index 61e29d1..c2c8e70 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
@@ -30,6 +30,7 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.util.Assert;
@@ -67,7 +68,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
final Layout<? extends Serializable> layout) throws IOException {
super(os, fileName, layout);
this.isForce = force;
- this.randomAccessFile = Assert.requireNonNull(file, "RandomAccessFile");
+ this.randomAccessFile = Objects.requireNonNull(file, "RandomAccessFile");
this.regionLength = regionLength;
this.advertiseURI = advertiseURI;
this.isEndOfBatch.set(Boolean.FALSE);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index 6dbf6b7..f614241 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -113,7 +114,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
* Constructor.
*/
protected AbstractConfiguration(final ConfigurationSource configurationSource) {
- this.configurationSource = Assert.requireNonNull(configurationSource, "configurationSource is null");
+ this.configurationSource = Objects.requireNonNull(configurationSource, "configurationSource is null");
componentMap.put(Configuration.CONTEXT_PROPERTIES, properties);
pluginManager = new PluginManager(Node.CATEGORY);
rootNode = new Node();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index aee0b9c..db899a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -24,6 +24,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Objects;
import org.apache.logging.log4j.core.util.Assert;
@@ -71,7 +72,7 @@ public class ConfigurationSource {
}
private ConfigurationSource(final byte[] data) {
- this.data = Assert.requireNonNull(data, "data is null");
+ this.data = Objects.requireNonNull(data, "data is null");
this.stream = new ByteArrayInputStream(data);
this.file = null;
this.url = null;
@@ -86,8 +87,8 @@ public class ConfigurationSource {
* @param file the file where the input stream originated
*/
public ConfigurationSource(final InputStream stream, final File file) {
- this.stream = Assert.requireNonNull(stream, "stream is null");
- this.file = Assert.requireNonNull(file, "file is null");
+ this.stream = Objects.requireNonNull(stream, "stream is null");
+ this.file = Objects.requireNonNull(file, "file is null");
this.location = file.getAbsolutePath();
this.url = null;
this.data = null;
@@ -101,8 +102,8 @@ public class ConfigurationSource {
* @param url the URL where the input stream originated
*/
public ConfigurationSource(final InputStream stream, final URL url) {
- this.stream = Assert.requireNonNull(stream, "stream is null");
- this.url = Assert.requireNonNull(url, "URL is null");
+ this.stream = Objects.requireNonNull(stream, "stream is null");
+ this.url = Objects.requireNonNull(url, "URL is null");
this.location = url.toString();
this.file = null;
this.data = null;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
index 014a971..36c15e9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.config;
+import java.util.Objects;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -33,7 +35,7 @@ public final class CustomLevelConfig {
private final int intLevel;
private CustomLevelConfig(final String levelName, final int intLevel) {
- this.levelName = Assert.requireNonNull(levelName, "levelName is null");
+ this.levelName = Objects.requireNonNull(levelName, "levelName is null");
this.intLevel = intLevel;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
index 63419e0..e412fd6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config;
import java.util.Comparator;
+import java.util.Objects;
import org.apache.logging.log4j.core.util.Assert;
@@ -40,8 +41,8 @@ public class OrderComparator implements Comparator<Class<?>> {
@Override
public int compare(final Class<?> lhs, final Class<?> rhs) {
- final Order lhsOrder = Assert.requireNonNull(lhs, "lhs").getAnnotation(Order.class);
- final Order rhsOrder = Assert.requireNonNull(rhs, "rhs").getAnnotation(Order.class);
+ final Order lhsOrder = Objects.requireNonNull(lhs, "lhs").getAnnotation(Order.class);
+ final Order rhsOrder = Objects.requireNonNull(rhs, "rhs").getAnnotation(Order.class);
if (lhsOrder == null && rhsOrder == null) {
// both unannotated means equal priority
return 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
index 76112e1..e37dbac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
@@ -20,6 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
import java.util.UnknownFormatConversionException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -74,7 +75,7 @@ public class TypeConverterRegistry {
* @throws UnknownFormatConversionException if no TypeConverter can be found for the given type.
*/
public TypeConverter<?> findCompatibleConverter(final Type type) {
- Assert.requireNonNull(type, "No type was provided");
+ Objects.requireNonNull(type, "No type was provided");
final TypeConverter<?> primary = registry.get(type);
// cached type converters
if (primary != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
index 5f5b590..5db526c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
@@ -39,7 +40,6 @@ import org.apache.logging.log4j.core.config.plugins.validation.ConstraintValidat
import org.apache.logging.log4j.core.config.plugins.validation.ConstraintValidators;
import org.apache.logging.log4j.core.config.plugins.visitors.PluginVisitor;
import org.apache.logging.log4j.core.config.plugins.visitors.PluginVisitors;
-import org.apache.logging.log4j.core.util.Assert;
import org.apache.logging.log4j.core.util.Builder;
import org.apache.logging.log4j.core.util.ReflectionUtil;
import org.apache.logging.log4j.core.util.TypeUtil;
@@ -144,8 +144,8 @@ public class PluginBuilder implements Builder<Object> {
}
private void verify() {
- Assert.requireNonNull(this.configuration, "No Configuration object was set.");
- Assert.requireNonNull(this.node, "No Node object was set.");
+ Objects.requireNonNull(this.configuration, "No Configuration object was set.");
+ Objects.requireNonNull(this.node, "No Node object was set.");
}
private static Builder<?> createBuilder(final Class<?> clazz)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
index 22c62b3..4e6e582 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
@@ -20,6 +20,7 @@ package org.apache.logging.log4j.core.config.plugins.visitors;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.convert.TypeConverters;
@@ -57,7 +58,7 @@ public abstract class AbstractPluginVisitor<A extends Annotation> implements Plu
@SuppressWarnings("unchecked")
@Override
public PluginVisitor<A> setAnnotation(final Annotation annotation) {
- final Annotation a = Assert.requireNonNull(annotation, "No annotation was provided");
+ final Annotation a = Objects.requireNonNull(annotation, "No annotation was provided");
if (this.clazz.isInstance(a)) {
this.annotation = (A) a;
}
@@ -72,13 +73,13 @@ public abstract class AbstractPluginVisitor<A extends Annotation> implements Plu
@Override
public PluginVisitor<A> setConversionType(final Class<?> conversionType) {
- this.conversionType = Assert.requireNonNull(conversionType, "No conversion type class was provided");
+ this.conversionType = Objects.requireNonNull(conversionType, "No conversion type class was provided");
return this;
}
@Override
public PluginVisitor<A> setStrSubstitutor(final StrSubstitutor substitutor) {
- this.substitutor = Assert.requireNonNull(substitutor, "No StrSubstitutor was provided");
+ this.substitutor = Objects.requireNonNull(substitutor, "No StrSubstitutor was provided");
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
index 84f6a9f..313c44e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.impl;
import java.net.URI;
+import java.util.Objects;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LoggerContext;
@@ -82,9 +83,8 @@ public class Log4jContextFactory implements LoggerContextFactory, ShutdownCallba
*/
public Log4jContextFactory(final ContextSelector selector,
final ShutdownCallbackRegistry shutdownCallbackRegistry) {
- this.selector = Assert.requireNonNull(selector, "No ContextSelector provided");
- this.shutdownCallbackRegistry = Assert.requireNonNull(shutdownCallbackRegistry,
- "No ShutdownCallbackRegistry provided");
+ this.selector = Objects.requireNonNull(selector, "No ContextSelector provided");
+ this.shutdownCallbackRegistry = Objects.requireNonNull(shutdownCallbackRegistry, "No ShutdownCallbackRegistry provided");
LOGGER.debug("Using ShutdownCallbackRegistry {}", shutdownCallbackRegistry.getClass());
initializeShutdownCallbackRegistry();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
index a5289bf..25421f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.jmx;
+import java.util.Objects;
+
import javax.management.ObjectName;
import org.apache.logging.log4j.core.Appender;
@@ -40,8 +42,8 @@ public class AppenderAdmin implements AppenderAdminMBean {
*/
public AppenderAdmin(final String contextName, final Appender appender) {
// super(executor); // no notifications for now
- this.contextName = Assert.requireNonNull(contextName, "contextName");
- this.appender = Assert.requireNonNull(appender, "appender");
+ this.contextName = Objects.requireNonNull(contextName, "contextName");
+ this.appender = Objects.requireNonNull(appender, "appender");
try {
final String ctxName = Server.escape(this.contextName);
final String configName = Server.escape(appender.getName());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
index 7a70131..9d28989 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.jmx;
+import java.util.Objects;
+
import javax.management.ObjectName;
import org.apache.logging.log4j.core.appender.AsyncAppender;
@@ -39,8 +41,8 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
*/
public AsyncAppenderAdmin(final String contextName, final AsyncAppender appender) {
// super(executor); // no notifications for now
- this.contextName = Assert.requireNonNull(contextName, "contextName");
- this.asyncAppender = Assert.requireNonNull(appender, "async appender");
+ this.contextName = Objects.requireNonNull(contextName, "contextName");
+ this.asyncAppender = Objects.requireNonNull(appender, "async appender");
try {
final String ctxName = Server.escape(this.contextName);
final String configName = Server.escape(appender.getName());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
index 8c31fe7..29c9ce8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.jmx;
+import java.util.Objects;
+
import javax.management.ObjectName;
import org.apache.logging.log4j.core.selector.ContextSelector;
@@ -43,7 +45,7 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
*/
public ContextSelectorAdmin(final String contextName, final ContextSelector selector) {
super();
- this.selector = Assert.requireNonNull(selector, "ContextSelector");
+ this.selector = Objects.requireNonNull(selector, "ContextSelector");
try {
final String mbeanName = String.format(PATTERN, Server.escape(contextName));
objectName = new ObjectName(mbeanName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
index 5be1cf6..b7bfba7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.jmx;
import java.util.List;
+import java.util.Objects;
import javax.management.ObjectName;
@@ -44,8 +45,8 @@ public class LoggerConfigAdmin implements LoggerConfigAdminMBean {
*/
public LoggerConfigAdmin(final LoggerContext loggerContext, final LoggerConfig loggerConfig) {
// super(executor); // no notifications for now
- this.loggerContext = Assert.requireNonNull(loggerContext, "loggerContext");
- this.loggerConfig = Assert.requireNonNull(loggerConfig, "loggerConfig");
+ this.loggerContext = Objects.requireNonNull(loggerContext, "loggerContext");
+ this.loggerConfig = Objects.requireNonNull(loggerConfig, "loggerConfig");
try {
final String ctxName = Server.escape(loggerContext.getName());
final String configName = Server.escape(loggerConfig.getName());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
index bb1cc3b..0b4e340 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
@@ -31,6 +31,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicLong;
@@ -72,7 +73,7 @@ public class LoggerContextAdmin extends NotificationBroadcasterSupport implement
*/
public LoggerContextAdmin(final LoggerContext loggerContext, final Executor executor) {
super(executor, createNotificationInfo());
- this.loggerContext = Assert.requireNonNull(loggerContext, "loggerContext");
+ this.loggerContext = Objects.requireNonNull(loggerContext, "loggerContext");
try {
final String ctxName = Server.escape(loggerContext.getName());
final String name = String.format(PATTERN, ctxName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
index b985491..5368be4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.jmx;
+import java.util.Objects;
+
import javax.management.ObjectName;
import org.apache.logging.log4j.core.util.Assert;
@@ -45,7 +47,7 @@ public class RingBufferAdmin implements RingBufferAdminMBean {
}
protected RingBufferAdmin(final RingBuffer<?> ringBuffer, final String mbeanName) {
- this.ringBuffer = Assert.requireNonNull(ringBuffer, "ringbuffer");
+ this.ringBuffer = Objects.requireNonNull(ringBuffer, "ringbuffer");
try {
objectName = new ObjectName(mbeanName);
} catch (final Exception e) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
index 9e52841..3678a6a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
+import java.util.Objects;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -107,7 +108,7 @@ public abstract class AbstractSocketServer<T extends InputStream> extends LogEve
*/
public AbstractSocketServer(final int port, final LogEventBridge<T> logEventInput) {
this.logger = LogManager.getLogger(this.getClass().getName() + '.' + port);
- this.logEventInput = Assert.requireNonNull(logEventInput, "LogEventInput");
+ this.logEventInput = Objects.requireNonNull(logEventInput, "LogEventInput");
}
protected boolean isActive() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/BundleContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/BundleContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/BundleContextSelector.java
index 3c2109c..17656e1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/BundleContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/BundleContextSelector.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.osgi;
import java.lang.ref.WeakReference;
import java.net.URI;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.logging.log4j.core.LoggerContext;
@@ -61,7 +62,7 @@ public class BundleContextSelector extends ClassLoaderContextSelector {
}
private static LoggerContext locateContext(final Bundle bundle, final URI configLocation) {
- final String name = Assert.requireNonNull(bundle, "No Bundle provided").getSymbolicName();
+ final String name = Objects.requireNonNull(bundle, "No Bundle provided").getSymbolicName();
final AtomicReference<WeakReference<LoggerContext>> ref = CONTEXT_MAP.get(name);
if (ref == null) {
final LoggerContext context = new LoggerContext(name, bundle, configLocation);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ReflectionUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ReflectionUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ReflectionUtil.java
index afb5614..70d6df1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ReflectionUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ReflectionUtil.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
+import java.util.Objects;
/**
* Utility class for performing common reflective operations.
@@ -41,7 +42,7 @@ public final class ReflectionUtil {
* @throws NullPointerException if {@code member} is {@code null}.
*/
public static <T extends AccessibleObject & Member> boolean isAccessible(final T member) {
- Assert.requireNonNull(member, "No member provided");
+ Objects.requireNonNull(member, "No member provided");
return Modifier.isPublic(member.getModifiers()) && Modifier.isPublic(member.getDeclaringClass().getModifiers());
}
@@ -67,7 +68,7 @@ public final class ReflectionUtil {
* @throws NullPointerException if {@code field} is {@code null}.
*/
public static void makeAccessible(final Field field) {
- Assert.requireNonNull(field, "No field provided");
+ Objects.requireNonNull(field, "No field provided");
if ((!isAccessible(field) || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
field.setAccessible(true);
}
@@ -86,7 +87,7 @@ public final class ReflectionUtil {
public static Object getFieldValue(final Field field, final Object instance) {
makeAccessible(field);
if (!Modifier.isStatic(field.getModifiers())) {
- Assert.requireNonNull(instance, "No instance given for non-static field");
+ Objects.requireNonNull(instance, "No instance given for non-static field");
}
try {
return field.get(instance);
@@ -120,7 +121,7 @@ public final class ReflectionUtil {
public static void setFieldValue(final Field field, final Object instance, final Object value) {
makeAccessible(field);
if (!Modifier.isStatic(field.getModifiers())) {
- Assert.requireNonNull(instance, "No instance given for non-static field");
+ Objects.requireNonNull(instance, "No instance given for non-static field");
}
try {
field.set(instance, value);
@@ -150,7 +151,7 @@ public final class ReflectionUtil {
* @throws IllegalStateException if no default constructor can be found
*/
public static <T> Constructor<T> getDefaultConstructor(final Class<T> clazz) {
- Assert.requireNonNull(clazz, "No class provided");
+ Objects.requireNonNull(clazz, "No class provided");
try {
final Constructor<T> constructor = clazz.getDeclaredConstructor();
makeAccessible(constructor);
@@ -179,7 +180,7 @@ public final class ReflectionUtil {
* @throws IllegalStateException if access is denied to the constructor, or there are no default constructors
*/
public static <T> T instantiate(final Class<T> clazz) {
- Assert.requireNonNull(clazz, "No class provided");
+ Objects.requireNonNull(clazz, "No class provided");
final Constructor<T> constructor = getDefaultConstructor(clazz);
try {
return constructor.newInstance();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
index 060d1f8..81a8de2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
@@ -20,6 +20,7 @@ import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.WildcardType;
+import java.util.Objects;
/**
* Utility class for working with Java {@link Type}s and derivatives. This class is adapted heavily from the
@@ -47,8 +48,8 @@ public final class TypeUtil {
* @see Class#isAssignableFrom(Class)
*/
public static boolean isAssignable(final Type lhs, final Type rhs) {
- Assert.requireNonNull(lhs, "No left hand side type provided");
- Assert.requireNonNull(rhs, "No right hand side type provided");
+ Objects.requireNonNull(lhs, "No left hand side type provided");
+ Objects.requireNonNull(rhs, "No right hand side type provided");
if (lhs.equals(rhs)) {
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java
index 51d0a76..1452a21 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.config.plugins.validation;
+import java.util.Objects;
+
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
@@ -32,7 +34,7 @@ public class ValidatingPlugin {
private final String name;
public ValidatingPlugin(final String name) {
- this.name = Assert.requireNonNull(name, "name");
+ this.name = Objects.requireNonNull(name, "name");
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
index dfffb8b..70db503 100644
--- a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
+++ b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.jmx.gui;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import javax.management.JMException;
@@ -53,7 +54,7 @@ public class Client {
* @throws IOException if the connection failed
*/
public Client(final JMXConnector connector) throws MalformedObjectNameException, IOException {
- this.connector = Assert.requireNonNull(connector, "JMXConnector");
+ this.connector = Objects.requireNonNull(connector, "JMXConnector");
this.connector.connect();
this.connection = connector.getMBeanServerConnection();
init();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd717915/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index 36a4124..fe12abc 100644
--- a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++ b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -26,7 +26,9 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
+
import javax.management.InstanceNotFoundException;
import javax.management.JMException;
import javax.management.ListenerNotFoundException;
@@ -77,7 +79,7 @@ public class ClientGui extends JPanel implements NotificationListener {
private JTabbedPane tabbedPaneContexts;
public ClientGui(final Client client) throws IOException, JMException {
- this.client = Assert.requireNonNull(client, "client");
+ this.client = Objects.requireNonNull(client, "client");
createWidgets();
populateWidgets();