You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 21:07:09 UTC
svn commit: r1842169 - in
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2:
spring/ConfigurationPropertiesFactoryBean.java tree/MergeCombiner.java
Author: ggregory
Date: Thu Sep 27 21:07:09 2018
New Revision: 1842169
URL: http://svn.apache.org/viewvc?rev=1842169&view=rev
Log:
Migrate away from deprecated APIs in Apache Commons Lang and Spring.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java?rev=1842169&r1=1842168&r2=1842169&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java Thu Sep 27 21:07:09 2018
@@ -65,7 +65,7 @@ public class ConfigurationPropertiesFact
public ConfigurationPropertiesFactoryBean(Configuration configuration)
{
- Assert.notNull(configuration);
+ Assert.notNull(configuration, "configuration");
this.compositeConfiguration = new CompositeConfiguration(configuration);
}
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=1842169&r1=1842168&r2=1842169&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 Thu Sep 27 21:07:09 2018
@@ -21,8 +21,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
/**
* <p>
@@ -165,7 +164,7 @@ public class MergeCombiner extends NodeC
for (Map.Entry<String, Object> e : attrs1.entrySet())
{
if (attrs2.containsKey(e.getKey())
- && !ObjectUtils
+ && !Objects
.equals(e.getValue(), attrs2.get(e.getKey())))
{
return false;