Misc clean ups.
- else { if } -> else if
- new kind of Number() -> valueOf()
- String replaceAll(S,S) -> replace(CS,CS)
- Initialize collections on creation
- Use diamonds
- Create arrays with {}s.diff --git a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
index 27585de..e2a3b07 100644
--- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
@@ -106,28 +106,28 @@
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
/** Empty array constant. */
- private static final URL[] EMPTY_URL_ARRAY = new URL[0];
+ private static final URL[] EMPTY_URL_ARRAY = {};
/** Empty array constant. */
- private static final URI[] EMPTY_URI_ARRAY = new URI[0];
+ private static final URI[] EMPTY_URI_ARRAY = {};
/** Empty array constant. */
- private static final Locale[] EMPTY_LOCALE_ARRAY = new Locale[0];
+ private static final Locale[] EMPTY_LOCALE_ARRAY = {};
/** Empty array constant. */
- private static final Date[] EMPTY_DATE_ARRAY = new Date[0];
+ private static final Date[] EMPTY_DATE_ARRAY = {};
/** Empty array constant. */
- private static final Color[] EMPTY_COLOR_ARRAY = new Color[0];
+ private static final Color[] EMPTY_COLOR_ARRAY = {};
/** Empty array constant. */
- private static final Calendar[] EMPTY_CALENDARD_ARRAY = new Calendar[0];
+ private static final Calendar[] EMPTY_CALENDARD_ARRAY = {};
/** Empty array constant. */
- private static final BigInteger[] EMPTY_BIG_INTEGER_ARRAY = new BigInteger[0];
+ private static final BigInteger[] EMPTY_BIG_INTEGER_ARRAY = {};
/** Empty array constant. */
- private static final BigDecimal[] EMPTY_BIG_DECIMAL_ARRAY = new BigDecimal[0];
+ private static final BigDecimal[] EMPTY_BIG_DECIMAL_ARRAY = {};
/** Stores temporary date formats. */
private static final ThreadLocal<String> TEMP_DATE_FORMAT = new ThreadLocal<>();
@@ -238,7 +238,7 @@
*/
public List<Boolean> getBooleanList(final String key)
{
- return getBooleanList(key, new ArrayList<Boolean>());
+ return getBooleanList(key, new ArrayList<>());
}
/**
@@ -303,7 +303,7 @@
*/
public List<Byte> getByteList(final String key)
{
- return getByteList(key, new ArrayList<Byte>());
+ return getByteList(key, new ArrayList<>());
}
/**
@@ -368,7 +368,7 @@
*/
public List<Short> getShortList(final String key)
{
- return getShortList(key, new ArrayList<Short>());
+ return getShortList(key, new ArrayList<>());
}
/**
@@ -434,7 +434,7 @@
*/
public List<Integer> getIntegerList(final String key)
{
- return getIntegerList(key, new ArrayList<Integer>());
+ return getIntegerList(key, new ArrayList<>());
}
/**
@@ -499,7 +499,7 @@
*/
public List<Long> getLongList(final String key)
{
- return getLongList(key, new ArrayList<Long>());
+ return getLongList(key, new ArrayList<>());
}
/**
@@ -564,7 +564,7 @@
*/
public List<Float> getFloatList(final String key)
{
- return getFloatList(key, new ArrayList<Float>());
+ return getFloatList(key, new ArrayList<>());
}
/**
@@ -630,7 +630,7 @@
*/
public List<Double> getDoubleList(final String key)
{
- return getDoubleList(key, new ArrayList<Double>());
+ return getDoubleList(key, new ArrayList<>());
}
/**
@@ -695,7 +695,7 @@
*/
public List<BigInteger> getBigIntegerList(final String key)
{
- return getBigIntegerList(key, new ArrayList<BigInteger>());
+ return getBigIntegerList(key, new ArrayList<>());
}
/**
@@ -760,7 +760,7 @@
*/
public List<BigDecimal> getBigDecimalList(final String key)
{
- return getBigDecimalList(key, new ArrayList<BigDecimal>());
+ return getBigDecimalList(key, new ArrayList<>());
}
/**
@@ -887,7 +887,7 @@
*/
public List<URI> getURIList(final String key)
{
- return getURIList(key, new ArrayList<URI>());
+ return getURIList(key, new ArrayList<>());
}
/**
@@ -950,7 +950,7 @@
*/
public List<URL> getURLList(final String key)
{
- return getURLList(key, new ArrayList<URL>());
+ return getURLList(key, new ArrayList<>());
}
/**
@@ -1091,7 +1091,7 @@
public List<Date> getDateList(final String key)
{
- return getDateList(key, new ArrayList<Date>());
+ return getDateList(key, new ArrayList<>());
}
/**
@@ -1109,7 +1109,7 @@
*/
public List<Date> getDateList(final String key, final String format)
{
- return getDateList(key, new ArrayList<Date>(), format);
+ return getDateList(key, new ArrayList<>(), format);
}
/**
@@ -1345,7 +1345,7 @@
*/
public List<Calendar> getCalendarList(final String key)
{
- return getCalendarList(key, new ArrayList<Calendar>());
+ return getCalendarList(key, new ArrayList<>());
}
/**
@@ -1363,7 +1363,7 @@
*/
public List<Calendar> getCalendarList(final String key, final String format)
{
- return getCalendarList(key, new ArrayList<Calendar>(), format);
+ return getCalendarList(key, new ArrayList<>(), format);
}
/**
@@ -1549,7 +1549,7 @@
*/
public List<Locale> getLocaleList(final String key)
{
- return getLocaleList(key, new ArrayList<Locale>());
+ return getLocaleList(key, new ArrayList<>());
}
/**
@@ -1645,7 +1645,7 @@
*/
public List<Color> getColorList(final String key)
{
- return getColorList(key, new ArrayList<Color>());
+ return getColorList(key, new ArrayList<>());
}
/**
diff --git a/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java b/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java
index 53acd57..2a2f087 100644
--- a/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java
@@ -48,7 +48,7 @@
*/
public EnvironmentConfiguration()
{
- super(new HashMap<String, Object>(System.getenv()));
+ super(new HashMap<>(System.getenv()));
}
/**
diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index d01f9c3..4ecf888 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -664,17 +664,13 @@
result.append(c);
}
+ } else if (isCommentChar(c) && Character.isWhitespace(lastChar))
+ {
+ stop = true;
}
else
{
- if (isCommentChar(c) && Character.isWhitespace(lastChar))
- {
- stop = true;
- }
- else
- {
- result.append(c);
- }
+ result.append(c);
}
i++;
@@ -874,7 +870,7 @@
if (quoted)
{
- return '"' + value.replaceAll("\"", "\\\\\\\"") + '"';
+ return '"' + value.replace("\"", "\\\"") + '"';
}
return value;
}
@@ -934,14 +930,10 @@
{
inSection = true;
sections.add(node.getNodeName());
- }
- else
+ } else if (!inSection && !globalSection)
{
- if (!inSection && !globalSection)
- {
- globalSection = true;
- sections.add(null);
- }
+ globalSection = true;
+ sections.add(null);
}
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
index 994237c..71723d7 100644
--- a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
@@ -205,7 +205,7 @@
final Set<String> keys = new HashSet<>();
if (context != null)
{
- recursiveGetKeys(keys, context, prefix, new HashSet<Context>());
+ recursiveGetKeys(keys, context, prefix, new HashSet<>());
}
else if (containsKey(prefix))
{
@@ -352,7 +352,7 @@
{
return false;
}
- key = key.replaceAll("\\.", "/");
+ key = key.replace('.', '/');
try
{
// throws a NamingException if JNDI doesn't contain the key.
@@ -410,7 +410,7 @@
try
{
- key = key.replaceAll("\\.", "/");
+ key = key.replace('.', '/');
return getBaseContext().lookup(key);
}
catch (final NameNotFoundException | NotContextException nctxex)
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 60b16ef..e557e82 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1206,10 +1206,10 @@
private static String includeOptional = "includeoptional";
/** The list of possible key/value separators */
- private static final char[] SEPARATORS = new char[] {'=', ':'};
+ private static final char[] SEPARATORS = {'=', ':'};
/** The white space characters used as key/value separators. */
- private static final char[] WHITE_SPACE = new char[]{' ', '\t', '\f'};
+ private static final char[] WHITE_SPACE = {' ', '\t', '\f'};
/** Constant for the platform specific line separator.*/
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
index ae0e6d6..540f305 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
@@ -89,7 +89,7 @@
/** Stores a map with the registered bean factories. */
private final Map<String, BeanFactory> beanFactories = Collections
- .synchronizedMap(new HashMap<String, BeanFactory>());
+ .synchronizedMap(new HashMap<>());
/**
* Stores the default bean factory, which is used if no other factory
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
index cfdf54c..1a3c95b 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
@@ -36,7 +36,7 @@
class MultiWrapDynaClass implements DynaClass
{
/** An empty array for converting the properties collection to an array. */
- private static final DynaProperty[] EMPTY_PROPS = new DynaProperty[0];
+ private static final DynaProperty[] EMPTY_PROPS = {};
/** A collection with all properties of this class. */
private final Collection<DynaProperty> properties;
diff --git a/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java
index 1691d12..e74abd0 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java
@@ -156,31 +156,26 @@
}
token.append(c);
inEscape = false;
+ } else if (c == getDelimiter())
+ {
+ // found a list delimiter -> add token and
+ // reset buffer
+ String t = token.toString();
+ if (trim)
+ {
+ t = t.trim();
+ }
+ list.add(t);
+ token = new StringBuilder();
}
-
+ else if (c == ESCAPE)
+ {
+ // potentially escape next character
+ inEscape = true;
+ }
else
{
- if (c == getDelimiter())
- {
- // found a list delimiter -> add token and
- // reset buffer
- String t = token.toString();
- if (trim)
- {
- t = t.trim();
- }
- list.add(t);
- token = new StringBuilder();
- }
- else if (c == ESCAPE)
- {
- // potentially escape next character
- inEscape = true;
- }
- else
- {
- token.append(c);
- }
+ token.append(c);
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
index b7ebcca..9390366 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
@@ -162,31 +162,26 @@
}
token.append(c);
inEscape = false;
+ } else if (c == getDelimiter())
+ {
+ // found a list delimiter -> add token and
+ // resetDefaultFileSystem buffer
+ String t = token.toString();
+ if (trim)
+ {
+ t = t.trim();
+ }
+ list.add(t);
+ token = new StringBuilder();
}
-
+ else if (c == esc)
+ {
+ // eventually escape next character
+ inEscape = true;
+ }
else
{
- if (c == getDelimiter())
- {
- // found a list delimiter -> add token and
- // resetDefaultFileSystem buffer
- String t = token.toString();
- if (trim)
- {
- t = t.trim();
- }
- list.add(t);
- token = new StringBuilder();
- }
- else if (c == esc)
- {
- // eventually escape next character
- inEscape = true;
- }
- else
- {
- token.append(c);
- }
+ token.append(c);
}
begin++;
diff --git a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index ea843f9..d540572 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -335,7 +335,7 @@
{
return (Float) n;
}
- return new Float(n.floatValue());
+ return Float.valueOf(n.floatValue());
}
/**
@@ -352,7 +352,7 @@
{
return (Double) n;
}
- return new Double(n.doubleValue());
+ return Double.valueOf(n.doubleValue());
}
/**
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index e583b94..ca886cd 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -672,15 +672,11 @@
if (url == null)
{
injectNullFileLocator();
- }
- else
+ } else if (getContent() instanceof FileLocatorAware)
{
- if (getContent() instanceof FileLocatorAware)
- {
- final FileLocator locator =
- prepareNullLocatorBuilder().sourceURL(url).create();
- ((FileLocatorAware) getContent()).initFileLocator(locator);
- }
+ final FileLocator locator =
+ prepareNullLocatorBuilder().sourceURL(url).create();
+ ((FileLocatorAware) getContent()).initFileLocator(locator);
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index 60eb057..709b73d 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -459,15 +459,15 @@
private static FileLocationStrategy initDefaultLocationStrategy()
{
final FileLocationStrategy[] subStrategies =
- new FileLocationStrategy[] {
- new ProvidedURLLocationStrategy(),
- new FileSystemLocationStrategy(),
- new AbsoluteNameLocationStrategy(),
- new BasePathLocationStrategy(),
- new HomeDirectoryLocationStrategy(true),
- new HomeDirectoryLocationStrategy(false),
- new ClasspathLocationStrategy()
- };
+ {
+ new ProvidedURLLocationStrategy(),
+ new FileSystemLocationStrategy(),
+ new AbsoluteNameLocationStrategy(),
+ new BasePathLocationStrategy(),
+ new HomeDirectoryLocationStrategy(true),
+ new HomeDirectoryLocationStrategy(false),
+ new ClasspathLocationStrategy()
+ };
return new CombinedLocationStrategy(Arrays.asList(subStrategies));
}
diff --git a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
index d8633a8..0574773 100644
--- a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
@@ -398,7 +398,7 @@
|| s.indexOf(',') != -1
|| s.indexOf(';') != -1)
{
- s = s.replaceAll("\"", "\\\\\\\"");
+ s = s.replace("\"", "\\\"");
s = "\"" + s + "\"";
}
diff --git a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
index 9166131..50b2f64 100644
--- a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
+++ b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
@@ -157,15 +157,11 @@
final long modifiedMillis = getLastModificationDate();
if (modifiedMillis > 0)
{
- if (lastModifiedMillis == 0)
- {
- // initialization
- updateLastModified(modifiedMillis);
- }
- else
- {
+ if (lastModifiedMillis != 0) {
return modifiedMillis != lastModifiedMillis;
}
+ // initialization
+ updateLastModified(modifiedMillis);
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
index 3892218..3ebb014 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
@@ -1288,7 +1288,7 @@
{
final NodeSelector selector =
new NodeSelector(resolver.nodeKey(node,
- new HashMap<ImmutableNode, String>(), current));
+ new HashMap<>(), current));
refSelector.setValue(selector);
final NodeTracker newTracker =
current.getNodeTracker().trackNodes(
diff --git a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index 9548f38..5241b67 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -777,17 +777,13 @@
{
resultNodes.add(repl);
replacedNodes.put(nd, repl);
+ } else if (removals.contains(nd))
+ {
+ removedNodes.add(nd);
}
else
{
- if (removals.contains(nd))
- {
- removedNodes.add(nd);
- }
- else
- {
- resultNodes.add(nd);
- }
+ resultNodes.add(nd);
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
index 1110273..cdccb32 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
@@ -63,13 +63,9 @@
{
setStartOffset(findStartIndex(subNodes,
startsWith.getConfigurationNode()));
- }
- else
+ } else if (reverse)
{
- if (reverse)
- {
- setStartOffset(size());
- }
+ setStartOffset(size());
}
}
diff --git a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java
index afd12a1..ae4dadd 100644
--- a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java
+++ b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java
@@ -232,7 +232,7 @@
*/
public static void testInterpolationSubset(final Configuration config)
{
- config.addProperty("test.a", new Integer(42));
+ config.addProperty("test.a", Integer.valueOf(42));
config.addProperty("test.b", "${test.a}");
assertEquals("Wrong interpolated value", 42, config
.getInt("test.b"));
diff --git a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
index 44e2431..a825e85 100644
--- a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
+++ b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
@@ -48,8 +48,8 @@
final boolean booleanValue = configuration.getBoolean("test.boolean.missing", true);
Assert.assertTrue(booleanValue);
- final Boolean booleanObject = configuration.getBoolean("test.boolean.missing", new Boolean(true));
- Assert.assertEquals(new Boolean(true), booleanObject);
+ final Boolean booleanObject = configuration.getBoolean("test.boolean.missing", Boolean.valueOf(true));
+ Assert.assertEquals(Boolean.valueOf(true), booleanObject);
}
public void testByte() throws Exception
diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
index 642c546..3658b85 100644
--- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
+++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
@@ -139,10 +139,8 @@
private void checkAddListProperty(final AbstractConfiguration config)
{
config.addProperty("test", "value1");
- final Object[] lstValues1 = new Object[]
- { "value2", "value3" };
- final Object[] lstValues2 = new Object[]
- { "value4", "value5", "value6" };
+ final Object[] lstValues1 = { "value2", "value3" };
+ final Object[] lstValues2 = { "value4", "value5", "value6" };
config.addProperty("test", lstValues1);
config.addProperty("test", Arrays.asList(lstValues2));
final List<Object> lst = config.getList("test");
@@ -939,7 +937,7 @@
{
final PropertiesConfiguration config = new PropertiesConfiguration();
final List<Integer> expected = prepareListTest(config);
- final Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, new ArrayList<Integer>());
+ final Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, new ArrayList<>());
assertEquals("Wrong result", expected, result);
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
index cd3a55f..0f3e44b 100644
--- a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
@@ -158,7 +158,7 @@
config.setProperty("test.items.item", new int[] { 2, 4, 8, 16 });
assertEquals(3, config.getMaxIndex("test.items.item"));
assertEquals(8, config.getInt("test.items.item(2)"));
- config.setProperty("test.items.item(2)", new Integer(6));
+ config.setProperty("test.items.item(2)", Integer.valueOf(6));
assertEquals(6, config.getInt("test.items.item(2)"));
config.setProperty("test.items.item(2)", new int[] { 7, 9, 11 });
assertEquals(5, config.getMaxIndex("test.items.item"));
@@ -169,7 +169,7 @@
assertTrue(config.getBoolean("test"));
assertEquals("01/01/05", config.getProperty("test.items"));
- config.setProperty("test.items.item", new Integer(42));
+ config.setProperty("test.items.item", Integer.valueOf(42));
assertEquals(0, config.getMaxIndex("test.items.item"));
assertEquals(42, config.getInt("test.items.item"));
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
index 69edee8..805e6ad 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
@@ -90,7 +90,7 @@
props.add("quick");
props.add("brown");
props.add("fox,jumps");
- final Object[] data = new Object[] {
+ final Object[] data = {
"The", props, "over,the", "lazy", "dog."
};
config.setProperty("complex.property", data);
@@ -118,7 +118,7 @@
{
for (int i = 0; i < 10; i++)
{
- config.addProperty("key" + i, new Integer(i));
+ config.addProperty("key" + i, Integer.valueOf(i));
}
final BaseConfiguration config2 = (BaseConfiguration) config.clone();
@@ -278,7 +278,7 @@
assertEquals("This returns true", boolT, config.getBoolean("boolA"));
assertEquals("This returns true, not the default", boolT, config.getBoolean("boolA", boolF));
assertEquals("This returns false(default)", boolF, config.getBoolean("boolNotInConfig", boolF));
- assertEquals("This returns true(Boolean)", new Boolean(boolT), config.getBoolean("boolA", new Boolean(boolF)));
+ assertEquals("This returns true(Boolean)", Boolean.valueOf(boolT), config.getBoolean("boolA", Boolean.valueOf(boolF)));
}
@Test(expected = ConversionException.class)
@@ -303,7 +303,7 @@
assertEquals("This returns 1(byte)", oneB, config.getByte("number"));
assertEquals("This returns 1(byte)", oneB, config.getByte("number", twoB));
assertEquals("This returns 2(default byte)", twoB, config.getByte("numberNotInConfig", twoB));
- assertEquals("This returns 1(Byte)", new Byte(oneB), config.getByte("number", new Byte("2")));
+ assertEquals("This returns 1(Byte)", Byte.valueOf(oneB), config.getByte("number", Byte.valueOf("2")));
}
@Test(expected = ConversionException.class)
@@ -328,7 +328,7 @@
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD"), 0);
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD", twoD), 0);
assertEquals("This returns 2(default double)", twoD, config.getDouble("numberNotInConfig", twoD), 0);
- assertEquals("This returns 1(Double)", new Double(oneD), config.getDouble("numberD", new Double("2")));
+ assertEquals("This returns 1(Double)", Double.valueOf(oneD), config.getDouble("numberD", Double.valueOf("2")));
}
@Test(expected = ConversionException.class)
@@ -380,7 +380,7 @@
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF"), 0);
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF", twoF), 0);
assertEquals("This returns 2(default float)", twoF, config.getFloat("numberNotInConfig", twoF), 0);
- assertEquals("This returns 1(Float)", new Float(oneF), config.getFloat("numberF", new Float("2")));
+ assertEquals("This returns 1(Float)", Float.valueOf(oneF), config.getFloat("numberF", Float.valueOf("2")));
}
@Test(expected = ConversionException.class)
@@ -448,12 +448,12 @@
// primitive wrappers
assertEquals("Boolean interpolation", Boolean.TRUE, config.getBoolean("booleanValue", null));
- assertEquals("Byte interpolation", new Byte("1"), config.getByte("value", null));
- assertEquals("Short interpolation", new Short("1"), config.getShort("value", null));
- assertEquals("Integer interpolation", new Integer("1"), config.getInteger("value", null));
- assertEquals("Long interpolation", new Long("1"), config.getLong("value", null));
- assertEquals("Float interpolation", new Float("1"), config.getFloat("value", null));
- assertEquals("Double interpolation", new Double("1"), config.getDouble("value", null));
+ assertEquals("Byte interpolation", Byte.valueOf("1"), config.getByte("value", null));
+ assertEquals("Short interpolation", Short.valueOf("1"), config.getShort("value", null));
+ assertEquals("Integer interpolation", Integer.valueOf("1"), config.getInteger("value", null));
+ assertEquals("Long interpolation", Long.valueOf("1"), config.getLong("value", null));
+ assertEquals("Float interpolation", Float.valueOf("1"), config.getFloat("value", null));
+ assertEquals("Double interpolation", Double.valueOf("1"), config.getDouble("value", null));
assertEquals("BigInteger interpolation", new BigInteger("1"), config.getBigInteger("value", null));
assertEquals("BigDecimal interpolation", new BigDecimal("1"), config.getBigDecimal("value", null));
@@ -489,7 +489,7 @@
assertEquals("This returns 1(long)", oneL, config.getLong("numberL"));
assertEquals("This returns 1(long)", oneL, config.getLong("numberL", twoL));
assertEquals("This returns 2(default long)", twoL, config.getLong("numberNotInConfig", twoL));
- assertEquals("This returns 1(Long)", new Long(oneL), config.getLong("numberL", new Long("2")));
+ assertEquals("This returns 1(Long)", Long.valueOf(oneL), config.getLong("numberL", Long.valueOf("2")));
}
@Test(expected = ConversionException.class)
@@ -526,7 +526,7 @@
assertEquals("This returns 1(short)", oneS, config.getShort("numberS"));
assertEquals("This returns 1(short)", oneS, config.getShort("numberS", twoS));
assertEquals("This returns 2(default short)", twoS, config.getShort("numberNotInConfig", twoS));
- assertEquals("This returns 1(Short)", new Short(oneS), config.getShort("numberS", new Short("2")));
+ assertEquals("This returns 1(Short)", Short.valueOf(oneS), config.getShort("numberS", Short.valueOf("2")));
}
@Test(expected = ConversionException.class)
@@ -709,7 +709,7 @@
@Test
public void testNumberConversions()
{
- config.setProperty(KEY_NUMBER, new Integer(42));
+ config.setProperty(KEY_NUMBER, Integer.valueOf(42));
assertEquals("Wrong int returned", 42, config.getInt(KEY_NUMBER));
assertEquals("Wrong long returned", 42L, config.getLong(KEY_NUMBER));
assertEquals("Wrong byte returned", (byte) 42, config
@@ -719,7 +719,7 @@
assertEquals("Wrong double returned", 42.0, config
.getDouble(KEY_NUMBER), 0.001);
- assertEquals("Wrong Long returned", new Long(42L), config.getLong(
+ assertEquals("Wrong Long returned", Long.valueOf(42L), config.getLong(
KEY_NUMBER, null));
assertEquals("Wrong BigInt returned", new BigInteger("42"), config
.getBigInteger(KEY_NUMBER));
diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java b/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
index 1ebb86f..59417e3 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
@@ -66,7 +66,7 @@
config.addProperty("application.mail.account.type", "pop3");
config.addProperty("application.mail.account.user", "postmaster");
config.addProperty("application.mail.account.pwd", "?.-gulp*#");
- config.addProperty("application.mail.timeout", new Integer(42));
+ config.addProperty("application.mail.timeout", Integer.valueOf(42));
config.addProperty("test", Boolean.TRUE);
configReader = new BaseConfigurationXMLReader(config);
diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
index e9f8814..f4f6a7b 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
@@ -79,7 +79,7 @@
assertEquals("This returns 1(byte)", oneB, config.getByte("number"));
assertEquals("This returns 1(byte)", oneB, config.getByte("number", twoB));
assertEquals("This returns 2(default byte)", twoB, config.getByte("numberNotInConfig", twoB));
- assertEquals("This returns 1(Byte)", new Byte(oneB), config.getByte("number", new Byte("2")));
+ assertEquals("This returns 1(Byte)", Byte.valueOf(oneB), config.getByte("number", Byte.valueOf("2")));
}
@Test(expected = NoSuchElementException.class)
@@ -104,7 +104,7 @@
assertEquals("This returns 1(short)", oneS, config.getShort("numberS"));
assertEquals("This returns 1(short)", oneS, config.getShort("numberS", twoS));
assertEquals("This returns 2(default short)", twoS, config.getShort("numberNotInConfig", twoS));
- assertEquals("This returns 1(Short)", new Short(oneS), config.getShort("numberS", new Short("2")));
+ assertEquals("This returns 1(Short)", Short.valueOf(oneS), config.getShort("numberS", Short.valueOf("2")));
}
@Test(expected = NoSuchElementException.class)
@@ -129,7 +129,7 @@
assertEquals("This returns 1(long)", oneL, config.getLong("numberL"));
assertEquals("This returns 1(long)", oneL, config.getLong("numberL", twoL));
assertEquals("This returns 2(default long)", twoL, config.getLong("numberNotInConfig", twoL));
- assertEquals("This returns 1(Long)", new Long(oneL), config.getLong("numberL", new Long("2")));
+ assertEquals("This returns 1(Long)", Long.valueOf(oneL), config.getLong("numberL", Long.valueOf("2")));
}
@Test(expected = NoSuchElementException.class)
@@ -154,7 +154,7 @@
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF"), 0);
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF", twoF), 0);
assertEquals("This returns 2(default float)", twoF, config.getFloat("numberNotInConfig", twoF), 0);
- assertEquals("This returns 1(Float)", new Float(oneF), config.getFloat("numberF", new Float("2")));
+ assertEquals("This returns 1(Float)", Float.valueOf(oneF), config.getFloat("numberF", Float.valueOf("2")));
}
@Test(expected = NoSuchElementException.class)
@@ -179,7 +179,7 @@
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD"), 0);
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD", twoD), 0);
assertEquals("This returns 2(default double)", twoD, config.getDouble("numberNotInConfig", twoD), 0);
- assertEquals("This returns 1(Double)", new Double(oneD), config.getDouble("numberD", new Double("2")));
+ assertEquals("This returns 1(Double)", Double.valueOf(oneD), config.getDouble("numberD", Double.valueOf("2")));
}
@Test(expected = NoSuchElementException.class)
@@ -272,7 +272,7 @@
assertEquals("This returns true", boolT, config.getBoolean("boolA"));
assertEquals("This returns true, not the default", boolT, config.getBoolean("boolA", boolF));
assertEquals("This returns false(default)", boolF, config.getBoolean("boolNotInConfig", boolF));
- assertEquals("This returns true(Boolean)", new Boolean(boolT), config.getBoolean("boolA", new Boolean(boolF)));
+ assertEquals("This returns true(Boolean)", Boolean.valueOf(boolT), config.getBoolean("boolA", Boolean.valueOf(boolF)));
}
@Test(expected = NoSuchElementException.class)
diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
index dd755aa..61f4f6c 100644
--- a/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
+++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
@@ -129,7 +129,7 @@
public void testConfigurationToPropertiesScalarValue()
{
final BaseConfiguration config = new BaseConfiguration();
- config.addProperty("scalar", new Integer(42));
+ config.addProperty("scalar", Integer.valueOf(42));
final Properties props = ConfigurationConverter.getProperties(config);
assertEquals("Wrong value", "42", props.getProperty("scalar"));
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
index 75dcd20..768df38 100644
--- a/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
+++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
@@ -43,11 +43,11 @@
Object[] values = {
Boolean.TRUE,
- new Double(Double.MAX_VALUE),
- new Float(Float.MAX_VALUE),
- new Integer(Integer.MAX_VALUE),
- new Long(Long.MAX_VALUE),
- new Short(Short.MAX_VALUE),
+ Double.valueOf(Double.MAX_VALUE),
+ Float.valueOf(Float.MAX_VALUE),
+ Integer.valueOf(Integer.MAX_VALUE),
+ Long.valueOf(Long.MAX_VALUE),
+ Short.valueOf(Short.MAX_VALUE),
"This is a string"
};
diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
index 1398dc3..86875ea 100644
--- a/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
+++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
@@ -45,11 +45,11 @@
Object[] values = {
Boolean.TRUE,
- new Double(Double.MAX_VALUE),
- new Float(Float.MAX_VALUE),
- new Integer(Integer.MAX_VALUE),
- new Long(Long.MAX_VALUE),
- new Short(Short.MAX_VALUE),
+ Double.valueOf(Double.MAX_VALUE),
+ Float.valueOf(Float.MAX_VALUE),
+ Integer.valueOf(Integer.MAX_VALUE),
+ Long.valueOf(Long.MAX_VALUE),
+ Short.valueOf(Short.MAX_VALUE),
"This is a string"
};
diff --git a/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
index e56b2cd..2e65da0 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
@@ -91,96 +91,96 @@
conf.addProperty("byte.list1", "1");
conf.addProperty("byte.list1", "2");
conf.addProperty("byte.list2", "1, 2");
- conf.addProperty("byte.list3", new Byte("1"));
- conf.addProperty("byte.list3", new Byte("2"));
- conf.addPropertyDirect("byte.list4", new Byte[] { new Byte("1"), new Byte("2") });
+ conf.addProperty("byte.list3", Byte.valueOf("1"));
+ conf.addProperty("byte.list3", Byte.valueOf("2"));
+ conf.addPropertyDirect("byte.list4", new Byte[] { Byte.valueOf("1"), Byte.valueOf("2") });
conf.addPropertyDirect("byte.list5", new byte[] { 1, 2 });
final List<Object> bytes = new ArrayList<>();
- bytes.add(new Byte("1"));
- bytes.add(new Byte("2"));
+ bytes.add(Byte.valueOf("1"));
+ bytes.add(Byte.valueOf("2"));
conf.addProperty("byte.list6", bytes);
conf.addProperty("byte.string", "1");
- conf.addProperty("byte.object", new Byte("1"));
+ conf.addProperty("byte.object", Byte.valueOf("1"));
conf.addProperty("byte.list.interpolated", "${byte.string},2");
// lists of shorts
conf.addProperty("short.list1", "1");
conf.addProperty("short.list1", "2");
conf.addProperty("short.list2", "1, 2");
- conf.addProperty("short.list3", new Short("1"));
- conf.addProperty("short.list3", new Short("2"));
- conf.addPropertyDirect("short.list4", new Short[] { new Short("1"), new Short("2") });
+ conf.addProperty("short.list3", Short.valueOf("1"));
+ conf.addProperty("short.list3", Short.valueOf("2"));
+ conf.addPropertyDirect("short.list4", new Short[] { Short.valueOf("1"), Short.valueOf("2") });
conf.addPropertyDirect("short.list5", new short[] { 1, 2 });
final List<Object> shorts = new ArrayList<>();
- shorts.add(new Short("1"));
- shorts.add(new Short("2"));
+ shorts.add(Short.valueOf("1"));
+ shorts.add(Short.valueOf("2"));
conf.addProperty("short.list6", shorts);
conf.addProperty("short.string", "1");
- conf.addProperty("short.object", new Short("1"));
+ conf.addProperty("short.object", Short.valueOf("1"));
conf.addProperty("short.list.interpolated", "${short.string},2");
// lists of integers
conf.addProperty("integer.list1", "1");
conf.addProperty("integer.list1", "2");
conf.addProperty("integer.list2", "1, 2");
- conf.addProperty("integer.list3", new Integer("1"));
- conf.addProperty("integer.list3", new Integer("2"));
- conf.addPropertyDirect("integer.list4", new Integer[] { new Integer("1"), new Integer("2") });
+ conf.addProperty("integer.list3", Integer.valueOf("1"));
+ conf.addProperty("integer.list3", Integer.valueOf("2"));
+ conf.addPropertyDirect("integer.list4", new Integer[] { Integer.valueOf("1"), Integer.valueOf("2") });
conf.addPropertyDirect("integer.list5", new int[] { 1, 2 });
final List<Object> integers = new ArrayList<>();
- integers.add(new Integer("1"));
- integers.add(new Integer("2"));
+ integers.add(Integer.valueOf("1"));
+ integers.add(Integer.valueOf("2"));
conf.addProperty("integer.list6", integers);
conf.addProperty("integer.string", "1");
- conf.addProperty("integer.object", new Integer("1"));
+ conf.addProperty("integer.object", Integer.valueOf("1"));
conf.addProperty("integer.list.interpolated", "${integer.string},2");
// lists of longs
conf.addProperty("long.list1", "1");
conf.addProperty("long.list1", "2");
conf.addProperty("long.list2", "1, 2");
- conf.addProperty("long.list3", new Long("1"));
- conf.addProperty("long.list3", new Long("2"));
- conf.addPropertyDirect("long.list4", new Long[] { new Long("1"), new Long("2") });
+ conf.addProperty("long.list3", Long.valueOf("1"));
+ conf.addProperty("long.list3", Long.valueOf("2"));
+ conf.addPropertyDirect("long.list4", new Long[] { Long.valueOf("1"), Long.valueOf("2") });
conf.addPropertyDirect("long.list5", new long[] { 1, 2 });
final List<Object> longs = new ArrayList<>();
- longs.add(new Long("1"));
- longs.add(new Long("2"));
+ longs.add(Long.valueOf("1"));
+ longs.add(Long.valueOf("2"));
conf.addProperty("long.list6", longs);
conf.addProperty("long.string", "1");
- conf.addProperty("long.object", new Long("1"));
+ conf.addProperty("long.object", Long.valueOf("1"));
conf.addProperty("long.list.interpolated", "${long.string},2");
// lists of floats
conf.addProperty("float.list1", "1");
conf.addProperty("float.list1", "2");
conf.addProperty("float.list2", "1, 2");
- conf.addProperty("float.list3", new Float("1"));
- conf.addProperty("float.list3", new Float("2"));
- conf.addPropertyDirect("float.list4", new Float[] { new Float("1"), new Float("2") });
+ conf.addProperty("float.list3", Float.valueOf("1"));
+ conf.addProperty("float.list3", Float.valueOf("2"));
+ conf.addPropertyDirect("float.list4", new Float[] { Float.valueOf("1"), Float.valueOf("2") });
conf.addPropertyDirect("float.list5", new float[] { 1, 2 });
final List<Object> floats = new ArrayList<>();
- floats.add(new Float("1"));
- floats.add(new Float("2"));
+ floats.add(Float.valueOf("1"));
+ floats.add(Float.valueOf("2"));
conf.addProperty("float.list6", floats);
conf.addProperty("float.string", "1");
- conf.addProperty("float.object", new Float("1"));
+ conf.addProperty("float.object", Float.valueOf("1"));
conf.addProperty("float.list.interpolated", "${float.string},2");
// lists of doubles
conf.addProperty("double.list1", "1");
conf.addProperty("double.list1", "2");
conf.addProperty("double.list2", "1, 2");
- conf.addProperty("double.list3", new Double("1"));
- conf.addProperty("double.list3", new Double("2"));
- conf.addPropertyDirect("double.list4", new Double[] { new Double("1"), new Double("2") });
+ conf.addProperty("double.list3", Double.valueOf("1"));
+ conf.addProperty("double.list3", Double.valueOf("2"));
+ conf.addPropertyDirect("double.list4", new Double[] { Double.valueOf("1"), Double.valueOf("2") });
conf.addPropertyDirect("double.list5", new double[] { 1, 2 });
final List<Object> doubles = new ArrayList<>();
- doubles.add(new Double("1"));
- doubles.add(new Double("2"));
+ doubles.add(Double.valueOf("1"));
+ doubles.add(Double.valueOf("2"));
conf.addProperty("double.list6", doubles);
conf.addProperty("double.string", "1");
- conf.addProperty("double.object", new Double("1"));
+ conf.addProperty("double.object", Double.valueOf("1"));
conf.addProperty("double.list.interpolated", "${double.string},2");
// lists of big integers
@@ -424,10 +424,10 @@
public void testGetBooleanArray()
{
// missing list
- final boolean[] defaultValue = new boolean[] { false, true };
+ final boolean[] defaultValue = { false, true };
ArrayAssert.assertEquals(defaultValue, conf.getBooleanArray("boolean.list", defaultValue));
- final boolean[] expected = new boolean[] { true, false };
+ final boolean[] expected = { true, false };
// list of strings
ArrayAssert.assertEquals(expected, conf.getBooleanArray("boolean.list1"));
@@ -503,10 +503,10 @@
public void testGetByteArray()
{
// missing list
- final byte[] defaultValue = new byte[] { 1, 2};
+ final byte[] defaultValue = { 1, 2};
ArrayAssert.assertEquals(defaultValue, conf.getByteArray("byte.list", defaultValue));
- final byte[] expected = new byte[] { 1, 2 };
+ final byte[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getByteArray("byte.list1"));
@@ -544,8 +544,8 @@
ListAssert.assertEquals(null, conf.getByteList("byte.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Byte("1"));
- expected.add(new Byte("2"));
+ expected.add(Byte.valueOf("1"));
+ expected.add(Byte.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getByteList("byte.list1"));
@@ -570,7 +570,7 @@
// single byte values
expected = new ArrayList<>();
- expected.add(new Byte("1"));
+ expected.add(Byte.valueOf("1"));
ListAssert.assertEquals(expected, conf.getByteList("byte.string"));
ListAssert.assertEquals(expected, conf.getByteList("byte.object"));
@@ -582,10 +582,10 @@
public void testGetShortArray()
{
// missing list
- final short[] defaultValue = new short[] { 2, 1};
+ final short[] defaultValue = { 2, 1};
ArrayAssert.assertEquals(defaultValue, conf.getShortArray("short.list", defaultValue));
- final short[] expected = new short[] { 1, 2 };
+ final short[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getShortArray("short.list1"));
@@ -623,8 +623,8 @@
ListAssert.assertEquals(null, conf.getShortList("short.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Short("1"));
- expected.add(new Short("2"));
+ expected.add(Short.valueOf("1"));
+ expected.add(Short.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getShortList("short.list1"));
@@ -649,7 +649,7 @@
// single short values
expected = new ArrayList<>();
- expected.add(new Short("1"));
+ expected.add(Short.valueOf("1"));
ListAssert.assertEquals(expected, conf.getShortList("short.string"));
ListAssert.assertEquals(expected, conf.getShortList("short.object"));
@@ -661,10 +661,10 @@
public void testGetIntegerArray()
{
// missing list
- final int[] defaultValue = new int[] { 2, 1};
+ final int[] defaultValue = { 2, 1};
ArrayAssert.assertEquals(defaultValue, conf.getIntArray("integer.list", defaultValue));
- final int[] expected = new int[] { 1, 2 };
+ final int[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getIntArray("integer.list1"));
@@ -702,8 +702,8 @@
ListAssert.assertEquals(null, conf.getIntegerList("integer.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Integer("1"));
- expected.add(new Integer("2"));
+ expected.add(Integer.valueOf("1"));
+ expected.add(Integer.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getIntegerList("integer.list1"));
@@ -728,7 +728,7 @@
// single int values
expected = new ArrayList<>();
- expected.add(new Integer("1"));
+ expected.add(Integer.valueOf("1"));
ListAssert.assertEquals(expected, conf.getIntegerList("integer.string"));
ListAssert.assertEquals(expected, conf.getIntegerList("integer.object"));
@@ -740,10 +740,10 @@
public void testGetLongArray()
{
// missing list
- final long[] defaultValue = new long[] { 2, 1};
+ final long[] defaultValue = { 2, 1};
ArrayAssert.assertEquals(defaultValue, conf.getLongArray("long.list", defaultValue));
- final long[] expected = new long[] { 1, 2 };
+ final long[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getLongArray("long.list1"));
@@ -781,8 +781,8 @@
ListAssert.assertEquals(null, conf.getLongList("long.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Long("1"));
- expected.add(new Long("2"));
+ expected.add(Long.valueOf("1"));
+ expected.add(Long.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getLongList("long.list1"));
@@ -807,7 +807,7 @@
// single long values
expected = new ArrayList<>();
- expected.add(new Long("1"));
+ expected.add(Long.valueOf("1"));
ListAssert.assertEquals(expected, conf.getLongList("long.string"));
ListAssert.assertEquals(expected, conf.getLongList("long.object"));
@@ -819,10 +819,10 @@
public void testGetFloatArray()
{
// missing list
- final float[] defaultValue = new float[] { 2, 1};
+ final float[] defaultValue = { 2, 1};
ArrayAssert.assertEquals(defaultValue, conf.getFloatArray("float.list", defaultValue), 0);
- final float[] expected = new float[] { 1, 2 };
+ final float[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getFloatArray("float.list1"), 0);
@@ -860,8 +860,8 @@
ListAssert.assertEquals(null, conf.getFloatList("float.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Float("1"));
- expected.add(new Float("2"));
+ expected.add(Float.valueOf("1"));
+ expected.add(Float.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getFloatList("float.list1"));
@@ -886,7 +886,7 @@
// single float values
expected = new ArrayList<>();
- expected.add(new Float("1"));
+ expected.add(Float.valueOf("1"));
ListAssert.assertEquals(expected, conf.getFloatList("float.string"));
ListAssert.assertEquals(expected, conf.getFloatList("float.object"));
@@ -898,10 +898,10 @@
public void testGetDoubleArray()
{
// missing list
- final double[] defaultValue = new double[] { 2, 1 };
+ final double[] defaultValue = { 2, 1 };
ArrayAssert.assertEquals(defaultValue, conf.getDoubleArray("double.list", defaultValue), 0);
- final double[] expected = new double[] { 1, 2 };
+ final double[] expected = { 1, 2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getDoubleArray("double.list1"), 0);
@@ -939,8 +939,8 @@
ListAssert.assertEquals(null, conf.getDoubleList("double.list", null));
List<Object> expected = new ArrayList<>();
- expected.add(new Double("1"));
- expected.add(new Double("2"));
+ expected.add(Double.valueOf("1"));
+ expected.add(Double.valueOf("2"));
// list of strings
ListAssert.assertEquals(expected, conf.getDoubleList("double.list1"));
@@ -965,7 +965,7 @@
// single double values
expected = new ArrayList<>();
- expected.add(new Double("1"));
+ expected.add(Double.valueOf("1"));
ListAssert.assertEquals(expected, conf.getDoubleList("double.string"));
ListAssert.assertEquals(expected, conf.getDoubleList("double.object"));
@@ -977,10 +977,10 @@
public void testGetBigIntegerArray()
{
// missing list
- final BigInteger[] defaultValue = new BigInteger[] { new BigInteger("2"), new BigInteger("1") };
+ final BigInteger[] defaultValue = { new BigInteger("2"), new BigInteger("1") };
ArrayAssert.assertEquals(defaultValue, conf.getBigIntegerArray("biginteger.list", defaultValue));
- final BigInteger[] expected = new BigInteger[] { new BigInteger("1"), new BigInteger("2") };
+ final BigInteger[] expected = { new BigInteger("1"), new BigInteger("2") };
// list of strings
ArrayAssert.assertEquals(expected, conf.getBigIntegerArray("biginteger.list1"));
@@ -1051,10 +1051,10 @@
public void testGetBigDecimalArray()
{
// missing list
- final BigDecimal[] defaultValue = new BigDecimal[] { new BigDecimal("2"), new BigDecimal("1") };
+ final BigDecimal[] defaultValue = { new BigDecimal("2"), new BigDecimal("1") };
ArrayAssert.assertEquals(defaultValue, conf.getBigDecimalArray("bigdecimal.list", defaultValue));
- final BigDecimal[] expected = new BigDecimal[] { new BigDecimal("1"), new BigDecimal("2") };
+ final BigDecimal[] expected = { new BigDecimal("1"), new BigDecimal("2") };
// list of strings
ArrayAssert.assertEquals(expected, conf.getBigDecimalArray("bigdecimal.list1"));
@@ -1143,10 +1143,10 @@
public void testGetURIArray() throws Exception
{
// missing list
- final URI[] defaultValue = new URI[] { new URI("http://www.apache.org"), new URI("http://jakarta.apache.org") };
+ final URI[] defaultValue = { new URI("http://www.apache.org"), new URI("http://jakarta.apache.org") };
ArrayAssert.assertEquals(defaultValue, conf.getURIArray("url.list", defaultValue));
- final URI[] expected = new URI[] { new URI("http://jakarta.apache.org"), new URI("http://www.apache.org") };
+ final URI[] expected = { new URI("http://jakarta.apache.org"), new URI("http://www.apache.org") };
// list of strings
ArrayAssert.assertEquals(expected, conf.getURIArray("uri.list1"));
@@ -1235,10 +1235,10 @@
public void testGetURLArray() throws Exception
{
// missing list
- final URL[] defaultValue = new URL[] { new URL("http://www.apache.org"), new URL("http://jakarta.apache.org") };
+ final URL[] defaultValue = { new URL("http://www.apache.org"), new URL("http://jakarta.apache.org") };
ArrayAssert.assertEquals(defaultValue, conf.getURLArray("url.list", defaultValue));
- final URL[] expected = new URL[] { new URL("http://jakarta.apache.org"), new URL("http://www.apache.org") };
+ final URL[] expected = { new URL("http://jakarta.apache.org"), new URL("http://www.apache.org") };
// list of strings
ArrayAssert.assertEquals(expected, conf.getURLArray("url.list1"));
@@ -1344,10 +1344,10 @@
public void testGetLocaleArray() throws Exception
{
// missing list
- final Locale[] defaultValue = new Locale[] { Locale.GERMAN, Locale.FRENCH };
+ final Locale[] defaultValue = { Locale.GERMAN, Locale.FRENCH };
ArrayAssert.assertEquals(defaultValue, conf.getLocaleArray("locale.list", defaultValue));
- final Locale[] expected = new Locale[] { Locale.FRENCH, Locale.GERMAN };
+ final Locale[] expected = { Locale.FRENCH, Locale.GERMAN };
// list of strings
ArrayAssert.assertEquals(expected, conf.getLocaleArray("locale.list1"));
@@ -1444,10 +1444,10 @@
public void testGetColorArray() throws Exception
{
// missing list
- final Color[] defaultValue = new Color[] { Color.red, Color.blue };
+ final Color[] defaultValue = { Color.red, Color.blue };
ArrayAssert.assertEquals(defaultValue, conf.getColorArray("color.list", defaultValue));
- final Color[] expected = new Color[] { Color.red, Color.blue };
+ final Color[] expected = { Color.red, Color.blue };
// list of strings
ArrayAssert.assertEquals(expected, conf.getColorArray("color.list1"));
@@ -1595,10 +1595,10 @@
final Date date2 = format.parse("2004-12-31");
// missing list
- final Date[] defaultValue = new Date[] { date2, date1 };
+ final Date[] defaultValue = { date2, date1 };
ArrayAssert.assertEquals(defaultValue, conf.getDateArray("date.list", defaultValue));
- final Date[] expected = new Date[] { date1, date2 };
+ final Date[] expected = { date1, date2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getDateArray("date.list1"));
@@ -1635,7 +1635,7 @@
final DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
final Date date1 = format.parse("01/01/2004");
final Date date2 = format.parse("12/31/2004");
- final Date[] expected = new Date[] { date1, date2 };
+ final Date[] expected = { date1, date2 };
conf.addProperty("date.format", "01/01/2004");
conf.addProperty("date.format", "12/31/2004");
@@ -1744,10 +1744,10 @@
calendar2.setTime(date2);
// missing list
- final Calendar[] defaultValue = new Calendar[] { calendar2, calendar1 };
+ final Calendar[] defaultValue = { calendar2, calendar1 };
ArrayAssert.assertEquals(defaultValue, conf.getCalendarArray("calendar.list", defaultValue));
- final Calendar[] expected = new Calendar[] { calendar1, calendar2 };
+ final Calendar[] expected = { calendar1, calendar2 };
// list of strings
ArrayAssert.assertEquals(expected, conf.getCalendarArray("calendar.list1"));
@@ -1789,7 +1789,7 @@
calendar1.setTime(date1);
final Calendar calendar2 = Calendar.getInstance();
calendar2.setTime(date2);
- final Calendar[] expected = new Calendar[] { calendar1, calendar2 };
+ final Calendar[] expected = { calendar1, calendar2 };
conf.addProperty("calendar.format", "01/01/2004");
conf.addProperty("calendar.format", "12/31/2004");
diff --git a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
index af06c35..9f4fcb3 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
@@ -317,8 +317,8 @@
final Thread testThreads[] = new Thread[THREAD_COUNT];
final int failures[] = new int[THREAD_COUNT];
- final String[] ids = new String[] {null, "2002", "3001", "3002", "3003"};
- final String[] expected = new String[] {"50", "25", "15", "25", "50"};
+ final String[] ids = {null, "2002", "3001", "3002", "3003"};
+ final String[] expected = {"50", "25", "15", "25", "50"};
for (int i = 0; i < testThreads.length; ++i)
{
testThreads[i] = new ReloadThread(builder, failures, i, LOOP_COUNT, true, ids[i], expected[i]);
diff --git a/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java
index 22865e4..60c0b4b 100644
--- a/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java
@@ -252,7 +252,7 @@
config.clearProperty("test.entity[@name]");
config.setProperty("element", "new value");
config.setProperty("test(0)", "A <new> value");
- config.addProperty("test(1).int", new Integer(9));
+ config.addProperty("test(1).int", Integer.valueOf(9));
config.addProperty("list(1).sublist.item", "seven");
config.setProperty("clear", "yes");
config.setProperty("mean", "now it's simple");
diff --git a/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
index 53c03b8..3defd89 100644
--- a/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
@@ -63,7 +63,7 @@
@Override
protected AbstractConfiguration getEmptyConfiguration()
{
- return new MapConfiguration(new HashMap<String, Object>());
+ return new MapConfiguration(new HashMap<>());
}
@Test
diff --git a/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
index 8be95c4..a195806 100644
--- a/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
@@ -232,8 +232,7 @@
public void testGetKeys()
{
setUpSubnodeConfig();
- final Set<String> keys = new HashSet<>();
- keys.addAll(ConfigurationAssert.keysToList(config));
+ final Set<String> keys = new HashSet<>(ConfigurationAssert.keysToList(config));
assertEquals("Incorrect number of keys", 2, keys.size());
assertTrue("Key 1 not contained", keys.contains("name"));
assertTrue("Key 2 not contained", keys.contains("fields.field.name"));
diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java
index 44bd9a2..311d622 100644
--- a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java
+++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java
@@ -354,7 +354,7 @@
@Test
public void testCreateBeanWithParameter()
{
- final Object param = new Integer(42);
+ final Object param = Integer.valueOf(42);
final TestBeanFactory factory = new TestBeanFactory();
helper.registerBeanFactory(TEST_FACTORY, factory);
final BeanDeclarationTestImpl data = setUpBeanDeclaration();
@@ -416,7 +416,7 @@
final BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", "Another test string");
- properties2.put("intValue", new Integer(100));
+ properties2.put("intValue", Integer.valueOf(100));
buddyData.setBeanProperties(properties2);
buddyData.setBeanClassName(BeanCreationTestBean.class.getName());
@@ -462,7 +462,7 @@
final BeanDeclarationTestImpl childBean = new BeanDeclarationTestImpl();
final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", name + " Another test string");
- properties2.put("intValue", new Integer(100));
+ properties2.put("intValue", Integer.valueOf(100));
childBean.setBeanProperties(properties2);
childBean.setBeanClassName(BeanCreationTestBean.class.getName());
diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
index 80f3451..a310818 100644
--- a/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
+++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
@@ -196,7 +196,7 @@
final CombinedBeanDeclaration cd = createCombinedDeclaration();
EasyMock.expect(decl(0).getConstructorArgs()).andReturn(null);
EasyMock.expect(decl(1).getConstructorArgs()).andReturn(
- new ArrayList<ConstructorArg>());
+ new ArrayList<>());
EasyMock.expect(decl(2).getConstructorArgs()).andReturn(null);
replay();
assertTrue("Got constructor arguments", cd.getConstructorArgs()
diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
index 71cdd98..c7c21e9 100644
--- a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
+++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
@@ -75,17 +75,17 @@
Object[] values = {
Boolean.TRUE,
Boolean.TRUE,
- new Double(Double.MAX_VALUE),
- new Float(Float.MAX_VALUE),
- new Integer(Integer.MAX_VALUE),
- new Long(Long.MAX_VALUE),
+ Double.valueOf(Double.MAX_VALUE),
+ Float.valueOf(Float.MAX_VALUE),
+ Integer.valueOf(Integer.MAX_VALUE),
+ Long.valueOf(Long.MAX_VALUE),
"First Value",
"Second Value",
"Third Value",
- new Integer(Integer.MAX_VALUE),
- new Short(Short.MAX_VALUE),
+ Integer.valueOf(Integer.MAX_VALUE),
+ Short.valueOf(Short.MAX_VALUE),
"This is a string",
- new Byte(Byte.MAX_VALUE),
+ Byte.valueOf(Byte.MAX_VALUE),
Character.valueOf(Character.MAX_VALUE)
};
@@ -114,7 +114,7 @@
}
for (final int element : intArray) {
- configuration.addProperty("intIndexed", new Integer(element));
+ configuration.addProperty("intIndexed", Integer.valueOf(element));
}
for (final String element : stringArray) {
@@ -472,7 +472,7 @@
@Test(expected = IndexOutOfBoundsException.class)
public void testSetIndexedArguments()
{
- bean.set("intArray", -1, new Integer(0));
+ bean.set("intArray", -1, Integer.valueOf(0));
}
/**
@@ -481,7 +481,7 @@
@Test
public void testSetIndexedValues()
{
- bean.set("intArray", 0, new Integer(1));
+ bean.set("intArray", 0, Integer.valueOf(1));
Object value = bean.get("intArray", 0);
assertNotNull("Returned new value 0", value);
@@ -489,7 +489,7 @@
assertEquals("Returned correct new value 0", 1, ((Integer) value).intValue());
- bean.set("intIndexed", 1, new Integer(11));
+ bean.set("intIndexed", 1, Integer.valueOf(11));
value = bean.get("intIndexed", 1);
assertNotNull("Returned new value 1", value);
@@ -527,7 +527,7 @@
@Test
public void testSetArrayValue()
{
- final MapConfiguration configuration = new MapConfiguration(new HashMap<String, Object>());
+ final MapConfiguration configuration = new MapConfiguration(new HashMap<>());
configuration.getMap().put("objectArray", new Object[] {"value1", "value2", "value3"});
final ConfigurationDynaBean bean = new ConfigurationDynaBean(configuration);
@@ -561,7 +561,7 @@
{
final boolean oldValue = ((Boolean) bean.get("booleanProperty")).booleanValue();
final boolean newValue = !oldValue;
- bean.set("booleanProperty", new Boolean(newValue));
+ bean.set("booleanProperty", Boolean.valueOf(newValue));
assertTrue("Matched new value", newValue == ((Boolean) bean.get("booleanProperty")).booleanValue());
}
@@ -573,7 +573,7 @@
{
final double oldValue = ((Double) bean.get("doubleProperty")).doubleValue();
final double newValue = oldValue + 1.0;
- bean.set("doubleProperty", new Double(newValue));
+ bean.set("doubleProperty", Double.valueOf(newValue));
assertEquals("Matched new value", newValue, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
}
@@ -585,7 +585,7 @@
{
final float oldValue = ((Float) bean.get("floatProperty")).floatValue();
final float newValue = oldValue + (float) 1.0;
- bean.set("floatProperty", new Float(newValue));
+ bean.set("floatProperty", Float.valueOf(newValue));
assertEquals("Matched new value", newValue, ((Float) bean.get("floatProperty")).floatValue(), 0.005f);
}
@@ -597,7 +597,7 @@
{
final int oldValue = ((Integer) bean.get("intProperty")).intValue();
final int newValue = oldValue + 1;
- bean.set("intProperty", new Integer(newValue));
+ bean.set("intProperty", Integer.valueOf(newValue));
assertEquals("Matched new value", newValue, ((Integer) bean.get("intProperty")).intValue());
}
@@ -609,7 +609,7 @@
{
final long oldValue = ((Long) bean.get("longProperty")).longValue();
final long newValue = oldValue + 1;
- bean.set("longProperty", new Long(newValue));
+ bean.set("longProperty", Long.valueOf(newValue));
assertEquals("Matched new value", newValue, ((Long) bean.get("longProperty")).longValue());
}
@@ -621,7 +621,7 @@
{
final short oldValue = ((Short) bean.get("shortProperty")).shortValue();
final short newValue = (short) (oldValue + 1);
- bean.set("shortProperty", new Short(newValue));
+ bean.set("shortProperty", Short.valueOf(newValue));
assertEquals("Matched new value", newValue, ((Short) bean.get("shortProperty")).shortValue());
}
diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
index 2dcbcb7..a0dde01 100644
--- a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
+++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
@@ -282,7 +282,7 @@
final BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", "Another test string");
- properties2.put("intValue", new Integer(100));
+ properties2.put("intValue", Integer.valueOf(100));
buddyData.setBeanProperties(properties2);
buddyData.setBeanClassName(BeanCreationTestBean.class.getName());
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
index 705a2f9..b15a72f 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
@@ -162,7 +162,7 @@
@Test
public void testSetPrefixLookupsNull()
{
- params.setPrefixLookups(new HashMap<String, Lookup>());
+ params.setPrefixLookups(new HashMap<>());
params.setPrefixLookups(null);
assertFalse("Found key",
params.getParameters().containsKey("prefixLookups"));
@@ -193,7 +193,7 @@
@Test
public void testSetDefaultLookupsNull()
{
- params.setDefaultLookups(new ArrayList<Lookup>());
+ params.setDefaultLookups(new ArrayList<>());
params.setDefaultLookups(null);
assertFalse("Found key",
params.getParameters().containsKey("defaultLookups"));
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
index b96ee04..589232a 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
@@ -232,7 +232,7 @@
{
assertNull("Got an instance",
FileBasedBuilderParametersImpl
- .fromParameters(new HashMap<String, Object>()));
+ .fromParameters(new HashMap<>()));
}
/**
@@ -244,7 +244,7 @@
{
final FileBasedBuilderParametersImpl params =
FileBasedBuilderParametersImpl.fromParameters(
- new HashMap<String, Object>(), true);
+ new HashMap<>(), true);
assertFalse("Got a location", params.getFileHandler()
.isLocationDefined());
}
@@ -429,7 +429,7 @@
new FileBasedBuilderParametersImpl()
.setReloadingRefreshDelay(20160213211429L);
- params.inheritFrom(new HashMap<String, Object>());
+ params.inheritFrom(new HashMap<>());
assertNotNull("Properties were overwritten",
params.getReloadingRefreshDelay());
}
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
index c2d4ba9..daa1ef7 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
@@ -55,7 +55,7 @@
{
assertNull("Got an instance",
CombinedBuilderParametersImpl
- .fromParameters(new HashMap<String, Object>()));
+ .fromParameters(new HashMap<>()));
}
/**
@@ -67,7 +67,7 @@
{
final CombinedBuilderParametersImpl params =
CombinedBuilderParametersImpl.fromParameters(
- new HashMap<String, Object>(), true);
+ new HashMap<>(), true);
assertNotNull("No instance", params);
assertNull("Got data", params.getDefinitionBuilder());
}
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
index 8a80ae3..8b85982 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
@@ -140,7 +140,7 @@
final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals("Wrong class", DEF_CLASS,
provider.determineConfigurationClass(decl,
- new ArrayList<BuilderParameters>()));
+ new ArrayList<>()));
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java
index f5a5803..149b4a5 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java
@@ -56,7 +56,7 @@
{
assertNull("Got an instance",
MultiFileBuilderParametersImpl
- .fromParameters(new HashMap<String, Object>()));
+ .fromParameters(new HashMap<>()));
}
/**
@@ -79,7 +79,7 @@
{
params =
MultiFileBuilderParametersImpl.fromParameters(
- new HashMap<String, Object>(), true);
+ new HashMap<>(), true);
assertNotNull("No new instance", params);
}
diff --git a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
index efdb1e1..b4e5e1f 100644
--- a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
@@ -196,7 +196,7 @@
@Test
public void testToCollectionSuccess()
{
- final Object[] src = new Object[] {
+ final Object[] src = {
VAR, "100"
};
final List<Integer> col = new ArrayList<>(src.length);
@@ -252,7 +252,7 @@
@Test
public void testToArrayPrimitiveSameType()
{
- final int[] src = new int[] {
+ final int[] src = {
1, 2, 3, 4, 5, 6
};
final int[] array =
@@ -268,7 +268,7 @@
@Test
public void testToArrayPrimitiveWrapperType()
{
- final Integer[] src = new Integer[] {
+ final Integer[] src = {
0, 1, 2, 4, 8, 16, 32, 64, 128
};
final int[] array =
diff --git a/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java b/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
index 6fa69ff..e5136b9 100644
--- a/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
+++ b/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
@@ -138,7 +138,7 @@
@Test
public void testToNumberDirect()
{
- final Integer i = new Integer(42);
+ final Integer i = Integer.valueOf(42);
assertSame("Wrong integer", i, PropertyConverter.toNumber(i, Integer.class));
final BigDecimal d = new BigDecimal("3.1415");
assertSame("Wrong BigDecimal", d, PropertyConverter.toNumber(d, Integer.class));
@@ -151,8 +151,8 @@
@Test
public void testToNumberFromString()
{
- assertEquals("Incorrect Integer value", new Integer(42), PropertyConverter.toNumber("42", Integer.class));
- assertEquals("Incorrect Short value", new Short((short) 10), PropertyConverter.toNumber(new StringBuffer("10"), Short.class));
+ assertEquals("Incorrect Integer value", Integer.valueOf(42), PropertyConverter.toNumber("42", Integer.class));
+ assertEquals("Incorrect Short value", Short.valueOf((short) 10), PropertyConverter.toNumber(new StringBuffer("10"), Short.class));
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java b/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
index 8f7a88b..9ae581e 100644
--- a/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
+++ b/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
@@ -88,7 +88,7 @@
public void testAddNodesEmptyEvent()
{
((BaseHierarchicalConfiguration) config).addNodes(TEST_PROPNAME,
- new ArrayList<ImmutableNode>());
+ new ArrayList<>());
listener.done();
}
diff --git a/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java b/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java
index 9f94ede..161a28a 100644
--- a/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java
+++ b/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java
@@ -30,6 +30,6 @@
@Override
protected AbstractConfiguration createConfiguration()
{
- return new MapConfiguration(new HashMap<String, Object>());
+ return new MapConfiguration(new HashMap<>());
}
}
diff --git a/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java b/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java
index 2f24201..2d309f7 100644
--- a/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java
+++ b/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java
@@ -31,6 +31,6 @@
@Override
protected AbstractConfiguration createConfiguration()
{
- return (SubsetConfiguration)new MapConfiguration(new HashMap<String, Object>()).subset("test");
+ return (SubsetConfiguration)new MapConfiguration(new HashMap<>()).subset("test");
}
}
diff --git a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
index c2ea77e..24825b0 100644
--- a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
@@ -351,7 +351,7 @@
public void testSetDataProperty() throws Exception
{
final File saveFile = folder.newFile();
- final byte[] expected = new byte[]{1, 2, 3, 4};
+ final byte[] expected = {1, 2, 3, 4};
config = new PropertyListConfiguration();
config.setProperty("foo", expected);
saveConfig(saveFile);
@@ -372,7 +372,7 @@
public void testAddDataProperty() throws Exception
{
final File saveFile = folder.newFile();
- final byte[] expected = new byte[]{1, 2, 3, 4};
+ final byte[] expected = {1, 2, 3, 4};
config = new PropertyListConfiguration();
config.addProperty("foo", expected);
saveConfig(saveFile);
diff --git a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
index 1617638..e6462d0 100644
--- a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
+++ b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
@@ -69,7 +69,7 @@
@Test
public void testFilterData() throws Exception
{
- final byte[] expected = new byte[] {0x20, 0x20};
+ final byte[] expected = {0x20, 0x20};
ArrayAssert.assertEquals("null string", null, parser.filterData(null));
ArrayAssert.assertEquals("data with < >", expected, parser.filterData("<2020>"));
ArrayAssert.assertEquals("data without < >", expected, parser.filterData("2020"));
diff --git a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
index 7b1a9e7..f3dd07c 100644
--- a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
@@ -348,7 +348,7 @@
public void testSetDataProperty() throws Exception
{
final File savedFile = folder.newFile();
- final byte[] expected = new byte[]{1, 2, 3, 4};
+ final byte[] expected = {1, 2, 3, 4};
config = new XMLPropertyListConfiguration();
config.setProperty("foo", expected);
save(savedFile);
@@ -369,7 +369,7 @@
public void testAddDataProperty() throws Exception
{
final File savedFile = folder.newFile();
- final byte[] expected = new byte[]{1, 2, 3, 4};
+ final byte[] expected = {1, 2, 3, 4};
config = new XMLPropertyListConfiguration();
config.addProperty("foo", expected);
save(savedFile);
diff --git a/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java b/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
index 84e5a56..4e7ea32 100644
--- a/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
+++ b/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
@@ -155,7 +155,7 @@
{
final EventListener<ReloadingEvent> l = createListenerMock();
EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE);
- expectEvent(l, new MutableObject<ReloadingEvent>());
+ expectEvent(l, new MutableObject<>());
EasyMock.replay(detector, l);
final ReloadingController ctrl = createController();
ctrl.addEventListener(ReloadingEvent.ANY, l);
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java b/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java
index 91582fb..1041c69 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java
@@ -612,7 +612,7 @@
@Test
public void testSetAttributesEmpty()
{
- checkSetAttributesNoOp(new HashMap<String, Object>());
+ checkSetAttributesNoOp(new HashMap<>());
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
index 32a56d6..43f48a8 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
@@ -865,7 +865,7 @@
resolver.resolveUpdateKey(
NodeStructureHelper.ROOT_PERSONAE_TREE, KEY, this,
model.getNodeHandler())).andReturn(
- new NodeUpdateData<ImmutableNode>(null, null, null, null));
+ new NodeUpdateData<>(null, null, null, null));
EasyMock.replay(resolver);
model.setProperty(KEY, this, resolver);
@@ -919,7 +919,7 @@
EasyMock.expect(
resolver.resolveKey(NodeStructureHelper.ROOT_AUTHORS_TREE, KEY,
model.getNodeHandler())).andReturn(
- new ArrayList<QueryResult<ImmutableNode>>(0));
+ new ArrayList<>(0));
EasyMock.expect(
resolver.resolveAddKey(NodeStructureHelper.ROOT_AUTHORS_TREE,
KEY, model.getNodeHandler())).andReturn(
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
index fef95e8..af2b376 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
@@ -936,7 +936,7 @@
.andReturn(Collections.singletonList(node));
EasyMock.expect(
resolver.nodeKey(EasyMock.anyObject(ImmutableNode.class),
- EasyMock.eq(new HashMap<ImmutableNode, String>()),
+ EasyMock.eq(new HashMap<>()),
EasyMock.anyObject(TreeData.class)))
.andReturn(childKey);
EasyMock.replay(resolver);
@@ -978,7 +978,7 @@
@Test(expected = ConfigurationRuntimeException.class)
public void testTrackChildNodeWithCreationNoResults()
{
- checkTrackChildNodeWithCreationInvalidKey(new ArrayList<ImmutableNode>());
+ checkTrackChildNodeWithCreationInvalidKey(new ArrayList<>());
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java
index 3b05340..b249984 100644
--- a/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java
@@ -139,7 +139,7 @@
for (int i = 0; i < values.length; i++)
{
- assertEquals("Wrong value at index " + i, values[i].replaceAll("\\\\", ""), v.get(i));
+ assertEquals("Wrong value at index " + i, values[i].replace("\\", ""), v.get(i));
}
}
}
