From 9e3e9a34f6264e466010982bc9df14287b692abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Mon, 17 Feb 2014 07:59:11 -0300 Subject: [PATCH] Using generics with collections when possible --- .../main/java/org/slf4j/LoggerFactory.java | 16 +++++------ slf4j-api/src/main/java/org/slf4j/MDC.java | 4 +-- slf4j-api/src/main/java/org/slf4j/Marker.java | 2 +- .../org/slf4j/helpers/BasicMDCAdapter.java | 27 ++++++++++--------- .../java/org/slf4j/helpers/BasicMarker.java | 10 +++---- .../org/slf4j/helpers/MessageFormatter.java | 8 +++--- .../java/org/slf4j/helpers/NOPMDCAdapter.java | 4 +-- .../helpers/SubstituteLoggerFactory.java | 2 +- .../main/java/org/slf4j/spi/MDCAdapter.java | 4 +-- 9 files changed, 39 insertions(+), 38 deletions(-) diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 361411081..52081ca54 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -123,7 +123,7 @@ private static boolean messageContainsOrgSlf4jImplStaticLoggerBinder(String msg) private final static void bind() { try { - Set staticLoggerBinderPathSet = findPossibleStaticLoggerBinderPathSet(); + Set staticLoggerBinderPathSet = findPossibleStaticLoggerBinderPathSet(); reportMultipleBindingAmbiguity(staticLoggerBinderPathSet); // the next line does the binding StaticLoggerBinder.getSingleton(); @@ -213,14 +213,14 @@ private final static void versionSanityCheck() { // the class itself. private static String STATIC_LOGGER_BINDER_PATH = "org/slf4j/impl/StaticLoggerBinder.class"; - private static Set findPossibleStaticLoggerBinderPathSet() { + private static Set findPossibleStaticLoggerBinderPathSet() { // use Set instead of list in order to deal with bug #138 // LinkedHashSet appropriate here because it preserves insertion order during iteration - Set staticLoggerBinderPathSet = new LinkedHashSet(); + Set staticLoggerBinderPathSet = new LinkedHashSet(); try { ClassLoader loggerFactoryClassLoader = LoggerFactory.class .getClassLoader(); - Enumeration paths; + Enumeration paths; if (loggerFactoryClassLoader == null) { paths = ClassLoader.getSystemResources(STATIC_LOGGER_BINDER_PATH); } else { @@ -237,7 +237,7 @@ private static Set findPossibleStaticLoggerBinderPathSet() { return staticLoggerBinderPathSet; } - private static boolean isAmbiguousStaticLoggerBinderPathSet(Set staticLoggerBinderPathSet) { + private static boolean isAmbiguousStaticLoggerBinderPathSet(Set staticLoggerBinderPathSet) { return staticLoggerBinderPathSet.size() > 1; } @@ -246,10 +246,10 @@ private static boolean isAmbiguousStaticLoggerBinderPathSet(Set staticLoggerBind * No reporting is done otherwise. * */ - private static void reportMultipleBindingAmbiguity(Set staticLoggerBinderPathSet) { + private static void reportMultipleBindingAmbiguity(Set staticLoggerBinderPathSet) { if (isAmbiguousStaticLoggerBinderPathSet(staticLoggerBinderPathSet)) { Util.report("Class path contains multiple SLF4J bindings."); - Iterator iterator = staticLoggerBinderPathSet.iterator(); + Iterator iterator = staticLoggerBinderPathSet.iterator(); while (iterator.hasNext()) { URL path = (URL) iterator.next(); Util.report("Found binding in [" + path + "]"); @@ -258,7 +258,7 @@ private static void reportMultipleBindingAmbiguity(Set staticLoggerBinderPathSet } } - private static void reportActualBinding(Set staticLoggerBinderPathSet) { + private static void reportActualBinding(Set staticLoggerBinderPathSet) { if (isAmbiguousStaticLoggerBinderPathSet(staticLoggerBinderPathSet)) { Util.report("Actual binding is of type ["+StaticLoggerBinder.getSingleton().getLoggerFactoryClassStr()+"]"); } diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java index bdb30e89d..8b23cfa70 100644 --- a/slf4j-api/src/main/java/org/slf4j/MDC.java +++ b/slf4j-api/src/main/java/org/slf4j/MDC.java @@ -180,7 +180,7 @@ public static void clear() { * @return A copy of the current thread's context map. May be null. * @since 1.5.1 */ - public static Map getCopyOfContextMap() { + public static Map getCopyOfContextMap() { if (mdcAdapter == null) { throw new IllegalStateException("MDCAdapter cannot be null. See also " + NULL_MDCA_URL); @@ -197,7 +197,7 @@ public static Map getCopyOfContextMap() { * must contain only keys and values of type String * @since 1.5.1 */ - public static void setContextMap(Map contextMap) { + public static void setContextMap(Map contextMap) { if (mdcAdapter == null) { throw new IllegalStateException("MDCAdapter cannot be null. See also " + NULL_MDCA_URL); diff --git a/slf4j-api/src/main/java/org/slf4j/Marker.java b/slf4j-api/src/main/java/org/slf4j/Marker.java index 3d59b5245..3d6c100c9 100644 --- a/slf4j-api/src/main/java/org/slf4j/Marker.java +++ b/slf4j-api/src/main/java/org/slf4j/Marker.java @@ -95,7 +95,7 @@ public interface Marker extends Serializable { * * @return Iterator over the references of this marker */ - public Iterator iterator(); + public Iterator iterator(); /** * Does this marker contain a reference to the 'other' marker? Marker A is defined diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java index 56818f108..6f07c7d24 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java @@ -43,7 +43,8 @@ */ public class BasicMDCAdapter implements MDCAdapter { - private InheritableThreadLocal inheritableThreadLocal = new InheritableThreadLocal(); + private InheritableThreadLocal> inheritableThreadLocal + = new InheritableThreadLocal>(); static boolean isJDK14() { try { @@ -74,9 +75,9 @@ public void put(String key, String val) { if (key == null) { throw new IllegalArgumentException("key cannot be null"); } - Map map = (Map) inheritableThreadLocal.get(); + Map map = (Map) inheritableThreadLocal.get(); if (map == null) { - map = Collections.synchronizedMap(new HashMap()); + map = Collections.synchronizedMap(new HashMap()); inheritableThreadLocal.set(map); } map.put(key, val); @@ -86,7 +87,7 @@ public void put(String key, String val) { * Get the context identified by the key parameter. */ public String get(String key) { - Map Map = (Map) inheritableThreadLocal.get(); + Map Map = (Map) inheritableThreadLocal.get(); if ((Map != null) && (key != null)) { return (String) Map.get(key); } else { @@ -98,7 +99,7 @@ public String get(String key) { * Remove the the context identified by the key parameter. */ public void remove(String key) { - Map map = (Map) inheritableThreadLocal.get(); + Map map = (Map) inheritableThreadLocal.get(); if (map != null) { map.remove(key); } @@ -108,7 +109,7 @@ public void remove(String key) { * Clear all entries in the MDC. */ public void clear() { - Map map = (Map) inheritableThreadLocal.get(); + Map map = (Map) inheritableThreadLocal.get(); if (map != null) { map.clear(); // the InheritableThreadLocal.remove method was introduced in JDK 1.5 @@ -127,8 +128,8 @@ public void clear() { * * @return the keys in the MDC */ - public Set getKeys() { - Map map = (Map) inheritableThreadLocal.get(); + public Set getKeys() { + Map map = (Map) inheritableThreadLocal.get(); if (map != null) { return map.keySet(); } else { @@ -140,10 +141,10 @@ public Set getKeys() { * Returned value may be null. * */ - public Map getCopyOfContextMap() { - Map oldMap = (Map) inheritableThreadLocal.get(); + public Map getCopyOfContextMap() { + Map oldMap = (Map) inheritableThreadLocal.get(); if (oldMap != null) { - Map newMap = Collections.synchronizedMap(new HashMap()); + Map newMap = Collections.synchronizedMap(new HashMap()); synchronized (oldMap) { newMap.putAll(oldMap); } @@ -153,8 +154,8 @@ public Map getCopyOfContextMap() { } } - public void setContextMap(Map contextMap) { - Map map = Collections.synchronizedMap(new HashMap(contextMap)); + public void setContextMap(Map contextMap) { + Map map = Collections.synchronizedMap(new HashMap(contextMap)); inheritableThreadLocal.set(map); } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java index 6474d48b5..ba884ddf3 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java @@ -42,7 +42,7 @@ public class BasicMarker implements Marker { private static final long serialVersionUID = 1803952589649545191L; private final String name; - private List refereceList; + private List refereceList; BasicMarker(String name) { if (name == null) { @@ -71,7 +71,7 @@ public synchronized void add(Marker reference) { } else { // let's add the reference if (refereceList == null) { - refereceList = new Vector(); + refereceList = new Vector(); } refereceList.add(reference); } @@ -86,11 +86,11 @@ public boolean hasChildren() { return hasReferences(); } - public synchronized Iterator iterator() { + public synchronized Iterator iterator() { if (refereceList != null) { return refereceList.iterator(); } else { - return Collections.EMPTY_LIST.iterator(); + return Collections.emptyIterator(); } } @@ -178,7 +178,7 @@ public String toString() { if (!this.hasReferences()) { return this.getName(); } - Iterator it = this.iterator(); + Iterator it = this.iterator(); Marker reference; StringBuffer sb = new StringBuffer(this.getName()); sb.append(' ').append(OPEN); diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java index a847a89bd..aa5081db8 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -222,13 +222,13 @@ final public static FormattingTuple arrayFormat(final String messagePattern, // itself escaped: "abc x:\\{}" // we have to consume one backward slash sbuf.append(messagePattern.substring(i, j - 1)); - deeplyAppendParameter(sbuf, argArray[L], new HashMap()); + deeplyAppendParameter(sbuf, argArray[L], new HashMap()); i = j + 2; } } else { // normal case sbuf.append(messagePattern.substring(i, j)); - deeplyAppendParameter(sbuf, argArray[L], new HashMap()); + deeplyAppendParameter(sbuf, argArray[L], new HashMap()); i = j + 2; } } @@ -268,7 +268,7 @@ final static boolean isDoubleEscaped(String messagePattern, // special treatment of array values was suggested by 'lizongbo' private static void deeplyAppendParameter(StringBuilder sbuf, Object o, - Map seenMap) { + Map seenMap) { if (o == null) { sbuf.append("null"); return; @@ -315,7 +315,7 @@ private static void safeObjectAppend(StringBuilder sbuf, Object o) { } private static void objectArrayAppend(StringBuilder sbuf, Object[] a, - Map seenMap) { + Map seenMap) { sbuf.append('['); if (!seenMap.containsKey(a)) { seenMap.put(a, null); diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMDCAdapter.java index ef9e96760..e902fc787 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMDCAdapter.java @@ -52,11 +52,11 @@ public void put(String key, String val) { public void remove(String key) { } - public Map getCopyOfContextMap() { + public Map getCopyOfContextMap() { return null; } - public void setContextMap(Map contextMap) { + public void setContextMap(Map contextMap) { // NOP } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java index 77d86540f..b5ca4ffc3 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java @@ -53,7 +53,7 @@ public Logger getLogger(String name) { return logger; } - public List getLoggerNames() { + public List getLoggerNames() { return new ArrayList(loggers.keySet()); } diff --git a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java index ac49211ea..20e47f0b7 100644 --- a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java @@ -76,7 +76,7 @@ public interface MDCAdapter { * @return A copy of the current thread's context map. May be null. * @since 1.5.1 */ - public Map getCopyOfContextMap(); + public Map getCopyOfContextMap(); /** * Set the current thread's context map by first clearing any existing @@ -87,5 +87,5 @@ public interface MDCAdapter { * * @since 1.5.1 */ - public void setContextMap(Map contextMap); + public void setContextMap(Map contextMap); }