[java-opensaml] branch master updated: OSJ-291 - Sweep SAML XMLObject interfaces for consistency
Scott Cantor
cantor.2 at osu.edu
Mon Nov 25 21:13:33 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=556d378b687f2ced58b769df5a2fdd4fb2c0a548
The following commit(s) were added to refs/heads/master by this push:
new 556d378 OSJ-291 - Sweep SAML XMLObject interfaces for consistency
556d378 is described below
commit 556d378b687f2ced58b769df5a2fdd4fb2c0a548
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 25 21:13:28 2019 -0500
OSJ-291 - Sweep SAML XMLObject interfaces for consistency
https://issues.shibboleth.net/jira/browse/OSJ-291
Clean up MDRPI and MDUI classes.
---
.../profile/logic/EntityAttributesPredicate.java | 2 +-
.../MetadataNameIdentifierFormatStrategy.java | 6 +--
.../profile/logic/RegistrationPolicyPredicate.java | 2 +-
.../saml/ext/saml2mdrpi/RegistrationPolicy.java | 13 +++---
.../opensaml/saml/ext/saml2mdrpi/UsagePolicy.java | 13 +++---
.../opensaml/saml/ext/saml2mdui/DomainHint.java | 27 ++++++++---
.../saml/ext/saml2mdui/GeolocationHint.java | 27 ++++++++---
.../org/opensaml/saml/ext/saml2mdui/IPHint.java | 26 ++++++++---
.../java/org/opensaml/saml/ext/saml2mdui/Logo.java | 43 +++++++++++-------
.../org/opensaml/saml/ext/saml2mdui/UIInfo.java | 3 --
.../saml/ext/saml2mdui/impl/DomainHintImpl.java | 29 ++----------
.../ext/saml2mdui/impl/DomainHintMarshaller.java | 10 ++---
.../ext/saml2mdui/impl/DomainHintUnmarshaller.java | 16 ++-----
.../ext/saml2mdui/impl/GeolocationHintImpl.java | 29 ++----------
.../saml2mdui/impl/GeolocationHintMarshaller.java | 10 ++---
.../impl/GeolocationHintUnmarshaller.java | 13 ++----
.../saml/ext/saml2mdui/impl/IPHintImpl.java | 27 +----------
.../saml/ext/saml2mdui/impl/IPHintMarshaller.java | 10 ++---
.../ext/saml2mdui/impl/IPHintUnmarshaller.java | 13 ++----
.../opensaml/saml/ext/saml2mdui/impl/LogoImpl.java | 52 +++-------------------
.../saml/ext/saml2mdui/impl/LogoMarshaller.java | 30 +++----------
.../saml/ext/saml2mdui/impl/LogoUnmarshaller.java | 21 ++-------
.../saml/ext/saml2mdui/impl/DomainHintTest.java | 4 +-
.../ext/saml2mdui/impl/GeolocationHintTest.java | 4 +-
.../saml/ext/saml2mdui/impl/IPHintTest.java | 4 +-
.../opensaml/saml/ext/saml2mdui/impl/LogoTest.java | 8 ++--
26 files changed, 165 insertions(+), 277 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
index d18a0d8..0a2bea7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
@@ -428,7 +428,7 @@ public class EntityAttributesPredicate implements Predicate<EntityDescriptor> {
if (object instanceof XSString) {
toMatch = ((XSString) object).getValue();
} else if (object instanceof XSURI) {
- toMatch = ((XSURI) object).getValue();
+ toMatch = ((XSURI) object).getURI();
} else if (object instanceof XSBoolean) {
toMatch = ((XSBoolean) object).getValue().getValue() ? "1" : "0";
toMatchAlt = ((XSBoolean) object).getValue().getValue() ? "true" : "false";
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/MetadataNameIdentifierFormatStrategy.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/MetadataNameIdentifierFormatStrategy.java
index 7936145..3002e48 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/MetadataNameIdentifierFormatStrategy.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/MetadataNameIdentifierFormatStrategy.java
@@ -68,12 +68,12 @@ public class MetadataNameIdentifierFormatStrategy implements Function<ProfileReq
if (role != null) {
final List<String> strings = new ArrayList<>();
for (final NameIDFormat nif : role.getNameIDFormats()) {
- if (nif.getFormat() != null) {
- if (NameID.UNSPECIFIED.equals(nif.getFormat())) {
+ if (nif.getURI() != null) {
+ if (NameID.UNSPECIFIED.equals(nif.getURI())) {
log.warn("Ignoring NameIDFormat metadata that includes the 'unspecified' format");
return Collections.emptyList();
}
- strings.add(nif.getFormat());
+ strings.add(nif.getURI());
}
}
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
index 54816ea..fc461ef 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
@@ -66,7 +66,7 @@ public class RegistrationPolicyPredicate extends AbstractRegistrationInfoPredica
@Override
protected boolean doApply(@Nonnull final RegistrationInfo info) {
for (final RegistrationPolicy policy : info.getRegistrationPolicies()) {
- if (policySet.contains(policy.getValue())) {
+ if (policySet.contains(policy.getURI())) {
return true;
}
}
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
index 8928eb5..899089d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
@@ -17,26 +17,27 @@
package org.opensaml.saml.ext.saml2mdrpi;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.LocalizedURI;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* Representation of the <code><mdrpi:RegistrationPolicy></code> element. <br/>
* See <a
* href="http://docs.oasis-open.org/security/saml/Post2.0/saml-metadata-rpi/v1.0/">http://docs.oasis-open.org/security
* /saml/Post2.0/saml-metadata-rpi/v1.0/</a>
*/
-// Checkstyle: InterfaceIsType OFF
public interface RegistrationPolicy extends LocalizedURI {
/** Name of the element inside the Extensions. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RegistrationPolicy";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "RegistrationPolicy";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MDRPI_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAMLConstants.SAML20MDRPI_PREFIX);
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
+ new QName(SAMLConstants.SAML20MDRPI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDRPI_PREFIX);
-}
-// Checkstyle: InterfaceIsType ON
+}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/UsagePolicy.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/UsagePolicy.java
index 2f0753c..000431a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/UsagePolicy.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/UsagePolicy.java
@@ -17,26 +17,27 @@
package org.opensaml.saml.ext.saml2mdrpi;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.LocalizedURI;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* Representation of the <code><mdrpi:UsagePolicy></code> element. <br/>
* See <a
* href="http://docs.oasis-open.org/security/saml/Post2.0/saml-metadata-rpi/v1.0/">http://docs.oasis-open.org/security
* /saml/Post2.0/saml-metadata-rpi/v1.0/</a>
*/
-// Checkstyle: InterfaceIsType OFF
public interface UsagePolicy extends LocalizedURI {
/** Name of the element inside the Extensions. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UsagePolicy";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "UsagePolicy";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MDRPI_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAMLConstants.SAML20MDRPI_PREFIX);
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
+ new QName(SAMLConstants.SAML20MDRPI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDRPI_PREFIX);
-}
-// Checkstyle: InterfaceIsType ON
+}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
index 2bac506..8b0470d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
@@ -17,13 +17,18 @@
package org.opensaml.saml.ext.saml2mdui;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.schema.XSString;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
- * IPHint.
+ * DomainHint.
*
* See IdP Discovery and Login UI Metadata Extension Profile.
*
@@ -32,26 +37,34 @@ import org.opensaml.saml.common.xml.SAMLConstants;
* The <DomainHint> element specifies a set of DNS domains associated with,
* or serviced by, the entity.
*/
-public interface DomainHint extends SAMLObject {
+public interface DomainHint extends SAMLObject, XSString {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DomainHint";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DomainHint";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
/**
* Gets the Hint.
*
* @return the Hint
+ *
+ * @deprecated
*/
- public String getHint();
+ @Nullable default String getHint() {
+ return getValue();
+ }
/**
* Sets the hint.
*
- * @param newHint hint
+ * @param value hint
+ *
+ * @deprecated
*/
- public void setHint(String newHint);
+ default void setHint(@Nullable final String value) {
+ setValue(value);
+ }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
index a178b71..0e51059 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
@@ -17,13 +17,18 @@
package org.opensaml.saml.ext.saml2mdui;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.schema.XSURI;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
- * IPHint.
+ * GeolocationHint.
*
* See IdP Discovery and Login UI Metadata Extension Profile.
*
@@ -33,26 +38,34 @@ import org.opensaml.saml.common.xml.SAMLConstants;
* with, or serviced by, the entity. Coordinates are given in decimal form using
* the World Geodetic System (2d) coordinate system.
*/
-public interface GeolocationHint extends SAMLObject {
+public interface GeolocationHint extends SAMLObject, XSURI {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "GeolocationHint";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "GeolocationHint";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
/**
* Gets the Hint.
*
* @return the Hint
+ *
+ * @deprecated
*/
- public String getHint();
+ @Nullable default String getHint() {
+ return getURI();
+ }
/**
* Sets the hint.
*
- * @param newHint hint
+ * @param value hint
+ *
+ * @deprecated
*/
- public void setHint(String newHint);
+ default void setHint(@Nullable final String value) {
+ setURI(value);
+ }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
index 153df5c..a8956ed 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
@@ -17,11 +17,16 @@
package org.opensaml.saml.ext.saml2mdui;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.schema.XSString;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* IPHint.
*
@@ -32,26 +37,35 @@ import org.opensaml.saml.common.xml.SAMLConstants;
* The <IPHint> element specifies a set of [CIDR] blocks associated with,
* or serviced by, the entity. Both IPv4 and IPv6 CIDR blocks MUST be supported.
*/
-public interface IPHint extends SAMLObject {
+public interface IPHint extends SAMLObject, XSString {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IPHint";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "IPHint";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
/**
* Gets the Hint.
*
* @return the Hint
+ *
+ * @deprecated
*/
- public String getHint();
+ @Nullable default String getHint() {
+ return getValue();
+ }
/**
* Sets the hint.
*
- * @param newHint hint
+ * @param value hint
+ *
+ * @deprecated
*/
- public void setHint(String newHint);
+ default void setHint(@Nullable final String value) {
+ setValue(value);
+ }
+
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
index 62ac160..64260b4 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
@@ -17,11 +17,15 @@
package org.opensaml.saml.ext.saml2mdui;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.LangBearing;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import org.opensaml.saml.saml2.metadata.LocalizedURI;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Localized logo type.
@@ -32,64 +36,71 @@ import org.opensaml.saml.common.xml.SAMLConstants;
* See IdP Discovery and Login UI Metadata Extension Profile.
*
*/
-public interface Logo extends LangBearing, SAMLObject {
+public interface Logo extends LocalizedURI, SAMLObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Logo";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Logo";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "LogoType";
+ @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "LogoType";
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull static final QName TYPE_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
/** Attribute label. */
- public static final String HEIGHT_ATTR_NAME = "height";
+ @Nonnull @NotEmpty static final String HEIGHT_ATTR_NAME = "height";
/** Attribute label. */
- public static final String WIDTH_ATTR_NAME = "width";
-
+ @Nonnull @NotEmpty static final String WIDTH_ATTR_NAME = "width";
/**
* Gets the URL.
*
* @return the URL
+ *
+ * @deprecated
*/
- public String getURL();
+ @Nullable default String getURL() {
+ return getURI();
+ }
/**
* Sets the URL.
*
- * @param newURL the URL
+ * @param uri the URL
+ *
+ * @deprecated
*/
- public void setURL(String newURL);
+ default void setURL(@Nullable final String uri) {
+ setURI(uri);
+ }
/**
* Get the height of the logo.
* @return the height of the logo
*/
- public Integer getHeight();
+ @Nullable public Integer getHeight();
/**
* Sets the height of the logo.
* @param newHeight the height of the logo
*/
- public void setHeight(Integer newHeight);
+ public void setHeight(@Nullable final Integer newHeight);
/**
* Get the width of the logo.
* @return the width of the logo
*/
- public Integer getWidth();
+ @Nullable public Integer getWidth();
/**
* Sets the width of the logo.
* @param newWidth the height of the logo
*/
- public void setWidth(Integer newWidth);
+ public void setWidth(@Nullable final Integer newWidth);
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/UIInfo.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/UIInfo.java
index ea43116..5bc0447 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/UIInfo.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/UIInfo.java
@@ -49,9 +49,6 @@ public interface UIInfo extends SAMLObject {
public static final QName TYPE_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
- /** Language attribute name. */
- public static final String LANG_ATTRIB_NAME = "lang";
-
/**
* Get the Display Names
*
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
index f961131..415cc03 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
@@ -17,21 +17,13 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import java.util.List;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.impl.XSStringImpl;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
/**
- * Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.DomainHint}.
+ * Concrete implementation of {@link DomainHint}.
*/
-public class DomainHintImpl extends AbstractXMLObject implements DomainHint{
-
- /**
- * local storage.
- */
- private String hint;
+public class DomainHintImpl extends XSStringImpl implements DomainHint{
/**
* Constructor.
@@ -44,19 +36,4 @@ public class DomainHintImpl extends AbstractXMLObject implements DomainHint{
super(namespaceURI, elementLocalName, namespacePrefix);
}
- /** {@inheritDoc} */
- public String getHint() {
- return hint;
- }
-
- /** {@inheritDoc} */
- public void setHint(final String newHint) {
- hint = prepareForAssignment(hint, newHint);
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return null;
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
index 7572098..23dc9cd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
@@ -21,22 +21,22 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
+import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
import org.w3c.dom.Element;
/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.DomainHint} objects.
+ * A thread safe Marshaller for {@link DomainHint} objects.
*/
-public class DomainHintMarshaller extends AbstractSAMLObjectMarshaller {
+public class DomainHintMarshaller extends XSStringMarshaller {
/** {@inheritDoc} */
protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
throws MarshallingException {
final DomainHint name = (DomainHint) samlObject;
- if (name.getHint() != null) {
- ElementSupport.appendTextContent(domElement, name.getHint());
+ if (name.getValue() != null) {
+ ElementSupport.appendTextContent(domElement, name.getValue());
}
}
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
index a3a8eeb..b4dda11 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
@@ -17,19 +17,11 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
+import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.DomainHint} objects.
+ * A thread-safe unmarshaller for {@link DomainHint} objects.
*/
-public class DomainHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final DomainHint hint = (DomainHint) samlObject;
-
- hint.setHint(elementContent);
- }
-}
\ No newline at end of file
+public class DomainHintUnmarshaller extends XSStringUnmarshaller {
+}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
index faae935..fc72fcd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
@@ -17,21 +17,13 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import java.util.List;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.impl.XSURIImpl;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
/**
- * Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.GeolocationHint}.
+ * Concrete implementation of {@link GeolocationHint}.
*/
-public class GeolocationHintImpl extends AbstractXMLObject implements GeolocationHint {
-
- /**
- * local storage.
- */
- private String hint;
+public class GeolocationHintImpl extends XSURIImpl implements GeolocationHint {
/**
* Constructor.
@@ -45,19 +37,4 @@ public class GeolocationHintImpl extends AbstractXMLObject implements Geolocatio
super(namespaceURI, elementLocalName, namespacePrefix);
}
- /** {@inheritDoc} */
- public String getHint() {
- return hint;
- }
-
- /** {@inheritDoc} */
- public void setHint(final String newHint) {
- hint = prepareForAssignment(hint, newHint);
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return null;
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
index bc9ac8b..7f650d2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
@@ -21,22 +21,22 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
+import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
import org.w3c.dom.Element;
/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.GeolocationHint} objects.
+ * A thread safe Marshaller for {@link GeolocationHint} objects.
*/
-public class GeolocationHintMarshaller extends AbstractSAMLObjectMarshaller {
+public class GeolocationHintMarshaller extends XSURIMarshaller {
/** {@inheritDoc} */
protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
throws MarshallingException {
final GeolocationHint name = (GeolocationHint) samlObject;
- if (name.getHint() != null) {
- ElementSupport.appendTextContent(domElement, name.getHint());
+ if (name.getURI() != null) {
+ ElementSupport.appendTextContent(domElement, name.getURI());
}
}
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
index 2d8de8d..76263d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
@@ -17,19 +17,12 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
+import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.GeolocationHint} objects.
+ * A thread-safe unmarshaller for {@link GeolocationHint} objects.
*/
-public class GeolocationHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
+public class GeolocationHintUnmarshaller extends XSURIUnmarshaller {
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final GeolocationHint hint = (GeolocationHint) samlObject;
-
- hint.setHint(elementContent);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
index 3e0408e..74eeaad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
@@ -17,23 +17,15 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import java.util.List;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.impl.XSStringImpl;
import org.opensaml.saml.ext.saml2mdui.IPHint;
/**
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.IPHint}.
*/
-public class IPHintImpl extends AbstractXMLObject implements IPHint {
+public class IPHintImpl extends XSStringImpl implements IPHint {
/**
- * local storage.
- */
- private String hint;
-
- /**
* Constructor.
*
* @param namespaceURI the namespaceURI
@@ -44,19 +36,4 @@ public class IPHintImpl extends AbstractXMLObject implements IPHint {
super(namespaceURI, elementLocalName, namespacePrefix);
}
- /** {@inheritDoc} */
- public String getHint() {
- return hint;
- }
-
- /** {@inheritDoc} */
- public void setHint(final String newHint) {
- hint = prepareForAssignment(hint, newHint);
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return null;
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
index a60e874..63d79cb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
@@ -21,22 +21,22 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
+import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
import org.opensaml.saml.ext.saml2mdui.IPHint;
import org.w3c.dom.Element;
/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.IPHint} objects.
+ * A thread safe Marshaller for {@link IPHint} objects.
*/
-public class IPHintMarshaller extends AbstractSAMLObjectMarshaller {
+public class IPHintMarshaller extends XSStringMarshaller {
/** {@inheritDoc} */
protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
throws MarshallingException {
final IPHint name = (IPHint) samlObject;
- if (name.getHint() != null) {
- ElementSupport.appendTextContent(domElement, name.getHint());
+ if (name.getValue() != null) {
+ ElementSupport.appendTextContent(domElement, name.getValue());
}
}
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
index d7f63a9..61f438f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
@@ -17,19 +17,12 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
+import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
import org.opensaml.saml.ext.saml2mdui.IPHint;
/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.IPHint} objects.
+ * A thread-safe unmarshaller for {@link IPHint} objects.
*/
-public class IPHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
+public class IPHintUnmarshaller extends XSStringUnmarshaller {
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final IPHint hint = (IPHint) samlObject;
-
- hint.setHint(elementContent);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
index e0c93c3..b33e595 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
@@ -17,26 +17,14 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import java.util.List;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.LangBearing;
-import org.opensaml.core.xml.XMLObject;
import org.opensaml.saml.ext.saml2mdui.Logo;
-
-import com.google.common.base.Strings;
+import org.opensaml.saml.saml2.metadata.impl.LocalizedURIImpl;
/**
- * Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.Logo}.
+ * Concrete implementation of {@link Logo}.
* @author rod widdowson
*/
-public class LogoImpl extends AbstractXMLObject implements Logo {
-
- /** Logo URL. */
- private String url;
-
- /** Language. */
- private String lang;
+public class LogoImpl extends LocalizedURIImpl implements Logo {
/** X-Dimension of the logo. */
private Integer width;
@@ -77,34 +65,6 @@ public class LogoImpl extends AbstractXMLObject implements Logo {
}
/** {@inheritDoc} */
- public String getURL() {
- return url;
- }
-
- /** {@inheritDoc} */
- public void setURL(final String newURL) {
- url = prepareForAssignment(url, newURL);
- }
-
- /** {@inheritDoc} */
- public String getXMLLang() {
- return lang;
- }
-
- /** {@inheritDoc} */
- public void setXMLLang(final String newLang) {
- final boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
- lang = prepareForAssignment(lang, newLang);
- manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
- }
-
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return null;
- }
-
- /** {@inheritDoc} */
@Override
public final boolean equals(final Object obj) {
return super.equals(obj);
@@ -113,10 +73,10 @@ public class LogoImpl extends AbstractXMLObject implements Logo {
/** {@inheritDoc} */
@Override
public int hashCode() {
- int hash = url.hashCode();
- hash = hash * 31 + lang.hashCode();
+ int hash = super.hashCode();
hash = hash * 31 + height;
hash = hash * 31 + width;
return hash;
}
-}
+
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
index 325a99f..d59ddd5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
@@ -17,51 +17,33 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.XMLConstants;
-
-import org.opensaml.core.xml.LangBearing;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
import org.opensaml.saml.ext.saml2mdui.Logo;
-import org.w3c.dom.Attr;
+import org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller;
import org.w3c.dom.Element;
/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.Logo} objects.
+ * A thread safe Marshaller for {@link Logo} objects.
*/
-public class LogoMarshaller extends AbstractSAMLObjectMarshaller {
+public class LogoMarshaller extends LocalizedURIMarshaller {
/**
* {@inheritDoc}
*/
protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
throws MarshallingException {
+ super.marshallAttributes(samlObject, domElement);
+
final Logo logo = (Logo) samlObject;
- if (logo.getXMLLang() != null) {
- final Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(),
- XMLConstants.XML_NS, LangBearing.XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
- attribute.setValue(logo.getXMLLang());
- domElement.setAttributeNodeNS(attribute);
- }
if (logo.getHeight() != null) {
domElement.setAttributeNS(null, Logo.HEIGHT_ATTR_NAME, logo.getHeight().toString());
}
+
if (logo.getWidth() != null) {
domElement.setAttributeNS(null, Logo.WIDTH_ATTR_NAME, logo.getWidth().toString());
}
}
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final Logo logo = (Logo) samlObject;
-
- if (logo.getURL() != null) {
- ElementSupport.appendTextContent(domElement, logo.getURL());
- }
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
index f6fe454..aad8bac 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
@@ -17,35 +17,22 @@
package org.opensaml.saml.ext.saml2mdui.impl;
-import net.shibboleth.utilities.java.support.xml.XMLConstants;
-
-import org.opensaml.core.xml.LangBearing;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
import org.opensaml.saml.ext.saml2mdui.Logo;
+import org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller;
import org.w3c.dom.Attr;
/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.Logo} objects.
+ * A thread-safe Unmarshaller for {@link Logo} objects.
*/
-public class LogoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final Logo logo = (Logo) samlObject;
-
- logo.setURL(elementContent);
- }
+public class LogoUnmarshaller extends LocalizedURIUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
final Logo logo = (Logo) samlObject;
- if (attribute.getLocalName().equals(LangBearing.XML_LANG_ATTR_LOCAL_NAME)
- && XMLConstants.XML_NS.equals(attribute.getNamespaceURI())) {
- logo.setXMLLang(attribute.getValue());
- } else if (attribute.getLocalName().equals(Logo.HEIGHT_ATTR_NAME) && attribute.getNamespaceURI() == null) {
+ if (attribute.getLocalName().equals(Logo.HEIGHT_ATTR_NAME) && attribute.getNamespaceURI() == null) {
logo.setHeight(Integer.valueOf(attribute.getValue()));
} else if (attribute.getLocalName().equals(Logo.WIDTH_ATTR_NAME) && attribute.getNamespaceURI() == null) {
logo.setWidth(Integer.valueOf(attribute.getValue()));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
index 3c1dea7..ab76f1f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
@@ -53,7 +53,7 @@ public class DomainHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementUnmarshall() {
DomainHint hint = (DomainHint) unmarshallElement(singleElementFile);
- Assert.assertEquals(hint.getHint(), expectedHint, "Name was not expected value");
+ Assert.assertEquals(hint.getValue(), expectedHint, "Name was not expected value");
}
/** {@inheritDoc} */
@@ -61,7 +61,7 @@ public class DomainHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementMarshall() {
DomainHint hint = (DomainHint) buildXMLObject(DomainHint.DEFAULT_ELEMENT_NAME);
- hint.setHint(expectedHint);
+ hint.setValue(expectedHint);
assertXMLEquals(expectedDOM, hint);
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
index 2e04f80..ab34304 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
@@ -53,7 +53,7 @@ public class GeolocationHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementUnmarshall() {
GeolocationHint hint = (GeolocationHint) unmarshallElement(singleElementFile);
- Assert.assertEquals(hint.getHint(), expectedHint, "Name was not expected value");
+ Assert.assertEquals(hint.getURI(), expectedHint, "Name was not expected value");
}
/** {@inheritDoc} */
@@ -61,7 +61,7 @@ public class GeolocationHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementMarshall() {
GeolocationHint hint = (GeolocationHint) buildXMLObject(GeolocationHint.DEFAULT_ELEMENT_NAME);
- hint.setHint(expectedHint);
+ hint.setURI(expectedHint);
assertXMLEquals(expectedDOM, hint);
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
index 6a3d04c..fe67c1c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
@@ -53,7 +53,7 @@ public class IPHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementUnmarshall() {
IPHint hint = (IPHint) unmarshallElement(singleElementFile);
- Assert.assertEquals(hint.getHint(), expectedHint, "Name was not expected value");
+ Assert.assertEquals(hint.getValue(), expectedHint, "Name was not expected value");
}
/** {@inheritDoc} */
@@ -61,7 +61,7 @@ public class IPHintTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementMarshall() {
IPHint hint = (IPHint) buildXMLObject(IPHint.DEFAULT_ELEMENT_NAME);
- hint.setHint(expectedHint);
+ hint.setValue(expectedHint);
assertXMLEquals(expectedDOM, hint);
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
index eaa5850..fc8f9d2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
@@ -61,7 +61,7 @@ public class LogoTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementUnmarshall() {
Logo logo = (Logo) unmarshallElement(singleElementFile);
- Assert.assertEquals(logo.getURL(), expectedURL, "URL was not expected value");
+ Assert.assertEquals(logo.getURI(), expectedURL, "URL was not expected value");
Assert.assertEquals(logo.getHeight(), expectedHeight, "height was not expected value");
Assert.assertEquals(logo.getWidth(), expectedWidth, "width was not expected value");
}
@@ -71,7 +71,7 @@ public class LogoTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementOptionalAttributesUnmarshall() {
Logo logo = (Logo) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertEquals(logo.getURL(), expectedURL, "URL was not expected value");
+ Assert.assertEquals(logo.getURI(), expectedURL, "URL was not expected value");
Assert.assertEquals(logo.getHeight(), expectedHeight, "height was not expected value");
Assert.assertEquals(logo.getWidth(), expectedWidth, "width was not expected value");
Assert.assertEquals(logo.getXMLLang(), expectedLang, "xml:lang was not the expected value");
@@ -82,7 +82,7 @@ public class LogoTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementMarshall() {
Logo logo = (Logo) buildXMLObject(Logo.DEFAULT_ELEMENT_NAME);
- logo.setURL(expectedURL);
+ logo.setURI(expectedURL);
logo.setWidth(expectedWidth);
logo.setHeight(expectedHeight);
@@ -94,7 +94,7 @@ public class LogoTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementOptionalAttributesMarshall() {
Logo logo = (Logo) buildXMLObject(Logo.DEFAULT_ELEMENT_NAME);
- logo.setURL(expectedURL);
+ logo.setURI(expectedURL);
logo.setWidth(expectedWidth);
logo.setHeight(expectedHeight);
logo.setXMLLang(expectedLang);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list