Repository: logging-chainsaw Updated Branches: refs/heads/master ba10849cc -> 4b8b96ff5
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java index 93b69f9..7f08c25 100644 --- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java +++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java @@ -88,7 +88,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton { private ZeroConfPreferenceModel preferenceModel; - private final Map serviceInfoToReceiveMap = new HashMap(); + private final Map<ServiceInfo, Plugin> serviceInfoToReceiveMap = new HashMap<>(); private JMenu connectToMenu = new JMenu("Connect to"); private JMenuItem helpItem = new JMenuItem(new AbstractAction("Learn more about ZeroConf...", @@ -169,8 +169,8 @@ public class ZeroConfPlugin extends GUIPluginSkeleton { public void pluginStopped(PluginEvent e) { Plugin plugin = e.getPlugin(); synchronized(serviceInfoToReceiveMap) { - for (Iterator iter = serviceInfoToReceiveMap.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Map.Entry) iter.next(); + for (Iterator<Map.Entry<ServiceInfo, Plugin>> iter = serviceInfoToReceiveMap.entrySet().iterator(); iter.hasNext();) { + Map.Entry<ServiceInfo, Plugin> entry = iter.next(); if(entry.getValue() == plugin) { iter.remove(); } @@ -198,7 +198,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton { private void registerServiceListenersForAppenders() { - Set serviceNames = new HashSet(); + Set<String> serviceNames = new HashSet<>(); serviceNames.add(MULTICAST_APPENDER_SERVICE_NAME); serviceNames.add(SOCKET_APPENDER_SERVICE_NAME); serviceNames.add(SOCKETHUB_APPENDER_SERVICE_NAME); @@ -422,7 +422,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton { } Plugin plugin; synchronized (serviceInfoToReceiveMap) { - plugin = (Plugin) serviceInfoToReceiveMap.get(info); + plugin = serviceInfoToReceiveMap.get(info); } ((LoggerRepositoryEx)LogManager.getLoggerRepository()).getPluginRegistry().stopPlugin(plugin.getName()); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java index 1ac13c4..4b31690 100644 --- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java +++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java @@ -23,8 +23,8 @@ import java.util.Set; public class ZeroConfPreferenceModel { - private List monitoredZones = new ArrayList(); - private Set autoConnectDevices = new HashSet(); + private List<String> monitoredZones = new ArrayList<>(); + private Set<String> autoConnectDevices = new HashSet<>(); // TODO expose addPropertyChangeListener @@ -38,19 +38,19 @@ public class ZeroConfPreferenceModel { monitoredZones.add(zone); } - public Set getAutoConnectDevices() { + public Set<String> getAutoConnectDevices() { return autoConnectDevices; } - public void setAutoConnectDevices(Set autoConnectDevices) { + public void setAutoConnectDevices(Set<String> autoConnectDevices) { this.autoConnectDevices = autoConnectDevices; } - public List getMonitoredZones() { + public List<String> getMonitoredZones() { return monitoredZones; } - public void setMonitoredZones(List monitoredZones) { + public void setMonitoredZones(List<String> monitoredZones) { this.monitoredZones = monitoredZones; } http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java index 55ade75..dc7fcce 100644 --- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java +++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java @@ -294,13 +294,13 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn String threadName; Object message; String ndc; - Hashtable mdc; + Hashtable<String, String> mdc; String[] throwable; String className; String methodName; String fileName; String lineNumber; - Hashtable properties; + Hashtable<String, String> properties; String currentSQLStatement; if (whereExists) { @@ -335,7 +335,7 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn ndc = rs.getString("NDC"); String mdcString = rs.getString("MDC"); - mdc = new Hashtable(); + mdc = new Hashtable<>(); if (mdcString != null) { // support MDC being wrapped in {{name, value}} @@ -369,7 +369,7 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn // property // are set) String propertiesString = rs.getString("PROPERTIES"); - properties = new Hashtable(); + properties = new Hashtable<>(); if (propertiesString != null) { // support properties being wrapped in {{name, http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/db/DBReceiverJob.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/db/DBReceiverJob.java b/src/main/java/org/apache/log4j/db/DBReceiverJob.java index 30139b4..80af7cc 100644 --- a/src/main/java/org/apache/log4j/db/DBReceiverJob.java +++ b/src/main/java/org/apache/log4j/db/DBReceiverJob.java @@ -203,7 +203,7 @@ class DBReceiverJob extends ComponentBase implements Job { statement.setLong(1, id); ResultSet rs = statement.executeQuery(); - Vector v = new Vector(); + Vector<String> v = new Vector<>(); while (rs.next()) { //int i = rs.getShort(1); @@ -213,7 +213,7 @@ class DBReceiverJob extends ComponentBase implements Job { int len = v.size(); String[] strRep = new String[len]; for (int i = 0; i < len; i++) { - strRep[i] = (String) v.get(i); + strRep[i] = v.get(i); } // we've filled strRep, we now attach it to the event return new ThrowableInformation(strRep); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java b/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java index b15fbca..4fec74d 100644 --- a/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java +++ b/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java @@ -168,8 +168,8 @@ public class UtilLoggingLevel extends Level { * Gets list of supported levels. * @return list of supported levels. */ - public static List getAllPossibleLevels() { - ArrayList list = new ArrayList(); + public static List<UtilLoggingLevel> getAllPossibleLevels() { + ArrayList<UtilLoggingLevel> list = new ArrayList<>(); list.add(FINE); list.add(FINER); list.add(FINEST); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/MulticastAppender.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/MulticastAppender.java b/src/main/java/org/apache/log4j/net/MulticastAppender.java index c74f467..2e4cff8 100644 --- a/src/main/java/org/apache/log4j/net/MulticastAppender.java +++ b/src/main/java/org/apache/log4j/net/MulticastAppender.java @@ -121,7 +121,7 @@ public class MulticastAppender extends AppenderSkeleton implements PortBased { } if (advertiseViaMulticastDNS) { - Map properties = new HashMap(); + Map<String, String> properties = new HashMap<>(); properties.put("multicastAddress", remoteHost); zeroConf = new ZeroConfSupport(ZONE, port, getName(), properties); zeroConf.advertise(); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/MulticastReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/MulticastReceiver.java b/src/main/java/org/apache/log4j/net/MulticastReceiver.java index f0a542f..69b33ec 100644 --- a/src/main/java/org/apache/log4j/net/MulticastReceiver.java +++ b/src/main/java/org/apache/log4j/net/MulticastReceiver.java @@ -174,7 +174,7 @@ public class MulticastReceiver extends Receiver implements PortBased, } class MulticastHandlerThread extends Thread { - private final List list = new ArrayList(); + private final List<String> list = new ArrayList<>(); public MulticastHandlerThread() { setDaemon(true); @@ -188,7 +188,7 @@ public class MulticastReceiver extends Receiver implements PortBased, } public void run() { - ArrayList list2 = new ArrayList(); + ArrayList<String> list2 = new ArrayList<>(); while (isAlive()) { synchronized (list) { @@ -209,7 +209,7 @@ public class MulticastReceiver extends Receiver implements PortBased, for (Object aList2 : list2) { String data = (String) aList2; - List v = decoderImpl.decodeEvents(data.trim()); + List<LoggingEvent> v = decoderImpl.decodeEvents(data.trim()); if (v != null) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/SocketReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/SocketReceiver.java b/src/main/java/org/apache/log4j/net/SocketReceiver.java index 821935f..29725ab 100644 --- a/src/main/java/org/apache/log4j/net/SocketReceiver.java +++ b/src/main/java/org/apache/log4j/net/SocketReceiver.java @@ -53,7 +53,7 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased, /** * socket map. */ - private Map socketMap = new HashMap(); + private Map<Socket, SocketNode13> socketMap = new HashMap<>(); /** * Paused. */ @@ -73,7 +73,7 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased, /** * Socket list. */ - private Vector socketList = new Vector(); + private Vector<Socket> socketList = new Vector<>(); /** * The MulticastDNS zone advertised by a SocketReceiver @@ -332,15 +332,15 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased, * been responsible for creating. * @return Vector of SocketDetails */ - public Vector getConnectedSocketDetails() { - Vector details = new Vector(socketList.size()); + public Vector<SocketDetail> getConnectedSocketDetails() { + Vector<SocketDetail> details = new Vector<>(socketList.size()); - for (Enumeration enumeration = socketList.elements(); + for (Enumeration<Socket> enumeration = socketList.elements(); enumeration.hasMoreElements(); ) { - Socket socket = (Socket) enumeration.nextElement(); + Socket socket = enumeration.nextElement(); details.add( - new SocketDetail(socket, (SocketNode13) socketMap.get(socket))); + new SocketDetail(socket, socketMap.get(socket))); } return details; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/UDPReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/UDPReceiver.java b/src/main/java/org/apache/log4j/net/UDPReceiver.java index 562d495..fefab1e 100644 --- a/src/main/java/org/apache/log4j/net/UDPReceiver.java +++ b/src/main/java/org/apache/log4j/net/UDPReceiver.java @@ -171,7 +171,7 @@ public class UDPReceiver extends Receiver implements PortBased, Pauseable { } class UDPHandlerThread extends Thread { - private final List list = new ArrayList(); + private final List<String> list = new ArrayList<>(); public UDPHandlerThread() { setDaemon(true); @@ -194,7 +194,7 @@ public class UDPReceiver extends Receiver implements PortBased, Pauseable { } public void run() { - ArrayList list2 = new ArrayList(); + ArrayList<String> list2 = new ArrayList<>(); while (!UDPReceiver.this.closed) { synchronized (list) { @@ -215,7 +215,7 @@ public class UDPReceiver extends Receiver implements PortBased, Pauseable { for (Object aList2 : list2) { String data = (String) aList2; - List v = decoderImpl.decodeEvents(data); + List<LoggingEvent> v = decoderImpl.decodeEvents(data); if (v != null) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/XMLSocketNode.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/XMLSocketNode.java b/src/main/java/org/apache/log4j/net/XMLSocketNode.java index b6b0c53..99d1fe0 100644 --- a/src/main/java/org/apache/log4j/net/XMLSocketNode.java +++ b/src/main/java/org/apache/log4j/net/XMLSocketNode.java @@ -131,7 +131,7 @@ public class XMLSocketNode extends ComponentBase implements Runnable { "no bytes read from stream - closing connection."); break; } - List v = decoder.decodeEvents(new String(b, 0, length)); + List<LoggingEvent> v = decoder.decodeEvents(new String(b, 0, length)); if (v != null) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java index ad60a89..104b2f7 100644 --- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java +++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java @@ -55,7 +55,7 @@ public class XMLSocketReceiver extends Receiver implements Runnable, PortBased, //default to log4j xml decoder protected String decoder = "org.apache.log4j.xml.XMLDecoder"; private ServerSocket serverSocket; - private List socketList = new Vector(); + private List<Socket> socketList = new Vector<>(); private Thread rThread; public static final int DEFAULT_PORT = 4448; protected int port = DEFAULT_PORT; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/plugins/PluginRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java index 5b22529..72909c1 100644 --- a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java +++ b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java @@ -40,7 +40,7 @@ public final class PluginRegistry { * The pluginMap is keyed by plugin name and contains plugins as values. * key=plugin.getName, value=plugin */ - private final Map pluginMap; + private final Map<String, Plugin> pluginMap; /** * Logger repository. */ @@ -62,7 +62,7 @@ public final class PluginRegistry { */ public PluginRegistry(final LoggerRepositoryEx repository) { super(); - pluginMap = new HashMap(); + pluginMap = new HashMap<>(); this.loggerRepository = repository; this.loggerRepository.addLoggerRepositoryEventListener(listener); } @@ -106,7 +106,7 @@ public final class PluginRegistry { // make sure the plugin has reference to repository plugin.setLoggerRepository(getLoggerRepository()); - Plugin existingPlugin = (Plugin) pluginMap.get(name); + Plugin existingPlugin = pluginMap.get(name); if (existingPlugin != null) { existingPlugin.shutdown(); } @@ -161,9 +161,9 @@ public final class PluginRegistry { * * @return List list of plugins from the repository. */ - public List getPlugins() { + public List<Plugin> getPlugins() { synchronized (pluginMap) { - List pluginList = new ArrayList(pluginMap.size()); + List<Plugin> pluginList = new ArrayList<>(pluginMap.size()); pluginList.addAll(pluginMap.values()); return pluginList; @@ -201,7 +201,7 @@ public final class PluginRegistry { */ public Plugin stopPlugin(final String pluginName) { synchronized (pluginMap) { - Plugin plugin = (Plugin) pluginMap.get(pluginName); + Plugin plugin = pluginMap.get(pluginName); if (plugin == null) { return null; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java index 5c2686e..9cff769 100644 --- a/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java +++ b/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java @@ -46,7 +46,7 @@ public class PropertyRewritePolicy implements RewritePolicy { * @param props */ public void setProperties(String props) { - Map hashTable = new HashMap(); + Map<String, String> hashTable = new HashMap<>(); StringTokenizer pairs = new StringTokenizer(props, ","); while (pairs.hasMoreTokens()) { StringTokenizer entry = new StringTokenizer(pairs.nextToken(), "="); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/scheduler/Scheduler.java b/src/main/java/org/apache/log4j/scheduler/Scheduler.java index 906dcc4..92c5e3e 100644 --- a/src/main/java/org/apache/log4j/scheduler/Scheduler.java +++ b/src/main/java/org/apache/log4j/scheduler/Scheduler.java @@ -35,7 +35,7 @@ public class Scheduler extends Thread { /** * Job list. */ - List jobList; + List<ScheduledJobEntry> jobList; /** * If set true, scheduler has or should shut down. */ @@ -46,7 +46,7 @@ public class Scheduler extends Thread { */ public Scheduler() { super(); - jobList = new Vector(); + jobList = new Vector<>(); } /** @@ -60,7 +60,7 @@ public class Scheduler extends Thread { int i = 0; for (; i < size; i++) { - ScheduledJobEntry se = (ScheduledJobEntry) jobList.get(i); + ScheduledJobEntry se = jobList.get(i); if (se.job == job) { found = true; break; @@ -88,7 +88,7 @@ public class Scheduler extends Thread { } int i = findIndex(job); if (i != -1) { - ScheduledJobEntry se = (ScheduledJobEntry) jobList.remove(i); + ScheduledJobEntry se = jobList.remove(i); if (se.job != job) { // this should never happen new IllegalStateException("Internal programming error"); } @@ -152,7 +152,7 @@ public class Scheduler extends Thread { if (i == -1) { return false; } else { - ScheduledJobEntry se = (ScheduledJobEntry) jobList.get(i); + ScheduledJobEntry se = jobList.get(i); se.period = newPeriod; return true; } @@ -174,7 +174,7 @@ public class Scheduler extends Thread { int i = 0; for (; i < max; i++) { - ScheduledJobEntry sje = (ScheduledJobEntry) jobList.get(i); + ScheduledJobEntry sje = jobList.get(i); if (desiredExecutionTime < sje.desiredExecutionTime) { break; @@ -202,7 +202,7 @@ public class Scheduler extends Thread { if (jobList.isEmpty()) { linger(); } else { - ScheduledJobEntry sje = (ScheduledJobEntry) jobList.get(0); + ScheduledJobEntry sje = jobList.get(0); long now = System.currentTimeMillis(); if (now >= sje.desiredExecutionTime) { executeInABox(sje.job); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/spi/Decoder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/spi/Decoder.java b/src/main/java/org/apache/log4j/spi/Decoder.java index d4686ad..c1096d0 100644 --- a/src/main/java/org/apache/log4j/spi/Decoder.java +++ b/src/main/java/org/apache/log4j/spi/Decoder.java @@ -38,7 +38,7 @@ public interface Decoder { * @param document document to decode. * @return list of LoggingEvent instances. */ - Vector decodeEvents(String document); + Vector<LoggingEvent> decodeEvents(String document); /** * Decode event from string. @@ -53,7 +53,7 @@ public interface Decoder { * @return list of LoggingEvent instances. * @throws IOException if IO error resolving document. */ - Vector decode(URL url) throws IOException; + Vector<LoggingEvent> decode(URL url) throws IOException; /** * Sets additional properties. http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java b/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java index c079a2c..ae30e4b 100644 --- a/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java +++ b/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java @@ -134,7 +134,7 @@ public interface LoggerRepositoryEx extends LoggerRepository { * Get the properties specific for this repository. * @return property map. */ - Map getProperties(); + Map<String, String> getProperties(); /** * Get the property of this repository. @@ -155,7 +155,7 @@ public interface LoggerRepositoryEx extends LoggerRepository { * * @return List */ - List getErrorList(); + List<ErrorItem> getErrorList(); /** * Errors which cannot be logged, go to the error list. http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/varia/ListModelAppender.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/varia/ListModelAppender.java b/src/main/java/org/apache/log4j/varia/ListModelAppender.java index ccbc9be..46ab7fc 100644 --- a/src/main/java/org/apache/log4j/varia/ListModelAppender.java +++ b/src/main/java/org/apache/log4j/varia/ListModelAppender.java @@ -36,7 +36,7 @@ public final class ListModelAppender extends AppenderSkeleton { /** * Default list model. */ - private final DefaultListModel model = new DefaultListModel(); + private final DefaultListModel<LoggingEvent> model = new DefaultListModel<>(); /** * Constructs a ListModelAppender. @@ -50,7 +50,7 @@ public final class ListModelAppender extends AppenderSkeleton { * * @return the list model */ - public ListModel getModel() { + public ListModel<LoggingEvent> getModel() { return model; } http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java index a73ab59..8aa53bc 100644 --- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java +++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java @@ -137,7 +137,7 @@ import org.apache.log4j.spi.ThrowableInformation; *@author Scott Deboy */ public class LogFilePatternReceiver extends Receiver { - private final List keywords = new ArrayList(); + private final List<String> keywords = new ArrayList<>(); private static final String PROP_START = "PROP("; private static final String PROP_END = ")"; @@ -189,8 +189,8 @@ public class LogFilePatternReceiver extends Receiver { private Rule expressionRule; private Map currentMap; - private List additionalLines; - private List matchingKeywords; + private List<String> additionalLines; + private List<String> matchingKeywords; private String regexp; private Reader reader; @@ -201,7 +201,7 @@ public class LogFilePatternReceiver extends Receiver { private boolean useCurrentThread; public static final int MISSING_FILE_RETRY_MILLIS = 10000; private boolean appendNonMatches; - private final Map customLevelDefinitionMap = new HashMap(); + private final Map<String, Level> customLevelDefinitionMap = new HashMap<>(); //default to one line - this number is incremented for each (NL) found in the logFormat private int lineCount = 1; @@ -410,7 +410,7 @@ public class LogFilePatternReceiver extends Receiver { */ private int getExceptionLine() { for (int i = 0; i < additionalLines.size(); i++) { - Matcher exceptionMatcher = exceptionPattern.matcher((String)additionalLines.get(i)); + Matcher exceptionMatcher = exceptionPattern.matcher(additionalLines.get(i)); if (exceptionMatcher.matches()) { return i; } @@ -463,7 +463,7 @@ public class LogFilePatternReceiver extends Receiver { } String[] exception = new String[additionalLines.size() - exceptionLine - 1]; for (int i = 0; i < exception.length; i++) { - exception[i] = (String) additionalLines.get(i + exceptionLine); + exception[i] = additionalLines.get(i + exceptionLine); } return exception; } @@ -672,8 +672,8 @@ public class LogFilePatternReceiver extends Receiver { } currentMap = new HashMap(); - additionalLines = new ArrayList(); - matchingKeywords = new ArrayList(); + additionalLines = new ArrayList<>(); + matchingKeywords = new ArrayList<>(); if (timestampFormat != null) { dateFormat = new SimpleDateFormat(quoteTimeStampChars(timestampFormat)); @@ -689,7 +689,7 @@ public class LogFilePatternReceiver extends Receiver { getLogger().warn("Invalid filter expression: " + filterExpression, e); } - List buildingKeywords = new ArrayList(); + List<String> buildingKeywords = new ArrayList<>(); String newPattern = logFormat; @@ -707,7 +707,7 @@ public class LogFilePatternReceiver extends Receiver { String current = newPattern; //build a list of property names and temporarily replace the property with an empty string, //we'll rebuild the pattern later - List propertyNames = new ArrayList(); + List<String> propertyNames = new ArrayList<>(); index = 0; while (index > -1) { if (current.contains(PROP_START) && current.contains(PROP_END)) { @@ -771,7 +771,7 @@ public class LogFilePatternReceiver extends Receiver { newPattern = newPattern.replaceAll(Pattern.quote(PATTERN_WILDCARD), REGEXP_DEFAULT_WILDCARD); //use buildingKeywords here to ensure correct order for (int i = 0;i<buildingKeywords.size();i++) { - String keyword = (String) buildingKeywords.get(i); + String keyword = buildingKeywords.get(i); //make the final keyword greedy (we're assuming it's the message) if (i == (buildingKeywords.size() - 1)) { newPattern = singleReplace(newPattern, String.valueOf(i), GREEDY_GROUP); @@ -950,7 +950,7 @@ public class LogFilePatternReceiver extends Receiver { levelImpl = Level.DEBUG; } else { //first try to resolve against custom level definition map, then fall back to regular levels - levelImpl = (Level) customLevelDefinitionMap.get(level); + levelImpl = customLevelDefinitionMap.get(level); if (levelImpl == null) { levelImpl = Level.toLevel(level.trim()); if (!level.equals(levelImpl.toString())) { http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java index c725467..921a036 100644 --- a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java +++ b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java @@ -259,7 +259,7 @@ public class LogFileXMLReceiver extends Receiver { shutdown(); } - private void processEvents(Collection c) { + private void processEvents(Collection<LoggingEvent> c) { if (c == null) { return; } http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java index a217415..00d6f7c 100644 --- a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java +++ b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java @@ -179,7 +179,7 @@ public class UtilLoggingXMLDecoder implements Decoder { * @return Vector of LoggingEvents * @throws IOException if IO error during processing. */ - public Vector decode(final URL url) throws IOException { + public Vector<LoggingEvent> decode(final URL url) throws IOException { LineNumberReader reader; boolean isZipFile = url.getPath().toLowerCase().endsWith(".zip"); InputStream inputStream; @@ -198,10 +198,10 @@ public class UtilLoggingXMLDecoder implements Decoder { } else { reader = new LineNumberReader(new InputStreamReader(inputStream, ENCODING)); } - Vector v = new Vector(); + Vector<LoggingEvent> v = new Vector<>(); String line; - Vector events; + Vector<LoggingEvent> events; try { while ((line = reader.readLine()) != null) { StringBuilder buffer = new StringBuilder(line); @@ -232,7 +232,7 @@ public class UtilLoggingXMLDecoder implements Decoder { * @param document to decode events from * @return Vector of LoggingEvents */ - public Vector decodeEvents(final String document) { + public Vector<LoggingEvent> decodeEvents(final String document) { if (document != null) { @@ -290,10 +290,10 @@ public class UtilLoggingXMLDecoder implements Decoder { return null; } - Vector events = decodeEvents(document); + Vector<LoggingEvent> events = decodeEvents(document); if (events.size() > 0) { - return (LoggingEvent) events.firstElement(); + return events.firstElement(); } return null; @@ -304,8 +304,8 @@ public class UtilLoggingXMLDecoder implements Decoder { * @param document XML document * @return Vector of LoggingEvents */ - private Vector decodeEvents(final Document document) { - Vector events = new Vector(); + private Vector<LoggingEvent> decodeEvents(final Document document) { + Vector<LoggingEvent> events = new Vector<>(); NodeList eventList = document.getElementsByTagName("record"); @@ -371,7 +371,7 @@ public class UtilLoggingXMLDecoder implements Decoder { } if (tagName.equalsIgnoreCase("exception")) { - ArrayList exceptionList = new ArrayList(); + ArrayList<String> exceptionList = new ArrayList<>(); NodeList exList = list.item(y).getChildNodes(); int exlistLength = exList.getLength(); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/xml/XMLDecoder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/xml/XMLDecoder.java b/src/main/java/org/apache/log4j/xml/XMLDecoder.java index 6395a23..52a3146 100644 --- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java +++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java @@ -177,7 +177,7 @@ public class XMLDecoder implements Decoder { * @return Vector of LoggingEvents * @throws IOException if IO error during processing. */ - public Vector decode(final URL url) throws IOException { + public Vector<LoggingEvent> decode(final URL url) throws IOException { LineNumberReader reader; boolean isZipFile = url.getPath().toLowerCase().endsWith(".zip"); InputStream inputStream; @@ -197,10 +197,10 @@ public class XMLDecoder implements Decoder { reader = new LineNumberReader(new InputStreamReader(inputStream, ENCODING)); } - Vector v = new Vector(); + Vector<LoggingEvent> v = new Vector<>(); String line; - Vector events; + Vector<LoggingEvent> events; try { while ((line = reader.readLine()) != null) { StringBuilder buffer = new StringBuilder(line); @@ -231,7 +231,7 @@ public class XMLDecoder implements Decoder { * @param document to decode events from * @return Vector of LoggingEvents */ - public Vector decodeEvents(final String document) { + public Vector<LoggingEvent> decodeEvents(final String document) { if (document != null) { if (document.trim().equals("")) { return null; @@ -286,10 +286,10 @@ public class XMLDecoder implements Decoder { return null; } - Vector events = decodeEvents(document); + Vector<LoggingEvent> events = decodeEvents(document); if (events.size() > 0) { - return (LoggingEvent) events.firstElement(); + return events.firstElement(); } return null; @@ -300,8 +300,8 @@ public class XMLDecoder implements Decoder { * @param document XML document * @return Vector of LoggingEvents */ - private Vector decodeEvents(final Document document) { - Vector events = new Vector(); + private Vector<LoggingEvent> decodeEvents(final Document document) { + Vector<LoggingEvent> events = new Vector<>(); Logger logger; long timeStamp; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/test/java/org/apache/log4j/VectorAppender.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/log4j/VectorAppender.java b/src/test/java/org/apache/log4j/VectorAppender.java index 52026d0..b0de7c4 100644 --- a/src/test/java/org/apache/log4j/VectorAppender.java +++ b/src/test/java/org/apache/log4j/VectorAppender.java @@ -25,13 +25,13 @@ import org.apache.log4j.spi.LoggingEvent; @author Ceki Gülcü */ public class VectorAppender extends AppenderSkeleton { - public Vector vector; + public Vector<LoggingEvent> vector; long delay = 0; public VectorAppender() { super(true); - vector = new Vector(); + vector = new Vector<>(); } @@ -50,7 +50,7 @@ public class VectorAppender extends AppenderSkeleton { * Returns a vector of {@link LoggingEvent}. * @return a vector of {@link LoggingEvent}. */ - public Vector getVector() { + public Vector<LoggingEvent> getVector() { return vector; } http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/test/java/org/apache/log4j/db/FullCycleDBTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/log4j/db/FullCycleDBTest.java b/src/test/java/org/apache/log4j/db/FullCycleDBTest.java index bbac287..7107f11 100644 --- a/src/test/java/org/apache/log4j/db/FullCycleDBTest.java +++ b/src/test/java/org/apache/log4j/db/FullCycleDBTest.java @@ -58,7 +58,7 @@ import java.io.IOException; public class FullCycleDBTest extends TestCase { - Vector witnessEvents; + Vector<LoggingEvent> witnessEvents; Hierarchy lrWrite; LoggerRepository lrRead; String appendConfigFile = null; @@ -74,7 +74,7 @@ public class FullCycleDBTest appendConfigFile = "append-with-drivermanager1.xml"; readConfigFile = "read-with-drivermanager1.xml"; - witnessEvents = new Vector(); + witnessEvents = new Vector<LoggingEvent>(); lrWrite = new Hierarchy(new RootLogger(Level.DEBUG)); lrRead = new LoggerRepositoryExImpl(new Hierarchy(new RootLogger(Level.DEBUG))); @@ -224,19 +224,19 @@ public class FullCycleDBTest // wait a little to allow events to be read try { Thread.sleep(3100); } catch(Exception e) {} VectorAppender va = (VectorAppender) lrRead.getRootLogger().getAppender("VECTOR"); - Vector returnedEvents = getRelevantEventsFromVA(va, startTime); + Vector<LoggingEvent> returnedEvents = getRelevantEventsFromVA(va, startTime); compareEvents(witnessEvents, returnedEvents); } - void compareEvents(Vector l, Vector r) { + void compareEvents(Vector<LoggingEvent> l, Vector<LoggingEvent> r) { assertNotNull("left vector of events should not be null"); assertEquals(l.size(), r.size()); for(int i = 0; i < r.size(); i++) { - LoggingEvent le = (LoggingEvent) l.get(i); - LoggingEvent re = (LoggingEvent) r.get(i); + LoggingEvent le = l.get(i); + LoggingEvent re = r.get(i); assertEquals(le.getMessage(), re.getMessage()); assertEquals(le.getLoggerName(), re.getLoggerName()); assertEquals(le.getLevel(), re.getLevel()); @@ -286,10 +286,10 @@ public class FullCycleDBTest } } - Vector getRelevantEventsFromVA(VectorAppender va, long startTime) { + Vector<LoggingEvent> getRelevantEventsFromVA(VectorAppender va, long startTime) { assertNotNull(va); - Vector v = va.getVector(); - Vector r = new Vector(); + Vector<LoggingEvent> v = va.getVector(); + Vector<LoggingEvent> r = new Vector<LoggingEvent>(); // remove all elements older than startTime for (Object aV : v) { LoggingEvent event = (LoggingEvent) aV; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java b/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java index 4328dc9..442b205 100644 --- a/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java +++ b/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java @@ -61,7 +61,7 @@ public class RewriteAppenderTest extends TestCase { logger.info("Message 0"); MDC.put("p1", "Hola"); - Map msg = new TreeMap(); + Map<String, String> msg = new TreeMap<>(); msg.put("p1", "Hello"); msg.put("p2", "World"); msg.put("x1", "Mundo"); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/test/java/org/apache/log4j/util/Compare.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/log4j/util/Compare.java b/src/test/java/org/apache/log4j/util/Compare.java index b68ea31..958d74a 100644 --- a/src/test/java/org/apache/log4j/util/Compare.java +++ b/src/test/java/org/apache/log4j/util/Compare.java @@ -33,7 +33,7 @@ public class Compare { static final int B2_NULL = -2; private static final InputStream open( - final Class testClass, + final Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, final String fileName) throws IOException { String resourceName = fileName; if (fileName.startsWith("witness/")) { @@ -52,7 +52,7 @@ public class Compare { return is; } - public static boolean compare(Class testClass, + public static boolean compare(Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, final String file1, final String file2) throws IOException { @@ -64,7 +64,7 @@ public class Compare { } public static boolean compare( - Class testClass, String file1, String file2, BufferedReader in1, BufferedReader in2) throws IOException { + Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, String file1, String file2, BufferedReader in1, BufferedReader in2) throws IOException { String s1; int lineCounter = 0; @@ -105,7 +105,7 @@ public class Compare { * Prints file on the console. * */ - private static void outputFile(Class testClass, String file) + private static void outputFile(Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, String file) throws IOException { InputStream is = open(testClass, file); BufferedReader in1 = new BufferedReader(new InputStreamReader(is)); @@ -135,7 +135,7 @@ public class Compare { } - public static boolean gzCompare(final Class testClass, + public static boolean gzCompare(final Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, final String actual, final String expected) throws IOException { @@ -155,7 +155,7 @@ public class Compare { } } - public static boolean gzCompare(Class testClass, String file1, String file2, BufferedReader in1, BufferedReader in2) throws IOException { + public static boolean gzCompare(Class<org.apache.log4j.rewrite.RewriteAppenderTest> testClass, String file1, String file2, BufferedReader in1, BufferedReader in2) throws IOException { String s1; int lineCounter = 0; http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java b/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java index bd9e7bc..59cba7f 100644 --- a/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java +++ b/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java @@ -58,28 +58,28 @@ public class XMLDecoderTest extends TestCase { public void testDecodeEventsString1() throws Exception { String xmlStr = getStringFromResource("xmlLayout.1.xml", 10000); XMLDecoder decoder = new XMLDecoder(); - Vector events = decoder.decodeEvents(xmlStr); + Vector<org.apache.log4j.spi.LoggingEvent> events = decoder.decodeEvents(xmlStr); assertEquals(17, events.size()); } public void testDecodeEventsString2() throws Exception { String xmlStr = getStringFromResource("xsltLayout.1.xml", 10000); XMLDecoder decoder = new XMLDecoder(); - Vector events = decoder.decodeEvents(xmlStr); + Vector<org.apache.log4j.spi.LoggingEvent> events = decoder.decodeEvents(xmlStr); assertEquals(15, events.size()); } public void testDecodeEventsURL1() throws Exception { URL resource = XMLDecoderTest.class.getResource("xmlLayout.1.xml"); XMLDecoder decoder = new XMLDecoder(); - Vector events = decoder.decode(resource); + Vector<org.apache.log4j.spi.LoggingEvent> events = decoder.decode(resource); assertEquals(17, events.size()); } public void testDecodeEventsURL2() throws Exception { URL resource = XMLDecoderTest.class.getResource("xsltLayout.1.xml"); XMLDecoder decoder = new XMLDecoder(); - Vector events = decoder.decode(resource); + Vector<org.apache.log4j.spi.LoggingEvent> events = decoder.decode(resource); assertEquals(15, events.size()); }
