[java-identity-provider] 03/06: IDP-1121 Attribute Values are no longer generic. Stage 2
Rod Widdowson
rdw at steadingsoftware.com
Fri May 17 09:10:01 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d9bd4134ca5993fa5144251171da80fc010977ed
commit d9bd4134ca5993fa5144251171da80fc010977ed
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 17 09:42:39 2019 +0100
IDP-1121 Attribute Values are no longer generic. Stage 2
https://issues.shibboleth.net/jira/browse/IDP-1121
String Generic type from IdPAttributeValue and fixup
---
.../net/shibboleth/idp/attribute/ByteAttributeValue.java | 2 +-
.../net/shibboleth/idp/attribute/EmptyAttributeValue.java | 2 +-
.../java/net/shibboleth/idp/attribute/IdPAttributeValue.java | 6 ++----
.../net/shibboleth/idp/attribute/StringAttributeValue.java | 2 +-
.../shibboleth/idp/attribute/XMLObjectAttributeValue.java | 2 +-
.../spring/matcher/AttributeRegexMatcherParserTest.java | 7 +++----
.../impl/CASScopedStringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/CASStringAttributeTranscoderTest.java | 12 ++++++------
.../transcoding/impl/SAML1ByteAttributeTranscoderTest.java | 2 +-
.../impl/SAML1ScopedStringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML1StringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML2ByteAttributeTranscoderTest.java | 2 +-
.../impl/SAML2ScopedStringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML2StringAttributeTranscoderTest.java | 2 +-
.../impl/SAML2XMLObjectAttributeTranscoderTest.java | 2 +-
.../AttributeSourcedSAML1NameIdentifierGeneratorTest.java | 2 +-
.../impl/AttributeSourcedSAML2NameIDGeneratorTest.java | 2 +-
17 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
index 92443f7..8699277 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
@@ -32,7 +32,7 @@ import org.apache.commons.codec.binary.Hex;
import com.google.common.base.MoreObjects;
/** A <code>byte[]</code> value for an {@link IdPAttribute}. */
-public class ByteAttributeValue implements IdPAttributeValue<byte[]> {
+public class ByteAttributeValue implements IdPAttributeValue {
/** Value of the attribute. */
private final byte[] value;
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
index 6922535..b92b695 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
@@ -32,7 +32,7 @@ import com.google.common.base.MoreObjects;
* An {@link IdPAttributeValue} that is empty. This class defines an enum to represent the various types of empty values
* that can occur.
*/
-public class EmptyAttributeValue implements IdPAttributeValue<EmptyAttributeValue.EmptyType> {
+public class EmptyAttributeValue implements IdPAttributeValue {
/** Instance of null empty attribute value. */
public static final EmptyAttributeValue NULL = new EmptyAttributeValue(EmptyType.NULL_VALUE);
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttributeValue.java
index 3ebf6af..0339f74 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttributeValue.java
@@ -29,17 +29,15 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
* {@link Object#hashCode()} method. They should also implement {@link Object#toString()} such that useful
* representations may be written out in log messages.
* </p>
- *
- * @param <ValueType> the type of value
*/
-public interface IdPAttributeValue<ValueType> {
+public interface IdPAttributeValue {
/**
* Get the value of this attribute.
*
* @return the attribute value
*/
- @Nonnull ValueType getValue();
+ @Nonnull Object getValue();
/**
* Get a displayable form of the value for user interfaces and similar purposes.
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
index 794bcae..f4bd760 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import com.google.common.base.MoreObjects;
/** Base class for {@link IdPAttribute} values that are strings. */
-public class StringAttributeValue implements IdPAttributeValue<String> {
+public class StringAttributeValue implements IdPAttributeValue {
/** The attribute value. */
@Nonnull @NotEmpty private final String value;
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java
index c4f6f70..c810bdd 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml2.core.NameIDType;
import com.google.common.base.MoreObjects;
/** A {@link XMLObjectAttributeValue} value for an {@link net.shibboleth.idp.attribute.IdPAttribute}. */
-public class XMLObjectAttributeValue implements IdPAttributeValue<XMLObject> {
+public class XMLObjectAttributeValue implements IdPAttributeValue {
/** Value of the attribute. */
private final XMLObject value;
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
index 39298e3..fb0b9da 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
@@ -23,7 +23,6 @@ import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueRegexpMatcher;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
@@ -36,9 +35,9 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
public class AttributeRegexMatcherParserTest extends BaseAttributeFilterParserTest {
private void testMatcher(final AttributeValueRegexpMatcher what, boolean caseSensitive) {
- IdPAttributeValue<String> upper = new StringAttributeValue("JSMITH");
- IdPAttributeValue<String> lower = new StringAttributeValue("jsmith");
- IdPAttributeValue<String> nonmatch = new StringAttributeValue("NONONONO");
+ StringAttributeValue upper = new StringAttributeValue("JSMITH");
+ StringAttributeValue lower = new StringAttributeValue("jsmith");
+ StringAttributeValue nonmatch = new StringAttributeValue("NONONONO");
assertTrue(what.compareAttributeValue(lower));
assertFalse(what.compareAttributeValue(nonmatch));
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
index 88eb406..57d00dd 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
@@ -116,7 +116,7 @@ public class CASScopedStringAttributeTranscoderTest {
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
index ecf9631..14dc10f 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
@@ -23,6 +23,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -38,11 +43,6 @@ import net.shibboleth.idp.cas.attribute.Attribute;
import net.shibboleth.idp.cas.attribute.CASAttributeTranscoder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
/** {@link CASStringAttributeTranscoder} unit test. */
public class CASStringAttributeTranscoderTest {
@@ -111,7 +111,7 @@ public class CASStringAttributeTranscoderTest {
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index 2d7ae4c..78e3ede 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -176,7 +176,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
Arrays.asList(new StringAttributeValue("foo"), new ScopedStringAttributeValue("foo", "bar"),
- new IdPAttributeValue<Object>() {
+ new IdPAttributeValue() {
public Object getValue() {
return intArray;
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index d6da1d5..209926f 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -168,7 +168,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index 128da03..8ad64fb 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -172,7 +172,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index b874721..2a21fe1 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -169,7 +169,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
Arrays.asList(new StringAttributeValue("foo"), new ScopedStringAttributeValue("foo", "bar"),
- new IdPAttributeValue<Object>() {
+ new IdPAttributeValue() {
public Object getValue() {
return intArray;
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index 1748eae..40be875 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -170,7 +170,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index 222614e..85d3240 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -165,7 +165,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index 93c754d..6f495e9 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -172,7 +172,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
final Collection<IdPAttributeValue> values =
- Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
+ Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue() {
@Override
public Object getValue() {
return intArray;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
index 93f03db..34e8b00 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
@@ -109,7 +109,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
@Test public void testWrongType() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final List<IdPAttributeValue> values = List.of(new IdPAttributeValue<Object>() {
+ final List<IdPAttributeValue> values = List.of(new IdPAttributeValue() {
public Object getValue() {
return intArray;
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
index 12a4d1a..381f4f1 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
@@ -108,7 +108,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
@Test public void testWrongType() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final var values = List.of(new IdPAttributeValue<Object>() {
+ final var values = List.of(new IdPAttributeValue() {
public Object getValue() {
return intArray;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list