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
The following commit(s) were added to refs/heads/master by this push:
new fe058a4 cxf-rt-databinding-jaxb: fix PMD rule: UnusedAssignment
fe058a4 is described below
commit fe058a4c83590e7a768e5be32c94622cbe1a3b6b
Author: Alexey Markevich <[email protected]>
AuthorDate: Wed Mar 3 17:46:13 2021 +0300
cxf-rt-databinding-jaxb: fix PMD rule: UnusedAssignment
---
.../org/apache/cxf/jaxb/FactoryClassGenerator.java | 4 ++--
.../java/org/apache/cxf/jaxb/JAXBDataBase.java | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 11 ++++-----
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 10 ++++----
.../org/apache/cxf/jaxb/JAXBSchemaInitializer.java | 13 ++++-------
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 8 +++----
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 27 +++++++++++-----------
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 2 +-
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 2 +-
9 files changed, 36 insertions(+), 43 deletions(-)
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/FactoryClassGenerator.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/FactoryClassGenerator.java
index c69b2b4..fe4c08b 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/FactoryClassGenerator.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/FactoryClassGenerator.java
@@ -63,10 +63,10 @@ public class FactoryClassGenerator extends
ClassGeneratorClassLoader implements
mv = cw.visitMethod(opcodes.ACC_PUBLIC, "create" + cls.getSimpleName(),
"()L" + StringUtils.periodToSlashes(cls.getName()) + ";",
null, null);
mv.visitCode();
- String name = cls.getName().replace(".", "/");
+ String name = cls.getName().replace('.', '/');
mv.visitTypeInsn(opcodes.NEW, name);
mv.visitInsn(opcodes.DUP);
- StringBuilder paraString = new StringBuilder(32).append("(");
+ StringBuilder paraString = new StringBuilder(32).append('(');
for (Class<?> paraClass : contructor.getParameterTypes()) {
mv.visitInsn(opcodes.ACONST_NULL);
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index 2c9aeb8..55ac0cf 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -171,7 +171,7 @@ public abstract class JAXBDataBase {
protected ValidationEventHandler getValidationEventHandler(Message m,
String property) {
Object value = m.getContextualProperty(property);
- ValidationEventHandler veventHandler = null;
+ ValidationEventHandler veventHandler;
if (value instanceof String) {
veventHandler = getValidationEventHandler((String)value);
} else {
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 2d842a1..6632c14 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -349,14 +349,13 @@ public class JAXBDataBinding extends
AbstractInterceptorProvidingDataBinding
}
String tns = getNamespaceToUse(service);
- CachedContextAndSchemas cachedContextAndSchemas = null;
- JAXBContext ctx = null;
+ final CachedContextAndSchemas cachedContextAndSchemas;
try {
cachedContextAndSchemas =
createJAXBContextAndSchemas(contextClasses, tns);
} catch (JAXBException e1) {
throw new ServiceConstructionException(e1);
}
- ctx = cachedContextAndSchemas.getContext();
+ final JAXBContext ctx = cachedContextAndSchemas.getContext();
if (LOG.isLoggable(Level.FINE)) {
LOG.log(Level.FINE, "CREATED_JAXB_CONTEXT", new Object[] {ctx,
contextClasses});
}
@@ -449,8 +448,8 @@ public class JAXBDataBinding extends
AbstractInterceptorProvidingDataBinding
if
("true".equals(service.get("org.apache.cxf.databinding.namespace"))) {
return null;
}
- String tns = null;
- if (service.getServiceInfos().size() > 0) {
+ final String tns;
+ if (!service.getServiceInfos().isEmpty()) {
tns =
service.getServiceInfos().get(0).getInterface().getName().getNamespaceURI();
} else {
tns = service.getName().getNamespaceURI();
@@ -699,7 +698,7 @@ public class JAXBDataBinding extends
AbstractInterceptorProvidingDataBinding
Field elField = getElField(partName, valueClass);
if (getMethod == null
&& elementType != null
- && "boolean".equals(elementType.toLowerCase())
+ && "boolean".equalsIgnoreCase(elementType)
&& (elField == null
|| (!Collection.class.isAssignableFrom(elField.getType())
&& !elField.getType().isArray()))) {
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 0350770..4d177e9 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -478,7 +478,7 @@ public final class JAXBEncoderDecoder {
}
private static String getName(Member m1) {
- String m1Name = null;
+ final String m1Name;
if (m1 instanceof Field) {
m1Name = ((Field)m1).getName();
} else {
@@ -498,7 +498,7 @@ public final class JAXBEncoderDecoder {
return;
}
Object objArray;
- Class<?> cls = null;
+ final Class<?> cls;
if (mObj instanceof List) {
List<?> l = (List<?>)mObj;
objArray = l.toArray();
@@ -539,7 +539,7 @@ public final class JAXBEncoderDecoder {
}
Class<?> cls = part.getTypeClass();
- Object obj = null;
+ Object obj;
try {
Constructor<?> cons = cls.getConstructor();
obj = cons.newInstance();
@@ -584,7 +584,7 @@ public final class JAXBEncoderDecoder {
m = Utils.getMethod(cls, accessType, "is" + s);
}
Type type = m.getGenericReturnType();
- Object o = null;
+ Object o;
if (JAXBSchemaInitializer.isArray(type)) {
Class<?> compType = JAXBSchemaInitializer
.getArrayComponentType(type);
@@ -836,7 +836,7 @@ public final class JAXBEncoderDecoder {
final Class<?> clazz,
final boolean unwrap) throws Exception {
- Object obj = null;
+ final Object obj;
boolean unmarshalWithClass = true;
if (clazz == null
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index ebde206..dde712f 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -253,11 +253,10 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
static XmlJavaTypeAdapter findFromTypeAdapter(JAXBContextProxy context,
Class<?> clazz, Annotation[] anns) {
- JAXBBeanInfo ret = null;
if (anns != null) {
for (Annotation a : anns) {
if
(XmlJavaTypeAdapter.class.isAssignableFrom(a.annotationType())) {
- ret = findFromTypeAdapter(context,
((XmlJavaTypeAdapter)a).value());
+ JAXBBeanInfo ret = findFromTypeAdapter(context,
((XmlJavaTypeAdapter)a).value());
if (ret != null) {
return (XmlJavaTypeAdapter)a;
}
@@ -267,7 +266,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
if (clazz != null) {
XmlJavaTypeAdapter xjta =
clazz.getAnnotation(XmlJavaTypeAdapter.class);
if (xjta != null) {
- ret = findFromTypeAdapter(context, xjta.value());
+ JAXBBeanInfo ret = findFromTypeAdapter(context, xjta.value());
if (ret != null) {
return xjta;
}
@@ -336,10 +335,9 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
private void createBridgeXsElement(MessagePartInfo part, QName qn, QName
typeName) {
- XmlSchemaElement el = null;
SchemaInfo schemaInfo = serviceInfo.getSchema(qn.getNamespaceURI());
if (schemaInfo != null) {
- el = schemaInfo.getElementByQName(qn);
+ XmlSchemaElement el = schemaInfo.getElementByQName(qn);
if (el == null) {
createXsElement(schemaInfo.getSchema(), part, typeName,
schemaInfo);
@@ -357,7 +355,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
schemaInfo = new SchemaInfo(qn.getNamespaceURI(), qualifiedSchemas,
false);
schemaInfo.setSchema(schema);
- el = createXsElement(schema, part, typeName, schemaInfo);
+ createXsElement(schema, part, typeName, schemaInfo);
NamespaceMap nsMap = new NamespaceMap();
nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX,
schema.getTargetNamespace());
@@ -498,7 +496,6 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
//TODO: handle @XmlAccessOrder
}
- XmlSchema schema = null;
if (schemaInfo == null) {
NamespaceMap nsMap = new NamespaceMap();
nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX,
part.getElementQName().getNamespaceURI());
@@ -506,7 +503,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
schemaInfo =
createSchemaIfNeeded(part.getElementQName().getNamespaceURI(), nsMap);
}
- schema = schemaInfo.getSchema();
+ XmlSchema schema = schemaInfo.getSchema();
// Before updating everything, make sure we haven't added this
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
index 9d83926..ef8a15b 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
@@ -48,7 +48,7 @@ import org.apache.cxf.service.model.MessagePartInfo;
public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
private static final Logger LOG =
LogUtils.getLogger(JAXBDataBinding.class);
JAXBDataBinding databinding;
- boolean unwrapJAXBElement = true;
+ boolean unwrapJAXBElement;
ValidationEventHandler veventHandler;
boolean setEventHandler = true;
@@ -109,8 +109,7 @@ public class DataReaderImpl<T> extends JAXBDataBase
implements DataReader<T> {
private Unmarshaller createUnmarshaller() {
try {
- Unmarshaller um = null;
- um = context.createUnmarshaller();
+ Unmarshaller um = context.createUnmarshaller();
if (databinding.getUnmarshallerListener() != null) {
um.setListener(databinding.getUnmarshallerListener());
}
@@ -143,9 +142,8 @@ public class DataReaderImpl<T> extends JAXBDataBase
implements DataReader<T> {
public Object read(MessagePartInfo part, T reader) {
boolean honorJaxbAnnotation = honorJAXBAnnotations(part);
- Annotation[] anns = null;
if (honorJaxbAnnotation) {
- anns = getJAXBAnnotation(part);
+ Annotation[] anns = getJAXBAnnotation(part);
if (anns.length > 0) {
// RpcLit will use the JAXB Bridge to unmarshall part message
when it is
// annotated with
@XmlList,@XmlAttachmentRef,@XmlJavaTypeAdapter
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index 0db8a6e..c7de57f 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxb.io;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
@@ -117,19 +116,19 @@ public class DataWriterImpl<T> extends JAXBDataBase
implements DataWriter<T> {
}
public Marshaller createMarshaller(Object elValue, MessagePartInfo part) {
- Class<?> cls = null;
- if (part != null) {
- cls = part.getTypeClass();
- }
-
- if (cls == null) {
- cls = null != elValue ? elValue.getClass() : null;
- }
-
- if (cls != null && cls.isArray() && elValue instanceof Collection) {
- Collection<?> col = (Collection<?>)elValue;
- elValue =
col.toArray((Object[])Array.newInstance(cls.getComponentType(), col.size()));
- }
+ //Class<?> cls = null;
+ //if (part != null) {
+ // cls = part.getTypeClass();
+ //}
+ //
+ //if (cls == null) {
+ // cls = null != elValue ? elValue.getClass() : null;
+ //}
+ //
+ //if (cls != null && cls.isArray() && elValue instanceof Collection) {
+ // Collection<?> col = (Collection<?>)elValue;
+ // elValue =
col.toArray((Object[])Array.newInstance(cls.getComponentType(), col.size()));
+ //}
Marshaller marshaller;
try {
diff --git
a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 2ed593f..7bdfe01 100644
---
a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -316,7 +316,7 @@ public class JAXBDataBindingTest {
assertEquals(2, classes.size());
}
- public abstract static class Type2 extends AddressEntity<Type2> {
+ public abstract static class Type2 extends AddressEntity<Type2> { //NOPMD
}
public abstract static class AddressEntity<T extends AddressEntity<T>> {
diff --git
a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index e19f798..91572a5 100644
---
a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -481,7 +481,7 @@ public class JAXBEncoderDecoderTest {
// unmarshal with schema should raise exception.
Unmarshaller m = context.createUnmarshaller();
m.setSchema(schema);
- obj = JAXBEncoderDecoder.unmarshall(m, elNode, part, true);
+ JAXBEncoderDecoder.unmarshall(m, elNode, part, true);
fail("Should have thrown a Fault");
} catch (Fault ex) {
// expected - schema validation should fail.
