This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4f7e6935d36a1a48fc959de6c32fe84b3df25198
Author: Alexey Markevich <buhhu...@gmail.com>
AuthorDate: Wed Mar 17 01:43:15 2021 +0300
cxf-tools-java2ws: fix PMD rule: UnusedAssignment
---
.../sts/x509/X509AsymmetricBindingTest.java | 2 +-
.../systest/sts/x509/cxf-asymmetric-service.xml | 2 +-
.../java2wsdl/generator/WSDLGeneratorFactory.java | 6 +--
.../generator/wsdl11/WSDL11Generator.java | 4 +-
.../wsdl11/annotator/WrapperBeanAnnotator.java | 2 +-
.../annotator/WrapperBeanFieldAnnotator.java | 2 +-
.../internal/DefaultServiceBuilderFactory.java | 2 +-
.../internal/SpringServiceBuilderFactory.java | 2 +-
.../fortest/cxf523/Operation0ResponseType.java | 12 ++---
.../cxf/tools/fortest/exception/OrderItem.java | 2 +-
.../org/apache/cxf/tools/java2ws/AegisTest.java | 61 ++++++----------------
11 files changed, 33 insertions(+), 64 deletions(-)
diff --git
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
index 694392c..6eb76f0 100644
---
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
+++
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
@@ -49,7 +49,7 @@ public class X509AsymmetricBindingTest extends
AbstractBusClientServerTestBase {
private static final String NAMESPACE =
"http://www.example.org/contract/DoubleIt";;
private static final QName SERVICE_QNAME = new QName(NAMESPACE,
"DoubleItService");
- private static final String PORT = allocatePort(DoubleItPortType.class);
+ private static final String PORT = allocatePort(DoubleItServer.class);
@BeforeClass
public static void startServers() throws Exception {
diff --git
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
index fff9746..95d65a0 100644
---
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
+++
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
@@ -45,7 +45,7 @@
<bean id="customSecurityContextCreator"
class="org.apache.cxf.systest.sts.x509.CustomWSS4JSecurityContextCreator" />
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt";
id="doubleitasymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService"
address="http://localhost:${testutil.ports.DoubleItPortType}/doubleit/services/doubleitasymmetricsaml2";
wsdlLocation="org/apache/cxf/systest/sts/x509/DoubleItAsymmetric.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt";
id="doubleitasymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService"
address="http://localhost:${testutil.ports.DoubleItServer}/doubleit/services/doubleitasymmetricsaml2";
wsdlLocation="org/apache/cxf/systest/sts/x509/DoubleItAsymmetric.wsdl">
<jaxws:properties>
<entry key="security.signature.username" value="myservicekey"/>
<entry key="security.callback-handler"
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
index 9b42782..8e9b81f 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
@@ -36,14 +36,14 @@ public final class WSDLGeneratorFactory {
protected String getGeneratorClassName() {
String pkgName = PackageUtils.getPackageName(getClass());
- return pkgName + "." + wsdlVersion.toString().toLowerCase() + "." +
wsdlVersion + "Generator";
+ return pkgName + '.' + wsdlVersion.toString().toLowerCase() + '.' +
wsdlVersion + "Generator";
}
public AbstractGenerator<?> newGenerator() {
- AbstractGenerator<?> generator = null;
+ final AbstractGenerator<?> generator;
String clzName = getGeneratorClassName();
try {
- generator = (AbstractGenerator<?>)
Class.forName(clzName).newInstance();
+ generator = (AbstractGenerator<?>)
Class.forName(clzName).getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new ToolException("Can not find the Generator for: " +
clzName, e);
}
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
index d55d51d..60096b8 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
@@ -87,10 +87,10 @@ public class WSDL11Generator extends
AbstractGenerator<Definition> {
wsdlWriter.writeWSDL(def, os);
os.close();
- if (def.getImports().size() > 0) {
+ if (!def.getImports().isEmpty()) {
for (Import wsdlImport :
WSDLDefinitionBuilder.getImports(def)) {
Definition wsdlDef = wsdlImport.getDefinition();
- File wsdlFile = null;
+ final File wsdlFile;
if (!StringUtils.isEmpty(wsdlImport.getLocationURI())) {
wsdlFile = new File(outputdir,
wsdlImport.getLocationURI());
} else {
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
index 5a16b25..77f08c8 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
@@ -45,7 +45,7 @@ public class WrapperBeanAnnotator implements Annotator {
}
public void annotate(final JavaAnnotatable clz) {
- WrapperBeanClass beanClass = null;
+ final WrapperBeanClass beanClass;
if (clz instanceof WrapperBeanClass) {
beanClass = (WrapperBeanClass) clz;
} else {
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotator.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotator.java
index 950f2f6..e53be01 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotator.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotator.java
@@ -37,7 +37,7 @@ import org.apache.cxf.tools.common.model.JavaField;
public class WrapperBeanFieldAnnotator implements Annotator {
public void annotate(final JavaAnnotatable field) {
- JavaField jField = null;
+ final JavaField jField;
if (field instanceof JavaField) {
jField = (JavaField) field;
} else {
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
index d0ed292..deea27b 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
@@ -48,7 +48,7 @@ public final class DefaultServiceBuilderFactory extends
ServiceBuilderFactory {
} else {
throw new ToolException("Unsupported databinding: " + dbn);
}
- AbstractServiceFactory builder = null;
+ final AbstractServiceFactory builder;
if (Style.Jaxws.equals(s)) {
builder = new JaxwsServiceBuilder();
} else if (Style.Simple.equals(s)) {
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
index a3d6898..ebb0db4 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
@@ -81,7 +81,7 @@ public final class SpringServiceBuilderFactory extends
ServiceBuilderFactory {
}
String beanName = getBuilderBeanName(s);
- ServiceBuilder builder = null;
+ final ServiceBuilder builder;
try {
builder = applicationContext.getBean(beanName,
ServiceBuilder.class);
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
index bb1c96e..0a081bc 100644
---
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
+++
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
@@ -94,22 +94,22 @@ public class Operation0ResponseType {
public String toString() {
StringBuilder buffer = new StringBuilder(128);
if (name != null) {
- buffer.append("name : " + name + "\n");
+ buffer.append("name : ").append(name).append('\n');
}
if (owner != null) {
- buffer.append("owner : " + owner + "\n");
+ buffer.append("owner : ").append(owner).append('\n');
}
if (species != null) {
- buffer.append("species : " + species + "\n");
+ buffer.append("species : ").append(species).append('\n');
}
if (sex != null) {
- buffer.append("sex : " + sex + "\n");
+ buffer.append("sex : ").append(sex).append('\n');
}
if (birth != null) {
- buffer.append("birth : " + birth + "\n");
+ buffer.append("birth : ").append(birth).append('\n');
}
if (death != null) {
- buffer.append("death : " + death + "\n");
+ buffer.append("death : ").append(death).append('\n');
}
return buffer.toString();
}
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/OrderItem.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/OrderItem.java
index 62cbe6c..604f28a 100644
---
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/OrderItem.java
+++
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/OrderItem.java
@@ -68,6 +68,6 @@ public class OrderItem {
}
public BigDecimal getTotalPrice() {
- return new BigDecimal(pricePerUnit).multiply(new BigDecimal(count));
+ return
BigDecimal.valueOf(pricePerUnit).multiply(BigDecimal.valueOf(count));
}
}
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
index 1c072bf..0a30ea5 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
@@ -19,27 +19,24 @@
package org.apache.cxf.tools.java2ws;
import java.io.File;
-import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.xml.stream.XMLStreamException;
import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Document;
-import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ToolTestBase;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -47,44 +44,18 @@ import static org.junit.Assert.assertTrue;
public class AegisTest extends ToolTestBase {
- private File output;
- private String cp;
- private File inputData;
-
-
- @Before
- public void startUp() throws Exception {
- cp = System.getProperty("java.class.path");
- URL url = getClass().getResource(".");
- output = new File(url.toURI());
- output = new File(output, "/generated/");
- url = getClass().getResource("/");
- inputData = new File(url.toURI());
- FileUtils.mkDir(output);
- }
-
- @After
- public void tearDown() {
- super.tearDown();
- System.setProperty("java.class.path", cp);
- FileUtils.removeDir(output);
- output = null;
- }
- private File outputFile(String name) {
- File f = new File(output.getPath() + File.separator + name);
- f.delete();
- return f;
- }
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder();
@Test
public void testAegisBasic() throws Exception {
final String sei =
org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI.class.getName();
- String[] args = new String[] {"-wsdl", "-o", output.getPath() +
"/aegis.wsdl", "-verbose", "-d",
- output.getPath(), "-s", output.getPath(),
+ File wsdlFile = new File(folder.getRoot(), "aegis.wsdl");
+ String[] args = new String[] {"-wsdl", "-o", wsdlFile.toString(),
"-verbose",
+ "-d", folder.getRoot().toString(),
+ "-s", folder.getRoot().toString(),
"-frontend", "jaxws", "-databinding",
"aegis",
"-client", "-server", sei};
- File wsdlFile = null;
- wsdlFile = outputFile("aegis.wsdl");
JavaToWS.main(args);
assertTrue("wsdl is not generated", wsdlFile.exists());
@@ -98,15 +69,13 @@ public class AegisTest extends ToolTestBase {
@Test
public void testAegisReconfigureDatabinding() throws Exception {
final String sei =
org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI.class.getName();
- String[] args = new String[] {"-wsdl", "-o", output.getPath() +
"/aegis.wsdl",
+ File wsdlFile = new File(folder.getRoot(), "aegis.wsdl");
+ String[] args = new String[] {"-wsdl", "-o", wsdlFile.toString(),
"-beans",
- new File(inputData,
"revisedAegisDefaultBeans.xml").
- getAbsolutePath(),
- "-verbose", "-s",
- output.getPath(), "-frontend", "jaxws",
"-databinding", "aegis",
+ new
File(getClass().getResource("/revisedAegisDefaultBeans.xml").toURI()).toString(),
+ "-verbose", "-s",
folder.getRoot().toString(),
+ "-frontend", "jaxws", "-databinding",
"aegis",
"-client", "-server", sei};
- File wsdlFile = null;
- wsdlFile = outputFile("aegis.wsdl");
JavaToWS.main(args);
assertTrue("wsdl is not generated " + getStdErr(), wsdlFile.exists());
@@ -127,7 +96,7 @@ public class AegisTest extends ToolTestBase {
}
- private Map<String, String> getNSMap() {
+ private static Map<String, String> getNSMap() {
Map<String, String> namespaces = new HashMap<>();
namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/";);
namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema";);
@@ -140,7 +109,7 @@ public class AegisTest extends ToolTestBase {
return namespaces;
}
- private void assertValid(String xpathExpression, Document doc) throws
XMLStreamException {
+ private static void assertValid(String xpathExpression, Document doc) {
XPathUtils xpu = new XPathUtils(getNSMap());
if (!xpu.isExist(xpathExpression, doc, XPathConstants.NODE)) {
Assert.fail("Failed to select any nodes for expression:\n" +
xpathExpression
