Javadoc cleanup

Remove some stale code

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2605 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
index 953bbce..a1368ef 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
@@ -310,7 +310,7 @@ public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHan
             throws ProfileException {
         log.debug("Building assertion NameIdentifier to relying party {} for principal {}", requestContext
                 .getInboundMessageIssuer(), requestContext.getPrincipalName());
-        Map<String, BaseAttribute> principalAttributes = requestContext.getPrincipalAttributes();
+        Map<String, BaseAttribute> principalAttributes = requestContext.getAttributes();
         if (principalAttributes == null || principalAttributes.isEmpty()) {
             log.error("No attributes for principal {}, unable to construct of NameID", requestContext
                     .getPrincipalName());
@@ -537,10 +537,9 @@ public abstract class AbstractSAML1ProfileHandler extends AbstractSAMLProfileHan
             AttributeStatement statment;
             if (requestContext.getInboundSAMLMessage() instanceof AttributeQuery) {
                 statment = attributeAuthority.buildAttributeStatement((AttributeQuery) requestContext
-                        .getInboundSAMLMessage(), requestContext.getPrincipalAttributes().values());
+                        .getInboundSAMLMessage(), requestContext.getAttributes().values());
             } else {
-                statment = attributeAuthority.buildAttributeStatement(null, requestContext.getPrincipalAttributes()
-                        .values());
+                statment = attributeAuthority.buildAttributeStatement(null, requestContext.getAttributes().values());
             }
 
             if (statment != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index 146fcf4..f21b490 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -87,7 +87,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
             } else {
                 resolvePrincipal(requestContext);
                 resolveAttributes(requestContext);
-                requestContext.setReleasedAttributes(requestContext.getPrincipalAttributes().keySet());
+                requestContext.setReleasedAttributes(requestContext.getAttributes().keySet());
 
                 ArrayList<Statement> statements = new ArrayList<Statement>();
                 AttributeStatement attributeStatement = buildAttributeStatement(requestContext,

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
index 77c0c9a..90262c7 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
@@ -247,7 +247,7 @@ public class ShibbolethSSOProfileHandler extends AbstractSAML1ProfileHandler {
                 AttributeStatement attributeStatement = buildAttributeStatement(requestContext,
                         "urn:oasis:names:tc:SAML:1.0:cm:bearer");
                 if (attributeStatement != null) {
-                    requestContext.setRequestedAttributes(requestContext.getPrincipalAttributes().keySet());
+                    requestContext.setRequestedAttributes(requestContext.getAttributes().keySet());
                     statements.add(attributeStatement);
                 }
             }

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
index 32af60e..6397b18 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
@@ -409,9 +409,9 @@ public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHan
         try {
             if (requestContext.getInboundSAMLMessage() instanceof AttributeQuery) {
                 return attributeAuthority.buildAttributeStatement((AttributeQuery) requestContext
-                        .getInboundSAMLMessage(), requestContext.getPrincipalAttributes().values());
+                        .getInboundSAMLMessage(), requestContext.getAttributes().values());
             } else {
-                return attributeAuthority.buildAttributeStatement(null, requestContext.getPrincipalAttributes()
+                return attributeAuthority.buildAttributeStatement(null, requestContext.getAttributes()
                         .values());
             }
         } catch (AttributeRequestException e) {
@@ -662,7 +662,7 @@ public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHan
         log.debug("Building assertion NameID for principal/relying party:{}/{}", requestContext.getPrincipalName(),
                 requestContext.getInboundMessageIssuer());
 
-        Map<String, BaseAttribute> principalAttributes = requestContext.getPrincipalAttributes();
+        Map<String, BaseAttribute> principalAttributes = requestContext.getAttributes();
         if (principalAttributes == null || principalAttributes.isEmpty()) {
             log.error("No attributes for principal {}, unable to construct of NameID", requestContext
                     .getPrincipalName());

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index 65c93f1..374b66c 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -90,7 +90,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
             // Resolve attribute query name id to principal name and place in context
             resolvePrincipal(requestContext);
             resolveAttributes(requestContext);
-            requestContext.setReleasedAttributes(requestContext.getPrincipalAttributes().keySet());
+            requestContext.setReleasedAttributes(requestContext.getAttributes().keySet());
 
             // Lookup principal name and attributes, create attribute statement from information
             ArrayList<Statement> statements = new ArrayList<Statement>();

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index a83c4b0..517a76b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -245,7 +245,7 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
             if (requestContext.getProfileConfiguration().includeAttributeStatement()) {
                 AttributeStatement attributeStatement = buildAttributeStatement(requestContext);
                 if (attributeStatement != null) {
-                    requestContext.setRequestedAttributes(requestContext.getPrincipalAttributes().keySet());
+                    requestContext.setRequestedAttributes(requestContext.getAttributes().keySet());
                     statements.add(attributeStatement);
                 }
             }