This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch HEAD in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 124fae280460ca911c6040868271328e6ca8fe98 Author: Alexey Markevich <[email protected]> AuthorDate: Tue Mar 16 03:19:13 2021 +0300 cxf-rt-databinding-aegis: fix PMD rule: UnusedAssignment --- .../java/org/apache/cxf/aegis/AegisContext.java | 5 +- .../cxf/aegis/databinding/AegisDatabinding.java | 6 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +- .../cxf/aegis/type/SimpleParameterizedType.java | 2 +- .../org/apache/cxf/aegis/type/basic/ArrayType.java | 2 +- .../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../cxf/aegis/type/basic/BigDecimalType.java | 2 +- .../type/basic/InterfaceInvocationHandler.java | 4 +- .../apache/cxf/aegis/type/basic/ObjectType.java | 5 +- .../org/apache/cxf/aegis/type/basic/TimeType.java | 2 +- .../apache/cxf/aegis/type/basic/TimestampType.java | 2 +- .../cxf/aegis/type/collection/CollectionType.java | 4 +- .../apache/cxf/aegis/type/collection/MapType.java | 2 +- .../org/apache/cxf/aegis/type/xml/SourceType.java | 2 +- .../org/apache/cxf/aegis/util/NamespaceHelper.java | 111 --------------------- .../cxf/aegis/util/date/XsDateTimeFormat.java | 4 +- .../cxf/aegis/type/basic/DateTimezoneTest.java | 2 +- 17 files changed, 21 insertions(+), 139 deletions(-) diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java index 2d5abdd..eddcbb9 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java @@ -234,14 +234,11 @@ public class AegisContext { rootTypeQNames = new HashSet<>(); if (this.rootClassNames != null) { for (String typeName : rootClassNames) { - Class<?> c = null; try { - c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class); + rootClasses.add(ClassLoaderUtils.loadClass(typeName, TypeUtil.class)); } catch (ClassNotFoundException e) { throw new DatabindingException("Could not find override type class: " + typeName, e); } - - rootClasses.add(c); } } diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java index 27a801a..302ba5a 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java @@ -202,16 +202,14 @@ public class AegisDatabinding extends AbstractDataBinding { for (String key : s.keySet()) { if (key.endsWith(".implementation")) { String className = key.substring(0, key.length() - ".implementation".length()); - Class<?> clazz = null; try { - clazz = ClassLoaderUtils.loadClass(className, getClass()); + String implClassName = (String)s.get(key); + implMap.put(ClassLoaderUtils.loadClass(className, getClass()), implClassName); } catch (ClassNotFoundException e) { Message message = new Message("MAPPED_CLASS_NOT_FOUND", LOG, className, key); LOG.warning(message.toString()); continue; } - String implClassName = (String)s.get(key); - implMap.put(clazz, implClassName); } } diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java index ce890cb..8ed3fef 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java @@ -107,7 +107,7 @@ public abstract class AbstractTypeCreator implements TypeCreator { public AegisType createTypeForClass(TypeClassInfo info) { Class<?> javaClass = TypeUtil.getTypeRelatedClass(info.getType()); - AegisType result = null; + final AegisType result; boolean newType = true; if (info.getType() instanceof TypeVariable) { //it's the generic type diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java index e8c3143..0b9b05c 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java @@ -70,7 +70,7 @@ class SimpleParameterizedType implements ParameterizedType { return false; } - ParameterizedType opt = null; + final ParameterizedType opt; try { opt = (ParameterizedType) obj; } catch (ClassCastException cce) { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java index 3b6b620..c274f97 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java @@ -236,7 +236,7 @@ public class ArrayType extends AegisType { forceXsiWrite = true; } - String ns = null; + String ns; if (type.isAbstract()) { ns = getSchemaType().getNamespaceURI(); } else { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java index 4f95d72..50f08a2 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java @@ -429,8 +429,7 @@ public class BeanType extends AegisType { AegisType type, MessageWriter writer, Context context) { if (!type.isFlatArray()) { - MessageWriter cwriter = null; - cwriter = getWriter(writer, name, type); + MessageWriter cwriter = getWriter(writer, name, type); type.writeObject(value, cwriter, context); cwriter.close(); } else { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigDecimalType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigDecimalType.java index 7d44e95..c87320d 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigDecimalType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigDecimalType.java @@ -45,7 +45,7 @@ public class BigDecimalType extends AegisType { @Override public void writeObject(final Object object, final MessageWriter writer, final Context context) { - BigDecimal d = null; + final BigDecimal d; if (object instanceof BigDecimal) { d = (BigDecimal)object; } else if (object instanceof BigInteger) { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java index 69de06f..4595d6b 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java @@ -94,7 +94,7 @@ class InterfaceInvocationHandler implements InvocationHandler { protected Object doGetter(Method method, Object[] args) throws Throwable { String methodName = method.getName(); - String attrName = null; + final String attrName; if (methodName.startsWith("get")) { attrName = convertMethodName(methodName, 3); @@ -127,7 +127,7 @@ class InterfaceInvocationHandler implements InvocationHandler { protected Object doSetter(Method method, Object[] args) throws Throwable { String methodName = method.getName(); - String attrName = null; + final String attrName; if (methodName.startsWith("set")) { attrName = convertMethodName(methodName, 3); diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java index bedc5cb..9971dcb 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java @@ -89,8 +89,7 @@ public class ObjectType extends AegisType { throw new DatabindingException("Missing 'xsi:type' attribute value"); } - AegisType type = null; - QName typeQName = null; + final QName typeQName; if (typeName != null) { typeName = typeName.trim(); @@ -104,7 +103,7 @@ public class ObjectType extends AegisType { tm = getTypeMapping(); } - type = tm.getType(typeQName); + AegisType type = tm.getType(typeQName); if (type == null) { type = tm.getType(getSchemaType()); diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java index 424fa60..65c47f4 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java @@ -46,7 +46,7 @@ public class TimeType extends AegisType { try { synchronized (format) { Calendar c = (Calendar)format.parseObject(value.trim()); - return new Time(c.getTimeInMillis()); + return new Time(c.getTimeInMillis()); //NOPMD } } catch (ParseException e) { throw new DatabindingException("Could not parse xs:dateTime: " + e.getMessage(), e); diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java index ff75860..c70d78e 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java @@ -46,7 +46,7 @@ public class TimestampType extends AegisType { try { synchronized (format) { Calendar c = (Calendar)format.parseObject(value.trim()); - return new Timestamp(c.getTimeInMillis()); + return new Timestamp(c.getTimeInMillis()); //NOPMD } } catch (ParseException e) { throw new DatabindingException("Could not parse xs:dateTime: " + e.getMessage(), e); diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java index cd03904..16e2fa3 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java @@ -58,7 +58,7 @@ public class CollectionType extends ArrayType { @Override @SuppressWarnings("unchecked") protected Collection<Object> createCollection() { - Collection<Object> values = null; + final Collection<Object> values; /* * getTypeClass returns the type of the object. These 'if's asked if the proposed @@ -111,7 +111,7 @@ public class CollectionType extends ArrayType { } for (Iterator<?> itr = list.iterator(); itr.hasNext();) { - String ns = null; + final String ns; if (type.isAbstract()) { ns = getSchemaType().getNamespaceURI(); } else { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java index 145eeba..bd5f09f 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java @@ -123,7 +123,7 @@ public class MapType extends AegisType { */ @SuppressWarnings("unchecked") protected Map<Object, Object> instantiateMap() { - Map<Object, Object> map = null; + final Map<Object, Object> map; Class<?> cls = getTypeClass(); if (cls.equals(Map.class)) { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java index 2ec5816..e6c216e 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java @@ -84,7 +84,7 @@ public class SourceType extends AegisType { if (object instanceof DOMSource) { DOMSource ds = (DOMSource)object; - Element element = null; + final Element element; if (ds.getNode() instanceof Element) { element = (Element)ds.getNode(); } else if (ds.getNode() instanceof Document) { diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java index 21218a5..3437ed3 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java @@ -18,8 +18,6 @@ */ package org.apache.cxf.aegis.util; -import java.net.MalformedURLException; -import java.net.URL; import java.util.List; import java.util.StringTokenizer; @@ -33,7 +31,6 @@ import org.w3c.dom.Element; import org.apache.cxf.aegis.DatabindingException; import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.helpers.JavaUtils; import org.apache.cxf.staxutils.StaxUtils; /** @@ -176,114 +173,6 @@ public final class NamespaceHelper { } /** - * Method makePackageName - * - * @param namespace - * @return - */ - public static String makePackageName(String namespace) { - - String hostname = null; - String path = ""; - - // get the target namespace of the document - try { - URL u = new URL(namespace); - - hostname = u.getHost(); - path = u.getPath(); - } catch (MalformedURLException e) { - if (namespace.indexOf(':') > -1) { - hostname = namespace.substring(namespace.indexOf(':') + 1); - - if (hostname.indexOf('/') > -1) { - hostname = hostname.substring(0, hostname.indexOf('/')); - } - } else { - hostname = namespace; - } - } - - // if we didn't file a hostname, bail - if (hostname == null) { - return null; - } - - // convert illegal java identifier - hostname = hostname.replace('-', '_'); - path = path.replace('-', '_'); - - // chomp off last forward slash in path, if necessary - if ((path.length() > 0) && (path.charAt(path.length() - 1) == '/')) { - path = path.substring(0, path.length() - 1); - } - - // tokenize the hostname and reverse it - StringTokenizer st = new StringTokenizer(hostname, ".:"); - String[] words = new String[st.countTokens()]; - - for (int i = 0; i < words.length; ++i) { - words[i] = st.nextToken(); - } - - StringBuilder sb = new StringBuilder(namespace.length()); - - for (int i = words.length - 1; i >= 0; --i) { - addWordToPackageBuffer(sb, words[i], i == words.length - 1); - } - - // tokenize the path - StringTokenizer st2 = new StringTokenizer(path, "/"); - - while (st2.hasMoreTokens()) { - addWordToPackageBuffer(sb, st2.nextToken(), false); - } - - return sb.toString(); - } - - /** - * Massage <tt>word</tt> into a form suitable for use in a Java package - * name. Append it to the target string buffer with a <tt>.</tt> delimiter - * iff <tt>word</tt> is not the first word in the package name. - * - * @param sb the buffer to append to - * @param word the word to append - * @param firstWord a flag indicating whether this is the first word - */ - private static void addWordToPackageBuffer(StringBuilder sb, String word, boolean firstWord) { - - if (JavaUtils.isJavaKeyword(word)) { - word = JavaUtils.makeNonJavaKeyword(word); - } - - // separate with dot after the first word - if (!firstWord) { - sb.append('.'); - } - - // prefix digits with underscores - if (Character.isDigit(word.charAt(0))) { - sb.append('_'); - } - - // replace periods with underscores - if (word.indexOf('.') != -1) { - char[] buf = word.toCharArray(); - - for (int i = 0; i < word.length(); i++) { - if (buf[i] == '.') { - buf[i] = '_'; - } - } - - word = new String(buf); - } - - sb.append(word); - } - - /** * Reads a QName from the element text. Reader must be positioned at the * start tag. * diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java index a9eac9e..c18d7b6 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java @@ -75,7 +75,7 @@ public class XsDateTimeFormat extends Format { if (idxCom != -1 && idxCom < idxSpc) { idxSpc = idxCom; } - String newVal = null; + final String newVal; if (idxSpc == -1) { newVal = pString.substring(offset); } else { @@ -147,7 +147,7 @@ public class XsDateTimeFormat extends Format { TimeZone tz = cal.getTimeZone(); // JDK 1.4: int offset = tz.getOffset(cal.getTimeInMillis()); int offset = cal.get(Calendar.ZONE_OFFSET); - if (tz.inDaylightTime(cal.getTime())) { + if (tz.inDaylightTime(cal.getTime())) { //NOPMD offset += cal.get(Calendar.DST_OFFSET); } if (offset == 0) { diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java index 5fe1d11..1ed02ec 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java @@ -84,7 +84,7 @@ public class DateTimezoneTest extends AbstractAegisTest { type.setSchemaType(new QName("urn:Bean", "bean")); DateBean bean = new DateBean(); - bean.setDate(Calendar.getInstance().getTime()); + bean.setDate(new Date()); // Test writing Element element = writeObjectToElement(type, bean, getContext()); assertTimezoneLessString(element.getTextContent());
