From 12ed52e05d7afb5e63cd6c927ace92e7aefa9bf3 Mon Sep 17 00:00:00 2001 From: Sebastian Peters Date: Mon, 18 Nov 2019 20:53:15 +0100 Subject: [PATCH 1/2] Remove unused xerces import --- .../xwork2/config/providers/XmlConfigurationProviderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java index 6aefed83d..b813f0b0e 100644 --- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java @@ -27,7 +27,6 @@ import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.config.entities.ResultTypeConfig; import com.opensymphony.xwork2.config.impl.MockConfiguration; import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.sun.org.apache.xerces.internal.dom.ElementImpl; import org.w3c.dom.Document; import java.io.File; From 0c17c650b131b75a6f53c49fed2d511bb163c81c Mon Sep 17 00:00:00 2001 From: Sebastian Peters Date: Mon, 18 Nov 2019 20:56:28 +0100 Subject: [PATCH 2/2] Fix warning: Use parameterized types instead of raw types --- .../XmlConfigurationProviderTest.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java index b813f0b0e..5c56e3aca 100644 --- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java @@ -325,8 +325,8 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { // tag body (as reported with WW-5029). final String fakeBodyString = "allowedMethod1,allowedMethod2,allowedMethod3"; PackageConfig.Builder testPackageConfigBuilder = new PackageConfig.Builder("allowedMethodsPackage"); - List singleStringList = new ArrayList(1); - List multipleStringList = new ArrayList(4); + List singleStringList = new ArrayList<>(1); + List multipleStringList = new ArrayList<>(4); singleStringList.add(fakeBodyString); multipleStringList.add("allowedMethod1,"); multipleStringList.add("allowed"); @@ -379,8 +379,8 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { // tag body (as reported with WW-5029). final String fakeBodyString = "allowedMethod1,allowedMethod2,allowedMethod3"; PackageConfig.Builder testPackageConfigBuilder = new PackageConfig.Builder("globalAllowedMethodsPackage"); - List singleStringList = new ArrayList(1); - List multipleStringList = new ArrayList(4); + List singleStringList = new ArrayList<>(1); + List multipleStringList = new ArrayList<>(4); singleStringList.add(fakeBodyString); multipleStringList.add("allowedMethod4,"); multipleStringList.add("allowed"); @@ -447,10 +447,10 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { resultTypeConfigBuilder.defaultResultParam(resultParam); ResultTypeConfig resultTypeConfig = resultTypeConfigBuilder.build(); testPackageConfigBuilder.addResultTypeConfig(resultTypeConfig); - List singleStringList = new ArrayList(1); - List singleStringList2 = new ArrayList(1); - List multipleStringList = new ArrayList(4); - List multipleStringList2 = new ArrayList(4); + List singleStringList = new ArrayList<>(1); + List singleStringList2 = new ArrayList<>(1); + List multipleStringList = new ArrayList<>(4); + List multipleStringList2 = new ArrayList<>(4); singleStringList.add(fakeBodyString); singleStringList2.add(fakeBodyString2); multipleStringList.add("/SomePath"); @@ -538,10 +538,10 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { resultTypeConfigBuilder.defaultResultParam(resultParam); ResultTypeConfig resultTypeConfig = resultTypeConfigBuilder.build(); testPackageConfigBuilder.addResultTypeConfig(resultTypeConfig); - List singleStringList = new ArrayList(1); - List singleStringList2 = new ArrayList(1); - List multipleStringList = new ArrayList(4); - List multipleStringList2 = new ArrayList(4); + List singleStringList = new ArrayList<>(1); + List singleStringList2 = new ArrayList<>(1); + List multipleStringList = new ArrayList<>(4); + List multipleStringList2 = new ArrayList<>(4); singleStringList.add(fakeBodyString); singleStringList2.add(fakeBodyString2); multipleStringList.add("/SomePath"); @@ -663,7 +663,7 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { List nodeList; public MockNodeList() { - this.nodeList = new ArrayList(0); + this.nodeList = new ArrayList<>(0); } /** @@ -675,24 +675,24 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { public MockNodeList(List stringList) { if (stringList != null) { final int nodeListLength = stringList.size(); - this.nodeList = new ArrayList(nodeListLength); + this.nodeList = new ArrayList<>(nodeListLength); for (int index = 0; index < nodeListLength; index++) { this.nodeList.add(new MockNode("node" + index, stringList.get(index), Node.TEXT_NODE, null, null)); } } else { - this.nodeList = new ArrayList(0); + this.nodeList = new ArrayList<>(0); } } public MockNodeList(NodeList nodeList) { if (nodeList != null) { final int nodeListLength = nodeList.getLength(); - this.nodeList = new ArrayList(nodeListLength); + this.nodeList = new ArrayList<>(nodeListLength); for (int index = 0; index < nodeListLength; index++) { this.nodeList.add(nodeList.item(index)); } } else { - this.nodeList = new ArrayList(0); + this.nodeList = new ArrayList<>(0); } } @@ -703,7 +703,7 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase { this.nodeList.add(nodeList.get(index)); } } else { - this.nodeList = new ArrayList(0); + this.nodeList = new ArrayList<>(0); } }