Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4193B18518 for ; Thu, 6 Aug 2015 15:47:51 +0000 (UTC) Received: (qmail 49540 invoked by uid 500); 6 Aug 2015 15:47:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 49477 invoked by uid 500); 6 Aug 2015 15:47:38 -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 49468 invoked by uid 99); 6 Aug 2015 15:47:38 -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; Thu, 06 Aug 2015 15:47:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DCD3E683E; Thu, 6 Aug 2015 15:47:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Temp making JoseHeaders abstract again Date: Thu, 6 Aug 2015 15:47:38 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 3a72794e7 -> 11e710d3d Temp making JoseHeaders abstract again Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11e710d3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11e710d3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11e710d3 Branch: refs/heads/master Commit: 11e710d3d7fd830b8cd9214863fcf3b4e90d7883 Parents: 3a72794 Author: Sergey Beryozkin Authored: Thu Aug 6 16:47:22 2015 +0100 Committer: Sergey Beryozkin Committed: Thu Aug 6 16:47:22 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java | 2 +- .../main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/11e710d3/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java index 66c7863..fd111e6 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java @@ -26,7 +26,7 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxrs.provider.json.JsonMapObject; import org.apache.cxf.rs.security.jose.jwk.JsonWebKey; -public class JoseHeaders extends JsonMapObject { +public abstract class JoseHeaders extends JsonMapObject { public JoseHeaders() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/11e710d3/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java index 077c500..f8be716 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java @@ -26,7 +26,7 @@ public class JwtToken { private JoseHeaders headers; private JwtClaims claims; public JwtToken(JwtClaims claims) { - this(new JoseHeaders(), claims); + this(new JoseHeaders() { }, claims); } public JwtToken(JoseHeaders headers, JwtClaims claims) { this.headers = headers;