[java-idp-oidc] 01/06: JOIDC-5 Renamed CientSecretReferenceKey to ClientSecretKeyReference
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Jun 26 13:31:00 UTC 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch dev/JOIDC-5
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=74d4eaa77c44b49ec79c8baf77c5579bb0871479
commit 74d4eaa77c44b49ec79c8baf77c5579bb0871479
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jun 26 08:36:12 2020 +0300
JOIDC-5 Renamed CientSecretReferenceKey to ClientSecretKeyReference
https://issues.shibboleth.net/jira/browse/JOIDC-5
---
...etReferenceKey.java => ClientSecretKeyReference.java} | 2 +-
.../main/resources/schema/saml-metadata-ext-oidcmd.xsd | 2 +-
...Builder.java => ClientSecretKeyReferenceBuilder.java} | 16 ++++++++--------
...nceKeyImpl.java => ClientSecretKeyReferenceImpl.java} | 8 ++++----
...ller.java => ClientSecretKeyReferenceMarshaller.java} | 6 +++---
...er.java => ClientSecretKeyReferenceUnmarshaller.java} | 6 +++---
.../ext/impl/provider/ClientSecretReferenceProvider.java | 12 ++++++------
.../src/main/resources/saml2-metadata-oidcmd-config.xml | 8 ++++----
.../impl/EntityDescriptor-with-oidcmd-clientsecret.xml | 2 +-
9 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java
similarity index 95%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java
index 5cdc8f44..bb6aedd5 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretKeyReference.java
@@ -21,7 +21,7 @@ import javax.xml.namespace.QName;
/**
* SAML2 OIDC metadata extension 'ClientSecretReferenceKey'.
*/
-public interface ClientSecretReferenceKey extends MetadataValueSAMLObject {
+public interface ClientSecretKeyReference extends MetadataValueSAMLObject {
/** Element name, no namespace. */
public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecretReferenceKey";
diff --git a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
index 7d5780b6..611b3ab1 100644
--- a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
+++ b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
@@ -74,6 +74,6 @@
<element name="PostLogoutRedirectUri" type="anyURI" />
<element name="JwksData" type="anyURI" />
- <element name="ClientSecretReferenceKey" type="anyURI" />
+ <element name="ClientSecretKeyReference" type="anyURI" />
</schema>
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceBuilder.java
similarity index 68%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceBuilder.java
index 02ff78ae..0b8ebd37 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
/**
- * Builder of {@link ClientSecretReferenceKeyImpl}.
+ * Builder of {@link ClientSecretKeyReferenceImpl}.
*/
-public class ClientSecretReferenceKeyBuilder extends AbstractSAMLObjectBuilder<ClientSecretReferenceKey> {
+public class ClientSecretKeyReferenceBuilder extends AbstractSAMLObjectBuilder<ClientSecretKeyReference> {
/**
* Constructor.
*/
- public ClientSecretReferenceKeyBuilder() {
+ public ClientSecretKeyReferenceBuilder() {
}
/** {@inheritDoc} */
- public ClientSecretReferenceKey buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, ClientSecretReferenceKey.DEFAULT_ELEMENT_LOCAL_NAME,
+ public ClientSecretKeyReference buildObject() {
+ return buildObject(Constants.SAML20MDOIDCMD_NS, ClientSecretKeyReference.DEFAULT_ELEMENT_LOCAL_NAME,
Constants.SAML20MDOIDCMD_PREFIX);
}
/** {@inheritDoc} */
- public ClientSecretReferenceKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new ClientSecretReferenceKeyImpl(namespaceURI, localName, namespacePrefix);
+ 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/ClientSecretReferenceKeyImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceImpl.java
similarity index 77%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceImpl.java
index caf4b917..ce164653 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceImpl.java
@@ -16,12 +16,12 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
/**
- * Concrete implementation of {@link ClientSecretReferenceKey}.
+ * Concrete implementation of {@link ClientSecretKeyReference}.
*/
-public class ClientSecretReferenceKeyImpl extends AbstractMetadataValueSAMLObject implements ClientSecretReferenceKey {
+public class ClientSecretKeyReferenceImpl extends AbstractMetadataValueSAMLObject implements ClientSecretKeyReference {
/**
* Constructor.
@@ -30,7 +30,7 @@ public class ClientSecretReferenceKeyImpl extends AbstractMetadataValueSAMLObjec
* @param elementLocalName the local name of the XML element this Object represents
* @param namespacePrefix the prefix for the given namespace
*/
- protected ClientSecretReferenceKeyImpl(final String namespaceURI, final String elementLocalName,
+ protected ClientSecretKeyReferenceImpl(final String namespaceURI, final String elementLocalName,
final String namespacePrefix) {
super(namespaceURI, elementLocalName, namespacePrefix);
}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceMarshaller.java
similarity index 72%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceMarshaller.java
index 3deea707..68b2b232 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceMarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
/**
- * A thread safe Marshaller for {@link ClientSecretReferenceKey} objects.
+ * A thread safe Marshaller for {@link ClientSecretKeyReference} objects.
*/
-public class ClientSecretReferenceKeyMarshaller extends AbstractMetadataValueMarshaller<ClientSecretReferenceKey> {
+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/ClientSecretReferenceKeyUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java
similarity index 71%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java
index 7958d1e2..e9bd25c9 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretKeyReferenceUnmarshaller.java
@@ -16,11 +16,11 @@
package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
/**
- * A thread-safe Unmarshaller for {@link ClientSecretReferenceKey} objects.
+ * A thread-safe Unmarshaller for {@link ClientSecretKeyReference} objects.
*/
-public class ClientSecretReferenceKeyUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientSecretReferenceKey> {
+public class ClientSecretKeyReferenceUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientSecretKeyReference> {
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index 1348c64d..f94c1bae 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.oauth2.sdk.auth.Secret;
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -70,7 +70,7 @@ public class ClientSecretReferenceProvider extends AbstractKeyInfoProvider {
@Override
public Collection<Credential> process(KeyInfoCredentialResolver resolver, XMLObject keyInfoChild,
CriteriaSet criteriaSet, KeyInfoResolutionContext kiContext) throws SecurityException {
- final ClientSecretReferenceKey clientSecretReference = getClientSecret(keyInfoChild);
+ final ClientSecretKeyReference clientSecretReference = getClientSecret(keyInfoChild);
if (clientSecretReference == null || StringSupport.trimOrNull(clientSecretReference.getValue()) == null) {
log.debug("No value found for the ClientSecretReferenceKey element");
return null;
@@ -104,13 +104,13 @@ public class ClientSecretReferenceProvider extends AbstractKeyInfoProvider {
/**
* Get the ClientSecretReferenceKey from the passed XML object.
*
- * @param xmlObject an XML object, presumably a {@link ClientSecretReferenceKey}
+ * @param xmlObject an XML object, presumably a {@link ClientSecretKeyReference}
* @return the ClientSecret which was found, or null if none
*/
- @Nullable protected ClientSecretReferenceKey getClientSecret(@Nonnull final XMLObject xmlObject) {
+ @Nullable protected ClientSecretKeyReference getClientSecret(@Nonnull final XMLObject xmlObject) {
- if (xmlObject instanceof ClientSecretReferenceKey) {
- return (ClientSecretReferenceKey) xmlObject;
+ if (xmlObject instanceof ClientSecretKeyReference) {
+ return (ClientSecretKeyReference) xmlObject;
} else {
return null;
}
diff --git a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
index d506fd38..38483dcc 100644
--- a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
+++ b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
@@ -10,10 +10,10 @@
<UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ApplicationTypeUnmarshaller"/>
</ObjectProvider>
- <ObjectProvider qualifiedName="oidcmd:ClientSecretReferenceKey">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyUnmarshaller"/>
+ <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">
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml b/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
index c8bde4a4..451e67dd 100644
--- a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
+++ b/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
@@ -4,7 +4,7 @@
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>mockClientSecret</ds:KeyName>
- <oidcmd:ClientSecretReferenceKey>mockClientSecretKey</oidcmd:ClientSecretReferenceKey>
+ <oidcmd:ClientSecretKeyReference>mockClientSecretKey</oidcmd:ClientSecretKeyReference>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:Extensions>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list