merge bug24009 into default

Author: rade

codegen.py

@@ -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

@@ -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

@@ -14,7 +14,6 @@
 //  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 //
 
-
 package com.rabbitmq.client;
 
 import com.rabbitmq.client.AMQP.BasicProperties;
@@ -25,9 +24,6 @@
  * These are intended for use with {@link Channel#basicPublish} and other Channel methods.
  */
 public class MessageProperties {
-    private static final Integer ZERO = 0;
-    private static final Integer ONE = 1;
-    private static final Integer TWO = 2;
 
     /** Empty basic properties, with no fields set */
     public static final BasicProperties MINIMAL_BASIC =
@@ -37,7 +33,7 @@ public class MessageProperties {
                             null, null);
     /** Empty basic properties, with only deliveryMode set to 2 (persistent) */
     public static final BasicProperties MINIMAL_PERSISTENT_BASIC =
-        new BasicProperties(null, null, null, TWO,
+        new BasicProperties(null, null, null, 2,
                             null, null, null, null,
                             null, null, null, null,
                             null, null);
@@ -47,8 +43,8 @@ public class MessageProperties {
         new BasicProperties("application/octet-stream",
                             null,
                             null,
-                            ONE,
-                            ZERO, null, null, null,
+                            1,
+                            0, null, null, null,
                             null, null, null, null,
                             null, null);
 
@@ -57,8 +53,8 @@ public class MessageProperties {
         new BasicProperties("application/octet-stream",
                             null,
                             null,
-                            TWO,
-                            ZERO, null, null, null,
+                            2,
+                            0, null, null, null,
                             null, null, null, null,
                             null, null);
 
@@ -67,8 +63,8 @@ public class MessageProperties {
         new BasicProperties("text/plain",
                             null,
                             null,
-                            ONE,
-                            ZERO, null, null, null,
+                            1,
+                            0, null, null, null,
                             null, null, null, null,
                             null, null);
 
@@ -77,8 +73,8 @@ public class MessageProperties {
         new BasicProperties("text/plain",
                             null,
                             null,
-                            TWO,
-                            ZERO, null, null, null,
+                            2,
+                            0, null, null, null,
                             null, null, null, null,
                             null, null);
 }

src/com/rabbitmq/client/FileProperties.java

@@ -23,6 +23,9 @@
  */
 public class PossibleAuthenticationFailureException extends IOException
 {
+    /** Default for non-checking. */
+    private static final long serialVersionUID = 1L;
+
     public PossibleAuthenticationFailureException(Throwable cause)
     {
         super("Possibly caused by authentication failure");

src/com/rabbitmq/client/MessageProperties.java

@@ -18,7 +18,6 @@
 
 import com.rabbitmq.client.impl.Version;
 
-import java.io.IOException;
 import java.net.ProtocolException;
 
 /**
@@ -27,6 +26,8 @@
  */
 public class ProtocolVersionMismatchException extends ProtocolException
 {
+    /** Default serialVersionUID for serializability without version checking. */
+    private static final long serialVersionUID = 1L;
     private Version clientVersion;
     private Version serverVersion;