[java-idp-oidc] 34/44: JOIDC-5 Removed 'Response' from XML-elements related to RequestObject.
Henri Mikkonen
henri.mikkonen at iki.fi
Thu Oct 22 13:08:46 UTC 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=aa7c81f3d1533f8d595578a86e6f7eee89733116
commit aa7c81f3d1533f8d595578a86e6f7eee89733116
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jul 3 17:27:11 2020 +0300
JOIDC-5 Removed 'Response' from XML-elements related to RequestObject.
https://issues.shibboleth.net/jira/browse/JOIDC-5
Response had ended up to the element/class names accidentally.
---
.../idp/saml/oidc/xmlobject/OAuthRPExtensions.java | 12 +++----
...nseAlg.java => RequestObjectEncryptionAlg.java} | 6 ++--
...nseAlg.java => RequestObjectEncryptionEnc.java} | 6 ++--
...sponseEnc.java => RequestObjectSigningAlg.java} | 6 ++--
.../resources/schema/saml-metadata-ext-oidcmd.xsd | 12 +++----
.../oidc/xmlobject/impl/OAuthRPExtensionsImpl.java | 42 +++++++++++-----------
.../impl/OAuthRPExtensionsUnmarshaller.java | 18 +++++-----
...java => RequestObjectEncryptionAlgBuilder.java} | 16 ++++-----
...pl.java => RequestObjectEncryptionAlgImpl.java} | 8 ++---
...a => RequestObjectEncryptionAlgMarshaller.java} | 6 ++--
...=> RequestObjectEncryptionAlgUnmarshaller.java} | 6 ++--
...java => RequestObjectEncryptionEncBuilder.java} | 16 ++++-----
...pl.java => RequestObjectEncryptionEncImpl.java} | 8 ++---
...a => RequestObjectEncryptionEncMarshaller.java} | 6 ++--
...=> RequestObjectEncryptionEncUnmarshaller.java} | 6 ++--
...er.java => RequestObjectSigningAlgBuilder.java} | 16 ++++-----
...gImpl.java => RequestObjectSigningAlgImpl.java} | 8 ++---
...java => RequestObjectSigningAlgMarshaller.java} | 6 ++--
...va => RequestObjectSigningAlgUnmarshaller.java} | 6 ++--
.../impl/ClientInformationNodeProcessor.java | 6 ++--
.../resources/saml2-metadata-oidcmd-config.xml | 24 ++++++-------
.../impl/EntitiesDescriptor-with-oidcmd.xml | 6 ++--
22 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
index 9b866e3f..efe1e7ee 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
@@ -248,42 +248,42 @@ public interface OAuthRPExtensions extends SAMLObject {
*
* @return The JWS alg algorithm for request object signature.
*/
- public RequestObjectSignedResponseAlg getRequestObjectSignedResponseAlg();
+ public RequestObjectSigningAlg getRequestObjectSigningAlg();
/**
* Set the JWS alg algorithm for request object signature.
*
* @param algorithm The JWS alg algorithm for request object signature.
*/
- public void setRequestObjectSignedResponseAlg(final RequestObjectSignedResponseAlg algorithm);
+ public void setRequestObjectSigningAlg(final RequestObjectSigningAlg algorithm);
/**
* Get the JWE alg algorithm for request object encryption.
*
* @return The JWE alg algorithm for request object encryption.
*/
- public RequestObjectEncryptionResponseAlg getRequestObjectEncryptionResponseAlg();
+ public RequestObjectEncryptionAlg getRequestObjectEncryptionAlg();
/**
* Set the JWE alg algorithm for request object encryption.
*
* @param algorithm The JWE alg algorithm for request object encryption.
*/
- public void setRequestObjectEncryptionResponseAlg(final RequestObjectEncryptionResponseAlg algorithm);
+ public void setRequestObjectEncryptionAlg(final RequestObjectEncryptionAlg algorithm);
/**
* Get the JWE enc algorithm for request object encryption.
*
* @return The JWE enc algorithm for request object encryption.
*/
- public RequestObjectEncryptionResponseEnc getRequestObjectEncryptionResponseEnc();
+ public RequestObjectEncryptionEnc getRequestObjectEncryptionEnc();
/**
* Set the JWE enc algorithm for request object encryption.
*
* @param algorithm The JWE enc algorithm for request object encryption.
*/
- public void setRequestObjectEncryptionResponseEnc(final RequestObjectEncryptionResponseEnc algorithm);
+ public void setRequestObjectEncryptionEnc(final RequestObjectEncryptionEnc algorithm);
/**
* Get the JWS alg algorithm for token endpoint authentication signature.
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSignedResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java
similarity index 86%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSignedResponseAlg.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java
index 921a80c5..7d63d878 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSignedResponseAlg.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
import javax.xml.namespace.QName;
/**
- * SAML2 OIDC metadata extension 'RequestObjectSignedResponseAlg'.
+ * SAML2 OIDC metadata extension 'RequestObjectEncryptionAlg'.
*/
-public interface RequestObjectSignedResponseAlg extends MetadataValueSAMLObject {
+public interface RequestObjectEncryptionAlg extends MetadataValueSAMLObject {
/** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectSignedResponseAlg";
+ public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectEncryptionAlg";
/** Default element name. */
public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java
similarity index 85%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseAlg.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java
index c041431a..acacdf8f 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseAlg.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
import javax.xml.namespace.QName;
/**
- * SAML2 OIDC metadata extension 'RequestObjectEncryptionResponseAlg'.
+ * SAML2 OIDC metadata extension 'RequestObjectEncryptionEnc'.
*/
-public interface RequestObjectEncryptionResponseAlg extends MetadataValueSAMLObject {
+public interface RequestObjectEncryptionEnc extends MetadataValueSAMLObject {
/** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectEncryptionResponseAlg";
+ public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectEncryptionEnc";
/** Default element name. */
public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java
similarity index 85%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseEnc.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java
index 68706e38..d862ff2b 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionResponseEnc.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
import javax.xml.namespace.QName;
/**
- * SAML2 OIDC metadata extension 'RequestObjectEncryptionResponseEnc'.
+ * SAML2 OIDC metadata extension 'RequestObjectSigningAlg'.
*/
-public interface RequestObjectEncryptionResponseEnc extends MetadataValueSAMLObject {
+public interface RequestObjectSigningAlg extends MetadataValueSAMLObject {
/** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectEncryptionResponseEnc";
+ public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestObjectSigningAlg";
/** Default element name. */
public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
index 1751f091..83e9e2e7 100644
--- a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
+++ b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
@@ -27,9 +27,9 @@
<element ref="oidcmd:UserInfoSignedResponseAlg" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:UserInfoEncryptedResponseAlg" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:UserInfoEncryptedResponseEnc" minOccurs="0" maxOccurs="1" />
- <element ref="oidcmd:RequestObjectSignedResponseAlg" minOccurs="0" maxOccurs="1" />
- <element ref="oidcmd:RequestObjectncryptedResponseAlg" minOccurs="0" maxOccurs="1" />
- <element ref="oidcmd:RequestObjectEncryptedResponseEnc" minOccurs="0" maxOccurs="1" />
+ <element ref="oidcmd:RequestObjectSigningAlg" minOccurs="0" maxOccurs="1" />
+ <element ref="oidcmd:RequestObjectEncryptionAlg" minOccurs="0" maxOccurs="1" />
+ <element ref="oidcmd:RequestObjectEncryptionEnc" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:TokenEndpointAuthSigningAlg" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:DefaultAcrValue" minOccurs="0" maxOccurs="unbounded" />
<element ref="oidcmd:InitiateLoginUri" minOccurs="0" maxOccurs="1" />
@@ -61,9 +61,9 @@
<element name="UserInfoSignedResponseAlg" type="anyURI" />
<element name="UserInfoEncryptionResponseAlg" type="anyURI" />
<element name="UserInfoEncryptionResponseEnc" type="anyURI" />
- <element name="RequestObjectSignedResponseAlg" type="anyURI" />
- <element name="RequestObjectEncryptionResponseAlg" type="anyURI" />
- <element name="RequestObjectEncryptionResponseEnc" type="anyURI" />
+ <element name="RequestObjectSigningAlg" type="anyURI" />
+ <element name="RequestObjectEncryptionAlg" type="anyURI" />
+ <element name="RequestObjectEncryptionEnc" type="anyURI" />
<element name="TokenEndpointAuthSigningAlg" type="anyURI" />
<element name="DefaultAcrValue" type="anyURI" />
<element name="InitiateLoginUri" type="anyURI" />
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
index bd725905..2e373a5f 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
@@ -36,9 +36,9 @@ import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
import net.shibboleth.idp.saml.oidc.xmlobject.OAuthRPExtensions;
import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
@@ -103,14 +103,14 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
/** User info encryption response encoder for this entity. */
private UserInfoEncryptionResponseEnc userInfoEncryptionResponseEnc;
- /** Request object signed response algorithm for this entity. */
- private RequestObjectSignedResponseAlg requestObjectSignedResponseAlg;
+ /** Request object signing algorithm for this entity. */
+ private RequestObjectSigningAlg requestObjectSigningAlg;
- /** Request object encryption response algorithm for this entity. */
- private RequestObjectEncryptionResponseAlg requestObjectEncryptionResponseAlg;
+ /** Request object encryption algorithm for this entity. */
+ private RequestObjectEncryptionAlg requestObjectEncryptionAlg;
- /** Request object encryption response encoder for this entity. */
- private RequestObjectEncryptionResponseEnc requestObjectEncryptionResponseEnc;
+ /** Request object encryption encoder for this entity. */
+ private RequestObjectEncryptionEnc requestObjectEncryptionEnc;
/** Token endpoint authentication signing algorithm for this entity. */
private TokenEndpointAuthSigningAlg tokenEndpointAuthSigningAlg;
@@ -337,38 +337,38 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
/** {@inheritDoc} */
@Override
- public RequestObjectSignedResponseAlg getRequestObjectSignedResponseAlg() {
- return requestObjectSignedResponseAlg;
+ public RequestObjectSigningAlg getRequestObjectSigningAlg() {
+ return requestObjectSigningAlg;
}
/** {@inheritDoc} */
@Override
- public void setRequestObjectSignedResponseAlg(RequestObjectSignedResponseAlg algorithm) {
- requestObjectSignedResponseAlg = algorithm;
+ public void setRequestObjectSigningAlg(RequestObjectSigningAlg algorithm) {
+ requestObjectSigningAlg = algorithm;
}
/** {@inheritDoc} */
@Override
- public RequestObjectEncryptionResponseAlg getRequestObjectEncryptionResponseAlg() {
- return requestObjectEncryptionResponseAlg;
+ public RequestObjectEncryptionAlg getRequestObjectEncryptionAlg() {
+ return requestObjectEncryptionAlg;
}
/** {@inheritDoc} */
@Override
- public void setRequestObjectEncryptionResponseAlg(RequestObjectEncryptionResponseAlg algorithm) {
- requestObjectEncryptionResponseAlg = algorithm;
+ public void setRequestObjectEncryptionAlg(RequestObjectEncryptionAlg algorithm) {
+ requestObjectEncryptionAlg = algorithm;
}
/** {@inheritDoc} */
@Override
- public RequestObjectEncryptionResponseEnc getRequestObjectEncryptionResponseEnc() {
- return requestObjectEncryptionResponseEnc;
+ public RequestObjectEncryptionEnc getRequestObjectEncryptionEnc() {
+ return requestObjectEncryptionEnc;
}
/** {@inheritDoc} */
@Override
- public void setRequestObjectEncryptionResponseEnc(RequestObjectEncryptionResponseEnc algorithm) {
- requestObjectEncryptionResponseEnc = algorithm;
+ public void setRequestObjectEncryptionEnc(RequestObjectEncryptionEnc algorithm) {
+ requestObjectEncryptionEnc = algorithm;
}
/** {@inheritDoc} */
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
index d4e46c03..2fb5482b 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
@@ -34,9 +34,9 @@ import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
import net.shibboleth.idp.saml.oidc.xmlobject.OAuthRPExtensions;
import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
@@ -91,12 +91,12 @@ public class OAuthRPExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshalle
descriptor.setUserInfoEncryptionResponseAlg((UserInfoEncryptionResponseAlg) childSAMLObject);
} else if (childSAMLObject instanceof UserInfoEncryptionResponseEnc) {
descriptor.setUserInfoEncryptionResponseEnc((UserInfoEncryptionResponseEnc) childSAMLObject);
- } else if (childSAMLObject instanceof RequestObjectSignedResponseAlg) {
- descriptor.setRequestObjectSignedResponseAlg((RequestObjectSignedResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof RequestObjectEncryptionResponseAlg) {
- descriptor.setRequestObjectEncryptionResponseAlg((RequestObjectEncryptionResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof RequestObjectEncryptionResponseEnc) {
- descriptor.setRequestObjectEncryptionResponseEnc((RequestObjectEncryptionResponseEnc) childSAMLObject);
+ } else if (childSAMLObject instanceof RequestObjectSigningAlg) {
+ descriptor.setRequestObjectSigningAlg((RequestObjectSigningAlg) childSAMLObject);
+ } else if (childSAMLObject instanceof RequestObjectEncryptionAlg) {
+ descriptor.setRequestObjectEncryptionAlg((RequestObjectEncryptionAlg) childSAMLObject);
+ } else if (childSAMLObject instanceof RequestObjectEncryptionEnc) {
+ descriptor.setRequestObjectEncryptionEnc((RequestObjectEncryptionEnc) childSAMLObject);
} else if (childSAMLObject instanceof TokenEndpointAuthSigningAlg) {
descriptor.setTokenEndpointAuthSigningAlg((TokenEndpointAuthSigningAlg) childSAMLObject);
} else if (childSAMLObject instanceof DefaultAcrValue) {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java
similarity index 63%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java
index 021071ac..dc9a95e9 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
/**
- * Builder of {@link RequestObjectEncryptionResponseAlgImpl}.
+ * Builder of {@link RequestObjectEncryptionAlgImpl}.
*/
-public class RequestObjectEncryptionResponseAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionResponseAlg> {
+public class RequestObjectEncryptionAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionAlg> {
/**
* Constructor.
*/
- public RequestObjectEncryptionResponseAlgBuilder() {
+ public RequestObjectEncryptionAlgBuilder() {
}
/** {@inheritDoc} */
- public RequestObjectEncryptionResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
+ public RequestObjectEncryptionAlg buildObject() {
+ return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionAlg.DEFAULT_ELEMENT_LOCAL_NAME,
Constants.SAML20MDOIDCMD_PREFIX);
}
/** {@inheritDoc} */
- public RequestObjectEncryptionResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new RequestObjectEncryptionResponseAlgImpl(namespaceURI, localName, namespacePrefix);
+ public RequestObjectEncryptionAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+ return new RequestObjectEncryptionAlgImpl(namespaceURI, localName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgImpl.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgImpl.java
index 907a1c63..451fca2a 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgImpl.java
@@ -16,12 +16,12 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
/**
- * Concrete implementation of {@link RequestObjectEncryptionResponseEnc}.
+ * Concrete implementation of {@link RequestObjectEncryptionAlg}.
*/
-public class RequestObjectEncryptionResponseEncImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionResponseEnc {
+public class RequestObjectEncryptionAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionAlg {
/**
* Constructor.
@@ -30,7 +30,7 @@ public class RequestObjectEncryptionResponseEncImpl extends AbstractMetadataValu
* @param elementLocalName the local name of the XML element this Object represents
* @param namespacePrefix the prefix for the given namespace
*/
- protected RequestObjectEncryptionResponseEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+ protected RequestObjectEncryptionAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
super(namespaceURI, elementLocalName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgMarshaller.java
similarity index 75%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgMarshaller.java
index b33d087a..0eae73c3 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgMarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
/**
- * A thread safe Marshaller for {@link RequestObjectEncryptionResponseEnc} objects.
+ * A thread safe Marshaller for {@link RequestObjectEncryptionAlg} objects.
*/
-public class RequestObjectEncryptionResponseEncMarshaller extends AbstractMetadataValueMarshaller<RequestObjectEncryptionResponseEnc> {
+public class RequestObjectEncryptionAlgMarshaller extends AbstractMetadataValueMarshaller<RequestObjectEncryptionAlg> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgUnmarshaller.java
similarity index 81%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgUnmarshaller.java
index 73818263..eebd2c04 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgUnmarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
/**
- * A thread-safe Unmarshaller for {@link RequestObjectEncryptionResponseAlg} objects.
+ * A thread-safe Unmarshaller for {@link RequestObjectEncryptionAlg} objects.
*/
-public class RequestObjectEncryptionResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectEncryptionResponseAlg> {
+public class RequestObjectEncryptionAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectEncryptionAlg> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncBuilder.java
similarity index 63%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncBuilder.java
index 505eb382..483eb046 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
/**
- * Builder of {@link RequestObjectEncryptionResponseEncImpl}.
+ * Builder of {@link RequestObjectEncryptionEncImpl}.
*/
-public class RequestObjectEncryptionResponseEncBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionResponseEnc> {
+public class RequestObjectEncryptionEncBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionEnc> {
/**
* Constructor.
*/
- public RequestObjectEncryptionResponseEncBuilder() {
+ public RequestObjectEncryptionEncBuilder() {
}
/** {@inheritDoc} */
- public RequestObjectEncryptionResponseEnc buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
+ public RequestObjectEncryptionEnc buildObject() {
+ return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionEnc.DEFAULT_ELEMENT_LOCAL_NAME,
Constants.SAML20MDOIDCMD_PREFIX);
}
/** {@inheritDoc} */
- public RequestObjectEncryptionResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new RequestObjectEncryptionResponseEncImpl(namespaceURI, localName, namespacePrefix);
+ public RequestObjectEncryptionEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+ return new RequestObjectEncryptionEncImpl(namespaceURI, localName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncImpl.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncImpl.java
index 723403e8..74676a15 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncImpl.java
@@ -16,12 +16,12 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
/**
- * Concrete implementation of {@link RequestObjectEncryptionResponseAlg}.
+ * Concrete implementation of {@link RequestObjectEncryptionEnc}.
*/
-public class RequestObjectEncryptionResponseAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionResponseAlg {
+public class RequestObjectEncryptionEncImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionEnc {
/**
* Constructor.
@@ -30,7 +30,7 @@ public class RequestObjectEncryptionResponseAlgImpl extends AbstractMetadataValu
* @param elementLocalName the local name of the XML element this Object represents
* @param namespacePrefix the prefix for the given namespace
*/
- protected RequestObjectEncryptionResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+ protected RequestObjectEncryptionEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
super(namespaceURI, elementLocalName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncMarshaller.java
similarity index 75%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncMarshaller.java
index eebabfc0..87e21d32 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseAlgMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncMarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
/**
- * A thread safe Marshaller for {@link RequestObjectEncryptionResponseAlg} objects.
+ * A thread safe Marshaller for {@link RequestObjectEncryptionEnc} objects.
*/
-public class RequestObjectEncryptionResponseAlgMarshaller extends AbstractMetadataValueMarshaller<RequestObjectEncryptionResponseAlg> {
+public class RequestObjectEncryptionEncMarshaller extends AbstractMetadataValueMarshaller<RequestObjectEncryptionEnc> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncUnmarshaller.java
similarity index 81%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncUnmarshaller.java
index 08dbbfc5..b02a77f7 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionResponseEncUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncUnmarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
/**
- * A thread-safe Unmarshaller for {@link RequestObjectEncryptionResponseEnc} objects.
+ * A thread-safe Unmarshaller for {@link RequestObjectEncryptionEnc} objects.
*/
-public class RequestObjectEncryptionResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectEncryptionResponseEnc> {
+public class RequestObjectEncryptionEncUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectEncryptionEnc> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgBuilder.java
similarity index 60%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgBuilder.java
index cb17f8b5..88fa27ca 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
/**
- * Builder of {@link RequestObjectSignedResponseAlgImpl}.
+ * Builder of {@link RequestObjectSigningAlgImpl}.
*/
-public class RequestObjectSignedResponseAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectSignedResponseAlg> {
+public class RequestObjectSigningAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectSigningAlg> {
/**
* Constructor.
*/
- public RequestObjectSignedResponseAlgBuilder() {
+ public RequestObjectSigningAlgBuilder() {
}
/** {@inheritDoc} */
- public RequestObjectSignedResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectSignedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
+ public RequestObjectSigningAlg buildObject() {
+ return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectSigningAlg.DEFAULT_ELEMENT_LOCAL_NAME,
Constants.SAML20MDOIDCMD_PREFIX);
}
/** {@inheritDoc} */
- public RequestObjectSignedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new RequestObjectSignedResponseAlgImpl(namespaceURI, localName, namespacePrefix);
+ public RequestObjectSigningAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+ return new RequestObjectSigningAlgImpl(namespaceURI, localName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgImpl.java
similarity index 70%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgImpl.java
index 8e511bf3..99c6c394 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgImpl.java
@@ -16,12 +16,12 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
/**
- * Concrete implementation of {@link RequestObjectSignedResponseAlg}.
+ * Concrete implementation of {@link RequestObjectSigningAlg}.
*/
-public class RequestObjectSignedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectSignedResponseAlg {
+public class RequestObjectSigningAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectSigningAlg {
/**
* Constructor.
@@ -30,7 +30,7 @@ public class RequestObjectSignedResponseAlgImpl extends AbstractMetadataValueSAM
* @param elementLocalName the local name of the XML element this Object represents
* @param namespacePrefix the prefix for the given namespace
*/
- protected RequestObjectSignedResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+ protected RequestObjectSigningAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
super(namespaceURI, elementLocalName, namespacePrefix);
}
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgMarshaller.java
similarity index 70%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgMarshaller.java
index 39f82b73..722af64c 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgMarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
/**
- * A thread safe Marshaller for {@link RequestObjectSignedResponseAlg} objects.
+ * A thread safe Marshaller for {@link RequestObjectSigningAlg} objects.
*/
-public class RequestObjectSignedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<RequestObjectSignedResponseAlg> {
+public class RequestObjectSigningAlgMarshaller extends AbstractMetadataValueMarshaller<RequestObjectSigningAlg> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgUnmarshaller.java
similarity index 69%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgUnmarshaller.java
index c7b88142..28e4f774 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSignedResponseAlgUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgUnmarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSignedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
/**
- * A thread-safe Unmarshaller for {@link RequestObjectSignedResponseAlg} objects.
+ * A thread-safe Unmarshaller for {@link RequestObjectSigningAlg} objects.
*/
-public class RequestObjectSignedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectSignedResponseAlg> {
+public class RequestObjectSigningAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectSigningAlg> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
index 031e969d..dfec03de 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
@@ -184,9 +184,9 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
metadata.setJWKSetURI(getSingleURIValue(extensions.getJwksUri()));
metadata.setPostLogoutRedirectionURIs(parseUris(extensions.getPostLogoutRedirectUris()));
metadata.setRedirectionURIs(parseRedirectUris(roleDescriptor));
- metadata.setRequestObjectJWEAlg(parseJweAlgorithm(extensions.getRequestObjectEncryptionResponseAlg()));
- metadata.setRequestObjectJWEEnc(parseEncryptionMethod(extensions.getRequestObjectEncryptionResponseEnc()));
- metadata.setRequestObjectJWSAlg(parseJwsAlgorithm(extensions.getRequestObjectSignedResponseAlg()));
+ metadata.setRequestObjectJWEAlg(parseJweAlgorithm(extensions.getRequestObjectEncryptionAlg()));
+ metadata.setRequestObjectJWEEnc(parseEncryptionMethod(extensions.getRequestObjectEncryptionEnc()));
+ metadata.setRequestObjectJWSAlg(parseJwsAlgorithm(extensions.getRequestObjectSigningAlg()));
metadata.setRequestObjectURIs(parseUris(extensions.getRequestUris()));
metadata.setResponseTypes(parseResponseTypes(extensions));
metadata.setScope(parseScope(extensions));
diff --git a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
index 45e97a5d..54d555ea 100644
--- a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
+++ b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
@@ -88,22 +88,22 @@
<UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.PostLogoutRedirectUriUnmarshaller"/>
</ObjectProvider>
- <ObjectProvider qualifiedName="oidcmd:RequestObjectEncryptionResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseAlgUnmarshaller"/>
+ <ObjectProvider qualifiedName="oidcmd:RequestObjectEncryptionAlg">
+ <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionAlgBuilder"/>
+ <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionAlgMarshaller"/>
+ <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionAlgUnmarshaller"/>
</ObjectProvider>
- <ObjectProvider qualifiedName="oidcmd:RequestObjectEncryptionResponseEnc">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseEncBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseEncMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionResponseEncUnmarshaller"/>
+ <ObjectProvider qualifiedName="oidcmd:RequestObjectEncryptionEnc">
+ <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionEncBuilder"/>
+ <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionEncMarshaller"/>
+ <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectEncryptionEncUnmarshaller"/>
</ObjectProvider>
- <ObjectProvider qualifiedName="oidcmd:RequestObjectSignedResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSignedResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSignedResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSignedResponseAlgUnmarshaller"/>
+ <ObjectProvider qualifiedName="oidcmd:RequestObjectSigningAlg">
+ <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSigningAlgBuilder"/>
+ <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSigningAlgMarshaller"/>
+ <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestObjectSigningAlgUnmarshaller"/>
</ObjectProvider>
<ObjectProvider qualifiedName="oidcmd:RequestUri">
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntitiesDescriptor-with-oidcmd.xml b/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntitiesDescriptor-with-oidcmd.xml
index 4c440fbd..44c2953e 100644
--- a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntitiesDescriptor-with-oidcmd.xml
+++ b/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntitiesDescriptor-with-oidcmd.xml
@@ -104,9 +104,9 @@
<oidcmd:IdTokenSignedResponseAlg>RS512</oidcmd:IdTokenSignedResponseAlg>
<oidcmd:InitiateLoginUri>https://example.org/initiateLogin</oidcmd:InitiateLoginUri>
<oidcmd:PostLogoutRedirectUri>https://example.org/postLogout</oidcmd:PostLogoutRedirectUri>
- <oidcmd:RequestObjectEncryptionResponseAlg>A128KW</oidcmd:RequestObjectEncryptionResponseAlg>
- <oidcmd:RequestObjectEncryptionResponseEnc>A128GCM</oidcmd:RequestObjectEncryptionResponseEnc>
- <oidcmd:RequestObjectSignedResponseAlg>RS256</oidcmd:RequestObjectSignedResponseAlg>
+ <oidcmd:RequestObjectEncryptionAlg>A128KW</oidcmd:RequestObjectEncryptionAlg>
+ <oidcmd:RequestObjectEncryptionEnc>A128GCM</oidcmd:RequestObjectEncryptionEnc>
+ <oidcmd:RequestObjectSigningAlg>RS256</oidcmd:RequestObjectSigningAlg>
<oidcmd:RequestUri>https://example.org/request</oidcmd:RequestUri>
<oidcmd:ResponseType>code</oidcmd:ResponseType>
<oidcmd:ResponseType>id_token</oidcmd:ResponseType>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list