From 51a7ccc397ab8363fc97c28d88cd9d6133682f02 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 5 Mar 2013 16:33:13 -0500 Subject: [PATCH] entity -> embed --- ...ithmEntity.java => JWEAlgorithmEmbed.java} | 12 ++--- ...ity.java => JWEEncryptionMethodEmbed.java} | 12 ++--- ...ithmEntity.java => JWSAlgorithmEmbed.java} | 12 ++--- .../oauth2/model/ClientDetailsEntity.java | 48 +++++++++---------- .../view/ClientEntityViewForAdmins.java | 18 +++---- .../view/ClientEntityViewForUsers.java | 18 +++---- .../mitre/openid/connect/web/ClientAPI.java | 24 +++++----- .../ClientDynamicRegistrationEndpoint.java | 18 +++---- 8 files changed, 81 insertions(+), 81 deletions(-) rename openid-connect-common/src/main/java/org/mitre/jose/{JWEAlgorithmEntity.java => JWEAlgorithmEmbed.java} (82%) rename openid-connect-common/src/main/java/org/mitre/jose/{JWEEncryptionMethodEntity.java => JWEEncryptionMethodEmbed.java} (79%) rename openid-connect-common/src/main/java/org/mitre/jose/{JWSAlgorithmEntity.java => JWSAlgorithmEmbed.java} (82%) diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEntity.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java similarity index 82% rename from openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEntity.java rename to openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java index bc63132a1..e0e06e497 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java @@ -19,20 +19,20 @@ import com.nimbusds.jose.JWEAlgorithm; * */ @Embeddable -public class JWEAlgorithmEntity { +public class JWEAlgorithmEmbed { private JWEAlgorithm algorithm; - public JWEAlgorithmEntity() { + public JWEAlgorithmEmbed() { } - public JWEAlgorithmEntity(JWEAlgorithm algorithm) { + public JWEAlgorithmEmbed(JWEAlgorithm algorithm) { this.algorithm = algorithm; } - public static JWEAlgorithmEntity getForAlgorithmName (String algorithmName) { - JWEAlgorithmEntity ent = new JWEAlgorithmEntity(); + public static JWEAlgorithmEmbed getForAlgorithmName (String algorithmName) { + JWEAlgorithmEmbed ent = new JWEAlgorithmEmbed(); ent.setAlgorithmName(algorithmName); if (ent.getAlgorithm() == null) { return null; @@ -72,7 +72,7 @@ public class JWEAlgorithmEntity { */ @Override public String toString() { - return "JWEAlgorithmEntity [algorithm=" + algorithm + "]"; + return "JWEAlgorithmEmbed [algorithm=" + algorithm + "]"; } /** diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEntity.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java similarity index 79% rename from openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEntity.java rename to openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java index 297f1b42a..ba44bed31 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java @@ -16,20 +16,20 @@ import com.nimbusds.jose.JWEAlgorithm; * */ @Embeddable -public class JWEEncryptionMethodEntity { +public class JWEEncryptionMethodEmbed { private EncryptionMethod algorithm; - public JWEEncryptionMethodEntity() { + public JWEEncryptionMethodEmbed() { } - public JWEEncryptionMethodEntity(EncryptionMethod algorithm) { + public JWEEncryptionMethodEmbed(EncryptionMethod algorithm) { this.algorithm = algorithm; } - public static JWEEncryptionMethodEntity getForAlgorithmName (String algorithmName) { - JWEEncryptionMethodEntity ent = new JWEEncryptionMethodEntity(); + public static JWEEncryptionMethodEmbed getForAlgorithmName (String algorithmName) { + JWEEncryptionMethodEmbed ent = new JWEEncryptionMethodEmbed(); ent.setAlgorithmName(algorithmName); if (ent.getAlgorithm() == null) { return null; @@ -69,7 +69,7 @@ public class JWEEncryptionMethodEntity { */ @Override public String toString() { - return "JWEEncryptionMethodEntity [algorithm=" + algorithm + "]"; + return "JWEEncryptionMethodEmbed [algorithm=" + algorithm + "]"; } /** diff --git a/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEntity.java b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java similarity index 82% rename from openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEntity.java rename to openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java index 02c6ca252..f0ffa9255 100644 --- a/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java @@ -20,20 +20,20 @@ import com.nimbusds.jose.JWSAlgorithm; * */ @Embeddable -public class JWSAlgorithmEntity { +public class JWSAlgorithmEmbed { private JWSAlgorithm algorithm; - public JWSAlgorithmEntity() { + public JWSAlgorithmEmbed() { } - public JWSAlgorithmEntity(JWSAlgorithm algorithm) { + public JWSAlgorithmEmbed(JWSAlgorithm algorithm) { this.algorithm = algorithm; } - public static JWSAlgorithmEntity getForAlgorithmName (String algorithmName) { - JWSAlgorithmEntity ent = new JWSAlgorithmEntity(); + public static JWSAlgorithmEmbed getForAlgorithmName (String algorithmName) { + JWSAlgorithmEmbed ent = new JWSAlgorithmEmbed(); ent.setAlgorithmName(algorithmName); if (ent.getAlgorithm() == null) { return null; @@ -88,7 +88,7 @@ public class JWSAlgorithmEntity { */ @Override public String toString() { - return "JWSAlgorithmEntity [algorithm=" + algorithm + "]"; + return "JWSAlgorithmEmbed [algorithm=" + algorithm + "]"; } diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index 69ef68715..2fb747046 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -46,9 +46,9 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mitre.jose.JWEAlgorithmEntity; -import org.mitre.jose.JWEEncryptionMethodEntity; -import org.mitre.jose.JWSAlgorithmEntity; +import org.mitre.jose.JWEAlgorithmEmbed; +import org.mitre.jose.JWEEncryptionMethodEmbed; +import org.mitre.jose.JWSAlgorithmEmbed; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.oauth2.provider.ClientDetails; @@ -89,15 +89,15 @@ public class ClientDetailsEntity implements ClientDetails { private String sectorIdentifierUri; // sector_identifier_uri private SubjectType subjectType; // subject_type - private JWSAlgorithmEntity requestObjectSigningAlg; // request_object_signing_alg + private JWSAlgorithmEmbed requestObjectSigningAlg; // request_object_signing_alg - private JWSAlgorithmEntity userInfoSignedResponseAlg; // user_info_signed_response_alg - private JWEAlgorithmEntity userInfoEncryptedResponseAlg; // user_info_encrypted_response_alg - private JWEEncryptionMethodEntity userInfoEncryptedResponseEnc; // user_info_encrypted_response_enc + private JWSAlgorithmEmbed userInfoSignedResponseAlg; // user_info_signed_response_alg + private JWEAlgorithmEmbed userInfoEncryptedResponseAlg; // user_info_encrypted_response_alg + private JWEEncryptionMethodEmbed userInfoEncryptedResponseEnc; // user_info_encrypted_response_enc - private JWSAlgorithmEntity idTokenSignedResponseAlg; // id_token_signed_response_alg - private JWEAlgorithmEntity idTokenEncryptedResponseAlg; // id_token_encrypted_response_alg - private JWEEncryptionMethodEntity idTokenEncryptedReponseEnc; // id_token_encrypted_response_enc + private JWSAlgorithmEmbed idTokenSignedResponseAlg; // id_token_signed_response_alg + private JWEAlgorithmEmbed idTokenEncryptedResponseAlg; // id_token_encrypted_response_alg + private JWEEncryptionMethodEmbed idTokenEncryptedReponseEnc; // id_token_encrypted_response_enc private Integer defaultMaxAge; // default_max_age private Boolean requireAuthTime; // require_auth_time @@ -662,11 +662,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="request_object_signing_alg")) }) - public JWSAlgorithmEntity getRequestObjectSigningAlg() { + public JWSAlgorithmEmbed getRequestObjectSigningAlg() { return requestObjectSigningAlg; } - public void setRequestObjectSigningAlg(JWSAlgorithmEntity requestObjectSigningAlg) { + public void setRequestObjectSigningAlg(JWSAlgorithmEmbed requestObjectSigningAlg) { this.requestObjectSigningAlg = requestObjectSigningAlg; } @@ -674,11 +674,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="user_info_signed_response_alg")) }) - public JWSAlgorithmEntity getUserInfoSignedResponseAlg() { + public JWSAlgorithmEmbed getUserInfoSignedResponseAlg() { return userInfoSignedResponseAlg; } - public void setUserInfoSignedResponseAlg(JWSAlgorithmEntity userInfoSignedResponseAlg) { + public void setUserInfoSignedResponseAlg(JWSAlgorithmEmbed userInfoSignedResponseAlg) { this.userInfoSignedResponseAlg = userInfoSignedResponseAlg; } @@ -686,11 +686,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="user_info_encrypted_response_alg")) }) - public JWEAlgorithmEntity getUserInfoEncryptedResponseAlg() { + public JWEAlgorithmEmbed getUserInfoEncryptedResponseAlg() { return userInfoEncryptedResponseAlg; } - public void setUserInfoEncryptedResponseAlg(JWEAlgorithmEntity userInfoEncryptedResponseAlg) { + public void setUserInfoEncryptedResponseAlg(JWEAlgorithmEmbed userInfoEncryptedResponseAlg) { this.userInfoEncryptedResponseAlg = userInfoEncryptedResponseAlg; } @@ -698,11 +698,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="user_info_encrypted_response_enc")) }) - public JWEEncryptionMethodEntity getUserInfoEncryptedResponseEnc() { + public JWEEncryptionMethodEmbed getUserInfoEncryptedResponseEnc() { return userInfoEncryptedResponseEnc; } - public void setUserInfoEncryptedResponseEnc(JWEEncryptionMethodEntity userInfoEncryptedResponseEnc) { + public void setUserInfoEncryptedResponseEnc(JWEEncryptionMethodEmbed userInfoEncryptedResponseEnc) { this.userInfoEncryptedResponseEnc = userInfoEncryptedResponseEnc; } @@ -710,11 +710,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="id_token_signed_response_alg")) }) - public JWSAlgorithmEntity getIdTokenSignedResponseAlg() { + public JWSAlgorithmEmbed getIdTokenSignedResponseAlg() { return idTokenSignedResponseAlg; } - public void setIdTokenSignedResponseAlg(JWSAlgorithmEntity idTokenSignedResponseAlg) { + public void setIdTokenSignedResponseAlg(JWSAlgorithmEmbed idTokenSignedResponseAlg) { this.idTokenSignedResponseAlg = idTokenSignedResponseAlg; } @@ -722,11 +722,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="id_token_encrypted_response_alg")) }) - public JWEAlgorithmEntity getIdTokenEncryptedResponseAlg() { + public JWEAlgorithmEmbed getIdTokenEncryptedResponseAlg() { return idTokenEncryptedResponseAlg; } - public void setIdTokenEncryptedResponseAlg(JWEAlgorithmEntity idTokenEncryptedResponseAlg) { + public void setIdTokenEncryptedResponseAlg(JWEAlgorithmEmbed idTokenEncryptedResponseAlg) { this.idTokenEncryptedResponseAlg = idTokenEncryptedResponseAlg; } @@ -734,11 +734,11 @@ public class ClientDetailsEntity implements ClientDetails { @AttributeOverrides({ @AttributeOverride(name = "algorithmName", column=@Column(name="id_token_encrypted_response_enc")) }) - public JWEEncryptionMethodEntity getIdTokenEncryptedReponseEnc() { + public JWEEncryptionMethodEmbed getIdTokenEncryptedReponseEnc() { return idTokenEncryptedReponseEnc; } - public void setIdTokenEncryptedReponseEnc(JWEEncryptionMethodEntity idTokenEncryptedReponseEnc) { + public void setIdTokenEncryptedReponseEnc(JWEEncryptionMethodEmbed idTokenEncryptedReponseEnc) { this.idTokenEncryptedReponseEnc = idTokenEncryptedReponseEnc; } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java index 454995bd8..5e8914f08 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java @@ -11,9 +11,9 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mitre.jose.JWEAlgorithmEntity; -import org.mitre.jose.JWEEncryptionMethodEntity; -import org.mitre.jose.JWSAlgorithmEntity; +import org.mitre.jose.JWEAlgorithmEmbed; +import org.mitre.jose.JWEEncryptionMethodEmbed; +import org.mitre.jose.JWSAlgorithmEmbed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -61,9 +61,9 @@ public class ClientEntityViewForAdmins extends AbstractView { } }) - .registerTypeAdapter(JWSAlgorithmEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWSAlgorithmEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWSAlgorithmEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWSAlgorithmEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { @@ -71,9 +71,9 @@ public class ClientEntityViewForAdmins extends AbstractView { } } }) - .registerTypeAdapter(JWEAlgorithmEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWEAlgorithmEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWEAlgorithmEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWEAlgorithmEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { @@ -81,9 +81,9 @@ public class ClientEntityViewForAdmins extends AbstractView { } } }) - .registerTypeAdapter(JWEEncryptionMethodEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWEEncryptionMethodEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWEEncryptionMethodEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWEEncryptionMethodEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java index 9fdad7467..bfd5e67e7 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java @@ -11,9 +11,9 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mitre.jose.JWEAlgorithmEntity; -import org.mitre.jose.JWEEncryptionMethodEntity; -import org.mitre.jose.JWSAlgorithmEntity; +import org.mitre.jose.JWEAlgorithmEmbed; +import org.mitre.jose.JWEEncryptionMethodEmbed; +import org.mitre.jose.JWSAlgorithmEmbed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -67,9 +67,9 @@ public class ClientEntityViewForUsers extends AbstractView { } }) - .registerTypeAdapter(JWSAlgorithmEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWSAlgorithmEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWSAlgorithmEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWSAlgorithmEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { @@ -77,9 +77,9 @@ public class ClientEntityViewForUsers extends AbstractView { } } }) - .registerTypeAdapter(JWEAlgorithmEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWEAlgorithmEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWEAlgorithmEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWEAlgorithmEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { @@ -87,9 +87,9 @@ public class ClientEntityViewForUsers extends AbstractView { } } }) - .registerTypeAdapter(JWEEncryptionMethodEntity.class, new JsonSerializer() { + .registerTypeAdapter(JWEEncryptionMethodEmbed.class, new JsonSerializer() { @Override - public JsonElement serialize(JWEEncryptionMethodEntity src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(JWEEncryptionMethodEmbed src, Type typeOfSrc, JsonSerializationContext context) { if (src != null) { return new JsonPrimitive(src.getAlgorithmName()); } else { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java index 88e7a128b..e135d6152 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java @@ -19,9 +19,9 @@ import java.lang.reflect.Type; import java.security.Principal; import java.util.Collection; -import org.mitre.jose.JWEAlgorithmEntity; -import org.mitre.jose.JWEEncryptionMethodEntity; -import org.mitre.jose.JWSAlgorithmEntity; +import org.mitre.jose.JWEAlgorithmEmbed; +import org.mitre.jose.JWEEncryptionMethodEmbed; +import org.mitre.jose.JWSAlgorithmEmbed; import org.mitre.oauth2.exception.ClientNotFoundException; import org.mitre.oauth2.model.ClientDetailsEntity; import org.mitre.oauth2.service.ClientDetailsEntityService; @@ -63,31 +63,31 @@ public class ClientAPI { private JsonParser parser = new JsonParser(); private Gson gson = new GsonBuilder() .serializeNulls() - .registerTypeAdapter(JWSAlgorithmEntity.class, new JsonDeserializer() { + .registerTypeAdapter(JWSAlgorithmEmbed.class, new JsonDeserializer() { @Override - public JWSAlgorithmEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public JWSAlgorithmEmbed deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { if (json.isJsonPrimitive()) { - return JWSAlgorithmEntity.getForAlgorithmName(json.getAsString()); + return JWSAlgorithmEmbed.getForAlgorithmName(json.getAsString()); } else { return null; } } }) - .registerTypeAdapter(JWEAlgorithmEntity.class, new JsonDeserializer() { + .registerTypeAdapter(JWEAlgorithmEmbed.class, new JsonDeserializer() { @Override - public JWEAlgorithmEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public JWEAlgorithmEmbed deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { if (json.isJsonPrimitive()) { - return JWEAlgorithmEntity.getForAlgorithmName(json.getAsString()); + return JWEAlgorithmEmbed.getForAlgorithmName(json.getAsString()); } else { return null; } } }) - .registerTypeAdapter(JWEEncryptionMethodEntity.class, new JsonDeserializer() { + .registerTypeAdapter(JWEEncryptionMethodEmbed.class, new JsonDeserializer() { @Override - public JWEEncryptionMethodEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public JWEEncryptionMethodEmbed deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { if (json.isJsonPrimitive()) { - return JWEEncryptionMethodEntity.getForAlgorithmName(json.getAsString()); + return JWEEncryptionMethodEmbed.getForAlgorithmName(json.getAsString()); } else { return null; } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java index d0fda7968..d9b2f1cef 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java @@ -6,9 +6,9 @@ import java.security.Principal; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.mitre.jose.JWEAlgorithmEntity; -import org.mitre.jose.JWEEncryptionMethodEntity; -import org.mitre.jose.JWSAlgorithmEntity; +import org.mitre.jose.JWEAlgorithmEmbed; +import org.mitre.jose.JWEEncryptionMethodEmbed; +import org.mitre.jose.JWSAlgorithmEmbed; import org.mitre.oauth2.model.ClientDetailsEntity; import org.mitre.oauth2.model.ClientDetailsEntity.AppType; import org.mitre.oauth2.model.ClientDetailsEntity.AuthMethod; @@ -260,10 +260,10 @@ public class ClientDynamicRegistrationEndpoint { /** * Gets the value of the given member as a JWS Algorithm, null if it doesn't exist */ - private JWSAlgorithmEntity getAsJwsAlgorithm(JsonObject o, String member) { + private JWSAlgorithmEmbed getAsJwsAlgorithm(JsonObject o, String member) { String s = getAsString(o, member); if (s != null) { - return JWSAlgorithmEntity.getForAlgorithmName(s); + return JWSAlgorithmEmbed.getForAlgorithmName(s); } else { return null; } @@ -272,10 +272,10 @@ public class ClientDynamicRegistrationEndpoint { /** * Gets the value of the given member as a JWE Algorithm, null if it doesn't exist */ - private JWEAlgorithmEntity getAsJweAlgorithm(JsonObject o, String member) { + private JWEAlgorithmEmbed getAsJweAlgorithm(JsonObject o, String member) { String s = getAsString(o, member); if (s != null) { - return JWEAlgorithmEntity.getForAlgorithmName(s); + return JWEAlgorithmEmbed.getForAlgorithmName(s); } else { return null; } @@ -285,10 +285,10 @@ public class ClientDynamicRegistrationEndpoint { /** * Gets the value of the given member as a JWE Encryption Method, null if it doesn't exist */ - private JWEEncryptionMethodEntity getAsJweEncryptionMethod(JsonObject o, String member) { + private JWEEncryptionMethodEmbed getAsJweEncryptionMethod(JsonObject o, String member) { String s = getAsString(o, member); if (s != null) { - return JWEEncryptionMethodEntity.getForAlgorithmName(s); + return JWEEncryptionMethodEmbed.getForAlgorithmName(s); } else { return null; }