You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2019/02/11 11:55:29 UTC

svn commit: r1853345 - in /santuario/xml-security-java/trunk: ./ etc/ src/main/java/org/apache/jcp/xml/dsig/internal/dom/ src/main/java/org/apache/xml/security/c14n/implementations/ src/main/java/org/apache/xml/security/encryption/ src/main/java/org/ap...

Author: coheigea
Date: Mon Feb 11 11:55:28 2019
New Revision: 1853345

URL: http://svn.apache.org/viewvc?rev=1853345&view=rev
Log:
Starting to update the PMD ruleset

Modified:
    santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml
    santuario/xml-security-java/trunk/pom.xml
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java

Modified: santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml (original)
+++ santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml Mon Feb 11 11:55:28 2019
@@ -24,26 +24,62 @@
   A PMD ruleset for Apache Santuario
   </description>
 
-  <rule ref="rulesets/java/basic.xml">
+  <rule ref="category/java/bestpractices.xml">
+     <exclude name="AbstractClassWithoutAbstractMethod" />
+     <exclude name="AccessorMethodGeneration" />
+     <exclude name="ArrayIsStoredDirectly" />
      <exclude name="AvoidUsingHardCodedIP" />
-     <exclude name="SimplifiedTernary" />
-  </rule>
-  <rule ref="rulesets/java/unusedcode.xml"/>
-  <rule ref="rulesets/java/imports.xml"/>
-  <rule ref="rulesets/java/imports.xml/TooManyStaticImports">
-    <properties>
-        <property name="maximumStaticImports" value="6"/>
-    </properties>
+     <exclude name="ConstantsInInterface" />
+     <exclude name="ForLoopCanBeForeach" />
+     <exclude name="GuardLogStatement" />
+     <exclude name="JUnitAssertionsShouldIncludeMessage"/>
+     <exclude name="JUnitTestContainsTooManyAsserts" />
+     <exclude name="JUnitTestsShouldIncludeAssert" />
+     <exclude name="JUnitUseExpected" />
+     <exclude name="MethodReturnsInternalArray" />
+     <exclude name="MissingOverride" />
+     <exclude name="OneDeclarationPerLine" />
+     <exclude name="PreserveStackTrace" />
+     <exclude name="UseAssertSameInsteadOfAssertTrue" />
+     <exclude name="UseAssertEqualsInsteadOfAssertTrue" />
+     <exclude name="UseVarargs" />
+
+     <!-- To fix -->
+     <exclude name="AvoidReassigningParameters" />
+     <exclude name="SwitchStmtsShouldHaveDefault" />
+     <exclude name="SystemPrintln" />
+     <exclude name="UnusedImports" />
+     <exclude name="PositionLiteralsFirstInComparisons" />
+     <exclude name="PositionLiteralsFirstInCaseInsensitiveComparisons" />
+     <exclude name="UnusedPrivateMethod" />
   </rule>
-  <rule ref="rulesets/java/braces.xml"/>
-  <rule ref="rulesets/java/empty.xml">
-      <exclude name="EmptyCatchBlock" />
+
+  <!-- TODO <rule ref="category/java/design.xml"> -->
+  <!-- TODO <rule ref="category/java/errorprone.xml"> -->
+
+  <rule ref="category/java/multithreading.xml">
+     <exclude name="AvoidSynchronizedAtMethodLevel" />
+     <exclude name="AvoidUsingVolatile" />
+     <exclude name="DoNotUseThreads" />
+     <exclude name="UseConcurrentHashMap" />
   </rule>
-  <rule ref="rulesets/java/migrating.xml">
-     <exclude name="JUnit4TestShouldUseAfterAnnotation" /> 
-     <exclude name="JUnit4TestShouldUseTestAnnotation" /> 
-     <exclude name="JUnitUseExpected" /> 
+
+  <rule ref="category/java/performance.xml">
+     <exclude name="AvoidInstantiatingObjectsInLoops" />
+     <exclude name="ConsecutiveAppendsShouldReuse" />
+     <exclude name="InefficientEmptyStringCheck" />
+     <exclude name="OptimizableToArrayCall" />
+     <exclude name="UseStringBufferForStringAppends" />
+
+     <!-- To fix -->
+     <exclude name="AvoidFileStream" />
+     <exclude name="AddEmptyString" />
+     <exclude name="TooFewBranchesForASwitchStatement" />
+     <exclude name="RedundantFieldInitializer" />
   </rule>
-  <rule ref="rulesets/java/unnecessary.xml"/>
 
+  <rule ref="category/java/security.xml" >
+     <exclude name="HardCodedCryptoKey" />
+  </rule>
+      
 </ruleset>

Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Mon Feb 11 11:55:28 2019
@@ -111,7 +111,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.7</version>
+                <version>3.11.0</version>
                 <configuration>
                     <rulesets>
                         <ruleset>${basedir}/etc/santuario-pmd-ruleset.xml</ruleset>

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Mon Feb 11 11:55:28 2019
@@ -118,7 +118,7 @@ public final class DOMExcC14NMethod exte
         for (int i = 0, size = prefixList.size(); i < size; i++) {
             prefixListAttr.append(prefixList.get(i));
             if (i < size - 1) {
-                prefixListAttr.append(" ");
+                prefixListAttr.append(' ');
             }
         }
         xwriter.writeAttribute("", "", "PrefixList", prefixListAttr.toString());

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Mon Feb 11 11:55:28 2019
@@ -461,8 +461,7 @@ public final class DOMUtils {
 
     public static boolean isNamespace(Node node)
     {
-        final short nodeType = node.getNodeType();
-        if (nodeType == Node.ATTRIBUTE_NODE) {
+        if (Node.ATTRIBUTE_NODE == node.getNodeType()) {
             final String namespaceURI = node.getNamespaceURI();
             return XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI);
         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java Mon Feb 11 11:55:28 2019
@@ -285,7 +285,7 @@ class Marshaller {
 
     private static void marshalGenericNode(XmlWriter xwriter, Node node) {
 
-        short nodeType = node.getNodeType();
+        short nodeType = node.getNodeType(); //NOPMD
         if (DOMUtils.isNamespace(node)) {
             xwriter.writeNamespace(node.getLocalName(), node.getTextContent());
         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java Mon Feb 11 11:55:28 2019
@@ -67,7 +67,7 @@ public final class XMLDSigRI extends Pro
         }
 
         ProviderService(Provider p, String type, String algo, String cn,
-            String[] aliases, HashMap<String, String> attrs) {
+            String[] aliases, Map<String, String> attrs) {
             super(p, type, algo, cn,
                   aliases == null ? null : Arrays.asList(aliases), attrs);
         }
@@ -129,7 +129,7 @@ public final class XMLDSigRI extends Pro
         final Provider p = this;
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
-                HashMap<String, String> MECH_TYPE = new HashMap<>();
+                Map<String, String> MECH_TYPE = new HashMap<>();
                 MECH_TYPE.put("MechanismType", "DOM");
 
                 putService(new ProviderService(p, "XMLSignatureFactory",

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Mon Feb 11 11:55:28 2019
@@ -34,6 +34,9 @@ import org.w3c.dom.Node;
  */
 public class NameSpaceSymbTable {
 
+    private static final org.slf4j.Logger LOG =
+        org.slf4j.LoggerFactory.getLogger(NameSpaceSymbTable.class);
+
     private static final String XMLNS = "xmlns";
     private static final SymbMap initialMap = new SymbMap();
 
@@ -56,7 +59,11 @@ public class NameSpaceSymbTable {
     public NameSpaceSymbTable() {
         level = new ArrayList<>();
         //Insert the default binding for xmlns.
-        symb = (SymbMap) initialMap.clone();
+        try {
+            symb = (SymbMap) initialMap.clone();
+        } catch (CloneNotSupportedException e) {
+            LOG.error("Error cloning the initial map");
+        }
     }
 
     /**
@@ -128,7 +135,11 @@ public class NameSpaceSymbTable {
     final void needsClone() {
         if (!cloned) {
             level.set(level.size() - 1, symb);
-            symb = (SymbMap) symb.clone();
+            try {
+                symb = (SymbMap) symb.clone();
+            } catch (CloneNotSupportedException e) {
+                LOG.error("Error cloning the symbol map");
+            }
             cloned = true;
         }
     }
@@ -386,18 +397,14 @@ class SymbMap implements Cloneable {
         return entries[index(key)];
     }
 
-    protected Object clone()  {
-        try {
-            SymbMap copy = (SymbMap) super.clone();
-            copy.entries = new NameSpaceSymbEntry[entries.length];
-            System.arraycopy(entries, 0, copy.entries, 0, entries.length);
-            copy.keys = new String[keys.length];
-            System.arraycopy(keys, 0, copy.keys, 0, keys.length);
+    @Override
+    protected Object clone() throws CloneNotSupportedException  {
+        SymbMap copy = (SymbMap) super.clone();
+        copy.entries = new NameSpaceSymbEntry[entries.length];
+        System.arraycopy(entries, 0, copy.entries, 0, entries.length);
+        copy.keys = new String[keys.length];
+        System.arraycopy(keys, 0, copy.keys, 0, keys.length);
 
-            return copy;
-        } catch (CloneNotSupportedException e) {
-            e.printStackTrace();
-        }
-        return null;
+        return copy;
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java Mon Feb 11 11:55:28 2019
@@ -218,7 +218,7 @@ class XmlAttrStack {
                         tquery = bquery;
                     }
                 } else {
-                    if (rpath.startsWith("/")) {
+                    if (rpath.charAt(0) == '/') {
                         tpath = removeDotSegments(rpath);
                     } else {
                         if (bauthority != null && bpath.length() == 0) {
@@ -259,7 +259,7 @@ class XmlAttrStack {
         // If the input buffer starts with a root slash "/" then move this
         // character to the output buffer.
         if (input.charAt(0) == '/') {
-            output.append("/");
+            output.append('/');
             input = input.substring(1);
         }
 
@@ -305,7 +305,7 @@ class XmlAttrStack {
             } else if (input.startsWith("/../")) {
                 input = input.substring(3);
                 if (output.length() == 0) {
-                    output.append("/");
+                    output.append('/');
                 } else if (output.toString().endsWith("../")) {
                     output.append("..");
                 } else if (output.toString().endsWith("..")) {
@@ -326,7 +326,7 @@ class XmlAttrStack {
                 // FIXME: what is complete path segment?
                 input = input.replaceFirst("/..", "/");
                 if (output.length() == 0) {
-                    output.append("/");
+                    output.append('/');
                 } else if (output.toString().endsWith("../")) {
                     output.append("..");
                 } else if (output.toString().endsWith("..")) {
@@ -388,7 +388,7 @@ class XmlAttrStack {
         // then append a slash "/". The output buffer is returned as the result
         // of remove_dot_segments
         if (output.toString().endsWith("..")) {
-            output.append("/");
+            output.append('/');
             printStep("3 ", output.toString(), input);
         }
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Mon Feb 11 11:55:28 2019
@@ -226,8 +226,7 @@ public abstract class AbstractSerializer
 
     protected static String createContext(String source, Node ctx) {
         // Create the context to parse the document against
-        StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
+        StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
 
         // Run through each node up to the document node and find any xmlns: nodes
         Map<String, String> storedNamespaces = new HashMap<>();
@@ -240,18 +239,18 @@ public abstract class AbstractSerializer
                     String nodeName = att.getNodeName();
                     if (("xmlns".equals(nodeName) || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" ");
+                        sb.append(' ');
                         sb.append(nodeName);
                         sb.append("=\"");
                         sb.append(att.getNodeValue());
-                        sb.append("\"");
+                        sb.append('\"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">");
+        sb.append('>');
         sb.append(source);
         sb.append("</dummy>");
         return sb.toString();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Mon Feb 11 11:55:28 2019
@@ -3284,7 +3284,7 @@ public class XMLCipher {
             public void setTarget(String target) {
                 if (target == null || target.length() == 0) {
                     this.target = null;
-                } else if (target.startsWith("#")) {
+                } else if (target.charAt(0) == '#') {
                     /*
                      * This is a same document URI reference. Do not parse,
                      * because it has no scheme.

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java Mon Feb 11 11:55:28 2019
@@ -486,7 +486,7 @@ public class XMLSecurityStreamWriter imp
         private NamespaceContext parentNamespaceContext;
         private List<String> prefixNsList = Collections.emptyList();
 
-        private NSContext(NamespaceContext parentNamespaceContext) {
+        NSContext(NamespaceContext parentNamespaceContext) {
             this.parentNamespaceContext = parentNamespaceContext;
         }
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Mon Feb 11 11:55:28 2019
@@ -351,8 +351,7 @@ public abstract class AbstractDecryptInp
         stringBuilder.append(wrapperElementName.getPrefix());
         stringBuilder.append(':');
         stringBuilder.append(wrapperElementName.getLocalPart());
-        stringBuilder.append(' ');
-        stringBuilder.append("xmlns:");
+        stringBuilder.append(" xmlns:");
         stringBuilder.append(wrapperElementName.getPrefix());
         stringBuilder.append("=\"");
         stringBuilder.append(wrapperElementName.getNamespaceURI());
@@ -374,13 +373,13 @@ public abstract class AbstractDecryptInp
                 if (prefix == null || prefix.isEmpty()) {
                     stringBuilder.append("xmlns=\"");
                     stringBuilder.append(uri);
-                    stringBuilder.append("\"");
+                    stringBuilder.append('\"');
                 } else {
                     stringBuilder.append("xmlns:");
                     stringBuilder.append(prefix);
                     stringBuilder.append("=\"");
                     stringBuilder.append(uri);
-                    stringBuilder.append("\"");
+                    stringBuilder.append('\"');
                 }
             }
         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java Mon Feb 11 11:55:28 2019
@@ -288,7 +288,7 @@ public abstract class AbstractSignatureE
                 for (Iterator<String> iterator = prefixSet.iterator(); iterator.hasNext(); ) {
                     String prefix = iterator.next();
                     if (prefixes.length() != 0) {
-                        prefixes.append(" ");
+                        prefixes.append(' ');
                     }
                     prefixes.append(prefix);
                 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Mon Feb 11 11:55:28 2019
@@ -220,7 +220,7 @@ public abstract class AbstractSignatureO
                 for (Iterator<String> iterator = prefixSet.iterator(); iterator.hasNext(); ) {
                     String prefix = iterator.next();
                     if (prefixes.length() != 0) {
-                        prefixes.append(" ");
+                        prefixes.append(' ');
                     }
                     prefixes.append(prefix);
                 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java Mon Feb 11 11:55:28 2019
@@ -34,7 +34,7 @@ public class DigestOutputStream extends
     protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
 
     private final MessageDigest messageDigest;
-    private StringBuilder stringBuilder;
+    private StringBuilder stringBuilder; //NOPMD
 
     public DigestOutputStream(MessageDigest messageDigest) {
         this.messageDigest = messageDigest;

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java Mon Feb 11 11:55:28 2019
@@ -33,7 +33,7 @@ public class SignerOutputStream extends
     protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
 
     private final SignatureAlgorithm signatureAlgorithm;
-    private StringBuilder stringBuilder;
+    private StringBuilder stringBuilder; //NOPMD
 
     public SignerOutputStream(SignatureAlgorithm signatureAlgorithm) {
         this.signatureAlgorithm = signatureAlgorithm;

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java Mon Feb 11 11:55:28 2019
@@ -139,7 +139,7 @@ public class FuncHere extends Function {
      * @param vars
      * @param globalsSize
      */
-    public void fixupVariables(@SuppressWarnings("rawtypes") java.util.Vector vars, int globalsSize) {
+    public void fixupVariables(@SuppressWarnings("rawtypes") java.util.Vector vars, int globalsSize) { //NOPMD
         // do nothing
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java Mon Feb 11 11:55:28 2019
@@ -81,7 +81,7 @@ public class InclusiveNamespaces extends
                 sb.append("#default ");
             } else {
                 sb.append(prefix);
-                sb.append(" ");
+                sb.append(' ');
             }
         }
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java Mon Feb 11 11:55:28 2019
@@ -54,7 +54,7 @@ public final class ClassLoaderUtils {
      */
     public static URL getResource(String resourceName, Class<?> callingClass) {
         URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
-        if (url == null && resourceName.startsWith("/")) {
+        if (url == null && resourceName.charAt(0) == '/') {
             //certain classloaders need it without the leading /
             url =
                 Thread.currentThread().getContextClassLoader().getResource(
@@ -69,7 +69,7 @@ public final class ClassLoaderUtils {
         if (url == null) {
             url = cluClassloader.getResource(resourceName);
         }
-        if (url == null && resourceName.startsWith("/")) {
+        if (url == null && resourceName.charAt(0) == '/') {
             //certain classloaders need it without the leading /
             url = cluClassloader.getResource(resourceName.substring(1));
         }
@@ -122,7 +122,7 @@ public final class ClassLoaderUtils {
             LOG.debug(e.getMessage(), e);
             //ignore
         }
-        if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+        if (!urls.hasMoreElements() && resourceName.charAt(0) == '/') {
             //certain classloaders need it without the leading /
             try {
                 urls =
@@ -147,7 +147,7 @@ public final class ClassLoaderUtils {
                 // ignore
             }
         }
-        if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+        if (!urls.hasMoreElements() && resourceName.charAt(0) == '/') {
             //certain classloaders need it without the leading /
             try {
                 urls = cluClassloader.getResources(resourceName.substring(1));

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java Mon Feb 11 11:55:28 2019
@@ -84,7 +84,7 @@ public class RFC2253Parser {
                 l += countQuotes(DN, j, k);
 
                 if (k > 0 && DN.charAt(k - 1) != '\\' && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -117,7 +117,7 @@ public class RFC2253Parser {
             l += countQuotes(str, j, k);
 
             if (k > 0 && str.charAt(k - 1) != '\\' && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append("+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -206,7 +206,7 @@ public class RFC2253Parser {
         }
 
         if (toXml) {
-            if (value.startsWith("#")) {
+            if (value.length() > 0 && value.charAt(0) == '#') {
                 value = '\\' + value;
             }
         } else {

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java Mon Feb 11 11:55:28 2019
@@ -365,7 +365,7 @@ public class KeySelectors {
         public static String dumpArray(byte[] in) {
             int numDumped = 0;
             StringBuilder buf = new StringBuilder(512);
-            buf.append("{");
+            buf.append('{');
             for (int i = 0;i < (in.length / numBytesPerRow); i++) {
                 for (int j=0; j < (numBytesPerRow); j++) {
                     buf.append("(byte)0x");
@@ -377,10 +377,10 @@ public class KeySelectors {
             while (numDumped < in.length) {
                 buf.append("(byte)0x");
                 buf.append(getHex(in[numDumped]));
-                buf.append(" ");
+                buf.append(' ');
                 numDumped += 1;
             }
-            buf.append("}");
+            buf.append('}');
             return buf.toString();
         }
     }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Mon Feb 11 11:55:28 2019
@@ -178,7 +178,6 @@ public class XMLSignatureFactoryTest {
             assertNotNull(stuff);
         } catch (MarshalException ex) {
             fail("Unmarshal failed: " + ex.getMessage());
-            ex.printStackTrace();
         }
     }
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Mon Feb 11 11:55:28 2019
@@ -143,7 +143,7 @@ public class ExclusiveC14NInteropTest ex
                 LOG.debug("Reference " + i + " was OK");
             } else {
                 sb.append(i);
-                sb.append(" ");
+                sb.append(' ');
 
                 //JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
                 //JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java Mon Feb 11 11:55:28 2019
@@ -42,7 +42,7 @@ public class NameSpaceSymbTableTest {
             node1 = doc.createAttributeNS("a","b");
             node2 = doc.createAttributeNS("b","c");
         } catch (Exception e) {
-            e.printStackTrace();
+            // e.printStackTrace();
         }
     }
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java Mon Feb 11 11:55:28 2019
@@ -79,22 +79,19 @@ public class UtfHelperTest {
 
         String str = new String(newResult);
         byte[] a = UtfHelpper.getStringInUtf8(str);
-        try {
-            // System.out.println("chunk:"+j);
-            byte[] correct = str.getBytes(StandardCharsets.UTF_8);
-            assertTrue("UtfHelper.getStringInUtf8 false", Arrays.equals(correct, a));
-            assertTrue(
-                "UtfHelper.getStringInUtf8 false",
-                Arrays.equals(correct, charByCharOs.toByteArray())
-            );
-            UtfHelpper.writeStringToUtf8(str, strOs);
-            assertTrue(
-                "UtfHelper.writeStringToUtf8 false",
-                Arrays.equals(correct, strOs.toByteArray())
-            );
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+
+        // System.out.println("chunk:"+j);
+        byte[] correct = str.getBytes(StandardCharsets.UTF_8);
+        assertTrue("UtfHelper.getStringInUtf8 false", Arrays.equals(correct, a));
+        assertTrue(
+                   "UtfHelper.getStringInUtf8 false",
+                   Arrays.equals(correct, charByCharOs.toByteArray())
+        );
+        UtfHelpper.writeStringToUtf8(str, strOs);
+        assertTrue(
+                   "UtfHelper.writeStringToUtf8 false",
+                   Arrays.equals(correct, strOs.toByteArray())
+        );
     }
 
 }
\ No newline at end of file

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Mon Feb 11 11:55:28 2019
@@ -23,6 +23,8 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
@@ -39,6 +41,7 @@ import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESedeKeySpec;
 import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.c14n.Canonicalizer;
@@ -58,6 +61,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -980,17 +984,9 @@ public class XMLCipherTest {
         return baos.toString(StandardCharsets.UTF_8.name());
     }
 
-    private Document document() {
-        Document d = null;
-        try {
-            File f = new File(documentName);
-            d = XMLUtils.read(new FileInputStream(f), false);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(-1);
-        }
-
-        return d;
+    private Document document() throws FileNotFoundException, ParserConfigurationException, SAXException, IOException {
+        File f = new File(documentName);
+        return XMLUtils.read(new FileInputStream(f), false);
     }
 
     private String element() {
@@ -998,16 +994,7 @@ public class XMLCipherTest {
     }
 
     private int index() {
-        int result = -1;
-
-        try {
-            result = Integer.parseInt(elementIndex);
-        } catch (NumberFormatException nfe) {
-            nfe.printStackTrace();
-            System.exit(-1);
-        }
-
-        return result;
+        return Integer.parseInt(elementIndex);
     }
 
 }
\ No newline at end of file

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java Mon Feb 11 11:55:28 2019
@@ -64,12 +64,7 @@ public class RFC2253ParserTest {
 
     @Test
     public void testToXML8() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        sb.append('L');
-        sb.append('u');
-        sb.append('\uc48d');
-        sb.append('i');
-        sb.append('\uc487');
+        StringBuilder sb = new StringBuilder("Lu\uc48di\uc487");
         assertEquals(RFC2253Parser.rfc2253toXMLdsig("SN=" + sb.toString()), "SN=Lu\uc48di\uc487");
     }
 
@@ -110,12 +105,7 @@ public class RFC2253ParserTest {
 
     @Test
     public void testToRFC8() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        sb.append('L');
-        sb.append('u');
-        sb.append('\uc48d');
-        sb.append('i');
-        sb.append('\uc487');
+        StringBuilder sb = new StringBuilder("Lu\uc48di\uc487");
         assertEquals(RFC2253Parser.xmldsigtoRFC2253("SN=" + sb.toString()), "SN=Lu\uc48di\uc487");
     }
 }
\ No newline at end of file

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Mon Feb 11 11:55:28 2019
@@ -139,7 +139,7 @@ public class OfflineResolver extends Res
     @Override
     public boolean engineCanResolveURI(ResourceResolverContext context) {
         String uriNodeValue = context.uriToResolve;
-        if (uriNodeValue.isEmpty() || uriNodeValue.startsWith("#")) {
+        if (uriNodeValue.isEmpty() || uriNodeValue.charAt(0) == '#') {
             return false;
         }
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1853345&r1=1853344&r2=1853345&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Mon Feb 11 11:55:28 2019
@@ -59,7 +59,6 @@ public class ResourceResolverTest {
             uriAttr.setValue("http://xmldsig.pothole.com/xml-stylesheet.txt");
             res.resolve(uriAttr, null, true);
         } catch (Exception e) {
-            e.printStackTrace();
             fail(uriAttr.getValue()
                 + " should be resolvable by the OfflineResolver");
         }