Moved LongString to com.rabbitmq.client (from ...impl).

Author: Steve Powell

codegen.py

@@ -161,7 +161,6 @@ def printHeader():
         print
         print "import com.rabbitmq.client.impl.ContentHeaderPropertyWriter;"
         print "import com.rabbitmq.client.impl.ContentHeaderPropertyReader;"
-        print "import com.rabbitmq.client.impl.LongString;"
         print "import com.rabbitmq.client.impl.LongStringHelper;"
 
     def printProtocolClass():
@@ -422,6 +421,7 @@ def printHeader():
         print "import java.util.Map;"
         print
         print "import com.rabbitmq.client.AMQP;"
+        print "import com.rabbitmq.client.LongString;"
         print "import com.rabbitmq.client.UnknownClassOrMethodId;"
         print "import com.rabbitmq.client.UnexpectedMethodError;"
 

src/com/rabbitmq/client/JDKSaslConfig.java

@@ -16,7 +16,6 @@
 
 package com.rabbitmq.client;
 
-import com.rabbitmq.client.impl.LongString;
 import com.rabbitmq.client.impl.LongStringHelper;
 
 import javax.security.auth.callback.Callback;

src/com/rabbitmq/client/impl/LongString.java renamed to src/com/rabbitmq/client/LongString.java

@@ -15,7 +15,7 @@
 //
 
 
-package com.rabbitmq.client.impl;
+package com.rabbitmq.client;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -31,26 +31,26 @@ public interface LongString
     public static final long MAX_LENGTH = 0xffffffffL;
 
     /**
-     * Get the length of the content of the long string in bytes
-     * @return the length in bytes >= 0 <= MAX_LENGTH
+     * @return the length of the {@link LongString} in bytes >= 0 <= MAX_LENGTH
      */
     public long length();
 
     /**
      * Get the content stream.
      * Repeated calls to this function return the same stream,
      * which may not support rewind.
-     * @return An input stream the reads the content
+     * @return An input stream that reads the content of the {@link LongString}
      * @throws IOException if an error is encountered
      */
     public DataInputStream getStream() throws IOException;
 
     /**
-     * Get the content as a byte array.
-     * Repeated calls to this function return the same array.
-     * This function will fail if getContentLength() > Integer.MAX_VALUE
-     * throwing an IllegalStateException.
-     * @return the content as an array
+     * Get the content as a byte array.  This need not be a copy. Updates to the
+     * returned array may change the value of the {@link LongString}.
+     * Repeated calls to this function may return the same array.
+     * This function will fail if <code><b>this</b>.length() > Integer.MAX_VALUE</code>,
+     * throwing an {@link IllegalStateException}.
+     * @return the array of bytes containing the content of the {@link LongString}
      */
     public byte [] getBytes();
 }

src/com/rabbitmq/client/RpcClient.java

@@ -234,7 +234,7 @@ public String stringCall(String message)
      * Perform an AMQP wire-protocol-table based RPC roundtrip <br><br>
      *
      * There are some restrictions on the values appearing in the table: <br>
-     * they must be of type {@link String}, {@link com.rabbitmq.client.impl.LongString}, {@link Integer}, {@link java.math.BigDecimal}, {@link Date},
+     * they must be of type {@link String}, {@link com.rabbitmq.client.LongString}, {@link Integer}, {@link java.math.BigDecimal}, {@link Date},
      * or (recursively) a {@link Map} of the enclosing type.
      *
      * @param message the table to send

src/com/rabbitmq/client/SaslMechanism.java

@@ -16,7 +16,6 @@
 
 package com.rabbitmq.client;
 
-import com.rabbitmq.client.impl.LongString;
 
 import java.io.IOException;
 

src/com/rabbitmq/client/UnexpectedMethodError.java

@@ -17,8 +17,6 @@
 
 package com.rabbitmq.client;
 
-import com.rabbitmq.client.impl.Method;
-
 /**
  * Indicates that a {@link Method} object was supplied that was not
  * expected. For instance, {@link Channel#basicGet} throws this if it

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -31,6 +31,7 @@
 import com.rabbitmq.client.Command;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.LongString;
 import com.rabbitmq.client.MissedHeartbeatException;
 import com.rabbitmq.client.PossibleAuthenticationFailureException;
 import com.rabbitmq.client.ProtocolVersionMismatchException;

src/com/rabbitmq/client/impl/CRDemoMechanism.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client.impl;
 
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.LongString;
 import com.rabbitmq.client.SaslConfig;
 import com.rabbitmq.client.SaslMechanism;
 

src/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import com.rabbitmq.client.ContentHeader;
+import com.rabbitmq.client.LongString;
 
 /**
  * Parses an AMQP wire-protocol {@link ContentHeader} from a

src/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import com.rabbitmq.client.ContentHeader;
+import com.rabbitmq.client.LongString;
 
 /**
  * Generates an AMQP wire-protocol packet from a {@link ContentHeader}.