[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSe...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 30 12:26:56 2013
New Revision: 3530

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3530&view=rev
Log:
Some renaming, annotation cleanup.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/package-info.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BasicEndpointSelector.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingException.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/package.html
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/ReceivedEndpointSecurityHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/ReceivedEndpointSecurityHandlerTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java Mon Dec 30 12:26:56 2013
@@ -20,7 +20,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
 import javax.xml.namespace.QName;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.Live;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
@@ -31,32 +37,33 @@
 /**
  * Endpoint selectors choose the endpoint that should be used to contact a peer.
  */
+ at NotThreadSafe
 public abstract class AbstractEndpointSelector {
 
     /** Bindings supported by the issuer. */
-    private List<String> supportedIssuerBindings;
+    @Nonnull @NonnullElements private List<String> supportedIssuerBindings;
 
     /** SAML request within the message flow. */
-    private SAMLObject samlRequest;
+    @Nullable private SAMLObject samlRequest;
 
     /** SAML response within the message flow. */
-    private SAMLObject samlResponse;
+    @Nullable private SAMLObject samlResponse;
 
     /** Resolver of metadata for the relying party. */
-    private MetadataResolver metadataResolver;
+    @Nullable private MetadataResolver metadataResolver;
 
     /** Metadata of party to select endpoing for. */
-    private EntityDescriptor entityMetadata;
+    @Nullable private EntityDescriptor entityMetadata;
 
     /** Role metadata of party to select endpoing for. */
-    private RoleDescriptor entityRoleMetadata;
+    @Nullable private RoleDescriptor entityRoleMetadata;
 
     /** Type of endpoint needed. */
-    private QName endpointType;
+    @Nullable private QName endpointType;
 
     /** Constructor. */
     public AbstractEndpointSelector() {
-        supportedIssuerBindings = new ArrayList<String>(5);
+        supportedIssuerBindings = new ArrayList<>(5);
     }
 
     /**
@@ -64,7 +71,7 @@
      * 
      * @return type of endpoint needed
      */
-    public QName getEndpointType() {
+    @Nullable public QName getEndpointType() {
         return endpointType;
     }
 
@@ -73,7 +80,7 @@
      * 
      * @param type type of endpoint needed
      */
-    public void setEndpointType(QName type) {
+    public void setEndpointType(@Nullable final QName type) {
         endpointType = type;
     }
 
@@ -82,7 +89,7 @@
      * 
      * @return metadata resolver used to look up entity information
      */
-    public MetadataResolver getMetadataResolver() {
+    @Nullable public MetadataResolver getMetadataResolver() {
         return metadataResolver;
     }
 
@@ -91,7 +98,7 @@
      * 
      * @param resolver metadata resolver used to look up entity information
      */
-    public void setMetadataResolver(MetadataResolver resolver) {
+    public void setMetadataResolver(@Nullable final MetadataResolver resolver) {
         metadataResolver = resolver;
     }
 
@@ -100,7 +107,7 @@
      * 
      * @return metadata of the entity
      */
-    public EntityDescriptor getEntityMetadata() {
+    @Nullable public EntityDescriptor getEntityMetadata() {
         return entityMetadata;
     }
 
@@ -109,7 +116,7 @@
      * 
      * @param entity metadata of the entity
      */
-    public void setEntityMetadata(EntityDescriptor entity) {

[... 452 lines stripped ...]