This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push:
new 7a0d0b4ee PMD updates to policy module
7a0d0b4ee is described below
commit 7a0d0b4eeb99304acec4bf15666ff68118b994a5
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Mon May 30 14:56:29 2022 +0100
PMD updates to policy module
---
.../java/org/apache/wss4j/policy/AssertionState.java | 2 +-
.../src/main/java/org/apache/wss4j/policy/SPUtils.java | 12 +++---------
.../wss4j/policy/model/AbstractSecurityAssertion.java | 8 ++------
.../org/apache/wss4j/policy/model/AlgorithmSuite.java | 12 ++++--------
.../java/org/apache/wss4j/policy/model/DOM2Writer.java | 5 ++---
.../main/java/org/apache/wss4j/policy/model/Header.java | 8 ++------
.../java/org/apache/wss4j/policy/model/NSStack.java | 16 ----------------
.../org/apache/wss4j/policy/model/SupportingTokens.java | 10 ++--------
.../main/java/org/apache/wss4j/policy/model/XPath.java | 7 ++-----
.../java/org/apache/wss4j/common/util/DOM2Writer.java | 5 ++---
.../main/java/org/apache/wss4j/common/util/NSStack.java | 17 -----------------
11 files changed, 20 insertions(+), 82 deletions(-)
diff --git a/policy/src/main/java/org/apache/wss4j/policy/AssertionState.java
b/policy/src/main/java/org/apache/wss4j/policy/AssertionState.java
index bdc13b41d..139a1628a 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/AssertionState.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/AssertionState.java
@@ -31,7 +31,7 @@ public class AssertionState {
private boolean asserted;
private boolean logged;
private Assertion assertion;
- private StringBuilder errorMessage = new StringBuilder();
+ private StringBuilder errorMessage = new StringBuilder(); //NOPMD
public AssertionState(Assertion assertion, boolean initialAssertionState) {
this.assertion = assertion;
diff --git a/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
b/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
index 878bdb045..16717698f 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
@@ -55,10 +55,7 @@ public final class SPUtils {
public static boolean hasChildElementWithName(Element element, QName
elementName) {
Element child = SPUtils.getFirstChildElement(element, elementName);
- if (child != null) {
- return true;
- }
- return false;
+ return child != null;
}
public static Element getFirstChildElement(Node parent, String
childNodeName) {
@@ -80,13 +77,10 @@ public final class SPUtils {
}
private static boolean isNodeEqualToQName(Node node, QName nodeName) {
- if ((node.getNamespaceURI() == null && nodeName.getNamespaceURI() ==
null
+ return (node.getNamespaceURI() == null && nodeName.getNamespaceURI()
== null
|| node.getNamespaceURI() != null
&& node.getNamespaceURI().equals(nodeName.getNamespaceURI()))
- && node.getLocalName().equals(nodeName.getLocalPart())) {
- return true;
- }
- return false;
+ && node.getLocalName().equals(nodeName.getLocalPart());
}
public static String getFirstChildElementText(Node parent, QName
childNodeName) {
diff --git
a/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
b/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
index c32bbfb6a..c849a0777 100644
---
a/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
+++
b/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
@@ -90,12 +90,8 @@ public abstract class AbstractSecurityAssertion implements
Assertion {
return false;
}
- if (version != null && !version.equals(that.version)
- || version == null && that.version != null) {
- return false;
- }
-
- return true;
+ return !(version != null && !version.equals(that.version)
+ || version == null && that.version != null);
}
@Override
diff --git
a/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
b/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
index 25b029e5e..b442ad2b4 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
@@ -221,7 +221,7 @@ public class AlgorithmSuite extends
AbstractSecurityAssertion implements PolicyC
private String symmetricSignature = SPConstants.HMAC_SHA1;
private String asymmetricSignature = SPConstants.RSA_SHA1;
- public AlgorithmSuiteType(String name, String digest, String
encryption, String symmetricKeyWrap,
+ public AlgorithmSuiteType(String name, String digest, String
encryption, String symmetricKeyWrap, //NOPMD
String asymmetricKeyWrap, String
encryptionKeyDerivation,
String signatureKeyDerivation, int
encryptionDerivedKeyLength,
int signatureDerivedKeyLength, int
minimumSymmetricKeyLength,
@@ -233,7 +233,7 @@ public class AlgorithmSuite extends
AbstractSecurityAssertion implements PolicyC
minimumAsymmetricKeyLength, maximumAsymmetricKeyLength);
}
- public AlgorithmSuiteType(String name, String digest, String
encryption, String symmetricKeyWrap,
+ public AlgorithmSuiteType(String name, String digest, String
encryption, String symmetricKeyWrap, //NOPMD
String asymmetricKeyWrap, String
encryptionKeyDerivation,
String signatureKeyDerivation, String
symmetricSignature,
String asymmetricSignature, int
encryptionDerivedKeyLength,
@@ -336,16 +336,12 @@ public class AlgorithmSuite extends
AbstractSecurityAssertion implements PolicyC
return false;
}
- if (encryptionDerivedKeyLength != that.encryptionDerivedKeyLength
+ return !(encryptionDerivedKeyLength !=
that.encryptionDerivedKeyLength
|| signatureDerivedKeyLength != that.signatureDerivedKeyLength
|| minimumSymmetricKeyLength != that.minimumSymmetricKeyLength
|| maximumSymmetricKeyLength != that.maximumSymmetricKeyLength
|| minimumAsymmetricKeyLength !=
that.minimumAsymmetricKeyLength
- || maximumAsymmetricKeyLength !=
that.maximumAsymmetricKeyLength) {
- return false;
- }
-
- return true;
+ || maximumAsymmetricKeyLength !=
that.maximumAsymmetricKeyLength);
}
@Override
diff --git a/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
b/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
index 7d3547ea3..7b24d17b0 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
@@ -225,7 +225,7 @@ final class DOM2Writer {
private static void printNamespaceDecl(Node node,
NSStack namespaceStack,
PrintWriter out) {
- switch (node.getNodeType()) {
+ switch (node.getNodeType()) { //NOPMD
case Node.ATTRIBUTE_NODE:
printNamespaceDecl(((Attr) node).getOwnerElement(), node,
namespaceStack, out);
@@ -273,10 +273,9 @@ final class DOM2Writer {
case '"':
fOut.print(""");
break;
- case '\r':
- case '\n':
default:
fOut.print(c);
+ break;
}
}
}
diff --git a/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
b/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
index 6c7ae8ab8..159d74841 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
@@ -52,12 +52,8 @@ public class Header {
return false;
}
- if (namespace != null && !namespace.equals(that.namespace)
- || namespace == null && that.namespace != null) {
- return false;
- }
-
- return true;
+ return !(namespace != null && !namespace.equals(that.namespace)
+ || namespace == null && that.namespace != null);
}
@Override
diff --git a/policy/src/main/java/org/apache/wss4j/policy/model/NSStack.java
b/policy/src/main/java/org/apache/wss4j/policy/model/NSStack.java
index 9c65936f5..59508e802 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/NSStack.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/NSStack.java
@@ -20,8 +20,6 @@
package org.apache.wss4j.policy.model;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
/**
* The abstraction this class provides is a push down stack of variable
@@ -94,20 +92,6 @@ class NSStack {
}
}
- /**
- * Return a copy of the current frame. Returns null if none are present.
- */
- public List<Mapping> cloneFrame() {
- if (stack[top] == null) {
- return null;
- }
- List<Mapping> clone = new ArrayList<>();
- for (Mapping map = topOfFrame(); map != null; map = next()) {
- clone.add(map);
- }
- return clone;
- }
-
/**
* Remove all mappings from the current frame.
*/
diff --git
a/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
b/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
index c2f130888..8a5cc2c65 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
@@ -267,10 +267,7 @@ public class SupportingTokens extends
AbstractSecurityAssertion implements Polic
*/
public boolean isEncryptedToken() {
QName name = getName();
- if (name != null && name.getLocalPart().contains("Encrypted")) {
- return true;
- }
- return false;
+ return name != null && name.getLocalPart().contains("Encrypted");
}
/**
@@ -278,10 +275,7 @@ public class SupportingTokens extends
AbstractSecurityAssertion implements Polic
*/
public boolean isEndorsing() {
QName name = getName();
- if (name != null && name.getLocalPart().contains("Endorsing")) {
- return true;
- }
- return false;
+ return name != null && name.getLocalPart().contains("Endorsing");
}
}
diff --git a/policy/src/main/java/org/apache/wss4j/policy/model/XPath.java
b/policy/src/main/java/org/apache/wss4j/policy/model/XPath.java
index a84e35d98..6e93c1f60 100644
--- a/policy/src/main/java/org/apache/wss4j/policy/model/XPath.java
+++ b/policy/src/main/java/org/apache/wss4j/policy/model/XPath.java
@@ -82,12 +82,9 @@ public class XPath {
if (version != that.version) {
return false;
}
- if (filter != null && !filter.equals(that.filter)
- || filter == null && that.filter != null) {
- return false;
- }
- return true;
+ return !(filter != null && !filter.equals(that.filter)
+ || filter == null && that.filter != null);
}
@Override
diff --git
a/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
index 8fec82c87..f383416f0 100644
---
a/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
+++
b/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
@@ -222,7 +222,7 @@ public final class DOM2Writer {
private static void printNamespaceDecl(Node node,
NSStack namespaceStack,
PrintWriter out) {
- switch (node.getNodeType()) {
+ switch (node.getNodeType()) { //NOPMD
case Node.ATTRIBUTE_NODE:
printNamespaceDecl(((Attr) node).getOwnerElement(), node,
namespaceStack, out);
@@ -270,10 +270,9 @@ public final class DOM2Writer {
case '"':
fOut.print(""");
break;
- case '\r':
- case '\n':
default:
fOut.print(c);
+ break;
}
}
}
diff --git
a/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
index 1f07833cc..6e2eb051c 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
@@ -19,9 +19,6 @@
package org.apache.wss4j.common.util;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* The abstraction this class provides is a push down stack of variable
* length frames of prefix to namespace mappings. Used for keeping track
@@ -105,20 +102,6 @@ public class NSStack {
}
}
- /**
- * Return a copy of the current frame. Returns null if none are present.
- */
- public List<Mapping> cloneFrame() {
- if (stack[top] == null) {
- return null;
- }
- List<Mapping> clone = new ArrayList<>();
- for (Mapping map = topOfFrame(); map != null; map = next()) {
- clone.add(map);
- }
- return clone;
- }
-
/**
* Remove all mappings from the current frame.
*/
