moved Encoder, Decoder and related classes into the codec sub-package

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@569045 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 57 insertions, 21 deletions

diff --git a/java/common/generate b/java/common/generate
index 8e6957803e..ac49c6283d 100755
--- a/java/common/generate
+++ b/java/common/generate
@@ -23,6 +23,10 @@ class Output:
     self.line("import java.util.Map;")
     self.line("import java.util.UUID;")
     self.line()
+    self.line("import org.apache.qpidity.codec.Decoder;")
+    self.line("import org.apache.qpidity.codec.Encodable;")
+    self.line("import org.apache.qpidity.codec.Encoder;")
+    self.line()
     self.line()
 
   def line(self, l = ""):
@@ -80,9 +84,9 @@ const.line("{")
 for d in spec.query["amqp/constant"]:
 	name = d["@name"]
 	val = d["@value"]
-	datatype = d["@datatype"]	
+	datatype = d["@datatype"]
 	if datatype == None:
-		const.line("public static final int %s = %s;" % (scream(name), val))   	
+		const.line("public static final int %s = %s;" % (scream(name), val))
 const.line("}")
 const.write()
 
diff --git a/java/common/src/main/java/org/apache/qpidity/Channel.java b/java/common/src/main/java/org/apache/qpidity/Channel.java
index 483b5e7f21..9df40106fc 100644
--- a/java/common/src/main/java/org/apache/qpidity/Channel.java
+++ b/java/common/src/main/java/org/apache/qpidity/Channel.java
@@ -25,6 +25,9 @@ import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.ArrayList;
 
+import org.apache.qpidity.codec.SegmentEncoder;
+import org.apache.qpidity.codec.SizeEncoder;
+
 import static org.apache.qpidity.Frame.*;
 import static org.apache.qpidity.Functions.*;
 
@@ -49,14 +52,14 @@ public class Channel extends Invoker implements Handler<Frame>
     private Method method = null;
     private List<ByteBuffer> data = null;
     private int dataSize;
-    
+
     public Channel(Connection connection, int channel, SessionDelegate delegate)
     {
         this.connection = connection;
         this.channel = channel;
         this.delegate = new ChannelDelegate();
         this.sessionDelegate = delegate;
-        
+
         tracks = new TrackSwitch<Channel>();
         tracks.map(L1, new MethodHandler<Channel>
                    (getMajor(), getMinor(), connection.getConnectionDelegate()));
diff --git a/java/common/src/main/java/org/apache/qpidity/Functions.java b/java/common/src/main/java/org/apache/qpidity/Functions.java
index f5217bf038..1008966b01 100644
--- a/java/common/src/main/java/org/apache/qpidity/Functions.java
+++ b/java/common/src/main/java/org/apache/qpidity/Functions.java
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
  * @author Rafael H. Schloming
  */
 
-class Functions
+public class Functions
 {
 
     public static final short unsigned(byte b)
diff --git a/java/common/src/main/java/org/apache/qpidity/HeaderHandler.java b/java/common/src/main/java/org/apache/qpidity/HeaderHandler.java
index 1855681756..8737932712 100644
--- a/java/common/src/main/java/org/apache/qpidity/HeaderHandler.java
+++ b/java/common/src/main/java/org/apache/qpidity/HeaderHandler.java
@@ -25,6 +25,8 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import org.apache.qpidity.codec.FragmentDecoder;
+
 
 /**
  * HeaderHandler
diff --git a/java/common/src/main/java/org/apache/qpidity/MethodDecoder.java b/java/common/src/main/java/org/apache/qpidity/MethodDecoder.java
index c1cf9b888c..96c6e4d52c 100644
--- a/java/common/src/main/java/org/apache/qpidity/MethodDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/MethodDecoder.java
@@ -24,6 +24,9 @@ import java.nio.ByteBuffer;
 
 import java.util.Iterator;
 
+import org.apache.qpidity.codec.Decoder;
+import org.apache.qpidity.codec.FragmentDecoder;
+
 
 /**
  * MethodDecoder
diff --git a/java/common/src/main/java/org/apache/qpidity/Struct.java b/java/common/src/main/java/org/apache/qpidity/Struct.java
index cf8a5c246f..50da4910ab 100644
--- a/java/common/src/main/java/org/apache/qpidity/Struct.java
+++ b/java/common/src/main/java/org/apache/qpidity/Struct.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpidity;
 
+import org.apache.qpidity.codec.Encodable;
+
 
 /**
  * Struct
@@ -35,6 +37,6 @@ public abstract class Struct implements Delegator, Encodable
         return StructFactory.create(type);
     }
 
-    abstract int getEncodedType();
+    public abstract int getEncodedType();
 
 }
diff --git a/java/common/src/main/java/org/apache/qpidity/Stub.java b/java/common/src/main/java/org/apache/qpidity/Stub.java
index 94d5932d20..7aa5030672 100644
--- a/java/common/src/main/java/org/apache/qpidity/Stub.java
+++ b/java/common/src/main/java/org/apache/qpidity/Stub.java
@@ -5,6 +5,10 @@ import java.lang.annotation.*;
 
 import java.nio.ByteBuffer;
 
+import org.apache.qpidity.codec.BBEncoder;
+import org.apache.qpidity.codec.Encoder;
+import org.apache.qpidity.codec.SizeEncoder;
+
 import static org.apache.qpidity.Option.*;
 
 
diff --git a/java/common/src/main/java/org/apache/qpidity/AbstractDecoder.java b/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java
index ca728812bd..134c9cdf47 100644
--- a/java/common/src/main/java/org/apache/qpidity/AbstractDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java
@@ -18,11 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.qpidity.RangeSet;
+import org.apache.qpidity.Struct;
+
 import static org.apache.qpidity.Functions.*;
 
 
diff --git a/java/common/src/main/java/org/apache/qpidity/AbstractEncoder.java b/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java
index ecd274615b..b6f875bc5d 100644
--- a/java/common/src/main/java/org/apache/qpidity/AbstractEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java
@@ -18,13 +18,17 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.ByteBuffer;
 
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.qpidity.Range;
+import org.apache.qpidity.RangeSet;
+import org.apache.qpidity.Struct;
+
 import static org.apache.qpidity.Functions.*;
 
 
diff --git a/java/common/src/main/java/org/apache/qpidity/BBDecoder.java b/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java
index afbb0eddab..b4e3389dde 100644
--- a/java/common/src/main/java/org/apache/qpidity/BBDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.ByteBuffer;
 
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
  * @author Rafael H. Schloming
  */
 
-class BBDecoder extends AbstractDecoder
+public class BBDecoder extends AbstractDecoder
 {
 
     private final ByteBuffer in;
diff --git a/java/common/src/main/java/org/apache/qpidity/BBEncoder.java b/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java
index 3e0a0bb2ba..bbc6ba0ad9 100644
--- a/java/common/src/main/java/org/apache/qpidity/BBEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.ByteBuffer;
 
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
  * @author Rafael H. Schloming
  */
 
-class BBEncoder extends AbstractEncoder
+public class BBEncoder extends AbstractEncoder
 {
 
     private final ByteBuffer out;
diff --git a/java/common/src/main/java/org/apache/qpidity/Decoder.java b/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java
index 13c3d0b7b8..ec91c877f8 100644
--- a/java/common/src/main/java/org/apache/qpidity/Decoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java
@@ -18,11 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.qpidity.RangeSet;
+import org.apache.qpidity.Struct;
+
+
 /**
  * Decoder
  *
diff --git a/java/common/src/main/java/org/apache/qpidity/Encodable.java b/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java
index 6a734a1791..b57c12fefe 100644
--- a/java/common/src/main/java/org/apache/qpidity/Encodable.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/Encoder.java b/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java
index 990cef7081..b879ed5cd7 100644
--- a/java/common/src/main/java/org/apache/qpidity/Encoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java
@@ -18,11 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.qpidity.RangeSet;
+import org.apache.qpidity.Struct;
+
+
 /**
  * Encoder
  *
diff --git a/java/common/src/main/java/org/apache/qpidity/FragmentDecoder.java b/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java
index b389d54390..53183e5007 100644
--- a/java/common/src/main/java/org/apache/qpidity/FragmentDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
@@ -34,7 +34,7 @@ import static java.lang.Math.*;
  * @author Rafael H. Schloming
  */
 
-class FragmentDecoder extends AbstractDecoder
+public class FragmentDecoder extends AbstractDecoder
 {
 
     private final Iterator<ByteBuffer> fragments;
diff --git a/java/common/src/main/java/org/apache/qpidity/SegmentEncoder.java b/java/common/src/main/java/org/apache/qpidity/codec/SegmentEncoder.java
index 25e29bdcf3..8fb396f278 100644
--- a/java/common/src/main/java/org/apache/qpidity/SegmentEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/SegmentEncoder.java
@@ -18,12 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.qpidity.Frame;
+import org.apache.qpidity.Handler;
+
 import static java.lang.Math.*;
 
 import static org.apache.qpidity.Frame.*;
@@ -35,7 +38,7 @@ import static org.apache.qpidity.Frame.*;
  * @author Rafael H. Schloming
  */
 
-class SegmentEncoder extends AbstractEncoder
+public class SegmentEncoder extends AbstractEncoder
 {
 
     private final Handler<ByteBuffer> handler;
diff --git a/java/common/src/main/java/org/apache/qpidity/SizeEncoder.java b/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java
index 141c501104..a12cbef50a 100644
--- a/java/common/src/main/java/org/apache/qpidity/SizeEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpidity.codec;
 
 import java.nio.ByteBuffer;
 
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author Rafael H. Schloming
  */
 
-class SizeEncoder extends AbstractEncoder
+public class SizeEncoder extends AbstractEncoder
 {
 
     private int size;