[java-identity-provider COMMIT] in /trunk/idp-consent-impl/src: main/java/net/shibboleth/idp/attribute/consent/Attrib...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 25 17:05:25 2013
New Revision: 4621

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4621&view=rev
Log:
Fix a couple of pervasive errors to get some files building.

Modified:
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentHelper.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentServlet.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/User.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/storage/CacheStorage.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/AttributeReleaseTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/ConsentHelperTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/UserTest.java

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java?rev=4621&r1=4620&r2=4621&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java (original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java Thu Jul 25 17:05:25 2013
@@ -58,7 +58,7 @@
      * @param attribute The @see Attribute.
      * @param consentDate The timestamp for this @see AttributeRelease.
      */
-    private AttributeRelease(final Attribute<?> attribute, final DateTime consentDate) {
+    private AttributeRelease(final Attribute attribute, final DateTime consentDate) {
         this.attributeId = attribute.getId();
         this.valuesHash = ConsentHelper.hashAttributeValues(attribute);
         this.consentDate = consentDate;
@@ -98,7 +98,7 @@
      * @param date The consent date for the attributes.
      * @return Returns a collection of attribute releases
      */
-    public static Collection<AttributeRelease> createAttributeReleases(Collection<Attribute<?>> attributes,
+    public static Collection<AttributeRelease> createAttributeReleases(Collection<Attribute> attributes,
             DateTime date) {
         Collection<AttributeRelease> attributeReleases = new HashSet<AttributeRelease>();
         for (Attribute attribute : attributes) {
@@ -113,7 +113,7 @@
      * @param attribute The @see Attribute to check for.
      * @return Returns true if this @see AttributeRelease contains the given attribute.
      */
-    public boolean contains(Attribute<?> attribute) {
+    public boolean contains(Attribute attribute) {
         return attributeId.equals(attribute.getId()) && valuesHash.equals(ConsentHelper.hashAttributeValues(attribute));
     }
 }

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java?rev=4621&r1=4620&r2=4621&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java (original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java Thu Jul 25 17:05:25 2013
@@ -70,11 +70,11 @@
     public void determineConsent(final ConsentContext consentContext) throws ConsentException {
 
         Assert.notNull(consentContext, "No consent context found");
-        Assert.state(consentContext.getOwner().getClass().equals(ProfileRequestContext.class),
+        Assert.state(consentContext.getParent().getClass().equals(ProfileRequestContext.class),
                 "Owner of a consent context must be a profile context");
 
         final String relyingPartyId = ConsentHelper.getRelyingParty(consentContext);
-        Collection<Attribute<?>> attributes = consentContext.getUserAttributes().values();
+        Collection<Attribute> attributes = consentContext.getUserAttributes().values();
 
         final String userId = ConsentHelper.findUserId(userIdAttribute, attributes);
         Assert.notNull(userId, "No userId found");
@@ -145,7 +145,7 @@
      * @param attributes A collection of attributes.
      */
     private void showAttributeReleaseView(final ConsentContext consentContext, final User user,
-            final String relyingPartyId, final Collection<Attribute<?>> attributes) {

[... 364 lines stripped ...]