You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/12/21 17:56:05 UTC
cxf git commit: Making JsonMapObject Serializable
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 078d14e09 -> d7872e7fa
Making JsonMapObject Serializable
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d7872e7f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d7872e7f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d7872e7f
Branch: refs/heads/3.1.x-fixes
Commit: d7872e7faa2f919154467158cd8790d6bd4f4be2
Parents: 078d14e
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Dec 21 16:55:33 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Dec 21 16:55:33 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java | 4 +++-
.../org/apache/cxf/rs/security/jose/common/JoseHeaders.java | 2 ++
.../java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java | 1 +
.../java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java | 2 ++
.../java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java | 2 ++
.../java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java | 1 +
.../java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java | 2 ++
.../java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java | 6 +++---
.../apache/cxf/rs/security/oidc/common/AbstractUserInfo.java | 2 ++
.../java/org/apache/cxf/rs/security/oidc/common/IdToken.java | 2 ++
.../org/apache/cxf/rs/security/oidc/common/UserAddress.java | 1 +
.../java/org/apache/cxf/rs/security/oidc/common/UserInfo.java | 1 +
12 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
index d0f6ad0..f9c1025 100644
--- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
+++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
@@ -19,11 +19,13 @@
package org.apache.cxf.jaxrs.json.basic;
+import java.io.Serializable;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-public class JsonMapObject {
+public class JsonMapObject implements Serializable {
+ private static final long serialVersionUID = 2620765136328623790L;
Map<String, Integer> updateCount;
Map<String, Object> values = new LinkedHashMap<String, Object>();
public JsonMapObject() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
index 3160232..950c277 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseHeaders.java
@@ -27,6 +27,8 @@ import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
public abstract class JoseHeaders extends JsonMapObject {
+ private static final long serialVersionUID = 1101185302425283553L;
+
public JoseHeaders() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
index d632777..b02f6db 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
@@ -34,6 +34,7 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
public class JweHeaders extends JoseHeaders {
+ private static final long serialVersionUID = 1L;
private JweHeaders protectedHeaders;
public JweHeaders() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java
index 6a064e8..ddba544 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKey.java
@@ -73,6 +73,8 @@ public class JsonWebKey extends JsonMapObject {
public static final String KEY_OPER_DERIVE_KEY = "deriveKey";
public static final String KEY_OPER_DERIVE_BITS = "deriveBits";
+ private static final long serialVersionUID = 3201315996547826368L;
+
public JsonWebKey() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
index ce53af8..d2c7f08 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
@@ -29,6 +29,8 @@ import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
public class JsonWebKeys extends JsonMapObject {
public static final String KEYS_PROPERTY = "keys";
+ private static final long serialVersionUID = -8002543601655429723L;
+
public JsonWebKeys() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
index ec75872..9d54b37 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
@@ -27,6 +27,7 @@ import org.apache.cxf.rs.security.jose.common.JoseType;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
public class JwsHeaders extends JoseHeaders {
+ private static final long serialVersionUID = 3422779299093961672L;
public JwsHeaders() {
}
public JwsHeaders(JoseType type) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java
index b924a55..d6a940d 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtClaims.java
@@ -32,6 +32,8 @@ import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
public class JwtClaims extends JsonMapObject {
+ private static final long serialVersionUID = 6274136637301800283L;
+
public JwtClaims() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
index 6780e78..de384be 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
@@ -29,13 +29,13 @@ public class JwtToken {
private JwtClaims claims;
public JwtToken(JwtClaims claims) {
- this(new JwsHeaders() { }, new JweHeaders() { }, claims);
+ this(new JwsHeaders(), new JweHeaders(), claims);
}
public JwtToken(JwsHeaders jwsHeaders, JwtClaims claims) {
- this(jwsHeaders, new JweHeaders() { }, claims);
+ this(jwsHeaders, new JweHeaders(), claims);
}
public JwtToken(JweHeaders jweHeaders, JwtClaims claims) {
- this(new JwsHeaders() { }, jweHeaders, claims);
+ this(new JwsHeaders(), jweHeaders, claims);
}
public JwtToken(JwsHeaders jwsHeaders, JweHeaders jweHeaders, JwtClaims claims) {
this.jwsHeaders = jwsHeaders;
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
index 426b1ed..583abed 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
@@ -43,6 +43,8 @@ public abstract class AbstractUserInfo extends JwtClaims {
public static final String PHONE_VERIFIED_CLAIM = "phone_number_verified";
public static final String ADDRESS_CLAIM = "address";
public static final String UPDATED_AT_CLAIM = "updated_at";
+ private static final long serialVersionUID = 4554501320190745304L;
+
public AbstractUserInfo() {
}
public AbstractUserInfo(JwtClaims claims) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java
index 6687e8b..fd9ddc9 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java
@@ -34,6 +34,8 @@ public class IdToken extends AbstractUserInfo {
public static final String AMR_CLAIM = "amr";
public static final String ACCESS_TOKEN_HASH_CLAIM = "at_hash";
public static final String AUTH_CODE_HASH_CLAIM = "c_hash";
+ private static final long serialVersionUID = -2243170791872714855L;
+
public IdToken() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserAddress.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserAddress.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserAddress.java
index 2aa007b..d9f60c3 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserAddress.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserAddress.java
@@ -29,6 +29,7 @@ public class UserAddress extends JsonMapObject {
public static final String COUNTRY = "country";
public static final String REGION = "region";
public static final String FORMATTED = "formatted";
+ private static final long serialVersionUID = -6065703167243134105L;
public UserAddress() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d7872e7f/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java
index 1ac2986..c2015f8 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
public class UserInfo extends AbstractUserInfo {
+ private static final long serialVersionUID = 6712696583010801033L;
public UserInfo() {
}
public UserInfo(JwtClaims claims) {