Author: oheger
Date: Sun Jan 24 20:54:41 2016
New Revision: 1726563
URL: http://svn.apache.org/viewvc?rev=1726563&view=rev
Log:
[CONFIGURATION-615] Changed generic types in getList() method.
The default value passed to getList() is now of type List<?> rather than
List<Object>. This change of the signature has been part of the 1.10
codebase, but it had not been merged to trunk. The corresponding issue
is CONFIGURATION-558.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java?rev=1726563&r1=1726562&r2=1726563&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
Sun Jan 24 20:54:41 2016
@@ -1425,7 +1425,7 @@ public abstract class AbstractConfigurat
}
@Override
- public List<Object> getList(String key, List<Object> defaultValue)
+ public List<Object> getList(String key, List<?> defaultValue)
{
Object value = getProperty(key);
List<Object> list;
@@ -1448,7 +1448,10 @@ public abstract class AbstractConfigurat
}
else if (value == null)
{
- list = defaultValue;
+ // This is okay because we just return this list to the caller
+ @SuppressWarnings("unchecked")
+ List<Object> resultList = (List<Object>) defaultValue;
+ list = resultList;
}
else if (value.getClass().isArray())
{
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java?rev=1726563&r1=1726562&r2=1726563&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
Sun Jan 24 20:54:41 2016
@@ -380,7 +380,7 @@ implements Cloneable
}
@Override
- public List<Object> getList(String key, List<Object> defaultValue)
+ public List<Object> getList(String key, List<?> defaultValue)
{
List<Object> list = new ArrayList<Object>();
@@ -400,7 +400,10 @@ implements Cloneable
if (list.isEmpty())
{
- return defaultValue;
+ // This is okay because we just return this list to the caller
+ @SuppressWarnings("unchecked")
+ List<Object> resultList = (List<Object>) defaultValue;
+ return resultList;
}
ListIterator<Object> lit = list.listIterator();
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java?rev=1726563&r1=1726562&r2=1726563&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
Sun Jan 24 20:54:41 2016
@@ -522,7 +522,7 @@ public class DynamicCombinedConfiguratio
}
@Override
- public List<Object> getList(String key, List<Object> defaultValue)
+ public List<Object> getList(String key, List<?> defaultValue)
{
return this.getCurrentConfig().getList(key, defaultValue);
}
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java?rev=1726563&r1=1726562&r2=1726563&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
Sun Jan 24 20:54:41 2016
@@ -533,7 +533,7 @@ public interface ImmutableConfiguration
* object that is not a List.
* @see #getList(Class, String, List)
*/
- List<Object> getList(String key, List<Object> defaultValue);
+ List<Object> getList(String key, List<?> defaultValue);
/**
* Get an object of the specified type associated with the given
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java?rev=1726563&r1=1726562&r2=1726563&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
Sun Jan 24 20:54:41 2016
@@ -225,7 +225,7 @@ public class PatternSubtreeConfiguration
}
@Override
- public List<Object> getList(String key, List<Object> defaultValue)
+ public List<Object> getList(String key, List<?> defaultValue)
{
return config.getList(makePath(key), defaultValue);
}
