This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/saml-refactor-new in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 4e6f6dd254a27130cde144a6a757b0e08191f385 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Wed Jul 9 10:12:36 2025 +0100 Removing some warnings --- .../wss4j/integration/test/kerberos/KerberosTest.java | 1 + .../java/org/apache/wss4j/dom/util/WSSecurityUtil.java | 2 ++ .../org/apache/wss4j/dom/message/AttachmentTest.java | 1 - .../org/apache/wss4j/dom/message/CertErrorTest.java | 1 - .../apache/wss4j/dom/message/ModifiedRequestTest.java | 1 - .../SignatureProtectionAssertionState.java | 1 - .../assertionStates/TokenProtectionAssertionState.java | 1 - .../common/saml/WSS4JXSBase64BinaryUnmarshaller.java | 2 +- .../wss4j/common/saml/processor/SAMLTokenProcessor.java | 1 - .../org/apache/wss4j/common/saml/dom/ReplayTest.java | 4 ---- .../common/saml/dom/SignatureConfirmationTest.java | 1 - .../org/apache/wss4j/common/saml/dom/ValidatorTest.java | 17 ----------------- .../apache/wss4j/stax/setup/ConfigurationConverter.java | 1 + .../java/org/apache/wss4j/stax/setup/OutboundWSSec.java | 2 -- .../wss4j/stax/test/saml/SamlTokenDerivedTest.java | 1 - 15 files changed, 5 insertions(+), 32 deletions(-) diff --git a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java index 640f5c0e1..88f313c89 100644 --- a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java +++ b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java @@ -1011,6 +1011,7 @@ public class KerberosTest { } } + @SuppressWarnings("deprecation") @Test public void testKerberosEncryptionOutboundDeprecatedTag() throws Exception { if (!runTests) { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java index 7c46365be..2104667b2 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java @@ -192,6 +192,7 @@ public final class WSSecurityUtil { return doc.createTextNode(org.apache.xml.security.utils.XMLUtils.encodeToString(data)); } + @SuppressWarnings("deprecation") public static List<Integer> decodeAction(String action) throws WSSecurityException { String actionToParse = action; if (actionToParse == null) { @@ -250,6 +251,7 @@ public final class WSSecurityUtil { * @return The list of HandlerAction Objects * @throws WSSecurityException */ + @SuppressWarnings("deprecation") public static List<HandlerAction> decodeHandlerAction( String action, WSSConfig wssConfig diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java index fb1d46c10..15d67f80f 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java @@ -42,7 +42,6 @@ import org.apache.wss4j.api.dom.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.api.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.common.ext.Attachment; import org.apache.wss4j.common.ext.AttachmentRequestCallback; import org.apache.wss4j.common.ext.AttachmentResultCallback; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java index f45d82b4f..832477243 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java @@ -27,7 +27,6 @@ import org.apache.wss4j.api.dom.engine.WSSConfig; import org.junit.jupiter.api.Test; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.api.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; import org.w3c.dom.Document; diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java index e79ba4644..2f3161f37 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java @@ -42,7 +42,6 @@ import org.apache.wss4j.api.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.api.dom.message.WSSecHeader; -import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.api.dom.message.SignatureUtils; import org.apache.wss4j.dom.util.WSSecurityUtil; diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignatureProtectionAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignatureProtectionAssertionState.java index 3873001fb..000f1b7c6 100644 --- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignatureProtectionAssertionState.java +++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignatureProtectionAssertionState.java @@ -112,7 +112,6 @@ public class SignatureProtectionAssertionState extends AssertionState implements } } } else if (securityEvent instanceof TokenSecurityEvent) { - @SuppressWarnings("unchecked") TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = (TokenSecurityEvent<? extends SecurityToken>) securityEvent; tokenSecurityEvents.add(tokenSecurityEvent); diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java index 7c5598797..73f912729 100644 --- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java +++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java @@ -103,7 +103,6 @@ public class TokenProtectionAssertionState extends AssertionState implements Ass signedElementEvents.add(signedElementSecurityEvent); } } else if (securityEvent instanceof TokenSecurityEvent) { - @SuppressWarnings("unchecked") TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = (TokenSecurityEvent<? extends SecurityToken>) securityEvent; tokenSecurityEvents.add(tokenSecurityEvent); diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java index 8827d8145..9c7e550ae 100644 --- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/WSS4JXSBase64BinaryUnmarshaller.java @@ -19,7 +19,7 @@ package org.apache.wss4j.common.saml; -import net.shibboleth.utilities.java.support.primitive.StringSupport; +import net.shibboleth.shared.primitive.StringSupport; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.io.UnmarshallingException; import org.w3c.dom.Text; diff --git a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java index 9da651ffa..b4253cfde 100644 --- a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java +++ b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/processor/SAMLTokenProcessor.java @@ -288,7 +288,6 @@ public class SAMLTokenProcessor implements Processor { ref.setDigestValue(reference.getDigestValue()); // Set the Transform algorithms as well - @SuppressWarnings("unchecked") List<Transform> transforms = reference.getTransforms(); List<String> transformAlgorithms = new ArrayList<>(transforms.size()); for (Transform transform : transforms) { diff --git a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java index 787eba04e..ee9a4f690 100644 --- a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java +++ b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ReplayTest.java @@ -21,12 +21,9 @@ package org.apache.wss4j.common.saml.dom; import java.nio.file.Path; -import javax.security.auth.callback.CallbackHandler; - import org.apache.wss4j.common.cache.EHCacheReplayCache; import org.apache.wss4j.common.util.SOAPUtil; import org.apache.wss4j.api.dom.WSConstants; -import org.apache.wss4j.common.crypto.KeystoreCallbackHandler; import org.apache.wss4j.api.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; @@ -62,7 +59,6 @@ public class ReplayTest { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(ReplayTest.class); - private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; @TempDir diff --git a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java index 961cc4ca5..c1f5abc8e 100644 --- a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java +++ b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/SignatureConfirmationTest.java @@ -57,7 +57,6 @@ public class SignatureConfirmationTest { crypto = CryptoFactory.getInstance(); } - @SuppressWarnings("unchecked") @Test public void testSAMLSignatureConfirmationProcessing() throws Exception { diff --git a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java index 3f77ad08e..0687d39fa 100644 --- a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java +++ b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java @@ -22,7 +22,6 @@ package org.apache.wss4j.common.saml.dom; import java.security.cert.X509Certificate; import java.util.List; -import javax.security.auth.callback.CallbackHandler; import javax.xml.namespace.QName; import org.apache.wss4j.common.crypto.Crypto; @@ -62,7 +61,6 @@ import static org.junit.jupiter.api.Assertions.fail; public class ValidatorTest { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(ValidatorTest.class); - private WSSecurityEngine secEngine = new WSSecurityEngine(); /** * In this test, a BinarySecurityToken is added to the SOAP header. A custom processor @@ -159,21 +157,6 @@ public class ValidatorTest { } - /** - * Verifies the soap envelope - * - * @param doc soap document - * @param wssConfig - * @throws Exception Thrown when there is a problem in verification - */ - private WSHandlerResult verify( - Document doc, WSSConfig wssConfig, CallbackHandler cb, Crypto crypto - ) throws Exception { - secEngine.setWssConfig(wssConfig); - return secEngine.processSecurityHeader(doc, null, cb, crypto); - } - - /** * A validator for a BST token. */ diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java index 2d64b2b20..cdd564213 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java @@ -75,6 +75,7 @@ public final class ConfigurationConverter { return properties; } + @SuppressWarnings("deprecation") public static void parseActions( Map<String, Object> config, WSSSecurityProperties properties diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java index 6e3dc41fc..85990aca0 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java @@ -517,7 +517,6 @@ public class OutboundWSSec { for (int i = 0; i < securityEventList.size(); i++) { SecurityEvent securityEvent = securityEventList.get(i); if (securityEvent instanceof TokenSecurityEvent) { - @SuppressWarnings("unchecked") TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = (TokenSecurityEvent<? extends SecurityToken>) securityEvent; TokenUsage mainSig = WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE; @@ -540,7 +539,6 @@ public class OutboundWSSec { for (int i = 0; i < securityEventList.size(); i++) { SecurityEvent securityEvent = securityEventList.get(i); if (securityEvent instanceof TokenSecurityEvent) { - @SuppressWarnings("unchecked") TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = (TokenSecurityEvent<? extends SecurityToken>) securityEvent; TokenUsage mainSig = WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java index cbf749a98..6800b3c07 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java @@ -41,7 +41,6 @@ import org.apache.wss4j.api.dom.WSConstants; import org.apache.wss4j.api.dom.engine.WSSConfig; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.api.dom.message.WSSecHeader; -import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
