[commons-configuration] branch master updated: Reuse constant.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git


The following commit(s) were added to refs/heads/master by this push:
     new ee9bbcd  Reuse constant.
ee9bbcd is described below

commit ee9bbcd34619c529440fc9f2bb218ca75c62ed95
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 14:18:19 2021 -0500

    Reuse constant.
---
 .../java/org/apache/commons/configuration2/AbstractConfiguration.java  | 3 ++-
 .../commons/configuration2/TestAbstractConfigurationBasicFeatures.java | 3 ++-
 .../commons/configuration2/plist/TestPropertyListConfiguration.java    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index fb06e73..c3be4b6 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -46,6 +46,7 @@ import org.apache.commons.configuration2.io.ConfigurationLogger;
 import org.apache.commons.configuration2.sync.LockMode;
 import org.apache.commons.configuration2.sync.NoOpSynchronizer;
 import org.apache.commons.configuration2.sync.Synchronizer;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.ObjectUtils;
 
@@ -1412,7 +1413,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
     public String[] getStringArray(final String key)
     {
         final String[] result = (String[]) getArray(String.class, key);
-        return result == null ? new String[0] : result;
+        return result == null ? ArrayUtils.EMPTY_STRING_ARRAY : result;
     }
 
     /**
diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
index 017e7b2..642c546 100644
--- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
+++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
@@ -41,6 +41,7 @@ import org.apache.commons.configuration2.event.EventListener;
 import org.apache.commons.configuration2.event.EventType;
 import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
 import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.lang3.ArrayUtils;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
@@ -814,7 +815,7 @@ public class TestAbstractConfigurationBasicFeatures
             expected[i] = (short) i;
         }
         final short[] result =
-                config.get(short[].class, KEY_PREFIX, new short[0]);
+                config.get(short[].class, KEY_PREFIX, ArrayUtils.EMPTY_SHORT_ARRAY);
         assertArrayEquals("Wrong result", expected, result);
     }
 
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 b5a1185..c2ea77e 100644
--- a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
@@ -44,6 +44,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.configuration2.io.FileHandler;
 import org.apache.commons.configuration2.tree.ImmutableNode;
 import org.apache.commons.configuration2.tree.NodeHandler;
+import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -214,7 +215,7 @@ public class TestPropertyListConfiguration
     @Test
     public void testData()
     {
-        ObjectAssert.assertInstanceOf("data", new byte[0].getClass(), config.getProperty("data"));
+        ObjectAssert.assertInstanceOf("data", ArrayUtils.EMPTY_BYTE_ARRAY.getClass(), config.getProperty("data"));
         ArrayAssert.assertEquals("data", "foo bar".getBytes(), (byte[]) config.getProperty("data"));
     }