Merged bug20589 into default

Author: Emile Joubert

codegen.py

@@ -19,10 +19,10 @@ for artifact in $@; do
   rm -f $artifact.asc
   gpg --homedir $GNUPG_PATH/.gnupg --local-user $SIGNING_KEY --no-tty --armor --detach-sign --output $artifact.asc $artifact
   for ext in '' .asc ; do
-    curl -XPUT --data-binary @$artifact$ext $NEXUS_ROOT/$artifact$ext
+    curl --upload-file $artifact$ext $NEXUS_ROOT/$artifact$ext
     for sum in md5 sha1 ; do
       ${sum}sum $artifact$ext | (read a rest ; echo -n "$a") >$artifact$ext.$sum
-      curl -XPUT --data-binary @$artifact$ext.$sum $NEXUS_ROOT/$artifact$ext.$sum
+      curl --upload-file $artifact$ext.$sum $NEXUS_ROOT/$artifact$ext.$sum
     done
   done
 done

nexus-upload.sh

@@ -22,6 +22,9 @@
  * which was already closed
  */
 public class AlreadyClosedException extends ShutdownSignalException {
+    /** Default for suppressing warnings without version check. */
+    private static final long serialVersionUID = 1L;
+
     public AlreadyClosedException(String s, Object ref)
     {
         super(true, true, s, ref);

src/com/rabbitmq/client/AlreadyClosedException.java

@@ -104,78 +104,91 @@ public interface BasicProperties {
      * Set the contentType field, or null indicating the field is not set
      * @param contentType the value to set the field to
      */
+    @Deprecated
     public abstract void setContentType(String contentType);
 
     /**
      * Set the contentEncoding field, or null indicating the field is not set
      * @param contentEncoding - the value to set the field to
      */
+    @Deprecated
     public abstract void setContentEncoding(String contentEncoding);
 
     /**
      * Set the headers table, or null indicating the field is not set
      * @param headers a map of table field names and values
      */
+    @Deprecated
     public abstract void setHeaders(Map<String, Object> headers);
 
     /**
      * Set the deliveryMode field, or null indicating the field is not set
      * @param deliveryMode the value to set the field to
      */
+    @Deprecated
     public abstract void setDeliveryMode(Integer deliveryMode);
 
     /**
      * Set the priority field, or null indicating the field is not set
      * @param priority the value to set the field to
      */
+    @Deprecated
     public abstract void setPriority(Integer priority);
 
     /**
      * Set the correlationId field, or null indicating the field is not set
      * @param correlationId the value to set the field to
      */
+    @Deprecated
     public abstract void setCorrelationId(String correlationId);
 
     /**
      * Set the replyTo field, or null indicating the field is not set
      * @param replyTo the value to set the field to
      */
+    @Deprecated
     public abstract void setReplyTo(String replyTo);
 
     /**
      * Set the expiration field, or null indicating the field is not set
      * @param expiration the value to set the field to
      */
+    @Deprecated
     public abstract void setExpiration(String expiration);
 
     /**
      * Set the messageId field, or null indicating the field is not set
      * @param messageId the value to set the field to
      */
+    @Deprecated
     public abstract void setMessageId(String messageId);
 
     /**
      * Set the timestamp field, or null indicating the field is not set
      * @param timestamp the value to set the field to
      */
+    @Deprecated
     public abstract void setTimestamp(Date timestamp);
 
     /**
      * Set the type field, or null indicating the field is not set
      * @param type the value to set the field to
      */
+    @Deprecated
     public abstract void setType(String type);
 
     /**
      * Set the userId field, or null indicating the field is not set
      * @param userId the value to set the field to
      */
+    @Deprecated
     public abstract void setUserId(String userId);
 
     /**
      * Set the appId field, or null indicating the field is not set
      * @param appId the value to set the field to
      */
+    @Deprecated
     public abstract void setAppId(String appId);
-    
+
 }

src/com/rabbitmq/client/BasicProperties.java

@@ -696,4 +696,19 @@ void basicNack(long deliveryTag, boolean multiple, boolean requeue)
      * @return the sequence number of the next message to be published
      */
     long getNextPublishSeqNo();
+
+    /**
+     * Asynchronously send a method over this channel.
+     * @param method method to transmit over this channel.
+     * @throws IOException Problem transmitting method.
+     */
+    void asyncRpc(Method method) throws IOException;
+
+    /**
+     * Synchronously send a method over this channel.
+     * @param method method to transmit over this channel.
+     * @return response to method. Caller should cast as appropriate.
+     * @throws IOException Problem transmitting method.
+     */
+    Method rpc(Method method) throws IOException;
 }

src/com/rabbitmq/client/Channel.java

@@ -89,7 +89,7 @@ public class ConnectionFactory implements Cloneable {
     private int connectionTimeout                 = DEFAULT_CONNECTION_TIMEOUT;
     private Map<String, Object> _clientProperties = AMQConnection.defaultClientProperties();
     private SocketFactory factory                 = SocketFactory.getDefault();
-    private SaslConfig saslConfig                 = new DefaultSaslConfig(this);
+    private SaslConfig saslConfig                 = DefaultSaslConfig.PLAIN;
 
     /**
      * Instantiate a ConnectionFactory with a default set of parameters.

src/com/rabbitmq/client/ConnectionFactory.java

@@ -21,6 +21,9 @@
 public class ConsumerCancelledException extends RuntimeException implements
         SensibleClone<ConsumerCancelledException> {
 
+    /** Default for non-checking. */
+    private static final long serialVersionUID = 1L;
+
     @Override
     public ConsumerCancelledException sensibleClone() {
         try {

src/com/rabbitmq/client/ConsumerCancelledException.java

@@ -38,5 +38,5 @@ public interface ContentHeader extends Cloneable {
      * A debugging utility - enable properties to be appended to a string buffer for use as trace messages.
      * @param buffer a place to append the properties as a string
      */
-    public void appendPropertyDebugStringTo(StringBuffer buffer);
+    public void appendPropertyDebugStringTo(StringBuilder buffer);
 }

src/com/rabbitmq/client/ContentHeader.java

@@ -16,56 +16,40 @@
 
 package com.rabbitmq.client;
 
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
+import com.rabbitmq.client.impl.ExternalMechanism;
+import com.rabbitmq.client.impl.PlainMechanism;
+
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
- * Default implementation of SaslConfig that uses the standard Java
- * algorithm for selecting a sasl client.
- * @see com.rabbitmq.client.ConnectionFactory
+ * Default SASL configuration. Uses one of our built-in mechanisms.
  */
 public class DefaultSaslConfig implements SaslConfig {
-    public static final String[] DEFAULT_PREFERRED_MECHANISMS = new String[]{"PLAIN"};
+    private final String mechanism;
 
-    private final ConnectionFactory factory;
-    private final List<String> mechanisms;
-    private final CallbackHandler callbackHandler;
+    public static final DefaultSaslConfig PLAIN = new DefaultSaslConfig("PLAIN");
+    public static final DefaultSaslConfig EXTERNAL = new DefaultSaslConfig("EXTERNAL");
 
     /**
-     * Create a DefaultSaslConfig which only wants to use PLAIN.
+     * Create a DefaultSaslConfig with an explicit mechanism to use.
      *
-     * @param factory - the ConnectionFactory to use to obtain username, password and host
+     * @param mechanism - a SASL mechanism to use
      */
-    public DefaultSaslConfig(ConnectionFactory factory) {
-        this(factory, DEFAULT_PREFERRED_MECHANISMS);
+    private DefaultSaslConfig(String mechanism) {
+        this.mechanism = mechanism;
     }
 
-    /**
-     * Create a DefaultSaslConfig with a list of mechanisms to use.
-     *
-     * @param factory - the ConnectionFactory to use to obtain username, password and host
-     * @param mechanisms - a list of SASL mechanisms to use (in descending order of preference)
-     */
-    public DefaultSaslConfig(ConnectionFactory factory, String[] mechanisms) {
-        this.factory = factory;
-        callbackHandler = new UsernamePasswordCallbackHandler(factory);
-        this.mechanisms = Arrays.asList(mechanisms);
-    }
-
-    public SaslClient getSaslClient(String[] serverMechanisms) throws SaslException {
+    public SaslMechanism getSaslMechanism(String[] serverMechanisms) {
         Set<String> server = new HashSet<String>(Arrays.asList(serverMechanisms));
 
-        for (String mechanism: mechanisms) {
-            if (server.contains(mechanism)) {
-                SaslClient saslClient = Sasl.createSaslClient(new String[]{mechanism},
-                         null, "AMQP", factory.getHost(), null, callbackHandler);
-                if (saslClient != null) return saslClient;
+        if (server.contains(mechanism)) {
+            if (mechanism.equals("PLAIN")) {
+                return new PlainMechanism();
+            }
+            else if (mechanism.equals("EXTERNAL")) {
+                return new ExternalMechanism();
             }
         }
         return null;