Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java Mon Apr 10 21:56:46 2017 @@ -74,7 +74,7 @@ public abstract class AbstractListDelimi { if (s == null) { - return new ArrayList<String>(0); + return new ArrayList<>(0); } return splitString(s, trim); } @@ -140,7 +140,7 @@ public abstract class AbstractListDelimi return split((String) value, true); } - Collection<Object> result = new LinkedList<Object>(); + Collection<Object> result = new LinkedList<>(); if (value instanceof Iterable) { flattenIterator(result, ((Iterable<?>) value).iterator(), limit);
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java Mon Apr 10 21:56:46 2017 @@ -325,7 +325,7 @@ public class DefaultConversionHandler im private <T> T[] toObjectArray(Object src, Class<T> elemClass, ConfigurationInterpolator ci) { - Collection<T> convertedCol = new LinkedList<T>(); + Collection<T> convertedCol = new LinkedList<>(); convertToCollection(src, elemClass, ci, convertedCol); // Safe to cast because the element class is specified @SuppressWarnings("unchecked") Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java Mon Apr 10 21:56:46 2017 @@ -139,7 +139,7 @@ public class DefaultListDelimiterHandler @Override protected Collection<String> splitString(String s, boolean trim) { - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); StringBuilder token = new StringBuilder(); boolean inEscape = false; Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java Mon Apr 10 21:56:46 2017 @@ -72,7 +72,7 @@ public class DisabledListDelimiterHandle @Override protected Collection<String> splitString(String s, boolean trim) { - Collection<String> result = new ArrayList<String>(1); + Collection<String> result = new ArrayList<>(1); result.add(s); return result; } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java Mon Apr 10 21:56:46 2017 @@ -145,7 +145,7 @@ public class LegacyListDelimiterHandler return Collections.singleton(s); } - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); StringBuilder token = new StringBuilder(); int begin = 0; Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java Mon Apr 10 21:56:46 2017 @@ -97,7 +97,7 @@ public class BaseEventSource implements EventType<T> eventType) { List<EventListener<? super T>> result = - new LinkedList<EventListener<? super T>>(); + new LinkedList<>(); for (EventListener<? super T> l : eventListeners .getEventListeners(eventType)) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java Mon Apr 10 21:56:46 2017 @@ -59,7 +59,7 @@ public class ConfigurationErrorEvent ext * @since 2.0 */ public static final EventType<ConfigurationErrorEvent> ANY = - new EventType<ConfigurationErrorEvent>(Event.ANY, "ERROR"); + new EventType<>(Event.ANY, "ERROR"); /** * Constant for the event type indicating a read error. Errors of this type @@ -69,7 +69,7 @@ public class ConfigurationErrorEvent ext * @since 2.0 */ public static final EventType<ConfigurationErrorEvent> READ = - new EventType<ConfigurationErrorEvent>(ANY, "READ_ERROR"); + new EventType<>(ANY, "READ_ERROR"); /** * Constant for the event type indicating a write error. Errors of this type @@ -79,7 +79,7 @@ public class ConfigurationErrorEvent ext * @since 2.0 */ public static final EventType<ConfigurationErrorEvent> WRITE = - new EventType<ConfigurationErrorEvent>(ANY, "WRITE_ERROR"); + new EventType<>(ANY, "WRITE_ERROR"); /** * The serial version UID. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java Mon Apr 10 21:56:46 2017 @@ -78,7 +78,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> ANY = - new EventType<ConfigurationEvent>(Event.ANY, "CONFIGURATION_UPDATE"); + new EventType<>(Event.ANY, "CONFIGURATION_UPDATE"); /** * Constant for the event type for an add property operation. @@ -86,7 +86,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> ADD_PROPERTY = - new EventType<ConfigurationEvent>(ANY, "ADD_PROPERTY"); + new EventType<>(ANY, "ADD_PROPERTY"); /** * Constant for the event type for a set property operation. @@ -94,7 +94,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> SET_PROPERTY = - new EventType<ConfigurationEvent>(ANY, "SET_PROPERTY"); + new EventType<>(ANY, "SET_PROPERTY"); /** * Constant for the event type for a clear property operation. @@ -102,7 +102,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> CLEAR_PROPERTY = - new EventType<ConfigurationEvent>(ANY, "CLEAR_PROPERTY"); + new EventType<>(ANY, "CLEAR_PROPERTY"); /** * Constant for the event type for a clear operation. @@ -110,7 +110,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> CLEAR = - new EventType<ConfigurationEvent>(ANY, "CLEAR"); + new EventType<>(ANY, "CLEAR"); /** * Constant for the common base event type for all hierarchical update @@ -120,7 +120,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> ANY_HIERARCHICAL = - new EventType<ConfigurationEvent>(ANY, "HIERARCHICAL"); + new EventType<>(ANY, "HIERARCHICAL"); /** * Constant for the event type for an add nodes operation. @@ -128,7 +128,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> ADD_NODES = - new EventType<ConfigurationEvent>(ANY_HIERARCHICAL, "ADD_NODES"); + new EventType<>(ANY_HIERARCHICAL, "ADD_NODES"); /** * Constant for the event type for a clear tree operation. @@ -136,7 +136,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> CLEAR_TREE = - new EventType<ConfigurationEvent>(ANY_HIERARCHICAL, "CLEAR_TREE"); + new EventType<>(ANY_HIERARCHICAL, "CLEAR_TREE"); /** * Constant for the event type indicating a change on a sub configuration. @@ -144,7 +144,7 @@ public class ConfigurationEvent extends * @since 2.0 */ public static final EventType<ConfigurationEvent> SUBNODE_CHANGED = - new EventType<ConfigurationEvent>(ANY_HIERARCHICAL, + new EventType<>(ANY_HIERARCHICAL, "SUBNODE_CHANGED"); /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/Event.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/Event.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/Event.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/Event.java Mon Apr 10 21:56:46 2017 @@ -40,7 +40,7 @@ public class Event extends EventObject * event types have this type as super direct (directly or indirectly). */ public static final EventType<Event> ANY = - new EventType<Event>(null, "ANY"); + new EventType<>(null, "ANY"); /** * Constant for the format used in toString() for a property representation. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java Mon Apr 10 21:56:46 2017 @@ -64,7 +64,7 @@ public class EventListenerList public EventListenerList() { listeners = - new CopyOnWriteArrayList<EventListenerRegistrationData<?>>(); + new CopyOnWriteArrayList<>(); } /** @@ -79,7 +79,7 @@ public class EventListenerList public <T extends Event> void addEventListener(EventType<T> type, EventListener<? super T> listener) { - listeners.add(new EventListenerRegistrationData<T>(type, listener)); + listeners.add(new EventListenerRegistrationData<>(type, listener)); } /** @@ -120,7 +120,7 @@ public class EventListenerList EventType<T> eventType, EventListener<? super T> listener) { return !(listener == null || eventType == null) - && removeEventListener(new EventListenerRegistrationData<T>( + && removeEventListener(new EventListenerRegistrationData<>( eventType, listener)); } @@ -194,7 +194,7 @@ public class EventListenerList public <T extends Event> EventListenerIterator<T> getEventListenerIterator( EventType<T> eventType) { - return new EventListenerIterator<T>(listeners.iterator(), eventType); + return new EventListenerIterator<>(listeners.iterator(), eventType); } /** @@ -225,9 +225,9 @@ public class EventListenerList EventType<T> eventType) { Map<EventType<?>, Set<EventType<?>>> superTypes = - new HashMap<EventType<?>, Set<EventType<?>>>(); + new HashMap<>(); List<EventListenerRegistrationData<? extends T>> results = - new LinkedList<EventListenerRegistrationData<? extends T>>(); + new LinkedList<>(); for (EventListenerRegistrationData<?> reg : listeners) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventType.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventType.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventType.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventType.java Mon Apr 10 21:56:46 2017 @@ -120,7 +120,7 @@ public class EventType<T extends Event> */ public static Set<EventType<?>> fetchSuperEventTypes(EventType<?> eventType) { - Set<EventType<?>> types = new HashSet<EventType<?>>(); + Set<EventType<?>> types = new HashSet<>(); EventType<?> currentType = eventType; while (currentType != null) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java Mon Apr 10 21:56:46 2017 @@ -117,8 +117,8 @@ public class ConfigurationInterpolator */ public ConfigurationInterpolator() { - prefixLookups = new ConcurrentHashMap<String, Lookup>(); - defaultLookups = new CopyOnWriteArrayList<Lookup>(); + prefixLookups = new ConcurrentHashMap<>(); + defaultLookups = new CopyOnWriteArrayList<>(); substitutor = initSubstitutor(); } @@ -193,7 +193,7 @@ public class ConfigurationInterpolator */ public Map<String, Lookup> getLookups() { - return new HashMap<String, Lookup>(prefixLookups); + return new HashMap<>(prefixLookups); } /** @@ -275,7 +275,7 @@ public class ConfigurationInterpolator */ public List<Lookup> getDefaultLookups() { - return new ArrayList<Lookup>(defaultLookups); + return new ArrayList<>(defaultLookups); } /** @@ -545,7 +545,7 @@ public class ConfigurationInterpolator static { - Map<String, Lookup> lookups = new HashMap<String, Lookup>(); + Map<String, Lookup> lookups = new HashMap<>(); for (DefaultLookups l : DefaultLookups.values()) { lookups.put(l.getPrefix(), l.getLookup()); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java Mon Apr 10 21:56:46 2017 @@ -57,7 +57,7 @@ public class ConstantLookup implements L private static final char FIELD_SEPRATOR = '.'; /** An internally used cache for already retrieved values. */ - private static Map<String, Object> constantCache = new HashMap<String, Object>(); + private static Map<String, Object> constantCache = new HashMap<>(); /** The logger. */ private final Log log = LogFactory.getLog(getClass()); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java Mon Apr 10 21:56:46 2017 @@ -80,10 +80,10 @@ public final class InterpolatorSpecifica interpolator = builder.interpolator; parentInterpolator = builder.parentInterpolator; prefixLookups = - Collections.unmodifiableMap(new HashMap<String, Lookup>( + Collections.unmodifiableMap(new HashMap<>( builder.prefixLookups)); defaultLookups = - Collections.unmodifiableCollection(new ArrayList<Lookup>( + Collections.unmodifiableCollection(new ArrayList<>( builder.defLookups)); } @@ -156,8 +156,8 @@ public final class InterpolatorSpecifica public Builder() { - prefixLookups = new HashMap<String, Lookup>(); - defLookups = new LinkedList<Lookup>(); + prefixLookups = new HashMap<>(); + defLookups = new LinkedList<>(); } /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java Mon Apr 10 21:56:46 2017 @@ -72,7 +72,7 @@ public class CombinedLocationStrategy im } subStrategies = Collections - .unmodifiableCollection(new ArrayList<FileLocationStrategy>( + .unmodifiableCollection(new ArrayList<>( subs)); if (subStrategies.contains(null)) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java Mon Apr 10 21:56:46 2017 @@ -164,7 +164,7 @@ public class FileHandler /** A collection with the registered listeners. */ private final List<FileHandlerListener> listeners = - new CopyOnWriteArrayList<FileHandlerListener>(); + new CopyOnWriteArrayList<>(); /** * Creates a new instance of {@code FileHandler} which is not associated @@ -216,7 +216,7 @@ public class FileHandler private FileHandler(FileBased obj, FileLocator locator) { content = obj; - fileLocator = new AtomicReference<FileLocator>(locator); + fileLocator = new AtomicReference<>(locator); } /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java Mon Apr 10 21:56:46 2017 @@ -235,7 +235,7 @@ public class PropertyListConfiguration e out.print(padding + quoteString(node.getNodeName()) + " = "); } - List<ImmutableNode> children = new ArrayList<ImmutableNode>(node.getChildren()); + List<ImmutableNode> children = new ArrayList<>(node.getChildren()); if (!children.isEmpty()) { // skip a line, except for the root dictionary @@ -471,7 +471,7 @@ public class PropertyListConfiguration e */ private static Map<String, Object> transformMap(Map<?, ?> src) { - Map<String, Object> dest = new HashMap<String, Object>(); + Map<String, Object> dest = new HashMap<>(); for (Map.Entry<?, ?> e : src.entrySet()) { if (e.getKey() instanceof String) Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Mon Apr 10 21:56:46 2017 @@ -452,7 +452,7 @@ public class XMLPropertyListConfiguratio */ private static Map<String, Object> transformMap(Map<?, ?> src) { - Map<String, Object> dest = new HashMap<String, Object>(); + Map<String, Object> dest = new HashMap<>(); for (Map.Entry<?, ?> e : src.entrySet()) { if (e.getKey() instanceof String) @@ -472,7 +472,7 @@ public class XMLPropertyListConfiguratio private final StringBuilder buffer = new StringBuilder(); /** The stack of configuration nodes */ - private final List<PListNodeBuilder> stack = new ArrayList<PListNodeBuilder>(); + private final List<PListNodeBuilder> stack = new ArrayList<>(); /** The builder for the resulting node. */ private final PListNodeBuilder resultBuilder; @@ -679,7 +679,7 @@ public class XMLPropertyListConfiguratio /** A collection with child builders of this builder. */ private final Collection<PListNodeBuilder> childBuilders = - new LinkedList<PListNodeBuilder>(); + new LinkedList<>(); /** The name of the represented node. */ private String name; @@ -710,7 +710,7 @@ public class XMLPropertyListConfiguratio } else { - List<Object> list = new ArrayList<Object>(); + List<Object> list = new ArrayList<>(); list.add(value); list.add(v); value = list; @@ -872,7 +872,7 @@ public class XMLPropertyListConfiguratio private static class ArrayNodeBuilder extends PListNodeBuilder { /** The list of values in the array. */ - private final List<Object> list = new ArrayList<Object>(); + private final List<Object> list = new ArrayList<>(); /** * Add an object to the array. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java Mon Apr 10 21:56:46 2017 @@ -135,7 +135,7 @@ public class CombinedReloadingController "Collection with sub controllers must not be null!"); } Collection<ReloadingController> ctrls = - new ArrayList<ReloadingController>(subCtrls); + new ArrayList<>(subCtrls); for (ReloadingController rc : ctrls) { if (rc == null) Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java Mon Apr 10 21:56:46 2017 @@ -36,7 +36,7 @@ public class ReloadingEvent extends Even { /** The common event super type for all reloading events. */ public static final EventType<ReloadingEvent> ANY = - new EventType<ReloadingEvent>(Event.ANY, "RELOAD"); + new EventType<>(Event.ANY, "RELOAD"); /** * The serial version UID. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java Mon Apr 10 21:56:46 2017 @@ -38,7 +38,7 @@ import org.xml.sax.SAXException; public class DefaultEntityResolver implements EntityResolver, EntityRegistry { /** Stores a map with the registered public IDs.*/ - private final Map<String, URL> registeredEntities = new HashMap<String, URL>(); + private final Map<String, URL> registeredEntities = new HashMap<>(); /** * <p> Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java Mon Apr 10 21:56:46 2017 @@ -43,7 +43,7 @@ public class ConfigurationPropertySource @Override public String[] getPropertyNames() { - final List<String> keys = new ArrayList<String>(); + final List<String> keys = new ArrayList<>(); final Iterator<String> keysIterator = source.getKeys(); while (keysIterator.hasNext()) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java Mon Apr 10 21:56:46 2017 @@ -73,7 +73,7 @@ abstract class AbstractImmutableNodeHand NodeMatcher<C> matcher, C criterion) { List<ImmutableNode> result = - new ArrayList<ImmutableNode>(node.getChildren().size()); + new ArrayList<>(node.getChildren().size()); for (ImmutableNode c : node.getChildren()) { if (matcher.matches(c, this, criterion)) Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java Mon Apr 10 21:56:46 2017 @@ -186,7 +186,7 @@ public class DefaultExpressionEngine imp public <T> List<QueryResult<T>> query(T root, String key, NodeHandler<T> handler) { - List<QueryResult<T>> results = new LinkedList<QueryResult<T>>(); + List<QueryResult<T>> results = new LinkedList<>(); findNodesForKey(new DefaultConfigurationKey(this, key).iterator(), root, results, handler); return results; @@ -344,7 +344,7 @@ public class DefaultExpressionEngine imp } T parent = findLastPathNode(it, root, handler); - List<String> pathNodes = new LinkedList<String>(); + List<String> pathNodes = new LinkedList<>(); while (it.hasNext()) { @@ -358,7 +358,7 @@ public class DefaultExpressionEngine imp it.next(); } - return new NodeAddData<T>(parent, it.currentKey(), !it.isPropertyKey(), + return new NodeAddData<>(parent, it.currentKey(), !it.isPropertyKey(), pathNodes); } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java Mon Apr 10 21:56:46 2017 @@ -244,7 +244,7 @@ public final class ImmutableNode */ public ImmutableNode setAttribute(String name, Object value) { - Map<String, Object> newAttrs = new HashMap<String, Object>(attributes); + Map<String, Object> newAttrs = new HashMap<>(attributes); newAttrs.put(name, value); return createWithNewAttributes(newAttrs); } @@ -266,7 +266,7 @@ public final class ImmutableNode return this; } - Map<String, Object> newAttrs = new HashMap<String, Object>(attributes); + Map<String, Object> newAttrs = new HashMap<>(attributes); newAttrs.putAll(newAttributes); return createWithNewAttributes(newAttrs); } @@ -281,7 +281,7 @@ public final class ImmutableNode */ public ImmutableNode removeAttribute(String name) { - Map<String, Object> newAttrs = new HashMap<String, Object>(attributes); + Map<String, Object> newAttrs = new HashMap<>(attributes); if (newAttrs.remove(name) != null) { return createWithNewAttributes(newAttrs); @@ -586,7 +586,7 @@ public final class ImmutableNode { if (children == null) { - children = new LinkedList<ImmutableNode>(); + children = new LinkedList<>(); } } @@ -598,7 +598,7 @@ public final class ImmutableNode { if (attributes == null) { - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); } } @@ -612,7 +612,7 @@ public final class ImmutableNode { if (childCount > 0) { - children = new ArrayList<ImmutableNode>(childCount); + children = new ArrayList<>(childCount); } } @@ -627,7 +627,7 @@ public final class ImmutableNode Collection<? extends ImmutableNode> children) { List<ImmutableNode> result = - new ArrayList<ImmutableNode>(children.size()); + new ArrayList<>(children.size()); for (ImmutableNode c : children) { if (c != null) Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java Mon Apr 10 21:56:46 2017 @@ -83,7 +83,7 @@ public class InMemoryNodeModel implement public InMemoryNodeModel(ImmutableNode root) { structure = - new AtomicReference<TreeData>( + new AtomicReference<>( createTreeData(initialRootNode(root), null)); } @@ -300,7 +300,7 @@ public class InMemoryNodeModel implement NodeSelector selector, final NodeKeyResolver<ImmutableNode> resolver) { final List<QueryResult<ImmutableNode>> removedElements = - new LinkedList<QueryResult<ImmutableNode>>(); + new LinkedList<>(); updateModel(new TransactionInitializer() { @Override @@ -553,7 +553,7 @@ public class InMemoryNodeModel implement NodeKeyResolver<ImmutableNode> resolver) { Mutable<Collection<NodeSelector>> refSelectors = - new MutableObject<Collection<NodeSelector>>(); + new MutableObject<>(); boolean done; do { @@ -590,7 +590,7 @@ public class InMemoryNodeModel implement NodeKeyResolver<ImmutableNode> resolver) { Mutable<Collection<NodeSelector>> refSelectors = - new MutableObject<Collection<NodeSelector>>(); + new MutableObject<>(); boolean done; do { @@ -635,7 +635,7 @@ public class InMemoryNodeModel implement String childName, NodeKeyResolver<ImmutableNode> resolver) { MutableObject<NodeSelector> refSelector = - new MutableObject<NodeSelector>(); + new MutableObject<>(); boolean done; do @@ -980,7 +980,7 @@ public class InMemoryNodeModel implement private static Collection<ImmutableNode> createNodesToAdd( String newNodeName, Iterable<?> values) { - Collection<ImmutableNode> nodes = new LinkedList<ImmutableNode>(); + Collection<ImmutableNode> nodes = new LinkedList<>(); for (Object value : values) { nodes.add(new ImmutableNode.Builder().name(newNodeName) @@ -1139,7 +1139,7 @@ public class InMemoryNodeModel implement ImmutableNode root) { Map<ImmutableNode, ImmutableNode> parents = - new HashMap<ImmutableNode, ImmutableNode>(); + new HashMap<>(); updateParentMapping(parents, root); return parents; } @@ -1289,8 +1289,8 @@ public class InMemoryNodeModel implement NodeKeyResolver<ImmutableNode> resolver) { List<NodeSelector> selectors = - new ArrayList<NodeSelector>(nodes.size()); - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + new ArrayList<>(nodes.size()); + Map<ImmutableNode, String> cache = new HashMap<>(); for (ImmutableNode node : nodes) { selectors.add(new NodeSelector(resolver.nodeKey(node, cache, Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java Mon Apr 10 21:56:46 2017 @@ -61,7 +61,7 @@ public class MergeCombiner extends NodeC addAttributes(result, node1, node2); // Check if nodes can be combined - List<ImmutableNode> children2 = new LinkedList<ImmutableNode>(node2.getChildren()); + List<ImmutableNode> children2 = new LinkedList<>(node2.getChildren()); for (ImmutableNode child1 : node1.getChildren()) { ImmutableNode child2 = canCombine(node2, child1, children2); @@ -97,7 +97,7 @@ public class MergeCombiner extends NodeC protected void addAttributes(ImmutableNode.Builder result, ImmutableNode node1, ImmutableNode node2) { - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.putAll(node1.getAttributes()); for (Map.Entry<String, Object> e : node2.getAttributes().entrySet()) { @@ -123,7 +123,7 @@ public class MergeCombiner extends NodeC ImmutableNode child, List<ImmutableNode> children2) { Map<String, Object> attrs1 = child.getAttributes(); - List<ImmutableNode> nodes = new ArrayList<ImmutableNode>(); + List<ImmutableNode> nodes = new ArrayList<>(); List<ImmutableNode> children = HANDLER.getChildren(node2, child.getNodeName()); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java Mon Apr 10 21:56:46 2017 @@ -140,12 +140,12 @@ class ModelTransaction currentData = treeData; this.resolver = resolver; replacementMapping = getCurrentData().copyReplacementMapping(); - replacedNodes = new HashMap<ImmutableNode, ImmutableNode>(); + replacedNodes = new HashMap<>(); parentMapping = getCurrentData().copyParentMapping(); - operations = new TreeMap<Integer, Map<ImmutableNode, Operations>>(); - addedNodes = new LinkedList<ImmutableNode>(); - removedNodes = new LinkedList<ImmutableNode>(); - allRemovedNodes = new LinkedList<ImmutableNode>(); + operations = new TreeMap<>(); + addedNodes = new LinkedList<>(); + removedNodes = new LinkedList<>(); + allRemovedNodes = new LinkedList<>(); queryRoot = initQueryRoot(treeData, selector); rootNodeSelector = selector; } @@ -365,7 +365,7 @@ class ModelTransaction operations.get(nodeLevel); if (levelOperations == null) { - levelOperations = new HashMap<ImmutableNode, Operations>(); + levelOperations = new HashMap<>(); operations.put(nodeLevel, levelOperations); } Operations ops = levelOperations.get(target); @@ -545,7 +545,7 @@ class ModelTransaction { if (newReferences == null) { - newReferences = new HashMap<ImmutableNode, Object>(); + newReferences = new HashMap<>(); } return newReferences; } @@ -775,7 +775,7 @@ class ModelTransaction Map<ImmutableNode, ImmutableNode> replacements = fetchReplacementMap(); Set<ImmutableNode> removals = fetchRemovalSet(); - List<ImmutableNode> resultNodes = new LinkedList<ImmutableNode>(); + List<ImmutableNode> resultNodes = new LinkedList<>(); for (ImmutableNode nd : target.getChildren()) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java Mon Apr 10 21:56:46 2017 @@ -149,7 +149,7 @@ public class NodeAddData<T> } else { - return Collections.unmodifiableList(new ArrayList<String>( + return Collections.unmodifiableList(new ArrayList<>( intermediateNodes)); } } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java Mon Apr 10 21:56:46 2017 @@ -66,7 +66,7 @@ public abstract class NodeCombiner */ public NodeCombiner() { - listNodes = new HashSet<String>(); + listNodes = new HashSet<>(); } /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java Mon Apr 10 21:56:46 2017 @@ -88,7 +88,7 @@ public class NodeSelector NodeKeyResolver<ImmutableNode> resolver, NodeHandler<ImmutableNode> handler) { - List<ImmutableNode> nodes = new LinkedList<ImmutableNode>(); + List<ImmutableNode> nodes = new LinkedList<>(); Iterator<String> itKeys = nodeKeys.iterator(); getFilteredResults(root, resolver, handler, itKeys.next(), nodes); @@ -96,7 +96,7 @@ public class NodeSelector { String currentKey = itKeys.next(); List<ImmutableNode> currentResults = - new LinkedList<ImmutableNode>(); + new LinkedList<>(); for (ImmutableNode currentRoot : nodes) { getFilteredResults(currentRoot, resolver, handler, currentKey, @@ -119,7 +119,7 @@ public class NodeSelector */ public NodeSelector subSelector(String subKey) { - List<String> keys = new ArrayList<String>(nodeKeys.size() + 1); + List<String> keys = new ArrayList<>(nodeKeys.size() + 1); keys.addAll(nodeKeys); keys.add(subKey); return new NodeSelector(keys); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java Mon Apr 10 21:56:46 2017 @@ -105,7 +105,7 @@ class NodeTracker NodeHandler<ImmutableNode> handler) { Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(trackedNodes); + new HashMap<>(trackedNodes); TrackedNodeData trackData = newState.get(selector); newState.put( selector, @@ -126,7 +126,7 @@ class NodeTracker Collection<ImmutableNode> nodes) { Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(trackedNodes); + new HashMap<>(trackedNodes); Iterator<ImmutableNode> itNodes = nodes.iterator(); for (NodeSelector selector : selectors) { @@ -161,7 +161,7 @@ class NodeTracker TrackedNodeData trackData = getTrackedNodeData(selector); Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(trackedNodes); + new HashMap<>(trackedNodes); TrackedNodeData newTrackData = trackData.observerRemoved(); if (newTrackData == null) { @@ -249,7 +249,7 @@ class NodeTracker } Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(); + new HashMap<>(); for (Map.Entry<NodeSelector, TrackedNodeData> e : trackedNodes .entrySet()) { @@ -278,7 +278,7 @@ class NodeTracker } Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(); + new HashMap<>(); for (Map.Entry<NodeSelector, TrackedNodeData> e : trackedNodes .entrySet()) { @@ -304,7 +304,7 @@ class NodeTracker ImmutableNode newNode) { Map<NodeSelector, TrackedNodeData> newState = - new HashMap<NodeSelector, TrackedNodeData>(trackedNodes); + new HashMap<>(trackedNodes); newState.put(selector, getTrackedNodeData(selector).detach(newNode)); return new NodeTracker(newState); } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java Mon Apr 10 21:56:46 2017 @@ -140,7 +140,7 @@ public class NodeTreeWalker private static <T> void bfs(T root, ConfigurationNodeVisitor<T> visitor, NodeHandler<T> handler) { - List<T> pendingNodes = new LinkedList<T>(); + List<T> pendingNodes = new LinkedList<>(); pendingNodes.add(root); boolean cancel = false; Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java Mon Apr 10 21:56:46 2017 @@ -141,7 +141,7 @@ public class NodeUpdateData<T> } else { - return Collections.unmodifiableMap(new HashMap<K, V>(map)); + return Collections.unmodifiableMap(new HashMap<>(map)); } } @@ -161,7 +161,7 @@ public class NodeUpdateData<T> } else { - return Collections.unmodifiableCollection(new ArrayList<T>(col)); + return Collections.unmodifiableCollection(new ArrayList<>(col)); } } } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java Mon Apr 10 21:56:46 2017 @@ -72,7 +72,7 @@ public final class QueryResult<T> */ public static <T> QueryResult<T> createNodeResult(T resultNode) { - return new QueryResult<T>(resultNode, null); + return new QueryResult<>(resultNode, null); } /** @@ -88,7 +88,7 @@ public final class QueryResult<T> public static <T> QueryResult<T> createAttributeResult(T parentNode, String attrName) { - return new QueryResult<T>(parentNode, attrName); + return new QueryResult<>(parentNode, attrName); } /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java Mon Apr 10 21:56:46 2017 @@ -97,7 +97,7 @@ class ReferenceTracker public ReferenceTracker addReferences(Map<ImmutableNode, ?> refs) { Map<ImmutableNode, Object> newRefs = - new HashMap<ImmutableNode, Object>(references); + new HashMap<>(references); newRefs.putAll(refs); return new ReferenceTracker(newRefs, removedReferences); } @@ -128,7 +128,7 @@ class ReferenceTracker if (newRefs == null) { newRefs = - new HashMap<ImmutableNode, Object>(references); + new HashMap<>(references); } newRefs.put(e.getValue(), ref); newRefs.remove(e.getKey()); @@ -136,7 +136,7 @@ class ReferenceTracker } List<Object> newRemovedRefs = - (newRefs != null) ? new LinkedList<Object>( + (newRefs != null) ? new LinkedList<>( removedReferences) : null; for (ImmutableNode node : removedNodes) { @@ -146,13 +146,13 @@ class ReferenceTracker if (newRefs == null) { newRefs = - new HashMap<ImmutableNode, Object>(references); + new HashMap<>(references); } newRefs.remove(node); if (newRemovedRefs == null) { newRemovedRefs = - new LinkedList<Object>(removedReferences); + new LinkedList<>(removedReferences); } newRemovedRefs.add(ref); } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java Mon Apr 10 21:56:46 2017 @@ -136,7 +136,7 @@ class TreeData extends AbstractImmutable */ public Map<ImmutableNode, ImmutableNode> copyParentMapping() { - return new HashMap<ImmutableNode, ImmutableNode>(parentMapping); + return new HashMap<>(parentMapping); } /** @@ -146,7 +146,7 @@ class TreeData extends AbstractImmutable */ public Map<ImmutableNode, ImmutableNode> copyReplacementMapping() { - return new HashMap<ImmutableNode, ImmutableNode>(replacementMapping); + return new HashMap<>(replacementMapping); } /** @@ -234,7 +234,7 @@ class TreeData extends AbstractImmutable Map<ImmutableNode, ImmutableNode> replacements) { Map<ImmutableNode, ImmutableNode> inverseMapping = - new HashMap<ImmutableNode, ImmutableNode>(); + new HashMap<>(); for (Map.Entry<ImmutableNode, ImmutableNode> e : replacements .entrySet()) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java Mon Apr 10 21:56:46 2017 @@ -134,7 +134,7 @@ public class UnionCombiner extends NodeC result.addAttributes(node1.getAttributes()); // Check if nodes can be combined - List<ImmutableNode> children2 = new LinkedList<ImmutableNode>(node2.getChildren()); + List<ImmutableNode> children2 = new LinkedList<>(node2.getChildren()); for (ImmutableNode child1 : node1.getChildren()) { ImmutableNode child2 = findCombineNode(node1, node2, child1 Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java Mon Apr 10 21:56:46 2017 @@ -65,7 +65,7 @@ class ConfigurationNodeIteratorAttribute @Override protected NodePointer createNodePointer(int position) { - return new ConfigurationAttributePointer<T>(parentPointer, + return new ConfigurationAttributePointer<>(parentPointer, attributeNames.get(position)); } @@ -91,7 +91,7 @@ class ConfigurationNodeIteratorAttribute private List<String> createAttributeDataList( ConfigurationNodePointer<T> parent, QName name) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); if (!WILDCARD.equals(name.getName())) { addAttributeData(parent, result, qualifiedName(name)); @@ -99,7 +99,7 @@ class ConfigurationNodeIteratorAttribute else { Set<String> names = - new LinkedHashSet<String>(parent.getNodeHandler() + new LinkedHashSet<>(parent.getNodeHandler() .getAttributes(parent.getConfigurationNode())); String prefix = (name.getPrefix() != null) ? prefixName(name.getPrefix(), Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java Mon Apr 10 21:56:46 2017 @@ -83,7 +83,7 @@ class ConfigurationNodeIteratorChildren< @Override protected NodePointer createNodePointer(int position) { - return new ConfigurationNodePointer<T>(getParent(), subNodes + return new ConfigurationNodePointer<>(getParent(), subNodes .get(position), getNodeHandler()); } @@ -149,7 +149,7 @@ class ConfigurationNodeIteratorChildren< private List<T> createSubNodeListForName(T node, QName name) { String compareName = qualifiedName(name); - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); for (T child : getNodeHandler().getChildren(node)) { if (StringUtils.equals(compareName, getNodeHandler() @@ -178,7 +178,7 @@ class ConfigurationNodeIteratorChildren< } else { - List<T> prefixChildren = new ArrayList<T>(children.size()); + List<T> prefixChildren = new ArrayList<>(children.size()); String prefix = prefixName(name.getPrefix(), null); for (T child : children) { Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java Mon Apr 10 21:56:46 2017 @@ -224,7 +224,7 @@ class ConfigurationNodePointer<T> extend @Override public NodeIterator attributeIterator(QName name) { - return new ConfigurationNodeIteratorAttribute<T>(this, name); + return new ConfigurationNodeIteratorAttribute<>(this, name); } /** @@ -239,7 +239,7 @@ class ConfigurationNodePointer<T> extend public NodeIterator childIterator(NodeTest test, boolean reverse, NodePointer startWith) { - return new ConfigurationNodeIteratorChildren<T>(this, test, reverse, + return new ConfigurationNodeIteratorChildren<>(this, test, reverse, castPointer(startWith)); } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java Mon Apr 10 21:56:46 2017 @@ -123,7 +123,7 @@ public class ConfigurationNodePointerFac */ public static <T> Object wrapNode(T node, NodeHandler<T> handler) { - return new NodeWrapper<T>(node, handler); + return new NodeWrapper<>(node, handler); } /** Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java Mon Apr 10 21:56:46 2017 @@ -359,7 +359,7 @@ public class XPathExpressionEngine imple { invalidPath(path, " cannot add properties to an attribute."); } - List<String> pathNodes = new LinkedList<String>(); + List<String> pathNodes = new LinkedList<>(); String lastComponent = null; boolean attr = false; boolean first = true; @@ -417,7 +417,7 @@ public class XPathExpressionEngine imple invalidPath(path, "contains no components."); } - return new NodeAddData<T>(parentNodeResult.getNode(), lastComponent, + return new NodeAddData<>(parentNodeResult.getNode(), lastComponent, attr, pathNodes); } @@ -521,7 +521,7 @@ public class XPathExpressionEngine imple private static <T> List<QueryResult<T>> convertResults(List<?> results) { List<QueryResult<T>> queryResults = - new ArrayList<QueryResult<T>>(results.size()); + new ArrayList<>(results.size()); for (Object res : results) { QueryResult<T> queryResult = createResult(res); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java Mon Apr 10 21:56:46 2017 @@ -64,7 +64,7 @@ public class ServletRequestConfiguration else { // ensure that escape characters in all list elements are removed - List<Object> result = new ArrayList<Object>(values.length); + List<Object> result = new ArrayList<>(values.length); for (String value : values) { Object val = handleDelimiters(value); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java Mon Apr 10 21:56:46 2017 @@ -152,7 +152,7 @@ public class ConfigurationAssert */ public static List<String> keysToList(ImmutableConfiguration config) { - List<String> keyList = new LinkedList<String>(); + List<String> keyList = new LinkedList<>(); appendKeys(config, keyList); return keyList; } @@ -165,7 +165,7 @@ public class ConfigurationAssert */ public static Set<String> keysToSet(ImmutableConfiguration config) { - Set<String> keySet = new HashSet<String>(); + Set<String> keySet = new HashSet<>(); appendKeys(config, keySet); return keySet; } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java Mon Apr 10 21:56:46 2017 @@ -179,7 +179,7 @@ public class DatabaseConfigurationTestHe public <T extends DatabaseConfiguration> T createConfig(Class<T> configCls, DatabaseBuilderParameters params) throws ConfigurationException { - return new BasicConfigurationBuilder<T>(configCls).configure(params) + return new BasicConfigurationBuilder<>(configCls).configure(params) .getConfiguration(); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java Mon Apr 10 21:56:46 2017 @@ -103,7 +103,7 @@ public abstract class TestAbstractConfig List<Object> list = config.getList("key3"); assertNotNull("no list found for the 'key3' property", list); - List<Object> expected = new ArrayList<Object>(); + List<Object> expected = new ArrayList<>(); expected.add("value3"); expected.add("value4"); expected.add("value5"); @@ -153,7 +153,7 @@ public abstract class TestAbstractConfig Configuration config = getConfiguration(); Iterator<String> keys = config.getKeys(); - List<String> expectedKeys = new ArrayList<String>(); + List<String> expectedKeys = new ArrayList<>(); expectedKeys.add("key1"); expectedKeys.add("key2"); expectedKeys.add("list"); @@ -162,7 +162,7 @@ public abstract class TestAbstractConfig assertNotNull("null iterator", keys); assertTrue("empty iterator", keys.hasNext()); - List<String> actualKeys = new ArrayList<String>(); + List<String> actualKeys = new ArrayList<>(); while (keys.hasNext()) { actualKeys.add(keys.next()); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java Mon Apr 10 21:56:46 2017 @@ -75,7 +75,7 @@ public class TestAbstractConfigurationBa @Override protected Iterator<String> getKeysInternal() { - Collection<String> keyCol = new ArrayList<String>(); + Collection<String> keyCol = new ArrayList<>(); ConfigurationAssert.appendKeys(getUnderlyingConfiguration(), keyCol); String[] keys = keyCol.toArray(new String[keyCol.size()]); return Arrays.asList(keys).iterator(); @@ -338,7 +338,7 @@ public class TestAbstractConfigurationBa AbstractConfiguration config = new TestConfigurationImpl(new PropertiesConfiguration()); int count = config.getInterpolator().getLookups().size(); - Map<String, Lookup> lookups = new HashMap<String, Lookup>(); + Map<String, Lookup> lookups = new HashMap<>(); lookups.put("test", look); config.setPrefixLookups(lookups); Map<String, Lookup> lookups2 = config.getInterpolator().getLookups(); @@ -874,7 +874,7 @@ public class TestAbstractConfigurationBa */ private static List<Integer> prepareListTest(PropertiesConfiguration config) { - List<Integer> expected = new ArrayList<Integer>(PROP_COUNT); + List<Integer> expected = new ArrayList<>(PROP_COUNT); for (int i = 0; i < PROP_COUNT; i++) { config.addProperty(KEY_PREFIX, String.valueOf(i)); @@ -926,7 +926,7 @@ public class TestAbstractConfigurationBa { PropertiesConfiguration config = new PropertiesConfiguration(); List<Integer> expected = prepareListTest(config); - List<Integer> result = new ArrayList<Integer>(PROP_COUNT); + List<Integer> result = new ArrayList<>(PROP_COUNT); assertSame("Wrong result", result, config.getCollection(Integer.class, KEY_PREFIX, result)); assertEquals("Wrong converted content", expected, result); } @@ -951,7 +951,7 @@ public class TestAbstractConfigurationBa { PropertiesConfiguration config = new PropertiesConfiguration(); config.addProperty(KEY_PREFIX, "1"); - List<Integer> result = new ArrayList<Integer>(1); + List<Integer> result = new ArrayList<>(1); config.getCollection(Integer.class, KEY_PREFIX, result); assertEquals("Wrong number of elements", 1, result.size()); assertEquals("Wrong element", Integer.valueOf(1), result.get(0)); @@ -965,7 +965,7 @@ public class TestAbstractConfigurationBa public void testGetCollectionUnknownNoDefault() { PropertiesConfiguration config = new PropertiesConfiguration(); - List<Integer> result = new ArrayList<Integer>(); + List<Integer> result = new ArrayList<>(); assertNull("Wrong result", config.getCollection(Integer.class, KEY_PREFIX, result)); assertTrue("Got elements", result.isEmpty()); } @@ -1135,7 +1135,7 @@ public class TestAbstractConfigurationBa private void checkCopyEvents(CollectingConfigurationListener l, Configuration src, EventType<?> eventType) { - Map<String, ConfigurationEvent> events = new HashMap<String, ConfigurationEvent>(); + Map<String, ConfigurationEvent> events = new HashMap<>(); for (ConfigurationEvent e : l.events) { assertEquals("Wrong event type", eventType, e.getEventType()); @@ -1226,7 +1226,7 @@ public class TestAbstractConfigurationBa private static class CollectingConfigurationListener implements EventListener<ConfigurationEvent> { - final List<ConfigurationEvent> events = new ArrayList<ConfigurationEvent>(); + final List<ConfigurationEvent> events = new ArrayList<>(); @Override public void onEvent(ConfigurationEvent event) Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java Mon Apr 10 21:56:46 2017 @@ -315,7 +315,7 @@ public class TestAbstractHierarchicalCon @Test public void testGetKeys() { - List<String> keys = new ArrayList<String>(); + List<String> keys = new ArrayList<>(); for (Iterator<String> it = config.getKeys(); it.hasNext();) { keys.add(it.next()); @@ -349,7 +349,7 @@ public class TestAbstractHierarchicalCon public void testGetKeysAttribute() { config.addProperty("tables.table(0)[@type]", "system"); - Set<String> keys = new HashSet<String>(); + Set<String> keys = new HashSet<>(); for (Iterator<String> it = config.getKeys(); it.hasNext();) { keys.add(it.next()); @@ -559,7 +559,7 @@ public class TestAbstractHierarchicalCon @Test public void testAddNodes() { - Collection<ImmutableNode> nodes = new ArrayList<ImmutableNode>(); + Collection<ImmutableNode> nodes = new ArrayList<>(); nodes.add(NodeStructureHelper.createFieldNode("birthDate")); nodes.add(NodeStructureHelper.createFieldNode("lastLogin")); nodes.add(NodeStructureHelper.createFieldNode("language")); @@ -577,7 +577,7 @@ public class TestAbstractHierarchicalCon @Test public void testAddNodesForNonExistingKey() { - Collection<ImmutableNode> nodes = new ArrayList<ImmutableNode>(); + Collection<ImmutableNode> nodes = new ArrayList<>(); ImmutableNode newNode = new ImmutableNode.Builder().name("usr").value("scott") .addAttribute("pwd", "tiger").create(); @@ -597,7 +597,7 @@ public class TestAbstractHierarchicalCon @Test(expected = IllegalArgumentException.class) public void testAddNodesWithAttributeKey() { - Collection<ImmutableNode> nodes = new ArrayList<ImmutableNode>(); + Collection<ImmutableNode> nodes = new ArrayList<>(); nodes.add(NodeStructureHelper.createNode("testNode", "yes")); config.addNodes("database.connection[@settings]", nodes); } @@ -854,7 +854,7 @@ public class TestAbstractHierarchicalCon @Test public void testNodeKeyEmptyCache() { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); ImmutableNode nodeTabName = NodeStructureHelper.nodeForKey(getRootNode(), "tables/table(0)/name"); @@ -876,7 +876,7 @@ public class TestAbstractHierarchicalCon @Test public void testNodeKeyCachePopulated() { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); ImmutableNode nodeTabName = NodeStructureHelper.nodeForKey(getRootNode(), "tables/table(0)/name"); @@ -898,7 +898,7 @@ public class TestAbstractHierarchicalCon @Test public void testNodeKeyCacheUsage() { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); ImmutableNode nodeTabName = NodeStructureHelper.nodeForKey(getRootNode(), "tables/table(0)/name"); @@ -914,7 +914,7 @@ public class TestAbstractHierarchicalCon @Test public void testNodeKeyRootNode() { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); assertEquals("Wrong root node key", "", config.nodeKey(getRootNode(), cache, config.getModel() .getNodeHandler())); @@ -926,7 +926,7 @@ public class TestAbstractHierarchicalCon @Test public void testNodeKeyCacheHit() { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); final String key = "someResultKey"; cache.put(getRootNode(), key); assertEquals("Wrong result", key, config.nodeKey(getRootNode(), @@ -962,7 +962,7 @@ public class TestAbstractHierarchicalCon */ private void checkKeys(String prefix, String[] expected) { - Set<String> values = new HashSet<String>(); + Set<String> values = new HashSet<>(); for (String anExpected : expected) { values.add((anExpected.startsWith(prefix)) ? anExpected : prefix + "." + anExpected); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java Mon Apr 10 21:56:46 2017 @@ -337,7 +337,7 @@ public class TestBaseConfiguration config.addProperty("array", "${number}"); config.addProperty("array", "${number}"); - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); list.add("1"); list.add("1"); @@ -396,7 +396,7 @@ public class TestBaseConfiguration @Test public void testAddProperty() throws Exception { - Collection<Object> props = new ArrayList<Object>(); + Collection<Object> props = new ArrayList<>(); props.add("one"); props.add("two,three,four"); props.add(new String[] { "5.1", "5.2", "5.3,5.4", "5.5" }); @@ -408,7 +408,7 @@ public class TestBaseConfiguration Collection<?> col = (Collection<?>) val; assertEquals(10, col.size()); - props = new ArrayList<Object>(); + props = new ArrayList<>(); props.add("quick"); props.add("brown"); props.add("fox,jumps"); @@ -600,9 +600,9 @@ public class TestBaseConfiguration Lookup prefixLookup = EasyMock.createMock(Lookup.class); Lookup defLookup = EasyMock.createMock(Lookup.class); EasyMock.replay(prefixLookup, defLookup); - Map<String, Lookup> prefixLookups = new HashMap<String, Lookup>(); + Map<String, Lookup> prefixLookups = new HashMap<>(); prefixLookups.put("test", prefixLookup); - List<Lookup> defLookups = new ArrayList<Lookup>(); + List<Lookup> defLookups = new ArrayList<>(); defLookups.add(defLookup); config.installInterpolator(prefixLookups, defLookups); ConfigurationInterpolator interpolator = config.getInterpolator(); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java Mon Apr 10 21:56:46 2017 @@ -268,14 +268,14 @@ public class TestBaseHierarchicalConfigu throws ConfigurationException { FileBasedConfigurationBuilder<XMLConfiguration> builder = - new FileBasedConfigurationBuilder<XMLConfiguration>( + new FileBasedConfigurationBuilder<>( XMLConfiguration.class); builder.configure(new Parameters().fileBased().setFile(testFile)); config = builder.getConfiguration(); CountDownLatch startLatch = new CountDownLatch(1); Collection<SubNodeAccessThread> threads = - new ArrayList<SubNodeAccessThread>(); + new ArrayList<>(); for (int i = 0; i < 4; i++) { SubNodeAccessThread t = Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java Mon Apr 10 21:56:46 2017 @@ -1014,7 +1014,7 @@ public class TestCombinedConfiguration final int writeCount = 3000; CountDownLatch latch = new CountDownLatch(1); AtomicInteger errorCount = new AtomicInteger(); - Collection<Thread> threads = new ArrayList<Thread>(numberOfReaders + 1); + Collection<Thread> threads = new ArrayList<>(numberOfReaders + 1); Thread writeThread = new WriteThread(config, latch, errorCount, writeCount); writeThread.start();
