You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2021/02/25 08:00:34 UTC
[ws-wss4j] branch master updated: More PMD fixes
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 1d93568 More PMD fixes
1d93568 is described below
commit 1d935686633023b2f9e6f99549c824cc0582a450
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 25 08:00:14 2021 +0000
More PMD fixes
---
.../wss4j/dom/message/XOPAttachmentTest.java | 2 +-
.../org/apache/wss4j/dom/saml/SamlAuthnTest.java | 2 +-
.../apache/wss4j/dom/saml/SamlConditionsTest.java | 2 +-
.../org/apache/wss4j/dom/saml/SamlTokenTest.java | 2 +-
.../apache/wss4j/stax/test/EncDecryptionTest.java | 22 +++++++++---------
.../test/InboundWSSecurityContextImplTest.java | 9 +++-----
.../wss4j/stax/test/InteroperabilityTest.java | 14 ++++-------
.../wss4j/stax/test/SecurityContextTokenTest.java | 27 ++++++++--------------
.../org/apache/wss4j/stax/test/SignatureTest.java | 19 ++++++++-------
.../org/apache/wss4j/stax/test/TimestampTest.java | 3 +--
.../apache/wss4j/stax/test/saml/SamlAuthnTest.java | 2 +-
11 files changed, 43 insertions(+), 61 deletions(-)
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
index 486bd04..597a8e0 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
@@ -742,7 +742,7 @@ public class XOPAttachmentTest {
*
* @throws Exception Thrown when there is a problem in verification
*/
- private WSHandlerResult verify(Document doc, CallbackHandler attachmentCallbackHandler) throws Exception {
+ private WSHandlerResult verify(Document doc, CallbackHandler attachmentCallbackHandler) throws Exception { //NOPMD
RequestData requestData = new RequestData();
requestData.setAttachmentCallbackHandler(attachmentCallbackHandler);
requestData.setSigVerCrypto(crypto);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
index bf507c1..2655892 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
@@ -157,7 +157,7 @@ public class SamlAuthnTest {
createAndVerifyMessage(callbackHandler, false);
}
- private void createAndVerifyMessage(
+ private void createAndVerifyMessage( //NOPMD - It incorrectly thinks this method isn't called
CallbackHandler samlCallbackHandler, boolean success
) throws Exception {
SAMLCallback samlCallback = new SAMLCallback();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
index 088fad8..84c01d6 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
@@ -744,7 +744,7 @@ public class SamlConditionsTest {
createAndVerifyMessage(callbackHandler, true);
}
- private void createAndVerifyMessage(
+ private void createAndVerifyMessage( //NOPMD - It incorrectly thinks this method isn't called
CallbackHandler samlCallbackHandler, boolean success
) throws Exception {
SAMLCallback samlCallback = new SAMLCallback();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
index 3b8ab8b..5511293 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
@@ -1413,7 +1413,7 @@ public class SamlTokenTest {
cipher.doFinal(document, elementToEncrypt, content);
}
- private WSHandlerResult createAndVerifyMessage(
+ private WSHandlerResult createAndVerifyMessage( //NOPMD - It incorrectly thinks this method isn't called
CallbackHandler samlCallbackHandler, boolean success
) throws Exception {
SAMLCallback samlCallback = new SAMLCallback();
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
index ad9b812..d62bf43 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
@@ -773,7 +773,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
WSSecurityEventConstants.Event[] expectedSecurityEvents = new WSSecurityEventConstants.Event[]{
WSSecurityEventConstants.X509Token,
@@ -890,7 +890,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
WSSecurityEventConstants.Event[] expectedSecurityEvents = new WSSecurityEventConstants.Event[]{
WSSecurityEventConstants.AlgorithmSuite,
@@ -1025,7 +1025,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, new ByteArrayInputStream(baos.toByteArray()));
//header element must still be there
@@ -1102,7 +1102,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//header element must still be there
@@ -1179,7 +1179,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//header element must still be there
@@ -1272,7 +1272,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, new ByteArrayInputStream(baos.toByteArray()));
//header element must still be there
@@ -1349,7 +1349,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//header element must still be there
@@ -1426,7 +1426,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//header element must still be there
@@ -1503,7 +1503,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//header element must still be there
@@ -1593,7 +1593,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl(key.getEncoded()));
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl(key.getEncoded()));
Document document = doInboundSecurity(securityProperties, xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
//no encrypted content
@@ -1645,7 +1645,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
Document document = doInboundSecurity(securityProperties, new ByteArrayInputStream(baos.toByteArray()));
//header element must still be there
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
index d92f6b1..4a9502f 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
@@ -86,8 +86,7 @@ public class InboundWSSecurityContextImplTest {
assertEquals(securityEventList.size(), 11);
- for (int i = 0; i < securityEventList.size(); i++) {
- SecurityEvent securityEvent = securityEventList.get(i);
+ for (SecurityEvent securityEvent : securityEventList) {
if (securityEvent instanceof HttpsTokenSecurityEvent) {
HttpsTokenSecurityEvent tokenSecurityEvent = (HttpsTokenSecurityEvent) securityEvent;
assertEquals(tokenSecurityEvent.getSecurityToken().getTokenUsages().size(), 2);
@@ -216,8 +215,7 @@ public class InboundWSSecurityContextImplTest {
boolean usernameTokenOccured = false;
assertEquals(securityEventList.size(), 34);
int x509TokenIndex = 0;
- for (int i = 0; i < securityEventList.size(); i++) {
- SecurityEvent securityEvent = securityEventList.get(i);
+ for (SecurityEvent securityEvent : securityEventList) {
if (securityEvent instanceof X509TokenSecurityEvent && x509TokenIndex == 0) {
x509TokenIndex++;
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
@@ -521,8 +519,7 @@ public class InboundWSSecurityContextImplTest {
assertEquals(securityEventList.size(), 24);
- for (int i = 0; i < securityEventList.size(); i++) {
- SecurityEvent securityEvent = securityEventList.get(i);
+ for (SecurityEvent securityEvent : securityEventList) {
if (securityEvent instanceof X509TokenSecurityEvent) {
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
assertEquals(tokenSecurityEvent.getSecurityToken().getTokenUsages().size(), 1);
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
index 7f17462..b633b02 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
@@ -150,8 +150,7 @@ public class InteroperabilityTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signedElementCorrelationID1)) {
@@ -313,8 +312,7 @@ public class InteroperabilityTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(encryptedElementCorrelationID)) {
@@ -448,8 +446,7 @@ public class InteroperabilityTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signedElementCorrelationID1)) {
@@ -624,8 +621,7 @@ public class InteroperabilityTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(encryptedElementCorrelationID)) {
@@ -683,7 +679,7 @@ public class InteroperabilityTest extends AbstractTestBase {
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
SecurityEventListener securityEventListener = new SecurityEventListener() {
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
index 01a1698..243a766 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
@@ -197,8 +197,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(operationCorrelationID)) {
@@ -279,8 +278,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(encryptedPartCorrelationID)) {
encryptedPartSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(operationCorrelationID)) {
@@ -415,8 +413,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -505,8 +502,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -675,8 +671,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -776,8 +771,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -901,8 +895,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -1001,8 +994,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> encryptedPartSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
@@ -1099,8 +1091,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
index 5cbf709..5ddb63f 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
@@ -675,7 +675,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
@@ -756,7 +756,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifierType(WSSConstants.WSSKeyIdentifierType.BST_EMBEDDED);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
@@ -810,7 +810,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
@@ -892,7 +892,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
@@ -973,7 +973,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
@@ -1055,7 +1055,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
securityProperties.setSignatureUser("transmitter");
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER);
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl());
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl());
securityProperties.setIncludeSignatureToken(true);
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
@@ -1107,7 +1107,7 @@ public class SignatureTest extends AbstractTestBase {
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER);
securityProperties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#hmac-sha1");
securityProperties.setCallbackHandler(
- new org.apache.wss4j.stax.test.CallbackHandlerImpl(key.getEncoded()){
+ new CallbackHandlerImpl(key.getEncoded()){
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
@@ -1193,7 +1193,7 @@ public class SignatureTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- securityProperties.setCallbackHandler(new org.apache.wss4j.stax.test.CallbackHandlerImpl(key.getEncoded()));
+ securityProperties.setCallbackHandler(new CallbackHandlerImpl(key.getEncoded()));
InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
@@ -1363,8 +1363,7 @@ public class SignatureTest extends AbstractTestBase {
List<SecurityEvent> signatureValueSecurityEvents = new ArrayList<>();
List<SecurityEvent> securityEvents = securityEventListener.getReceivedSecurityEvents();
- for (int i = 0; i < securityEvents.size(); i++) {
- SecurityEvent securityEvent = securityEvents.get(i);
+ for (SecurityEvent securityEvent : securityEvents) {
if (securityEvent.getCorrelationID().equals(signedElementCorrelationID)) {
signedElementSecurityEvents.add(securityEvent);
} else if (securityEvent.getCorrelationID().equals(signatureValueCorrelationID)) {
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
index 5dc850c..b12fc82 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
@@ -581,8 +581,7 @@ public class TimestampTest extends AbstractTestBase {
nodesToRemove.add(node);
}
}
- for (int i = 0; i < nodesToRemove.size(); i++) {
- Node node = nodesToRemove.get(i);
+ for (Node node : nodesToRemove) {
node.getParentNode().removeChild(node);
}
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
index cdcc07d..f65f92a 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
@@ -168,7 +168,7 @@ public class SamlAuthnTest extends AbstractTestBase {
createDOMMessageAndVerifyStAX(callbackHandler, false);
}
- private void createDOMMessageAndVerifyStAX(
+ private void createDOMMessageAndVerifyStAX( //NOPMD PMD wrongly detects that this method is never called
CallbackHandler samlCallbackHandler, boolean success
) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();