[java-opensaml COMMIT] in /trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client: SOAPClient.java http/HttpS...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep  9 20:01:45 2014
New Revision: 4016

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4016&view=rev
Log:
Add annotations.

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClient.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClient.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClient.java?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClient.java (original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClient.java Tue Sep  9 20:01:45 2014
@@ -17,7 +17,10 @@
 
 package org.opensaml.soap.client;
 
+import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 import org.opensaml.messaging.context.InOutOperationContext;
 import org.opensaml.security.SecurityException;
@@ -44,8 +47,9 @@
      * @throws SecurityException thrown if the response does not meet any security policy associated with the message
      *             context
      */
-    public void send(String endpoint, InOutOperationContext context) throws SOAPException, SecurityException;
+    void send(@Nonnull @NotEmpty final String endpoint, @Nonnull final InOutOperationContext context)
+            throws SOAPException, SecurityException;
 
     /** Marker interface for binding/transport request parameters. */
-    public interface SOAPRequestParameters {};
+    interface SOAPRequestParameters {};
 }

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java (original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java Tue Sep  9 20:01:45 2014
@@ -24,8 +24,14 @@
 import java.util.List;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -66,96 +72,131 @@
  * SOAP client that uses HTTP as the underlying transport and POST as the binding.
  */
 @ThreadSafe
-public class HttpSOAPClient implements SOAPClient {
+public class HttpSOAPClient extends AbstractInitializableComponent implements SOAPClient {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(HttpSOAPClient.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(HttpSOAPClient.class);
 
     /** HTTP client used to send requests and receive responses. */
-    private final HttpClient httpClient;
+    @NonnullAfterInit private HttpClient httpClient;
 
     /** Pool of XML parsers used to parser incoming responses. */
-    private final ParserPool parserPool;
+    @NonnullAfterInit private ParserPool parserPool;
 
     /**
      * Strategy used to look up the {@link SOAPClientContext} associated with the
      * outbound message context.
      */
-    private Function<MessageContext, SOAPClientContext> soapClientContextLookupStrategy;
+    @Nonnull private Function<MessageContext, SOAPClientContext> soapClientContextLookupStrategy;
 
     /**
      * Strategy used to look up the {@link SOAP11Context} associated with the
      * outbound message context.
      */
-    private Function<MessageContext, SOAP11Context> soap11ContextLookupStrategy;
-    
-    /**
-     * Constructor.
-     * 
-     * @param client Client used to make outbound HTTP requests. This client SHOULD employ a
-     *            thread-safe {@link HttpClient} and may be shared with other objects.
-     * @param parser pool of XML parsers used to parse incoming responses
-     */
-    public HttpSOAPClient(@Nonnull final HttpClient client, @Nonnull final ParserPool parser) {
-        httpClient = Constraint.isNotNull(client, "HttpClient cannot be null");
-        parserPool = Constraint.isNotNull(parser, "ParserPool cannot be null");
-        

[... 323 lines stripped ...]