Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 955B1200CDE for ; Tue, 8 Aug 2017 23:13:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9429B167FF7; Tue, 8 Aug 2017 21:13:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B90C0167FFD for ; Tue, 8 Aug 2017 23:13:51 +0200 (CEST) Received: (qmail 87684 invoked by uid 500); 8 Aug 2017 21:13:50 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87529 invoked by uid 99); 8 Aug 2017 21:13:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 21:13:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B611AE9456; Tue, 8 Aug 2017 21:13:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Tue, 08 Aug 2017 21:13:56 -0000 Message-Id: <2ca8daaeafce44d987d0a9ef47576851@git.apache.org> In-Reply-To: <473d2327b9f340ed8ea57c1c0baf96a0@git.apache.org> References: <473d2327b9f340ed8ea57c1c0baf96a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] cxf git commit: Fix some more warnings archived-at: Tue, 08 Aug 2017 21:13:52 -0000 Fix some more warnings Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55504e75 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55504e75 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55504e75 Branch: refs/heads/master Commit: 55504e75246c4425bece6c2a05e5c22e125900a8 Parents: db11547 Author: Daniel Kulp Authored: Tue Aug 8 16:26:22 2017 -0400 Committer: Daniel Kulp Committed: Tue Aug 8 16:26:22 2017 -0400 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java | 5 +---- .../apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java | 4 ++-- .../apache/cxf/systest/jms/security/SamlCallbackHandler.java | 6 +++--- .../java/org/apache/cxf/systest/https/conduit/PushBack401.java | 1 - 4 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/55504e75/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java index fc5c087..45b59ae 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java @@ -149,10 +149,7 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor imple return false; } Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE); - if (responseCode != null && responseCode != 200) { - return false; - } - return true; + return !(responseCode != null && responseCode != 200); } private boolean isServerGet(Message message) { http://git-wip-us.apache.org/repos/asf/cxf/blob/55504e75/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java index 685d8c2..f465d13 100644 --- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java +++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java @@ -21,12 +21,12 @@ package org.apache.cxf.jaxrs.sse.client; import java.util.concurrent.TimeUnit; import javax.ws.rs.client.WebTarget; -import javax.ws.rs.sse.InboundSseEvent; +import javax.ws.rs.sse.SseEvent; import javax.ws.rs.sse.SseEventSource; import javax.ws.rs.sse.SseEventSource.Builder; public class SseEventSourceBuilderImpl extends SseEventSource.Builder { - private long delay = InboundSseEvent.RECONNECT_NOT_SET; + private long delay = SseEvent.RECONNECT_NOT_SET; private TimeUnit unit = TimeUnit.MILLISECONDS; private WebTarget target; http://git-wip-us.apache.org/repos/asf/cxf/blob/55504e75/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/SamlCallbackHandler.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/SamlCallbackHandler.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/SamlCallbackHandler.java index 7781557..6844e9f 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/SamlCallbackHandler.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/SamlCallbackHandler.java @@ -27,6 +27,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -41,7 +42,6 @@ import org.apache.wss4j.common.saml.bean.SubjectBean; import org.apache.wss4j.common.saml.bean.Version; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; -import org.apache.wss4j.dom.WSConstants; /** * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion. @@ -55,8 +55,8 @@ public class SamlCallbackHandler implements CallbackHandler { private String cryptoAlias = "alice"; private String cryptoPassword = "password"; private String cryptoPropertiesFile = "alice.properties"; - private String signatureAlgorithm = WSConstants.RSA_SHA1; - private String digestAlgorithm = WSConstants.SHA1; + private String signatureAlgorithm = WSS4JConstants.RSA_SHA1; + private String digestAlgorithm = WSS4JConstants.SHA1; public SamlCallbackHandler() { // http://git-wip-us.apache.org/repos/asf/cxf/blob/55504e75/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/PushBack401.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/PushBack401.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/PushBack401.java index a252e4f..b31f659 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/PushBack401.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/PushBack401.java @@ -141,7 +141,6 @@ public class PushBack401 extends AbstractPhaseInterceptor { } // No Authorization: Basic replyUnauthorized(message, null); - return; } /**