[java-identity-provider COMMIT] /trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul 23 11:32:54 2014
New Revision: 6335

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6335&view=rev
Log:
IDP 245.  OrganizationName, ODN and varoues fields from ContactPerson

Modified:
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java

Modified: trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java?rev=6335&r1=6334&r2=6335&view=diff
==============================================================================
--- trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java (original)
+++ trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java Wed Jul 23 11:32:54 2014
@@ -25,13 +25,19 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 import org.opensaml.saml.ext.saml2mdui.Description;
 import org.opensaml.saml.ext.saml2mdui.DisplayName;
 import org.opensaml.saml.ext.saml2mdui.UIInfo;
 import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
+import org.opensaml.saml.saml2.metadata.ContactPerson;
+import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml.saml2.metadata.Organization;
+import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
+import org.opensaml.saml.saml2.metadata.OrganizationName;
 import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml.saml2.metadata.ServiceDescription;
 import org.opensaml.saml.saml2.metadata.ServiceName;
@@ -75,7 +81,7 @@
      * 
      * @param what what to set.
      */
-    public void setRPEntityDescriptor(@Nonnull EntityDescriptor what) {
+    public void setRPEntityDescriptor(@Nonnull final EntityDescriptor what) {
         rpEntityDescriptor = Constraint.isNotNull(what, "Injected RP EntityDescriptor cannot be null");
     }
 
@@ -93,7 +99,7 @@
      * 
      * @param what what to set.
      */
-    public void setRPSPSSODescriptor(@Nonnull SPSSODescriptor what) {
+    public void setRPSPSSODescriptor(@Nonnull final SPSSODescriptor what) {
         rpSPSSODescriptor = Constraint.isNotNull(what, "Injected RP EntityDescriptor cannot be null");
     }
 
@@ -120,7 +126,7 @@
      * 
      * @param what the value to set.
      */
-    public void getRPUInfo(@Nullable UIInfo what) {
+    public void getRPUInfo(@Nullable final UIInfo what) {
         rpUIInfo = what;
     }
 
@@ -129,7 +135,7 @@
      * 
      * @param what what to set.
      */
-    public void setRPAttributeConsumingService(@Nonnull AttributeConsumingService what) {
+    public void setRPAttributeConsumingService(@Nonnull final AttributeConsumingService what) {
         rpAttributeConsumingService =
                 Constraint.isNotNull(what, "Injected RP AttributeConsumingService cannot be null");
     }
@@ -139,7 +145,7 @@
      * 
      * @param languages the languages to set.
      */
-    public void setBrowserLanguages(@Nonnull List<String> languages) {
+    public void setBrowserLanguages(@Nonnull final List<String> languages) {
         browserLanguages = Constraint.isNotNull(languages, "Language List mustr be non null");
     }
 
@@ -158,7 +164,7 @@
      * @param lang - which language to look up
      * @return null or an appropriate name
      */
-    @Nullable protected String getNameFromUIInfo(String lang) {
+    @Nullable protected String getNameFromUIInfo(final String lang) {
 
         if (getRPUInfo() != null) {
             for (final DisplayName name : getRPUInfo().getDisplayNames()) {
@@ -241,7 +247,7 @@
      * @param lang - which language to look up
      * @return null or an appropriate description
      */
-    @Nullable protected String getDescriptionFromUIInfo(String lang) {
+    @Nullable protected String getDescriptionFromUIInfo(final String lang) {
         if (getRPUInfo() == null || getRPUInfo().getDescriptions() == null) {
             log.trace("No UIInfo");
             return null;
@@ -270,7 +276,7 @@
      * @param lang - which language to look up
      * @return null or an appropriate description
      */
-    @Nullable private String getDescriptionFromAttributeConsumingService(String lang) {
+    @Nullable protected String getDescriptionFromAttributeConsumingService(final String lang) {
         if (getRPAttributeConsumingService() == null) {
             log.trace("No ACS found");
             return null;
@@ -288,12 +294,77 @@
     }
 
     /**
+     * Get the {@link Organization} from the {@link SPSODescriptor}, failing that the {@link EntityDescriptor}.
+     * 
+     * @return the {@link Organization} for the relying party.
+     */

[... 186 lines stripped ...]