[java-idp-oidc] 39/44: JOIDC-5 Moved SAML metadata extension to java-oidc-common.
Henri Mikkonen
henri.mikkonen at iki.fi
Thu Oct 22 13:08:51 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=afc286b0068e5c09933c9d1486d104db4a84437e
commit afc286b0068e5c09933c9d1486d104db4a84437e
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Oct 16 16:33:59 2020 +0300
JOIDC-5 Moved SAML metadata extension to java-oidc-common.
https://issues.shibboleth.net/jira/browse/JOIDC-5
See commit 378636189bccba3dca0876e130ce125cdfbc2ba9 in
java-oidc-common
---
.../idp/saml/oidc/xmlobject/ApplicationType.java | 37 --
.../idp/saml/oidc/xmlobject/ClientSecret.java | 37 --
.../oidc/xmlobject/ClientSecretKeyReference.java | 37 --
.../idp/saml/oidc/xmlobject/ClientUri.java | 37 --
.../idp/saml/oidc/xmlobject/Constants.java | 34 --
.../idp/saml/oidc/xmlobject/DefaultAcrValue.java | 37 --
.../idp/saml/oidc/xmlobject/GrantType.java | 37 --
.../xmlobject/IdTokenEncryptedResponseAlg.java | 37 --
.../xmlobject/IdTokenEncryptedResponseEnc.java | 37 --
.../oidc/xmlobject/IdTokenSignedResponseAlg.java | 37 --
.../idp/saml/oidc/xmlobject/InitiateLoginUri.java | 37 --
.../idp/saml/oidc/xmlobject/JwksData.java | 37 --
.../idp/saml/oidc/xmlobject/JwksUri.java | 37 --
.../oidc/xmlobject/MetadataValueSAMLObject.java | 48 ---
.../idp/saml/oidc/xmlobject/OAuthRPExtensions.java | 365 -----------------
.../saml/oidc/xmlobject/PostLogoutRedirectUri.java | 37 --
.../oidc/xmlobject/RequestObjectEncryptionAlg.java | 37 --
.../oidc/xmlobject/RequestObjectEncryptionEnc.java | 37 --
.../oidc/xmlobject/RequestObjectSigningAlg.java | 37 --
.../idp/saml/oidc/xmlobject/RequestUri.java | 37 --
.../idp/saml/oidc/xmlobject/ResponseType.java | 37 --
.../shibboleth/idp/saml/oidc/xmlobject/Scope.java | 37 --
.../saml/oidc/xmlobject/SectorIdentifierUri.java | 37 --
.../idp/saml/oidc/xmlobject/SoftwareId.java | 37 --
.../idp/saml/oidc/xmlobject/SoftwareVersion.java | 37 --
.../oidc/xmlobject/TokenEndpointAuthMethod.java | 37 --
.../xmlobject/TokenEndpointAuthSigningAlg.java | 37 --
.../xmlobject/UserInfoEncryptedResponseAlg.java | 37 --
.../xmlobject/UserInfoEncryptedResponseEnc.java | 37 --
.../oidc/xmlobject/UserInfoSignedResponseAlg.java | 37 --
.../resources/schema/saml-metadata-ext-oidcmd.xsd | 76 ----
idp-oidc-extension-impl/pom.xml | 24 +-
.../impl/AbstractMetadataValueMarshaller.java | 42 --
.../impl/AbstractMetadataValueSAMLObject.java | 68 ----
.../impl/AbstractMetadataValueUnmarshaller.java | 35 --
.../xmlobject/impl/ApplicationTypeBuilder.java | 46 ---
.../oidc/xmlobject/impl/ApplicationTypeImpl.java | 36 --
.../xmlobject/impl/ApplicationTypeMarshaller.java | 26 --
.../impl/ApplicationTypeUnmarshaller.java | 26 --
.../oidc/xmlobject/impl/ClientSecretBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/ClientSecretImpl.java | 36 --
.../impl/ClientSecretKeyReferenceBuilder.java | 46 ---
.../impl/ClientSecretKeyReferenceImpl.java | 37 --
.../impl/ClientSecretKeyReferenceMarshaller.java | 26 --
.../impl/ClientSecretKeyReferenceUnmarshaller.java | 26 --
.../xmlobject/impl/ClientSecretMarshaller.java | 26 --
.../xmlobject/impl/ClientSecretUnmarshaller.java | 26 --
.../saml/oidc/xmlobject/impl/ClientUriBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/ClientUriImpl.java | 36 --
.../oidc/xmlobject/impl/ClientUriMarshaller.java | 26 --
.../oidc/xmlobject/impl/ClientUriUnmarshaller.java | 26 --
.../xmlobject/impl/DefaultAcrValueBuilder.java | 46 ---
.../oidc/xmlobject/impl/DefaultAcrValueImpl.java | 36 --
.../xmlobject/impl/DefaultAcrValueMarshaller.java | 26 --
.../impl/DefaultAcrValueUnmarshaller.java | 26 --
.../saml/oidc/xmlobject/impl/GrantTypeBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/GrantTypeImpl.java | 37 --
.../oidc/xmlobject/impl/GrantTypeMarshaller.java | 26 --
.../oidc/xmlobject/impl/GrantTypeUnmarshaller.java | 26 --
.../impl/IdTokenEncryptedResponseAlgBuilder.java | 46 ---
.../impl/IdTokenEncryptedResponseAlgImpl.java | 36 --
.../IdTokenEncryptedResponseAlgMarshaller.java | 26 --
.../IdTokenEncryptedResponseAlgUnmarshaller.java | 26 --
.../impl/IdTokenEncryptedResponseEncBuilder.java | 46 ---
.../impl/IdTokenEncryptedResponseEncImpl.java | 36 --
.../IdTokenEncryptedResponseEncMarshaller.java | 26 --
.../IdTokenEncryptedResponseEncUnmarshaller.java | 26 --
.../impl/IdTokenSignedResponseAlgBuilder.java | 46 ---
.../impl/IdTokenSignedResponseAlgImpl.java | 36 --
.../impl/IdTokenSignedResponseAlgMarshaller.java | 26 --
.../impl/IdTokenSignedResponseAlgUnmarshaller.java | 26 --
.../xmlobject/impl/InitiateLoginUriBuilder.java | 46 ---
.../oidc/xmlobject/impl/InitiateLoginUriImpl.java | 36 --
.../xmlobject/impl/InitiateLoginUriMarshaller.java | 26 --
.../impl/InitiateLoginUriUnmarshaller.java | 26 --
.../saml/oidc/xmlobject/impl/JwksDataBuilder.java | 46 ---
.../idp/saml/oidc/xmlobject/impl/JwksDataImpl.java | 36 --
.../oidc/xmlobject/impl/JwksDataMarshaller.java | 26 --
.../oidc/xmlobject/impl/JwksDataUnmarshaller.java | 26 --
.../saml/oidc/xmlobject/impl/JwksUriBuilder.java | 46 ---
.../idp/saml/oidc/xmlobject/impl/JwksUriImpl.java | 36 --
.../oidc/xmlobject/impl/JwksUriMarshaller.java | 26 --
.../oidc/xmlobject/impl/JwksUriUnmarshaller.java | 26 --
.../xmlobject/impl/OAuthRPExtensionsBuilder.java | 48 ---
.../oidc/xmlobject/impl/OAuthRPExtensionsImpl.java | 440 ---------------------
.../impl/OAuthRPExtensionsMarshaller.java | 27 --
.../impl/OAuthRPExtensionsUnmarshaller.java | 133 -------
.../impl/PostLogoutRedirectUriBuilder.java | 46 ---
.../xmlobject/impl/PostLogoutRedirectUriImpl.java | 36 --
.../impl/PostLogoutRedirectUriMarshaller.java | 26 --
.../impl/PostLogoutRedirectUriUnmarshaller.java | 26 --
.../impl/RequestObjectEncryptionAlgBuilder.java | 46 ---
.../impl/RequestObjectEncryptionAlgImpl.java | 36 --
.../impl/RequestObjectEncryptionAlgMarshaller.java | 26 --
.../RequestObjectEncryptionAlgUnmarshaller.java | 26 --
.../impl/RequestObjectEncryptionEncBuilder.java | 46 ---
.../impl/RequestObjectEncryptionEncImpl.java | 36 --
.../impl/RequestObjectEncryptionEncMarshaller.java | 26 --
.../RequestObjectEncryptionEncUnmarshaller.java | 26 --
.../impl/RequestObjectSigningAlgBuilder.java | 46 ---
.../impl/RequestObjectSigningAlgImpl.java | 36 --
.../impl/RequestObjectSigningAlgMarshaller.java | 26 --
.../impl/RequestObjectSigningAlgUnmarshaller.java | 26 --
.../oidc/xmlobject/impl/RequestUriBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/RequestUriImpl.java | 36 --
.../oidc/xmlobject/impl/RequestUriMarshaller.java | 26 --
.../xmlobject/impl/RequestUriUnmarshaller.java | 26 --
.../oidc/xmlobject/impl/ResponseTypeBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/ResponseTypeImpl.java | 36 --
.../xmlobject/impl/ResponseTypeMarshaller.java | 26 --
.../xmlobject/impl/ResponseTypeUnmarshaller.java | 26 --
.../idp/saml/oidc/xmlobject/impl/ScopeBuilder.java | 46 ---
.../idp/saml/oidc/xmlobject/impl/ScopeImpl.java | 36 --
.../saml/oidc/xmlobject/impl/ScopeMarshaller.java | 26 --
.../oidc/xmlobject/impl/ScopeUnmarshaller.java | 26 --
.../xmlobject/impl/SectorIdentifierUriBuilder.java | 46 ---
.../xmlobject/impl/SectorIdentifierUriImpl.java | 36 --
.../impl/SectorIdentifierUriMarshaller.java | 26 --
.../impl/SectorIdentifierUriUnmarshaller.java | 26 --
.../oidc/xmlobject/impl/SoftwareIdBuilder.java | 46 ---
.../saml/oidc/xmlobject/impl/SoftwareIdImpl.java | 36 --
.../oidc/xmlobject/impl/SoftwareIdMarshaller.java | 26 --
.../xmlobject/impl/SoftwareIdUnmarshaller.java | 26 --
.../xmlobject/impl/SoftwareVersionBuilder.java | 46 ---
.../oidc/xmlobject/impl/SoftwareVersionImpl.java | 36 --
.../xmlobject/impl/SoftwareVersionMarshaller.java | 26 --
.../impl/SoftwareVersionUnmarshaller.java | 26 --
.../impl/TokenEndpointAuthMethodBuilder.java | 46 ---
.../impl/TokenEndpointAuthMethodImpl.java | 36 --
.../impl/TokenEndpointAuthMethodMarshaller.java | 26 --
.../impl/TokenEndpointAuthMethodUnmarshaller.java | 26 --
.../impl/TokenEndpointAuthSigningAlgBuilder.java | 46 ---
.../impl/TokenEndpointAuthSigningAlgImpl.java | 36 --
.../TokenEndpointAuthSigningAlgMarshaller.java | 26 --
.../TokenEndpointAuthSigningAlgUnmarshaller.java | 26 --
.../impl/UserInfoEncryptedResponseAlgBuilder.java | 46 ---
.../impl/UserInfoEncryptedResponseAlgImpl.java | 36 --
.../UserInfoEncryptedResponseAlgMarshaller.java | 26 --
.../UserInfoEncryptedResponseAlgUnmarshaller.java | 26 --
.../impl/UserInfoEncryptedResponseEncBuilder.java | 46 ---
.../impl/UserInfoEncryptedResponseEncImpl.java | 36 --
.../UserInfoEncryptedResponseEncMarshaller.java | 26 --
.../UserInfoEncryptedResponseEncUnmarshaller.java | 26 --
.../impl/UserInfoSignedResponseAlgBuilder.java | 46 ---
.../impl/UserInfoSignedResponseAlgImpl.java | 36 --
.../impl/UserInfoSignedResponseAlgMarshaller.java | 26 --
.../UserInfoSignedResponseAlgUnmarshaller.java | 26 --
.../impl/XMLObjectProviderInitializer.java | 37 --
.../services/org.opensaml.core.config.Initializer | 1 -
.../resources/saml2-metadata-oidcmd-config.xml | 176 ---------
150 files changed, 23 insertions(+), 6150 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ApplicationType.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ApplicationType.java
deleted file mode 100644
index 362b3153..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ApplicationType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'ApplicationType'.
- */
-public interface ApplicationType extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ApplicationType";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecret.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecret.java
deleted file mode 100644
index c64b8699..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecret.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'ClientSecret'.
- */
-public interface ClientSecret extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecret";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java
deleted file mode 100644
index bb6aedd5..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'ClientSecretReferenceKey'.
- */
-public interface ClientSecretKeyReference extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecretReferenceKey";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientUri.java
deleted file mode 100644
index ea77273e..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'ClientUri'.
- */
-public interface ClientUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Constants.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Constants.java
deleted file mode 100644
index a8a90833..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Constants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import org.opensaml.saml.common.xml.SAMLConstants;
-
-/**
- * Constants related to SAML 2.0 Metadata extension OAuthRPRoleDescriptorType.
- */
-public final class Constants {
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors prefi. */
- public static final String SAML20MDOIDCMD_PREFIX = "oidcmd";
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors XML namespace. */
- public static final String SAML20MDOIDCMD_NS = "urn:mace:shibboleth:metadata:oidc:1.0";
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors. */
- public static final String SAML20MDOIDCMD_SCHEMA_LOCATION = SAMLConstants.SCHEMA_DIR + "saml-metadata-ext-oidcmd.xsd";
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/DefaultAcrValue.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/DefaultAcrValue.java
deleted file mode 100644
index 614623d6..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/DefaultAcrValue.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'DefaultAcrValue'.
- */
-public interface DefaultAcrValue extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DefaultAcrValue";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/GrantType.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/GrantType.java
deleted file mode 100644
index af626e2a..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/GrantType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'GrantType'.
- */
-public interface GrantType extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "GrantType";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java
deleted file mode 100644
index 68ec3203..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'IdTokenEncryptedResponseAlg'.
- */
-public interface IdTokenEncryptedResponseAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptedResponseAlg";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java
deleted file mode 100644
index 08f554da..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'IdTokenEncryptedResponseEnc'.
- */
-public interface IdTokenEncryptedResponseEnc extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptedResponseEnc";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenSignedResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenSignedResponseAlg.java
deleted file mode 100644
index e0e2ac45..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenSignedResponseAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'IdTokenSignedResponseAlg'.
- */
-public interface IdTokenSignedResponseAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenSignedResponseAlg";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/InitiateLoginUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/InitiateLoginUri.java
deleted file mode 100644
index 2e70f746..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/InitiateLoginUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'InitiateLoginUri'.
- */
-public interface InitiateLoginUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "InitiateLoginUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksData.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksData.java
deleted file mode 100644
index e9ece14f..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksData.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'JwksData'.
- */
-public interface JwksData extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksData";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksUri.java
deleted file mode 100644
index 718ba363..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/JwksUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'JwksUri'.
- */
-public interface JwksUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/MetadataValueSAMLObject.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/MetadataValueSAMLObject.java
deleted file mode 100644
index a696d160..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/MetadataValueSAMLObject.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import org.opensaml.saml.common.SAMLObject;
-
-/**
- * Abstract interface for SAML metadata objects containing single {@link String} value inside the element.
- */
-public abstract interface MetadataValueSAMLObject extends SAMLObject {
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors prefi. */
- public static final String SAML20MDOIDCMD_PREFIX = Constants.SAML20MDOIDCMD_PREFIX;
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors XML namespace. */
- public static final String SAML20MDOIDCMD_NS = Constants.SAML20MDOIDCMD_NS;
-
- /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors. */
- public static final String SAML20MDOIDCMD_SCHEMA_LOCATION = Constants.SAML20MDOIDCMD_SCHEMA_LOCATION;
-
- /**
- * Get the value for this metadata object.
- *
- * @return The value for this metadata object.
- */
- public String getValue();
-
- /**
- * Set the value for this metadata object.
- *
- * @param newValue What to set.
- */
- public void setValue(final String newValue);
-}
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
deleted file mode 100644
index 88229291..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml.common.SAMLObject;
-
-/**
- * SAML 2.0 Metadata extension OAuthRPExtensions.
- */
-public interface OAuthRPExtensions extends SAMLObject {
-
- /** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "OAuthRPExtensions";
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(MetadataValueSAMLObject.SAML20MDOIDCMD_NS, TYPE_LOCAL_NAME,
- MetadataValueSAMLObject.SAML20MDOIDCMD_PREFIX);
-
- /** "defaultMaxAge" attribute's local name. */
- public static final String DEFAULT_MAX_AGE_ATTRIB_NAME = "defaultMaxAge";
-
- /** "requireAuthTime" attribute's local name. */
- public static final String REQUIRE_AUTH_TIME_ATTRIB_NAME = "requireAuthTime";
-
- /**
- * Get the token endpoint authentication method.
- *
- * @return The token endpoint authentication method.
- */
- public TokenEndpointAuthMethod getTokenEndpointAuthMethod();
-
- /**
- * Set the token endpoint authentication method.
- *
- * @param method The token endpoint authentication method.
- */
- public void setTokenEndpointAuthMethod(final TokenEndpointAuthMethod method);
-
- /**
- * Get the list of response types.
- *
- * @return The list of response types.
- */
- public List<ResponseType> getResponseTypes();
-
- /**
- * Get the list of grant types.
- *
- * @return The list of grant types.
- */
- public List<GrantType> getGrantTypes();
-
- /**
- * Get the application type.
- *
- * @return The application type.
- */
- public ApplicationType getApplicationType();
-
- /**
- * Set the application type.
- *
- * @param type The application type.
- */
- public void setApplicationType(final ApplicationType type);
-
- /**
- * Get the client URI.
- *
- * @return The client URI.
- */
- public ClientUri getClientUri();
-
- /**
- * Set the client URI.
- *
- * @param uri The client URI.
- */
- public void setClientUri(final ClientUri uri);
-
- /**
- * Get the list of scopes.
- *
- * @return The list of scopes.
- */
- public List<Scope> getScopes();
-
- /**
- * Get the URI for the JWK set.
- *
- * @return The URI for the JWK set.
- */
- public JwksUri getJwksUri();
-
- /**
- * Set the URI for the JWK set.
- *
- * @param uri The URI for the JWK set.
- */
- public void setJwksUri(final JwksUri uri);
-
- /**
- * Get the software identifier.
- *
- * @return The software identifier.
- */
- public SoftwareId getSoftwareId();
-
- /**
- * Set the software identifier.
- *
- * @param id The software identifier.
- */
- public void setSoftwareId(final SoftwareId id);
-
- /**
- * Get the software version.
- *
- * @return The software version.
- */
- public SoftwareVersion getSoftwareVersion();
-
- /**
- * Set the software version.
- *
- * @param version The software version.
- */
- public void setSoftwareVersion(final SoftwareVersion version);
-
- /**
- * Get the sector identifier URI.
- *
- * @return he sector identifier URI.
- */
- public SectorIdentifierUri getSectorIdentifierUri();
-
- /**
- * Set the sector identifier URI.
- *
- * @param uri The sector identifier URI.
- */
- public void setSectorIdentifierUri(final SectorIdentifierUri uri);
-
- /**
- * Get the JWS alg algorithm for ID token signature.
- *
- * @return The JWS alg algorithm for ID token signature.
- */
- public IdTokenSignedResponseAlg getIdTokenSignedResponseAlg();
-
- /**
- * Set the JWS alg algorithm for ID token signature.
- *
- * @param algorithm The JWS alg algorithm for ID token signature.
- */
- public void setIdTokenSignedResponseAlg(final IdTokenSignedResponseAlg algorithm);
-
- /**
- * Get the JWE alg algorithm for ID token encryption.
- *
- * @return The JWE alg algorithm for ID token encryption.
- */
- public IdTokenEncryptedResponseAlg getIdTokenEncryptedResponseAlg();
-
- /**
- * Set the JWE alg algorithm for ID token encryption.
- *
- * @param algorithm The JWE alg algorithm for ID token encryption.
- */
- public void setIdTokenEncryptedResponseAlg(final IdTokenEncryptedResponseAlg algorithm);
-
- /**
- * Get the JWE enc algorithm for ID token encryption.
- *
- * @return The JWE enc algorithm for ID token encryption.
- */
- public IdTokenEncryptedResponseEnc getIdTokenEncryptedResponseEnc();
-
- /**
- * Set the JWE enc algorithm for ID token encryption.
- *
- * @param algorithm The JWE enc algorithm for ID token encryption.
- */
- public void setIdTokenEncryptedResponseEnc(final IdTokenEncryptedResponseEnc algorithm);
-
- /**
- * Get the JWS alg algorithm for UserInfo response signature.
- *
- * @return The JWS alg algorithm for UserInfo response signature.
- */
- public UserInfoSignedResponseAlg getUserInfoSignedResponseAlg();
-
- /**
- * Set the JWS alg algorithm for UserInfo response signature.
- *
- * @param algorithm The JWS alg algorithm for UserInfo response signature.
- */
- public void setUserInfoSignedResponseAlg(final UserInfoSignedResponseAlg algorithm);
-
- /**
- * Get the JWE alg algorithm for UserInfo response encryption.
- *
- * @return The JWE alg algorithm for UserInfo response encryption.
- */
- public UserInfoEncryptedResponseAlg getUserInfoEncryptedResponseAlg();
-
- /**
- * Set the JWE alg algorithm for UserInfo response encryption.
- *
- * @param algorithm The JWE alg algorithm for UserInfo response encryption.
- */
- public void setUserInfoEncryptedResponseAlg(final UserInfoEncryptedResponseAlg algorithm);
-
- /**
- * Get the JWE enc algorithm for UserInfo response encryption.
- *
- * @return The JWE enc algorithm for UserInfo response encryption.
- */
- public UserInfoEncryptedResponseEnc getUserInfoEncryptedResponseEnc();
-
- /**
- * Set the JWE enc algorithm for UserInfo response encryption.
- *
- * @param algorithm The JWE enc algorithm for UserInfo response encryption.
- */
- public void setUserInfoEncryptedResponseEnc(final UserInfoEncryptedResponseEnc algorithm);
-
- /**
- * Get the JWS alg algorithm for request object signature.
- *
- * @return The JWS alg algorithm for request object signature.
- */
- public RequestObjectSigningAlg getRequestObjectSigningAlg();
-
- /**
- * Set the JWS alg algorithm for request object signature.
- *
- * @param algorithm The JWS alg algorithm for request object signature.
- */
- 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 RequestObjectEncryptionAlg getRequestObjectEncryptionAlg();
-
- /**
- * Set the JWE alg algorithm for request object encryption.
- *
- * @param algorithm The JWE alg algorithm for request object encryption.
- */
- 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 RequestObjectEncryptionEnc getRequestObjectEncryptionEnc();
-
- /**
- * Set the JWE enc algorithm for request object encryption.
- *
- * @param algorithm The JWE enc algorithm for request object encryption.
- */
- public void setRequestObjectEncryptionEnc(final RequestObjectEncryptionEnc algorithm);
-
- /**
- * Get the JWS alg algorithm for token endpoint authentication signature.
- *
- * @return The JWS alg algorithm for token endpoint authentication signature.
- */
- public TokenEndpointAuthSigningAlg getTokenEndpointAuthSigningAlg();
-
- /**
- * Set the JWS alg algorithm for token endpoint authentication signature.
- *
- * @param algorithm The JWS alg algorithm for token endpoint authentication signature.
- */
- public void setTokenEndpointAuthSigningAlg(final TokenEndpointAuthSigningAlg algorithm);
-
- /**
- * Get the list of default ACR values.
- *
- * @return The list of default ACR values.
- */
- public List<DefaultAcrValue> getDefaultAcrValues();
-
- /**
- * Get the URI for initiating login.
- *
- * @return The URI for initiating login.
- */
- public InitiateLoginUri getInitiateLoginUri();
-
- /**
- * Set the URI for initiating login.
- *
- * @param uri The URI for initiating login.
- */
- public void setInitiateLoginUri(final InitiateLoginUri uri);
-
- /**
- * Get the list of request URIs.
- *
- * @return The list of request URIs.
- */
- public List<RequestUri> getRequestUris();
-
- /**
- * Get the list of post logout redirection URIs.
- *
- * @return The list of post logout redirection URIs.
- */
- public List<PostLogoutRedirectUri> getPostLogoutRedirectUris();
-
- /**
- * Get the value for default max age.
- *
- * @return The value for default max age.
- */
- public int getDefaultMaxAge();
-
- /**
- * Set the value for default max age.
- *
- * @param age The value for default max age.
- */
- public void setDefaultMaxAge(final int age);
-
- /**
- * Get the flag to require authentication time.
- *
- * @return The flag to require authentication time.
- */
- public boolean isRequireAuthTime();
-
- /**
- * Set the flag to require authentication time.
- *
- * @param flag The flag to require authentication time.
- */
- public void setRequireAuthTime(final boolean flag);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/PostLogoutRedirectUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/PostLogoutRedirectUri.java
deleted file mode 100644
index bed5071c..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/PostLogoutRedirectUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'PostLogoutRedirectUri'.
- */
-public interface PostLogoutRedirectUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PostLogoutRedirectUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java
deleted file mode 100644
index 7d63d878..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'RequestObjectEncryptionAlg'.
- */
-public interface RequestObjectEncryptionAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- 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,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java
deleted file mode 100644
index acacdf8f..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectEncryptionEnc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'RequestObjectEncryptionEnc'.
- */
-public interface RequestObjectEncryptionEnc extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- 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,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java
deleted file mode 100644
index d862ff2b..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestObjectSigningAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'RequestObjectSigningAlg'.
- */
-public interface RequestObjectSigningAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- 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,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestUri.java
deleted file mode 100644
index f5dfff5a..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/RequestUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'RequestUri'.
- */
-public interface RequestUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ResponseType.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ResponseType.java
deleted file mode 100644
index 3c8f0da2..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ResponseType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'ResponseType'.
- */
-public interface ResponseType extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ResponseType";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Scope.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Scope.java
deleted file mode 100644
index baa9f57d..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/Scope.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'Scope'.
- */
-public interface Scope extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Scope";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SectorIdentifierUri.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SectorIdentifierUri.java
deleted file mode 100644
index 01e09383..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SectorIdentifierUri.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'SectorIdentifierUri'.
- */
-public interface SectorIdentifierUri extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SectorIdentifierUri";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareId.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareId.java
deleted file mode 100644
index a2d350c6..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareId.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'SoftwareId'.
- */
-public interface SoftwareId extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SoftwareId";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareVersion.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareVersion.java
deleted file mode 100644
index a90eb7b3..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SoftwareVersion.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'SoftwareVersion'.
- */
-public interface SoftwareVersion extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SoftwareVersion";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthMethod.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthMethod.java
deleted file mode 100644
index fb601d6e..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthMethod.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'TokenEndpointAuthMethod'.
- */
-public interface TokenEndpointAuthMethod extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "TokenEndpointAuthMethod";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthSigningAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthSigningAlg.java
deleted file mode 100644
index 88ad29e9..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/TokenEndpointAuthSigningAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'TokenEndpointAuthSigningAlg'.
- */
-public interface TokenEndpointAuthSigningAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "TokenEndpointAuthSigningAlg";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java
deleted file mode 100644
index 481fc999..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'UserInfoEncryptedResponseAlg'.
- */
-public interface UserInfoEncryptedResponseAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptedResponseAlg";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java
deleted file mode 100644
index 91e1ff53..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'UserInfoEncryptedResponseEnc'.
- */
-public interface UserInfoEncryptedResponseEnc extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptedResponseEnc";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoSignedResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoSignedResponseAlg.java
deleted file mode 100644
index 7e82bcd5..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoSignedResponseAlg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'UserInfoSignedResponseAlg'.
- */
-public interface UserInfoSignedResponseAlg extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoSignedResponseAlg";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
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
deleted file mode 100644
index 8302a99f..00000000
--- a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:oidcmd="urn:mace:shibboleth:metadata:oidc:1.0" targetNamespace="urn:mace:shibboleth:metadata:oidc:1.0" elementFormDefault="unqualified" attributeFormDefault="unqualified" blockDefault="substitution" version="2.0">
-
- <annotation>
- <documentation>
- Document title: SAML Metadata Extension Schema for OIDC OP/RP information.
- </documentation>
- </annotation>
-
- <element name="OAuthRPExtensions">
- <complexType>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="oidcmd:TokenEndpointAuthMethod" />
- <element ref="oidcmd:GrantType" />
- <element ref="oidcmd:ResponseType" />
- <element ref="oidcmd:ApplicationType" />
- <element ref="oidcmd:ClientUri" />
- <element ref="oidcmd:Scope" />
- <element ref="oidcmd:SoftwareId" />
- <element ref="oidcmd:SoftwareVersion" />
- <element ref="oidcmd:SectorIdentifierUri" />
- <element ref="oidcmd:IdTokenSignedResponseAlg" />
- <element ref="oidcmd:IdTokenEncryptedResponseAlg" />
- <element ref="oidcmd:IdTokenEncryptedResponseEnc" />
- <element ref="oidcmd:UserInfoSignedResponseAlg" />
- <element ref="oidcmd:UserInfoEncryptedResponseAlg" />
- <element ref="oidcmd:UserInfoEncryptedResponseEnc" />
- <element ref="oidcmd:RequestObjectSigningAlg" />
- <element ref="oidcmd:RequestObjectEncryptionAlg" />
- <element ref="oidcmd:RequestObjectEncryptionEnc" />
- <element ref="oidcmd:TokenEndpointAuthSigningAlg" />
- <element ref="oidcmd:DefaultAcrValue" /><!-- order matters -->
- <element ref="oidcmd:InitiateLoginUri" />
- <element ref="oidcmd:RequestUri" />
- <element ref="oidcmd:PostLogoutRedirectUri" />
- <any namespace="##other" processContents="lax" />
- </choice>
- <attribute name="defaultMaxAge" type="int" use="optional" />
- <attribute name="requireAuthTime" type="string" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
- </element>
-
- <element name="TokenEndpointAuthMethod" type="anyURI" />
- <element name="GrantType" type="anyURI" />
- <element name="ResponseType" type="anyURI" />
- <element name="ApplicationType" type="anyURI" />
-
- <element name="ClientUri" type="anyURI" />
- <element name="Scope" type="anyURI" />
- <element name="SoftwareId" type="anyURI" />
- <element name="SoftwareVersion" type="anyURI" />
- <element name="SectorIdentifierUri" type="anyURI" />
-
- <element name="IdTokenSignedResponseAlg" type="anyURI" />
- <element name="IdTokenEncryptedResponseAlg" type="anyURI" />
- <element name="IdTokenEncryptedResponseEnc" type="anyURI" />
- <element name="UserInfoSignedResponseAlg" type="anyURI" />
- <element name="UserInfoEncryptedResponseAlg" type="anyURI" />
- <element name="UserInfoEncryptedResponseEnc" 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" />
- <element name="RequestUri" type="anyURI" />
- <element name="PostLogoutRedirectUri" type="anyURI" />
-
- <element name="JwkSet" type="anyURI" />
- <element name="JwkSetUri" type="anyURI" />
- <element name="JwksData" type="anyURI" />
- <element name="ClientSecret" type="anyURI" />
- <element name="ClientSecretKeyReference" type="anyURI" />
-
-</schema>
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 6b94c356..56bd9765 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -57,6 +57,17 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-impl</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${slf4j.groupId}</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -171,7 +182,18 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-conf</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-conf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-conf-impl</artifactId>
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueMarshaller.java
deleted file mode 100644
index d176145f..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueMarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.MetadataValueSAMLObject;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.w3c.dom.Element;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-/**
- * Abstract thread safe Marshaller for {@link MetadataValueSAMLObject} objects.
- * @param <T> The metadata value.
- */
-public abstract class AbstractMetadataValueMarshaller<T extends MetadataValueSAMLObject> extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final T metadataObject = (T) samlObject;
-
- if (metadataObject.getValue() != null) {
- ElementSupport.appendTextContent(domElement, metadataObject.getValue());
- }
- }
-}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueSAMLObject.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueSAMLObject.java
deleted file mode 100644
index b5710095..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueSAMLObject.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
-
-/**
- * Base implementation for all simple metadata objects containing {@link String} value inside the element.
- */
-public abstract class AbstractMetadataValueSAMLObject extends AbstractXMLObject {
-
- /** The value for this metadata object. */
- private String value;
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected AbstractMetadataValueSAMLObject(final String namespaceURI, final String elementLocalName,
- final String namespacePrefix) {
- super(namespaceURI, elementLocalName, namespacePrefix);
- }
-
- /**
- * Get the value for this metadata object.
- *
- * @return The value for this metadata object.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Set the value for this metadata object.
- *
- * @param newValue What to set.
- */
- public void setValue(final String newValue) {
- value = newValue;
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return Collections.emptyList();
- }
-
-}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueUnmarshaller.java
deleted file mode 100644
index ba03cfd5..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/AbstractMetadataValueUnmarshaller.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.MetadataValueSAMLObject;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
-
-/**
- * Abstract thread-safe Unmarshaller for {@link MetadataValueSAMLObject} objects.
- * @param <T> The metadata value.
- */
-public abstract class AbstractMetadataValueUnmarshaller<T extends MetadataValueSAMLObject>
- extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final T metadataObject = (T) samlObject;
- metadataObject.setValue(elementContent);
- }
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeBuilder.java
deleted file mode 100644
index e156ea75..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link ApplicationTypeImpl}.
- */
-public class ApplicationTypeBuilder extends AbstractSAMLObjectBuilder<ApplicationType> {
-
- /**
- * Constructor.
- */
- public ApplicationTypeBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public ApplicationType buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ApplicationType.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public ApplicationType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ApplicationTypeImpl(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/ApplicationTypeImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeImpl.java
deleted file mode 100644
index 9a6cc65e..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-
-/**
- * Concrete implementation of {@link ApplicationType}.
- */
-public class ApplicationTypeImpl extends AbstractMetadataValueSAMLObject implements ApplicationType {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ApplicationTypeImpl(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/ApplicationTypeMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeMarshaller.java
deleted file mode 100644
index 261bc43e..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-
-/**
- * A thread safe Marshaller for {@link ApplicationType} objects.
- */
-public class ApplicationTypeMarshaller extends AbstractMetadataValueMarshaller<ApplicationType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeUnmarshaller.java
deleted file mode 100644
index 20dc172f..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ApplicationTypeUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-
-/**
- * A thread-safe Unmarshaller for {@link ApplicationType} objects.
- */
-public class ApplicationTypeUnmarshaller extends AbstractMetadataValueUnmarshaller<ApplicationType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretBuilder.java
deleted file mode 100644
index 814b3c03..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecret;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link ClientSecretImpl}.
- */
-public class ClientSecretBuilder extends AbstractSAMLObjectBuilder<ClientSecret> {
-
- /**
- * Constructor.
- */
- public ClientSecretBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public ClientSecret buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ClientSecret.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public ClientSecret buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ClientSecretImpl(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/ClientSecretImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretImpl.java
deleted file mode 100644
index f5418f15..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecret;
-
-/**
- * Concrete implementation of {@link ClientSecret}.
- */
-public class ClientSecretImpl extends AbstractMetadataValueSAMLObject implements ClientSecret {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ClientSecretImpl(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/ClientSecretKeyReferenceBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceBuilder.java
deleted file mode 100644
index 0b8ebd37..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link ClientSecretKeyReferenceImpl}.
- */
-public class ClientSecretKeyReferenceBuilder extends AbstractSAMLObjectBuilder<ClientSecretKeyReference> {
-
- /**
- * Constructor.
- */
- public ClientSecretKeyReferenceBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public ClientSecretKeyReference buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ClientSecretKeyReference.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public ClientSecretKeyReference buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ClientSecretKeyReferenceImpl(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/ClientSecretKeyReferenceImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceImpl.java
deleted file mode 100644
index ce164653..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
-
-/**
- * Concrete implementation of {@link ClientSecretKeyReference}.
- */
-public class ClientSecretKeyReferenceImpl extends AbstractMetadataValueSAMLObject implements ClientSecretKeyReference {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ClientSecretKeyReferenceImpl(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/ClientSecretKeyReferenceMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceMarshaller.java
deleted file mode 100644
index 68b2b232..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
-
-/**
- * A thread safe Marshaller for {@link ClientSecretKeyReference} objects.
- */
-public class ClientSecretKeyReferenceMarshaller extends AbstractMetadataValueMarshaller<ClientSecretKeyReference> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java
deleted file mode 100644
index e9bd25c9..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
-
-/**
- * A thread-safe Unmarshaller for {@link ClientSecretKeyReference} objects.
- */
-public class ClientSecretKeyReferenceUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientSecretKeyReference> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretMarshaller.java
deleted file mode 100644
index 614c5bbf..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecret;
-
-/**
- * A thread safe Marshaller for {@link ClientSecret} objects.
- */
-public class ClientSecretMarshaller extends AbstractMetadataValueMarshaller<ClientSecret> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretUnmarshaller.java
deleted file mode 100644
index d9adaf4d..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecret;
-
-/**
- * A thread-safe Unmarshaller for {@link ClientSecret} objects.
- */
-public class ClientSecretUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientSecret> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriBuilder.java
deleted file mode 100644
index 35a188de..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link ClientUriImpl}.
- */
-public class ClientUriBuilder extends AbstractSAMLObjectBuilder<ClientUri> {
-
- /**
- * Constructor.
- */
- public ClientUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public ClientUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ClientUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public ClientUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ClientUriImpl(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/ClientUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriImpl.java
deleted file mode 100644
index 23ef565d..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-
-/**
- * Concrete implementation of {@link ClientUri}.
- */
-public class ClientUriImpl extends AbstractMetadataValueSAMLObject implements ClientUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ClientUriImpl(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/ClientUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriMarshaller.java
deleted file mode 100644
index a702e065..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-
-/**
- * A thread safe Marshaller for {@link ClientUri} objects.
- */
-public class ClientUriMarshaller extends AbstractMetadataValueMarshaller<ClientUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriUnmarshaller.java
deleted file mode 100644
index d4ec0a6c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-
-/**
- * A thread-safe Unmarshaller for {@link ClientUri} objects.
- */
-public class ClientUriUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueBuilder.java
deleted file mode 100644
index 364d121c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link DefaultAcrValueImpl}.
- */
-public class DefaultAcrValueBuilder extends AbstractSAMLObjectBuilder<DefaultAcrValue> {
-
- /**
- * Constructor.
- */
- public DefaultAcrValueBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public DefaultAcrValue buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, DefaultAcrValue.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public DefaultAcrValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new DefaultAcrValueImpl(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/DefaultAcrValueImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueImpl.java
deleted file mode 100644
index 536d1fc6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-
-/**
- * Concrete implementation of {@link DefaultAcrValue}.
- */
-public class DefaultAcrValueImpl extends AbstractMetadataValueSAMLObject implements DefaultAcrValue {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected DefaultAcrValueImpl(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/DefaultAcrValueMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueMarshaller.java
deleted file mode 100644
index 5819befa..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-
-/**
- * A thread safe Marshaller for {@link DefaultAcrValue} objects.
- */
-public class DefaultAcrValueMarshaller extends AbstractMetadataValueMarshaller<DefaultAcrValue> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueUnmarshaller.java
deleted file mode 100644
index 8a4a71a2..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/DefaultAcrValueUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-
-/**
- * A thread-safe Unmarshaller for {@link DefaultAcrValue} objects.
- */
-public class DefaultAcrValueUnmarshaller extends AbstractMetadataValueUnmarshaller<DefaultAcrValue> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeBuilder.java
deleted file mode 100644
index d503c067..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-
-/**
- * Builder of {@link GrantTypeImpl}.
- */
-public class GrantTypeBuilder extends AbstractSAMLObjectBuilder<GrantType> {
-
- /**
- * Constructor.
- */
- public GrantTypeBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public GrantType buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, GrantType.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public GrantType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new GrantTypeImpl(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/GrantTypeImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeImpl.java
deleted file mode 100644
index 8a31792d..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-
-/**
- * Concrete implementation of {@link GrantType}.
- */
-public class GrantTypeImpl extends AbstractMetadataValueSAMLObject implements GrantType {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected GrantTypeImpl(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/GrantTypeMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeMarshaller.java
deleted file mode 100644
index 5d3a4f97..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-
-/**
- * A thread safe Marshaller for {@link GrantType} objects.
- */
-public class GrantTypeMarshaller extends AbstractMetadataValueMarshaller<GrantType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeUnmarshaller.java
deleted file mode 100644
index 044c0812..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/GrantTypeUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-
-/**
- * A thread-safe Unmarshaller for {@link GrantType} objects.
- */
-public class GrantTypeUnmarshaller extends AbstractMetadataValueUnmarshaller<GrantType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java
deleted file mode 100644
index 05b4244e..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link IdTokenEncryptedResponseAlgImpl}.
- */
-public class IdTokenEncryptedResponseAlgBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptedResponseAlg> {
-
- /**
- * Constructor.
- */
- public IdTokenEncryptedResponseAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public IdTokenEncryptedResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public IdTokenEncryptedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new IdTokenEncryptedResponseAlgImpl(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/IdTokenEncryptedResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgImpl.java
deleted file mode 100644
index 4b50ed09..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-
-/**
- * Concrete implementation of {@link IdTokenEncryptedResponseAlg}.
- */
-public class IdTokenEncryptedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptedResponseAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected IdTokenEncryptedResponseAlgImpl(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/IdTokenEncryptedResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgMarshaller.java
deleted file mode 100644
index 4e99cec4..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-
-/**
- * A thread safe Marshaller for {@link IdTokenEncryptedResponseAlg} objects.
- */
-public class IdTokenEncryptedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java
deleted file mode 100644
index 229b0842..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link IdTokenEncryptedResponseAlg} objects.
- */
-public class IdTokenEncryptedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java
deleted file mode 100644
index a903a943..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link IdTokenEncryptedResponseEncImpl}.
- */
-public class IdTokenEncryptedResponseEncBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptedResponseEnc> {
-
- /**
- * Constructor.
- */
- public IdTokenEncryptedResponseEncBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public IdTokenEncryptedResponseEnc buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptedResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public IdTokenEncryptedResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new IdTokenEncryptedResponseEncImpl(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/IdTokenEncryptedResponseEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncImpl.java
deleted file mode 100644
index 218d94df..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-
-/**
- * Concrete implementation of {@link IdTokenEncryptedResponseEnc}.
- */
-public class IdTokenEncryptedResponseEncImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptedResponseEnc {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected IdTokenEncryptedResponseEncImpl(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/IdTokenEncryptedResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncMarshaller.java
deleted file mode 100644
index 85602efa..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-
-/**
- * A thread safe Marshaller for {@link IdTokenEncryptedResponseEnc} objects.
- */
-public class IdTokenEncryptedResponseEncMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptedResponseEnc> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java
deleted file mode 100644
index 788bfc92..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-
-/**
- * A thread-safe Unmarshaller for {@link IdTokenEncryptedResponseEnc} objects.
- */
-public class IdTokenEncryptedResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptedResponseEnc> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgBuilder.java
deleted file mode 100644
index 0a3a4a19..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link IdTokenSignedResponseAlgImpl}.
- */
-public class IdTokenSignedResponseAlgBuilder extends AbstractSAMLObjectBuilder<IdTokenSignedResponseAlg> {
-
- /**
- * Constructor.
- */
- public IdTokenSignedResponseAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public IdTokenSignedResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenSignedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public IdTokenSignedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new IdTokenSignedResponseAlgImpl(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/IdTokenSignedResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgImpl.java
deleted file mode 100644
index 9a23b8d8..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-
-/**
- * Concrete implementation of {@link IdTokenSignedResponseAlg}.
- */
-public class IdTokenSignedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements IdTokenSignedResponseAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected IdTokenSignedResponseAlgImpl(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/IdTokenSignedResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgMarshaller.java
deleted file mode 100644
index d9ad0ecb..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-
-/**
- * A thread safe Marshaller for {@link IdTokenSignedResponseAlg} objects.
- */
-public class IdTokenSignedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<IdTokenSignedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgUnmarshaller.java
deleted file mode 100644
index da4affaa..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenSignedResponseAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link IdTokenSignedResponseAlg} objects.
- */
-public class IdTokenSignedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenSignedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriBuilder.java
deleted file mode 100644
index f5b1ee95..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link InitiateLoginUriImpl}.
- */
-public class InitiateLoginUriBuilder extends AbstractSAMLObjectBuilder<InitiateLoginUri> {
-
- /**
- * Constructor.
- */
- public InitiateLoginUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public InitiateLoginUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, InitiateLoginUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public InitiateLoginUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new InitiateLoginUriImpl(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/InitiateLoginUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriImpl.java
deleted file mode 100644
index 719ee4d6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
-
-/**
- * Concrete implementation of {@link InitiateLoginUri}.
- */
-public class InitiateLoginUriImpl extends AbstractMetadataValueSAMLObject implements InitiateLoginUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected InitiateLoginUriImpl(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/InitiateLoginUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriMarshaller.java
deleted file mode 100644
index 991c835e..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
-
-/**
- * A thread safe Marshaller for {@link InitiateLoginUri} objects.
- */
-public class InitiateLoginUriMarshaller extends AbstractMetadataValueMarshaller<InitiateLoginUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriUnmarshaller.java
deleted file mode 100644
index 3d704510..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/InitiateLoginUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
-
-/**
- * A thread-safe Unmarshaller for {@link InitiateLoginUri} objects.
- */
-public class InitiateLoginUriUnmarshaller extends AbstractMetadataValueUnmarshaller<InitiateLoginUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataBuilder.java
deleted file mode 100644
index c34bfc44..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksData;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link JwksDataImpl}.
- */
-public class JwksDataBuilder extends AbstractSAMLObjectBuilder<JwksData> {
-
- /**
- * Constructor.
- */
- public JwksDataBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public JwksData buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, JwksData.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public JwksData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new JwksDataImpl(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/JwksDataImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataImpl.java
deleted file mode 100644
index 6c6698c3..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksData;
-
-/**
- * Concrete implementation of {@link JwksData}.
- */
-public class JwksDataImpl extends AbstractMetadataValueSAMLObject implements JwksData {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected JwksDataImpl(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/JwksDataMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataMarshaller.java
deleted file mode 100644
index aaaf844b..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksData;
-
-/**
- * A thread safe Marshaller for {@link JwksData} objects.
- */
-public class JwksDataMarshaller extends AbstractMetadataValueMarshaller<JwksData> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataUnmarshaller.java
deleted file mode 100644
index 32b504bc..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksDataUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksData;
-
-/**
- * A thread-safe Unmarshaller for {@link JwksData} objects.
- */
-public class JwksDataUnmarshaller extends AbstractMetadataValueUnmarshaller<JwksData> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriBuilder.java
deleted file mode 100644
index c1dad8bb..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link JwksUriImpl}.
- */
-public class JwksUriBuilder extends AbstractSAMLObjectBuilder<JwksUri> {
-
- /**
- * Constructor.
- */
- public JwksUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public JwksUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, JwksUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public JwksUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new JwksUriImpl(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/JwksUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriImpl.java
deleted file mode 100644
index db005b19..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
-
-/**
- * Concrete implementation of {@link JwksUri}.
- */
-public class JwksUriImpl extends AbstractMetadataValueSAMLObject implements JwksUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected JwksUriImpl(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/JwksUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriMarshaller.java
deleted file mode 100644
index 8cdb868b..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
-
-/**
- * A thread safe Marshaller for {@link JwksUri} objects.
- */
-public class JwksUriMarshaller extends AbstractMetadataValueMarshaller<JwksUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriUnmarshaller.java
deleted file mode 100644
index 0b421246..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/JwksUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
-
-/**
- * A thread-safe Unmarshaller for {@link JwksUri} objects.
- */
-public class JwksUriUnmarshaller extends AbstractMetadataValueUnmarshaller<JwksUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsBuilder.java
deleted file mode 100644
index 91e8e093..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.MetadataValueSAMLObject;
-import net.shibboleth.idp.saml.oidc.xmlobject.OAuthRPExtensions;
-
-/**
- * Builder of {@link OAuthRPExtensions} objects.
- */
-public class OAuthRPExtensionsBuilder extends AbstractSAMLObjectBuilder<OAuthRPExtensions> {
-
- /** Constructor. */
- public OAuthRPExtensionsBuilder() {
-
- }
-
- /** {@inheritDoc} */
- @Override
- public OAuthRPExtensions buildObject() {
- return buildObject(MetadataValueSAMLObject.SAML20MDOIDCMD_NS,
- OAuthRPExtensions.TYPE_LOCAL_NAME,
- MetadataValueSAMLObject.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- @Override
- public OAuthRPExtensions buildObject(final String namespaceURI, final String localName,
- final String namespacePrefix) {
- return new OAuthRPExtensionsImpl(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/OAuthRPExtensionsImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
deleted file mode 100644
index 0f84f9d7..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.saml2.metadata.Endpoint;
-import org.opensaml.saml.saml2.metadata.impl.RoleDescriptorImpl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-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.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;
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-
-/**
- * Implementation for {@link OAuthRPExtensions}.
- */
-public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRPExtensions {
-
- /** Token endpoint authentication method for this entity. */
- private TokenEndpointAuthMethod tokenEndpointAuthMethod;
-
- /** Response types for this entity. */
- private final XMLObjectChildrenList<ResponseType> responseTypes;
-
- /** Grant types for this entity. */
- private final XMLObjectChildrenList<GrantType> grantTypes;
-
- /** Application type for this entity. */
- private ApplicationType applicationType;
-
- /** Client URI for this entity. */
- private ClientUri clientUri;
-
- private final XMLObjectChildrenList<Scope> scopes;
-
- /** JWKS URI for this entity. */
- private JwksUri jwksUri;
-
- /** Software identifier for this entity. */
- private SoftwareId softwareId;
-
- /** Software version for this entity. */
- private SoftwareVersion softwareVersion;
-
- /** Sector identifier URI for this entity. */
- private SectorIdentifierUri sectorIdentifierUri;
-
- /** ID token signed response algorithm for this entity. */
- private IdTokenSignedResponseAlg idTokenSignedResponseAlg;
-
- /** ID token encrypted response algorithm for this entity. */
- private IdTokenEncryptedResponseAlg idTokenEncryptedResponseAlg;
-
- /** ID token encrypted response encoder for this entity. */
- private IdTokenEncryptedResponseEnc idTokenEncryptedResponseEnc;
-
- /** User info signed response algorithm for this entity. */
- private UserInfoSignedResponseAlg userInfoSignedResponseAlg;
-
- /** User info encrypted response algorithm for this entity. */
- private UserInfoEncryptedResponseAlg userInfoEncryptedResponseAlg;
-
- /** User info encrypted response encoder for this entity. */
- private UserInfoEncryptedResponseEnc userInfoEncryptedResponseEnc;
-
- /** Request object signing algorithm for this entity. */
- private RequestObjectSigningAlg requestObjectSigningAlg;
-
- /** Request object encryption algorithm for this entity. */
- private RequestObjectEncryptionAlg requestObjectEncryptionAlg;
-
- /** Request object encryption encoder for this entity. */
- private RequestObjectEncryptionEnc requestObjectEncryptionEnc;
-
- /** Token endpoint authentication signing algorithm for this entity. */
- private TokenEndpointAuthSigningAlg tokenEndpointAuthSigningAlg;
-
- /** Default ACR values for this entity. */
- private final XMLObjectChildrenList<DefaultAcrValue> defaultAcrValues;
-
- /** Initiate login URI for this entity. */
- private InitiateLoginUri initiateLoginUri;
-
- /** Request URIs for this entity. */
- private final XMLObjectChildrenList<RequestUri> requestUris;
-
- /** Post logout redirect URIs for this entity. */
- private final XMLObjectChildrenList<PostLogoutRedirectUri> postLogoutRedirectUris;
-
- /** Default max age for this entity. */
- private int defaultMaxAge;
-
- /** Require auth time flag for this entity. */
- private boolean requireAuthTime;
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected OAuthRPExtensionsImpl(final String namespaceURI, final String elementLocalName,
- final String namespacePrefix) {
- super(namespaceURI, elementLocalName, namespacePrefix);
- responseTypes = new XMLObjectChildrenList<>(this);
- grantTypes = new XMLObjectChildrenList<>(this);
- scopes = new XMLObjectChildrenList<>(this);
- defaultAcrValues = new XMLObjectChildrenList<>(this);
- requestUris = new XMLObjectChildrenList<>(this);
- postLogoutRedirectUris = new XMLObjectChildrenList<>(this);
- }
-
- /** {@inheritDoc} */
- public List<Endpoint> getEndpoints() {
- return new ArrayList<>();
- }
-
- /** {@inheritDoc} */
- public List<Endpoint> getEndpoints(final QName type) {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<ResponseType> getResponseTypes() {
- return responseTypes;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<GrantType> getGrantTypes() {
- return grantTypes;
- }
-
- /** {@inheritDoc} */
- @Override
- public ApplicationType getApplicationType() {
- return applicationType;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setApplicationType(final ApplicationType type) {
- applicationType = type;
- }
-
- /** {@inheritDoc} */
- @Override
- public TokenEndpointAuthMethod getTokenEndpointAuthMethod() {
- return tokenEndpointAuthMethod;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setTokenEndpointAuthMethod(TokenEndpointAuthMethod method) {
- tokenEndpointAuthMethod = method;
- }
-
- /** {@inheritDoc} */
- @Override
- public ClientUri getClientUri() {
- return clientUri;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setClientUri(ClientUri uri) {
- clientUri = uri;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<Scope> getScopes() {
- return scopes;
- }
-
- /** {@inheritDoc} */
- @Override
- public JwksUri getJwksUri() {
- return jwksUri;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setJwksUri(JwksUri uri) {
- jwksUri = uri;
- }
-
- /** {@inheritDoc} */
- @Override
- public SoftwareId getSoftwareId() {
- return softwareId;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setSoftwareId(SoftwareId id) {
- softwareId = id;
- }
-
- /** {@inheritDoc} */
- @Override
- public SoftwareVersion getSoftwareVersion() {
- return softwareVersion;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setSoftwareVersion(SoftwareVersion version) {
- softwareVersion = version;
- }
-
- /** {@inheritDoc} */
- @Override
- public SectorIdentifierUri getSectorIdentifierUri() {
- return sectorIdentifierUri;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setSectorIdentifierUri(SectorIdentifierUri uri) {
- sectorIdentifierUri = uri;
- }
-
- /** {@inheritDoc} */
- @Override
- public IdTokenSignedResponseAlg getIdTokenSignedResponseAlg() {
- return idTokenSignedResponseAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setIdTokenSignedResponseAlg(IdTokenSignedResponseAlg algorithm) {
- idTokenSignedResponseAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public IdTokenEncryptedResponseAlg getIdTokenEncryptedResponseAlg() {
- return idTokenEncryptedResponseAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setIdTokenEncryptedResponseAlg(IdTokenEncryptedResponseAlg algorithm) {
- idTokenEncryptedResponseAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public IdTokenEncryptedResponseEnc getIdTokenEncryptedResponseEnc() {
- return idTokenEncryptedResponseEnc;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setIdTokenEncryptedResponseEnc(IdTokenEncryptedResponseEnc algorithm) {
- idTokenEncryptedResponseEnc = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public UserInfoSignedResponseAlg getUserInfoSignedResponseAlg() {
- return userInfoSignedResponseAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setUserInfoSignedResponseAlg(UserInfoSignedResponseAlg algorithm) {
- userInfoSignedResponseAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public UserInfoEncryptedResponseAlg getUserInfoEncryptedResponseAlg() {
- return userInfoEncryptedResponseAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setUserInfoEncryptedResponseAlg(UserInfoEncryptedResponseAlg algorithm) {
- userInfoEncryptedResponseAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public UserInfoEncryptedResponseEnc getUserInfoEncryptedResponseEnc() {
- return userInfoEncryptedResponseEnc;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setUserInfoEncryptedResponseEnc(UserInfoEncryptedResponseEnc algorithm) {
- userInfoEncryptedResponseEnc = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public RequestObjectSigningAlg getRequestObjectSigningAlg() {
- return requestObjectSigningAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setRequestObjectSigningAlg(RequestObjectSigningAlg algorithm) {
- requestObjectSigningAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public RequestObjectEncryptionAlg getRequestObjectEncryptionAlg() {
- return requestObjectEncryptionAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setRequestObjectEncryptionAlg(RequestObjectEncryptionAlg algorithm) {
- requestObjectEncryptionAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public RequestObjectEncryptionEnc getRequestObjectEncryptionEnc() {
- return requestObjectEncryptionEnc;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setRequestObjectEncryptionEnc(RequestObjectEncryptionEnc algorithm) {
- requestObjectEncryptionEnc = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public TokenEndpointAuthSigningAlg getTokenEndpointAuthSigningAlg() {
- return tokenEndpointAuthSigningAlg;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setTokenEndpointAuthSigningAlg(TokenEndpointAuthSigningAlg algorithm) {
- tokenEndpointAuthSigningAlg = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<DefaultAcrValue> getDefaultAcrValues() {
- return defaultAcrValues;
- }
-
- /** {@inheritDoc} */
- @Override
- public InitiateLoginUri getInitiateLoginUri() {
- return initiateLoginUri;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setInitiateLoginUri(InitiateLoginUri uri) {
- initiateLoginUri = uri;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<RequestUri> getRequestUris() {
- return requestUris;
- }
-
- /** {@inheritDoc} */
- @Override
- public List<PostLogoutRedirectUri> getPostLogoutRedirectUris() {
- return postLogoutRedirectUris;
- }
-
- /** {@inheritDoc} */
- @Override
- public int getDefaultMaxAge() {
- return defaultMaxAge;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setDefaultMaxAge(int age) {
- defaultMaxAge = age;
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isRequireAuthTime() {
- return requireAuthTime;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setRequireAuthTime(boolean flag) {
- requireAuthTime = flag;
- }
-
-}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsMarshaller.java
deleted file mode 100644
index 3faaf585..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.RoleDescriptorMarshaller;
-
-/**
- * Marshaller for {@link OAuthRPExtensions} objects.
- */
-public class OAuthRPExtensionsMarshaller extends RoleDescriptorMarshaller {
-
- //TODO
-}
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
deleted file mode 100644
index ba391bae..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
-import org.w3c.dom.Attr;
-
-import com.google.common.base.Strings;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
-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.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;
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-
-/**
- * Unmarshaller for {@link OAuthRPExtensions} objects.
- */
-public class OAuthRPExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
- throws UnmarshallingException {
- final OAuthRPExtensions descriptor = (OAuthRPExtensions) parentSAMLObject;
-
- if (childSAMLObject instanceof ResponseType) {
- descriptor.getResponseTypes().add((ResponseType) childSAMLObject);
- } else if (childSAMLObject instanceof GrantType) {
- descriptor.getGrantTypes().add((GrantType) childSAMLObject);
- } else if (childSAMLObject instanceof ApplicationType) {
- descriptor.setApplicationType((ApplicationType) childSAMLObject);
- } else if (childSAMLObject instanceof TokenEndpointAuthMethod) {
- descriptor.setTokenEndpointAuthMethod((TokenEndpointAuthMethod) childSAMLObject);
- } else if (childSAMLObject instanceof ClientUri) {
- descriptor.setClientUri((ClientUri) childSAMLObject);
- } else if (childSAMLObject instanceof Scope) {
- descriptor.getScopes().add((Scope) childSAMLObject);
- } else if (childSAMLObject instanceof JwksUri) {
- descriptor.setJwksUri((JwksUri) childSAMLObject);
- } else if (childSAMLObject instanceof SoftwareId) {
- descriptor.setSoftwareId((SoftwareId) childSAMLObject);
- } else if (childSAMLObject instanceof SoftwareVersion) {
- descriptor.setSoftwareVersion((SoftwareVersion) childSAMLObject);
- } else if (childSAMLObject instanceof SectorIdentifierUri) {
- descriptor.setSectorIdentifierUri((SectorIdentifierUri) childSAMLObject);
- } else if (childSAMLObject instanceof IdTokenSignedResponseAlg) {
- descriptor.setIdTokenSignedResponseAlg((IdTokenSignedResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof IdTokenEncryptedResponseAlg) {
- descriptor.setIdTokenEncryptedResponseAlg((IdTokenEncryptedResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof IdTokenEncryptedResponseEnc) {
- descriptor.setIdTokenEncryptedResponseEnc((IdTokenEncryptedResponseEnc) childSAMLObject);
- } else if (childSAMLObject instanceof UserInfoSignedResponseAlg) {
- descriptor.setUserInfoSignedResponseAlg((UserInfoSignedResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof UserInfoEncryptedResponseAlg) {
- descriptor.setUserInfoEncryptedResponseAlg((UserInfoEncryptedResponseAlg) childSAMLObject);
- } else if (childSAMLObject instanceof UserInfoEncryptedResponseEnc) {
- descriptor.setUserInfoEncryptedResponseEnc((UserInfoEncryptedResponseEnc) 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) {
- descriptor.getDefaultAcrValues().add((DefaultAcrValue) childSAMLObject);
- } else if (childSAMLObject instanceof InitiateLoginUri) {
- descriptor.setInitiateLoginUri((InitiateLoginUri) childSAMLObject);
- } else if (childSAMLObject instanceof RequestUri) {
- descriptor.getRequestUris().add((RequestUri) childSAMLObject);
- } else if (childSAMLObject instanceof PostLogoutRedirectUri) {
- descriptor.getPostLogoutRedirectUris().add((PostLogoutRedirectUri) childSAMLObject);
- } else {
- super.processChildElement(parentSAMLObject, childSAMLObject);
- }
- }
-
- /** {@inheritDoc} */
- protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
- final OAuthRPExtensions descriptor = (OAuthRPExtensions) samlObject;
-
- if (attribute.getNamespaceURI() == null) {
- if (attribute.getLocalName().equals(OAuthRPExtensions.DEFAULT_MAX_AGE_ATTRIB_NAME)
- && !Strings.isNullOrEmpty(attribute.getValue())) {
- descriptor.setDefaultMaxAge(Integer.parseInt(attribute.getValue()));
- } else if (attribute.getLocalName().equals(OAuthRPExtensions.REQUIRE_AUTH_TIME_ATTRIB_NAME)
- && !Strings.isNullOrEmpty(attribute.getValue())) {
- descriptor.setRequireAuthTime(Boolean.parseBoolean(attribute.getValue()));
- } else {
- super.processAttribute(samlObject, attribute);
- }
- } else {
-
- }
- }
-}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriBuilder.java
deleted file mode 100644
index 100a8b6f..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link PostLogoutRedirectUriImpl}.
- */
-public class PostLogoutRedirectUriBuilder extends AbstractSAMLObjectBuilder<PostLogoutRedirectUri> {
-
- /**
- * Constructor.
- */
- public PostLogoutRedirectUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public PostLogoutRedirectUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, PostLogoutRedirectUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public PostLogoutRedirectUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new PostLogoutRedirectUriImpl(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/PostLogoutRedirectUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriImpl.java
deleted file mode 100644
index b1ee4294..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-
-/**
- * Concrete implementation of {@link PostLogoutRedirectUri}.
- */
-public class PostLogoutRedirectUriImpl extends AbstractMetadataValueSAMLObject implements PostLogoutRedirectUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected PostLogoutRedirectUriImpl(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/PostLogoutRedirectUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriMarshaller.java
deleted file mode 100644
index fe2b3677..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-
-/**
- * A thread safe Marshaller for {@link PostLogoutRedirectUri} objects.
- */
-public class PostLogoutRedirectUriMarshaller extends AbstractMetadataValueMarshaller<PostLogoutRedirectUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriUnmarshaller.java
deleted file mode 100644
index 81f955e4..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/PostLogoutRedirectUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.PostLogoutRedirectUri;
-
-/**
- * A thread-safe Unmarshaller for {@link PostLogoutRedirectUri} objects.
- */
-public class PostLogoutRedirectUriUnmarshaller extends AbstractMetadataValueUnmarshaller<PostLogoutRedirectUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java
deleted file mode 100644
index dc9a95e9..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link RequestObjectEncryptionAlgImpl}.
- */
-public class RequestObjectEncryptionAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionAlg> {
-
- /**
- * Constructor.
- */
- public RequestObjectEncryptionAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public RequestObjectEncryptionAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- 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/RequestObjectEncryptionAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgImpl.java
deleted file mode 100644
index 451fca2a..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
-
-/**
- * Concrete implementation of {@link RequestObjectEncryptionAlg}.
- */
-public class RequestObjectEncryptionAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- 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/RequestObjectEncryptionAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgMarshaller.java
deleted file mode 100644
index 0eae73c3..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
-
-/**
- * A thread safe Marshaller for {@link RequestObjectEncryptionAlg} objects.
- */
-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/RequestObjectEncryptionAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgUnmarshaller.java
deleted file mode 100644
index eebd2c04..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link RequestObjectEncryptionAlg} objects.
- */
-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/RequestObjectEncryptionEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncBuilder.java
deleted file mode 100644
index 483eb046..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link RequestObjectEncryptionEncImpl}.
- */
-public class RequestObjectEncryptionEncBuilder extends AbstractSAMLObjectBuilder<RequestObjectEncryptionEnc> {
-
- /**
- * Constructor.
- */
- public RequestObjectEncryptionEncBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public RequestObjectEncryptionEnc buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectEncryptionEnc.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- 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/RequestObjectEncryptionEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncImpl.java
deleted file mode 100644
index 74676a15..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
-
-/**
- * Concrete implementation of {@link RequestObjectEncryptionEnc}.
- */
-public class RequestObjectEncryptionEncImpl extends AbstractMetadataValueSAMLObject implements RequestObjectEncryptionEnc {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- 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/RequestObjectEncryptionEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncMarshaller.java
deleted file mode 100644
index 87e21d32..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
-
-/**
- * A thread safe Marshaller for {@link RequestObjectEncryptionEnc} objects.
- */
-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/RequestObjectEncryptionEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncUnmarshaller.java
deleted file mode 100644
index b02a77f7..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectEncryptionEncUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectEncryptionEnc;
-
-/**
- * A thread-safe Unmarshaller for {@link RequestObjectEncryptionEnc} objects.
- */
-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/RequestObjectSigningAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgBuilder.java
deleted file mode 100644
index 88fa27ca..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link RequestObjectSigningAlgImpl}.
- */
-public class RequestObjectSigningAlgBuilder extends AbstractSAMLObjectBuilder<RequestObjectSigningAlg> {
-
- /**
- * Constructor.
- */
- public RequestObjectSigningAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public RequestObjectSigningAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestObjectSigningAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- 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/RequestObjectSigningAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgImpl.java
deleted file mode 100644
index 99c6c394..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
-
-/**
- * Concrete implementation of {@link RequestObjectSigningAlg}.
- */
-public class RequestObjectSigningAlgImpl extends AbstractMetadataValueSAMLObject implements RequestObjectSigningAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- 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/RequestObjectSigningAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgMarshaller.java
deleted file mode 100644
index 722af64c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
-
-/**
- * A thread safe Marshaller for {@link RequestObjectSigningAlg} objects.
- */
-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/RequestObjectSigningAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgUnmarshaller.java
deleted file mode 100644
index 28e4f774..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestObjectSigningAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestObjectSigningAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link RequestObjectSigningAlg} objects.
- */
-public class RequestObjectSigningAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestObjectSigningAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriBuilder.java
deleted file mode 100644
index 8c4cb2d1..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link RequestUriImpl}.
- */
-public class RequestUriBuilder extends AbstractSAMLObjectBuilder<RequestUri> {
-
- /**
- * Constructor.
- */
- public RequestUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public RequestUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, RequestUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public RequestUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new RequestUriImpl(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/RequestUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriImpl.java
deleted file mode 100644
index 2fb9efaa..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
-
-/**
- * Concrete implementation of {@link RequestUri}.
- */
-public class RequestUriImpl extends AbstractMetadataValueSAMLObject implements RequestUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected RequestUriImpl(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/RequestUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriMarshaller.java
deleted file mode 100644
index e3005ff1..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
-
-/**
- * A thread safe Marshaller for {@link RequestUri} objects.
- */
-public class RequestUriMarshaller extends AbstractMetadataValueMarshaller<RequestUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriUnmarshaller.java
deleted file mode 100644
index 13ef6724..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/RequestUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.RequestUri;
-
-/**
- * A thread-safe Unmarshaller for {@link RequestUri} objects.
- */
-public class RequestUriUnmarshaller extends AbstractMetadataValueUnmarshaller<RequestUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeBuilder.java
deleted file mode 100644
index 62872c69..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
-
-/**
- * Builder of {@link ResponseTypeImpl}.
- */
-public class ResponseTypeBuilder extends AbstractSAMLObjectBuilder<ResponseType> {
-
- /**
- * Constructor.
- */
- public ResponseTypeBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public ResponseType buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ResponseType.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public ResponseType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ResponseTypeImpl(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/ResponseTypeImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeImpl.java
deleted file mode 100644
index 0b16ac70..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
-
-/**
- * Concrete implementation of {@link ResponseType}.
- */
-public class ResponseTypeImpl extends AbstractMetadataValueSAMLObject implements ResponseType {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ResponseTypeImpl(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/ResponseTypeMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeMarshaller.java
deleted file mode 100644
index d89c7ee6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
-
-/**
- * A thread safe Marshaller for {@link ResponseType} objects.
- */
-public class ResponseTypeMarshaller extends AbstractMetadataValueMarshaller<ResponseType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeUnmarshaller.java
deleted file mode 100644
index afd265b9..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ResponseTypeUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.ResponseType;
-
-/**
- * A thread-safe Unmarshaller for {@link ResponseType} objects.
- */
-public class ResponseTypeUnmarshaller extends AbstractMetadataValueUnmarshaller<ResponseType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeBuilder.java
deleted file mode 100644
index 49cb1f0c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
-
-/**
- * Builder of {@link ResponseTypeImpl}.
- */
-public class ScopeBuilder extends AbstractSAMLObjectBuilder<Scope> {
-
- /**
- * Constructor.
- */
- public ScopeBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public Scope buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, Scope.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public Scope buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ScopeImpl(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/ScopeImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeImpl.java
deleted file mode 100644
index b4ebb1b6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
-
-/**
- * Concrete implementation of {@link Scope}.
- */
-public class ScopeImpl extends AbstractMetadataValueSAMLObject implements Scope {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected ScopeImpl(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/ScopeMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeMarshaller.java
deleted file mode 100644
index 581ae19e..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
-
-/**
- * A thread safe Marshaller for {@link Scope} objects.
- */
-public class ScopeMarshaller extends AbstractMetadataValueMarshaller<Scope> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeUnmarshaller.java
deleted file mode 100644
index dbf2b64f..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ScopeUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
-
-/**
- * A thread-safe Unmarshaller for {@link Scope} objects.
- */
-public class ScopeUnmarshaller extends AbstractMetadataValueUnmarshaller<Scope> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriBuilder.java
deleted file mode 100644
index b0a29274..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link SectorIdentifierUriImpl}.
- */
-public class SectorIdentifierUriBuilder extends AbstractSAMLObjectBuilder<SectorIdentifierUri> {
-
- /**
- * Constructor.
- */
- public SectorIdentifierUriBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public SectorIdentifierUri buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, SectorIdentifierUri.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public SectorIdentifierUri buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new SectorIdentifierUriImpl(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/SectorIdentifierUriImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriImpl.java
deleted file mode 100644
index 24bf5977..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-
-/**
- * Concrete implementation of {@link SectorIdentifierUri}.
- */
-public class SectorIdentifierUriImpl extends AbstractMetadataValueSAMLObject implements SectorIdentifierUri {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected SectorIdentifierUriImpl(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/SectorIdentifierUriMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriMarshaller.java
deleted file mode 100644
index 98ad9fff..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-
-/**
- * A thread safe Marshaller for {@link SectorIdentifierUri} objects.
- */
-public class SectorIdentifierUriMarshaller extends AbstractMetadataValueMarshaller<SectorIdentifierUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriUnmarshaller.java
deleted file mode 100644
index 64145b9d..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SectorIdentifierUriUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
-
-/**
- * A thread-safe Unmarshaller for {@link SectorIdentifierUri} objects.
- */
-public class SectorIdentifierUriUnmarshaller extends AbstractMetadataValueUnmarshaller<SectorIdentifierUri> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdBuilder.java
deleted file mode 100644
index ec73489f..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link SoftwareIdImpl}.
- */
-public class SoftwareIdBuilder extends AbstractSAMLObjectBuilder<SoftwareId> {
-
- /**
- * Constructor.
- */
- public SoftwareIdBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public SoftwareId buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, SoftwareId.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public SoftwareId buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new SoftwareIdImpl(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/SoftwareIdImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdImpl.java
deleted file mode 100644
index d635f82b..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-
-/**
- * Concrete implementation of {@link SoftwareId}.
- */
-public class SoftwareIdImpl extends AbstractMetadataValueSAMLObject implements SoftwareId {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected SoftwareIdImpl(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/SoftwareIdMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdMarshaller.java
deleted file mode 100644
index 74e2b383..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-
-/**
- * A thread safe Marshaller for {@link SoftwareId} objects.
- */
-public class SoftwareIdMarshaller extends AbstractMetadataValueMarshaller<SoftwareId> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdUnmarshaller.java
deleted file mode 100644
index 887cfd27..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareIdUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
-
-/**
- * A thread-safe Unmarshaller for {@link SoftwareId} objects.
- */
-public class SoftwareIdUnmarshaller extends AbstractMetadataValueUnmarshaller<SoftwareId> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionBuilder.java
deleted file mode 100644
index 32e42362..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link SoftwareVersionImpl}.
- */
-public class SoftwareVersionBuilder extends AbstractSAMLObjectBuilder<SoftwareVersion> {
-
- /**
- * Constructor.
- */
- public SoftwareVersionBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public SoftwareVersion buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, SoftwareVersion.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public SoftwareVersion buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new SoftwareVersionImpl(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/SoftwareVersionImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionImpl.java
deleted file mode 100644
index e3616e35..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-
-/**
- * Concrete implementation of {@link SoftwareVersion}.
- */
-public class SoftwareVersionImpl extends AbstractMetadataValueSAMLObject implements SoftwareVersion {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected SoftwareVersionImpl(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/SoftwareVersionMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionMarshaller.java
deleted file mode 100644
index d93958b0..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-
-/**
- * A thread safe Marshaller for {@link SoftwareVersion} objects.
- */
-public class SoftwareVersionMarshaller extends AbstractMetadataValueMarshaller<SoftwareVersion> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionUnmarshaller.java
deleted file mode 100644
index 35c51523..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SoftwareVersionUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-
-/**
- * A thread-safe Unmarshaller for {@link SoftwareVersion} objects.
- */
-public class SoftwareVersionUnmarshaller extends AbstractMetadataValueUnmarshaller<SoftwareVersion> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodBuilder.java
deleted file mode 100644
index ebc06b82..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link TokenEndpointAuthMethodImpl}.
- */
-public class TokenEndpointAuthMethodBuilder extends AbstractSAMLObjectBuilder<TokenEndpointAuthMethod> {
-
- /**
- * Constructor.
- */
- public TokenEndpointAuthMethodBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public TokenEndpointAuthMethod buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, TokenEndpointAuthMethod.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public TokenEndpointAuthMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new TokenEndpointAuthMethodImpl(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/TokenEndpointAuthMethodImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodImpl.java
deleted file mode 100644
index 30bab0f1..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-
-/**
- * Concrete implementation of {@link TokenEndpointAuthMethod}.
- */
-public class TokenEndpointAuthMethodImpl extends AbstractMetadataValueSAMLObject implements TokenEndpointAuthMethod {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected TokenEndpointAuthMethodImpl(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/TokenEndpointAuthMethodMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodMarshaller.java
deleted file mode 100644
index 2e4151c3..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-
-/**
- * A thread safe Marshaller for {@link TokenEndpointAuthMethod} objects.
- */
-public class TokenEndpointAuthMethodMarshaller extends AbstractMetadataValueMarshaller<TokenEndpointAuthMethod> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodUnmarshaller.java
deleted file mode 100644
index 1e378c66..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthMethodUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
-
-/**
- * A thread-safe Unmarshaller for {@link TokenEndpointAuthMethod} objects.
- */
-public class TokenEndpointAuthMethodUnmarshaller extends AbstractMetadataValueUnmarshaller<TokenEndpointAuthMethod> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgBuilder.java
deleted file mode 100644
index 3928b2e0..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link TokenEndpointAuthSigningAlgImpl}.
- */
-public class TokenEndpointAuthSigningAlgBuilder extends AbstractSAMLObjectBuilder<TokenEndpointAuthSigningAlg> {
-
- /**
- * Constructor.
- */
- public TokenEndpointAuthSigningAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public TokenEndpointAuthSigningAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, TokenEndpointAuthSigningAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public TokenEndpointAuthSigningAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new TokenEndpointAuthSigningAlgImpl(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/TokenEndpointAuthSigningAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgImpl.java
deleted file mode 100644
index 89abe9b5..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-
-/**
- * Concrete implementation of {@link TokenEndpointAuthSigningAlg}.
- */
-public class TokenEndpointAuthSigningAlgImpl extends AbstractMetadataValueSAMLObject implements TokenEndpointAuthSigningAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected TokenEndpointAuthSigningAlgImpl(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/TokenEndpointAuthSigningAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgMarshaller.java
deleted file mode 100644
index 7d6072a7..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-
-/**
- * A thread safe Marshaller for {@link TokenEndpointAuthSigningAlg} objects.
- */
-public class TokenEndpointAuthSigningAlgMarshaller extends AbstractMetadataValueMarshaller<TokenEndpointAuthSigningAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgUnmarshaller.java
deleted file mode 100644
index 73f195e1..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/TokenEndpointAuthSigningAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link TokenEndpointAuthSigningAlg} objects.
- */
-public class TokenEndpointAuthSigningAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<TokenEndpointAuthSigningAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java
deleted file mode 100644
index 4b34ebf6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link UserInfoEncryptedResponseAlgImpl}.
- */
-public class UserInfoEncryptedResponseAlgBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptedResponseAlg> {
-
- /**
- * Constructor.
- */
- public UserInfoEncryptedResponseAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public UserInfoEncryptedResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public UserInfoEncryptedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new UserInfoEncryptedResponseAlgImpl(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/UserInfoEncryptedResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgImpl.java
deleted file mode 100644
index b5704260..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-
-/**
- * Concrete implementation of {@link UserInfoEncryptedResponseAlg}.
- */
-public class UserInfoEncryptedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptedResponseAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected UserInfoEncryptedResponseAlgImpl(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/UserInfoEncryptedResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgMarshaller.java
deleted file mode 100644
index b5c8f6d8..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-
-/**
- * A thread safe Marshaller for {@link UserInfoEncryptedResponseAlg} objects.
- */
-public class UserInfoEncryptedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java
deleted file mode 100644
index da212e21..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link UserInfoEncryptedResponseAlg} objects.
- */
-public class UserInfoEncryptedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java
deleted file mode 100644
index 1457d238..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link UserInfoEncryptedResponseEncImpl}.
- */
-public class UserInfoEncryptedResponseEncBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptedResponseEnc> {
-
- /**
- * Constructor.
- */
- public UserInfoEncryptedResponseEncBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public UserInfoEncryptedResponseEnc buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptedResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public UserInfoEncryptedResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new UserInfoEncryptedResponseEncImpl(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/UserInfoEncryptedResponseEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncImpl.java
deleted file mode 100644
index 063bc640..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-
-/**
- * Concrete implementation of {@link UserInfoEncryptedResponseEnc}.
- */
-public class UserInfoEncryptedResponseEncImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptedResponseEnc {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected UserInfoEncryptedResponseEncImpl(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/UserInfoEncryptedResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncMarshaller.java
deleted file mode 100644
index f349850c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-
-/**
- * A thread safe Marshaller for {@link UserInfoEncryptedResponseEnc} objects.
- */
-public class UserInfoEncryptedResponseEncMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptedResponseEnc> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java
deleted file mode 100644
index b0697376..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
-
-/**
- * A thread-safe Unmarshaller for {@link UserInfoEncryptedResponseEnc} objects.
- */
-public class UserInfoEncryptedResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptedResponseEnc> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgBuilder.java
deleted file mode 100644
index 7f7d9d75..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link UserInfoSignedResponseAlgImpl}.
- */
-public class UserInfoSignedResponseAlgBuilder extends AbstractSAMLObjectBuilder<UserInfoSignedResponseAlg> {
-
- /**
- * Constructor.
- */
- public UserInfoSignedResponseAlgBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public UserInfoSignedResponseAlg buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoSignedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public UserInfoSignedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new UserInfoSignedResponseAlgImpl(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/UserInfoSignedResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgImpl.java
deleted file mode 100644
index 5713557c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-
-/**
- * Concrete implementation of {@link UserInfoSignedResponseAlg}.
- */
-public class UserInfoSignedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements UserInfoSignedResponseAlg {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected UserInfoSignedResponseAlgImpl(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/UserInfoSignedResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgMarshaller.java
deleted file mode 100644
index 82d9b471..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-
-/**
- * A thread safe Marshaller for {@link UserInfoSignedResponseAlg} objects.
- */
-public class UserInfoSignedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<UserInfoSignedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgUnmarshaller.java
deleted file mode 100644
index 535f5dc7..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoSignedResponseAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link UserInfoSignedResponseAlg} objects.
- */
-public class UserInfoSignedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoSignedResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/XMLObjectProviderInitializer.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/XMLObjectProviderInitializer.java
deleted file mode 100644
index d0a99de9..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/XMLObjectProviderInitializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import org.opensaml.core.xml.config.AbstractXMLObjectProviderInitializer;
-
-/**
- * XMLObject provider initializer for the metadata extension.
- */
-public class XMLObjectProviderInitializer extends AbstractXMLObjectProviderInitializer {
-
- /** Config resources. */
- private static String[] configs = {
- "/saml2-metadata-oidcmd-config.xml",
- };
-
- /** {@inheritDoc} */
- @Override
- protected String[] getConfigResources() {
- return configs;
- }
-
-}
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer b/idp-oidc-extension-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
deleted file mode 100644
index ef3a2676..00000000
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.idp.saml.oidc.xmlobject.impl.XMLObjectProviderInitializer
\ No newline at end of file
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
deleted file mode 100644
index 80d95b8c..00000000
--- a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oidcmd="urn:mace:shibboleth:metadata:oidc:1.0" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
-
- <!-- SAML 2.0 Protocol Third-party Object providers -->
- <ObjectProviders>
-
- <ObjectProvider qualifiedName="oidcmd:ApplicationType">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ApplicationTypeBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ApplicationTypeMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ApplicationTypeUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:ClientSecretKeyReference">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretKeyReferenceBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretKeyReferenceMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretKeyReferenceUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:ClientSecret">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:ClientUri">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientUriUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:DefaultAcrValue">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.DefaultAcrValueBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.DefaultAcrValueMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.DefaultAcrValueUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:GrantType">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.GrantTypeBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.GrantTypeMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.GrantTypeUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptedResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptedResponseEnc">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:IdTokenSignedResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenSignedResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenSignedResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenSignedResponseAlgUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:InitiateLoginUri">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.InitiateLoginUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.InitiateLoginUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.InitiateLoginUriUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:JwksData">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksDataBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksDataMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksDataUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:JwksUri">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.JwksUriUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:OAuthRPExtensions">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.OAuthRPExtensionsBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.OAuthRPExtensionsMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.OAuthRPExtensionsUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:PostLogoutRedirectUri">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.PostLogoutRedirectUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.PostLogoutRedirectUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.PostLogoutRedirectUriUnmarshaller"/>
- </ObjectProvider>
-
- <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: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: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">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.RequestUriUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:ResponseType">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ResponseTypeBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ResponseTypeMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ResponseTypeUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:Scope">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ScopeBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ScopeMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ScopeUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:SectorIdentifierUri">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SectorIdentifierUriBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SectorIdentifierUriMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SectorIdentifierUriUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:SoftwareId">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareIdBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareIdMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareIdUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:SoftwareVersion">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareVersionBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareVersionMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareVersionUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:TokenEndpointAuthMethod">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthMethodBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthMethodMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthMethodUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:TokenEndpointAuthSigningAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthSigningAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthSigningAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthSigningAlgUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptedResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptedResponseEnc">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncUnmarshaller"/>
- </ObjectProvider>
-
- <ObjectProvider qualifiedName="oidcmd:UserInfoSignedResponseAlg">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoSignedResponseAlgBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoSignedResponseAlgMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoSignedResponseAlgUnmarshaller"/>
- </ObjectProvider>
-
- </ObjectProviders>
-</XMLTooling>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list