This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3d5564dbff38b782837e291871cd210351acbfc2 Author: Daniel Kulp <[email protected]> AuthorDate: Mon Mar 13 09:42:51 2023 -0400 Fix some checkstyle/pmd issues --- core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java | 3 ++- .../org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java | 4 +++- .../main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java index c48ef86814..71c9076832 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java @@ -19,6 +19,8 @@ package org.apache.cxf.bus.spring; +import java.lang.ref.WeakReference; + import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.configuration.Configurer; @@ -32,7 +34,6 @@ import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.support.AbstractApplicationContext; -import java.lang.ref.WeakReference; /** * diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java index ee7adedf98..13fdf5d746 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java @@ -56,7 +56,9 @@ public class AttachmentCallbackHandler implements CallbackHandler { message.setAttachments(new ArrayList<Attachment>()); } attachments = message.getAttachments(); - defaultMimeType = MessageUtils.getContextualString(message, AttachmentUtil.ATTACHMENT_CONTENT_TYPE, "application/octet-stream"); + defaultMimeType = MessageUtils.getContextualString(message, + AttachmentUtil.ATTACHMENT_CONTENT_TYPE, + "application/octet-stream"); } public AttachmentCallbackHandler(Collection<org.apache.cxf.message.Attachment> attachments) { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java index e43ebc5cf5..d50cbc205c 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java @@ -31,8 +31,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.security.auth.callback.CallbackHandler; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -330,7 +328,6 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token if (verifyProofOfPossession) { STSPropertiesMBean stsProperties = tokenParameters.getStsProperties(); Crypto sigCrypto = stsProperties.getSignatureCrypto(); - CallbackHandler callbackHandler = stsProperties.getCallbackHandler(); RequestData requestData = new RequestData(); requestData.setSigVerCrypto(sigCrypto); WSSConfig wssConfig = WSSConfig.getNewInstance();
