qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [3/4] qpid-broker-j git commit: QPID-7531: [Java Broker, AMQP 1.0] Code clean-up
Date Fri, 06 Oct 2017 14:48:20 GMT
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
index c006c56..21b8e78 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
@@ -23,9 +23,9 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
-public abstract class FixedFourWriter<T extends Object> implements ValueWriter<T>
+public abstract class FixedFourWriter<T> implements ValueWriter<T>
 {
-    private int _value;
+    private final int _value;
 
 
     public FixedFourWriter(int object)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
index 72dc2fd..3f3ce6d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
-public abstract class FixedSixteenWriter<T extends Object> implements ValueWriter<T>
+public abstract class FixedSixteenWriter<T> implements ValueWriter<T>
 {
     private long _msb;
     private long _lsb;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
index f03b182..dc62aa0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
-public abstract class FixedTwoWriter <T extends Object> implements ValueWriter<T>
+public abstract class FixedTwoWriter <T> implements ValueWriter<T>
 {
     private short _value;
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
index 6eaea3c..44ec7c6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
@@ -37,7 +37,7 @@ public class FloatWriter extends FixedFourWriter<Float>
         return FORMAT_CODE;
     }
 
-    private static Factory<Float> FACTORY = new Factory<Float>()
+    private static final Factory<Float> FACTORY = new Factory<Float>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
index 313b664..3a77e44 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
@@ -26,7 +26,7 @@ public class IntegerWriter
     private static final byte EIGHT_BYTE_FORMAT_CODE = (byte)0x71;
     private static final byte ONE_BYTE_FORMAT_CODE = (byte) 0x54;
 
-    private static ValueWriter.Factory<Integer> FACTORY = new ValueWriter.Factory<Integer>()
+    private static final ValueWriter.Factory<Integer> FACTORY = new ValueWriter.Factory<Integer>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java
index 9c9f169..c5ed18d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.bytebuffer.QpidByteBufferUtils;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
 
-public class ListConstructor extends VariableWidthTypeConstructor<List>
+public class ListConstructor extends VariableWidthTypeConstructor<List<Object>>
 {
     private ListConstructor(final int size)
     {
@@ -36,7 +36,7 @@ public class ListConstructor extends VariableWidthTypeConstructor<List>
     }
 
     @Override
-    public List construct(final List<QpidByteBuffer> in, final ValueHandler handler) throws AmqpErrorException
+    public List<Object> construct(final List<QpidByteBuffer> in, final ValueHandler handler) throws AmqpErrorException
     {
         int size;
         int count;
@@ -50,7 +50,7 @@ public class ListConstructor extends VariableWidthTypeConstructor<List>
                                                        remaining));
         }
 
-        if(getSize() == 1)
+        if (getSize() == 1)
         {
             size = QpidByteBufferUtils.get(in) & 0xFF;
             count = QpidByteBufferUtils.get(in) & 0xFF;
@@ -72,15 +72,15 @@ public class ListConstructor extends VariableWidthTypeConstructor<List>
         return construct(in, handler, size, count);
     }
 
-    protected List construct(final List<QpidByteBuffer> in,
-                             final ValueHandler handler,
-                             final int size,
-                             final int count)
+    protected List<Object> construct(final List<QpidByteBuffer> in,
+                                     final ValueHandler handler,
+                                     final int size,
+                                     final int count)
             throws AmqpErrorException
     {
-        List list = new ArrayList(count);
+        List<Object> list = new ArrayList<>(count);
 
-        for(int i = 0; i < count; i++)
+        for (int i = 0; i < count; i++)
         {
             list.add(handler.parse(in));
         }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
index dd809fa..0fb00ef 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
@@ -29,7 +29,7 @@ public class ListWriter
 {
     private static class NonEmptyListWriter extends AbstractListWriter<List>
     {
-        private List _list;
+        private final List _list;
         private int _position = 0;
 
         public NonEmptyListWriter(final Registry registry, final List object)
@@ -84,7 +84,7 @@ public class ListWriter
         }
     }
 
-    private static ValueWriter.Factory<List> FACTORY =
+    private static final ValueWriter.Factory<List> FACTORY =
             new ValueWriter.Factory<List>()
             {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
index 8fbb262..d846c38 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
@@ -28,7 +28,7 @@ public class LongWriter
 
     private static final byte ONE_BYTE_FORMAT_CODE = (byte) 0x55;
 
-    private static ValueWriter.Factory<Long> FACTORY =
+    private static final ValueWriter.Factory<Long> FACTORY =
             new ValueWriter.Factory<Long>()
             {
                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java
index e04480a..058dc48 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java
@@ -29,7 +29,7 @@ import org.apache.qpid.server.bytebuffer.QpidByteBufferUtils;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
 
-public class MapConstructor extends VariableWidthTypeConstructor<Map>
+public class MapConstructor extends VariableWidthTypeConstructor<Map<Object,Object>>
 {
     private MapConstructor(final int size)
     {
@@ -37,7 +37,7 @@ public class MapConstructor extends VariableWidthTypeConstructor<Map>
     }
 
     @Override
-    public Map construct(final List<QpidByteBuffer> in, final ValueHandler handler) throws AmqpErrorException
+    public Map<Object, Object> construct(final List<QpidByteBuffer> in, final ValueHandler handler) throws AmqpErrorException
     {
         return construct(in, handler, Object.class, Object.class);
     }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
index df6f0aa..2f73c8f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 public class MapWriter extends AbstractMapWriter<Map>
 {
-    private Map _map;
+    private final Map _map;
     private Object _value;
     private Iterator<Map.Entry> _iterator;
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
index b0620ca..27be92c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
@@ -21,7 +21,6 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import java.util.List;
 
-import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 class NullTypeConstructor implements TypeConstructor<Void>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
index a8d30b6..52c5c3c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
@@ -40,7 +40,7 @@ public class NullWriter implements ValueWriter<Void>
         buffer.put((byte)0x40);
     }
 
-    private static Factory<Void> FACTORY = new Factory<Void>()
+    private static final Factory<Void> FACTORY = new Factory<Void>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
index 434015d..adc77ef 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
@@ -24,10 +24,6 @@ import org.apache.qpid.server.protocol.v1_0.type.RestrictedType;
 
 public class RestrictedTypeValueWriter<V> extends DelegatingValueWriter<RestrictedType<V>>
 {
-    public RestrictedTypeValueWriter(final Registry registry)
-    {
-        super(registry);
-    }
 
     public RestrictedTypeValueWriter(final Registry registry,
                                      final RestrictedType<V> object)
@@ -41,7 +37,7 @@ public class RestrictedTypeValueWriter<V> extends DelegatingValueWriter<Restrict
         return restrictedType.getValue();
     }
 
-    private static Factory FACTORY = new Factory()
+    private static final Factory FACTORY = new Factory()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
index 81224a4..08f06c9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
@@ -48,7 +48,7 @@ public class ShortWriter extends FixedTwoWriter<Short>
         return FORMAT_CODE;
     }
 
-    private static Factory<Short> FACTORY = new Factory<Short>()
+    private static final Factory<Short> FACTORY = new Factory<Short>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
index b3c83b0..9aaafd3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
@@ -25,7 +25,7 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 public abstract class SimpleVariableWidthWriter<V> extends VariableWidthWriter<V>
 {
-    private byte[] _buf;
+    private final byte[] _buf;
 
     public SimpleVariableWidthWriter(byte[] value)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java
index 91ad3b7..2b8c058 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java
@@ -44,7 +44,7 @@ public class StringWriter extends SimpleVariableWidthWriter<String>
     }
 
 
-    private static Factory<String> FACTORY = new Factory<String>()
+    private static final Factory<String> FACTORY = new Factory<String>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java
index d46ca53..937f105 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java
@@ -129,7 +129,7 @@ public class SymbolArrayWriter extends SimpleVariableWidthWriter<Symbol[]>
     }
 
 
-    private static Factory<Symbol[]> FACTORY = new Factory<Symbol[]>()
+    private static final Factory<Symbol[]> FACTORY = new Factory<Symbol[]>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java
index 9195529..51a5a59 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java
@@ -31,7 +31,7 @@ public class SymbolWriter extends VariableWidthWriter<Symbol>
     private static final Charset ENCODING_CHARSET = Charset.forName("US-ASCII");
     public static final byte LARGE_ENCODING_CODE = (byte) 0xb3;
     public static final byte SMALL_ENCODING_CODE = (byte) 0xa3;
-    private Symbol _value;
+    private final Symbol _value;
 
     public SymbolWriter(final Symbol object)
     {
@@ -61,7 +61,7 @@ public class SymbolWriter extends VariableWidthWriter<Symbol>
         }
     }
 
-    private static Factory<Symbol> FACTORY = new Factory<Symbol>()
+    private static final Factory<Symbol> FACTORY = new Factory<Symbol>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java
index 3577646..1314b30 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java
@@ -38,7 +38,7 @@ public class TimestampWriter extends FixedEightWriter<Date>
         return FORMAT_CODE;
     }
 
-    private static Factory<Date> FACTORY = new Factory<Date>()
+    private static final Factory<Date> FACTORY = new Factory<Date>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java
index 115b610..22908f4 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java
@@ -54,7 +54,7 @@ public class UUIDWriter extends FixedSixteenWriter<UUID>
         return value.getLeastSignificantBits();
     }
 
-    private static Factory<UUID> FACTORY = new Factory<UUID>()
+    private static final Factory<UUID> FACTORY = new Factory<UUID>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java
index 6d1faa3..40f7c1e 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java
@@ -36,7 +36,7 @@ public class UnsignedByteWriter extends FixedOneWriter<UnsignedByte>
         return (byte) 0x50;
     }
 
-    private static Factory<UnsignedByte> FACTORY = new Factory<UnsignedByte>()
+    private static final Factory<UnsignedByte> FACTORY = new Factory<UnsignedByte>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java
index 3bde0a5..72bc604 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java
@@ -51,7 +51,7 @@ public class UnsignedIntegerWriter
 
 
 
-    private static ValueWriter.Factory<UnsignedInteger> FACTORY = new ValueWriter.Factory<UnsignedInteger>()
+    private static final ValueWriter.Factory<UnsignedInteger> FACTORY = new ValueWriter.Factory<UnsignedInteger>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java
index 1128c22..89ebf70 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java
@@ -48,7 +48,7 @@ public class UnsignedLongWriter
 
 
 
-    private static ValueWriter.Factory<UnsignedLong> FACTORY =
+    private static final ValueWriter.Factory<UnsignedLong> FACTORY =
             new ValueWriter.Factory<UnsignedLong>()
             {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java
index adca010..ed0da8a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java
@@ -48,7 +48,7 @@ public class UnsignedShortWriter extends FixedTwoWriter<UnsignedShort>
         return FORMAT_CODE;
     }
 
-    private static Factory<UnsignedShort> FACTORY = new Factory<UnsignedShort>()
+    private static final Factory<UnsignedShort> FACTORY = new Factory<UnsignedShort>()
                                             {
 
                                                 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
index b7959e1..82b05d5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -89,7 +90,7 @@ public class ValueHandler implements DescribedTypeConstructorRegistry.Source
 
     public Object parse(QpidByteBuffer in) throws AmqpErrorException
     {
-        return parse(new ArrayList<>(Arrays.asList(in)));
+        return parse(new ArrayList<>(Collections.singletonList(in)));
     }
 
     public Object parse(final List<QpidByteBuffer> in) throws AmqpErrorException

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java
index 2cf5a92..32e8dc3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java
@@ -25,7 +25,7 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
 public interface ValueProducingProtocolHandler extends ProtocolHandler
 {
     Object getValue();
-    public boolean hasError();
-    public Error getError();
+    boolean hasError();
+    Error getError();
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java
index be75aa5..147be55 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java
@@ -23,12 +23,12 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
-public interface ValueWriter<T extends Object>
+public interface ValueWriter<T>
 {
 
 
 
-    interface Factory<V extends Object>
+    interface Factory<V>
     {
         ValueWriter<V> newInstance(Registry registry, V object);
     }
@@ -40,9 +40,9 @@ public interface ValueWriter<T extends Object>
             Registry getDescribedTypeRegistry();
         }
 
-        <V extends Object> ValueWriter<V> getValueWriter(V value);
+        <V> ValueWriter<V> getValueWriter(V value);
 
-        <V extends Object> ValueWriter<V> register(Class<V> clazz, ValueWriter.Factory<V> writer);
+        <V> ValueWriter<V> register(Class<V> clazz, ValueWriter.Factory<V> writer);
 
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java
index c573085..fbf93fa 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java
@@ -22,7 +22,7 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 public abstract class VariableWidthTypeConstructor<T> implements TypeConstructor<T>
 {
-    protected int _size;
+    protected final int _size;
 
     public VariableWidthTypeConstructor(int size)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java
index 4916538..7dd19a1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java
@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 
 class ZeroListConstructor implements TypeConstructor<List>
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java
index b83bf12..f3d62e3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java
@@ -21,7 +21,6 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import java.util.List;
 
-import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java
index cdd086c..730bd63 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java
@@ -21,7 +21,6 @@ package org.apache.qpid.server.protocol.v1_0.codec;
 
 import java.util.List;
 
-import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java
index 8ab89ea..7d0f28e 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 
 public abstract class AMQFrame<T>
 {
-    private T _frameBody;
+    private final T _frameBody;
     private List<QpidByteBuffer> _payload;
 
     AMQFrame(T frameBody)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java
index a77e587..041578a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java
@@ -22,7 +22,7 @@ package org.apache.qpid.server.protocol.v1_0.framing;
 public class OversizeFrameException extends RuntimeException
 {
     private final AMQFrame _frame;
-    private int _size;
+    private final int _size;
 
     public OversizeFrameException(final AMQFrame frame, final int size)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java
index 8c327eb..567c300 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java
@@ -33,7 +33,7 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
 public class SectionDecoderImpl implements SectionDecoder
 {
 
-    private ValueHandler _valueHandler;
+    private final ValueHandler _valueHandler;
 
 
     public SectionDecoderImpl(final SectionDecoderRegistry describedTypeRegistry)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
index 77ae8e3..5f00f0b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
@@ -26,7 +26,7 @@ import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry
 
 public class SectionEncoderImpl implements SectionEncoder
 {
-    private AMQPDescribedTypeRegistry _registry;
+    private final AMQPDescribedTypeRegistry _registry;
 
     public SectionEncoderImpl(final AMQPDescribedTypeRegistry describedTypeRegistry)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java
index 91e74bd..9db2d16 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.store.StoreException;
 
 public class LinkStoreUtils
 {
-    private static AMQPDescribedTypeRegistry DESCRIBED_TYPE_REGISTRY =
+    private static final AMQPDescribedTypeRegistry DESCRIBED_TYPE_REGISTRY =
             AMQPDescribedTypeRegistry.newInstance().registerTransportLayer().registerMessagingLayer();
 
     public static Object amqpBytesToObject(final byte[] bytes)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java
index 8ab68da..46b8fe6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java
@@ -22,5 +22,5 @@ package org.apache.qpid.server.protocol.v1_0.type;
 
 public interface ErrorCondition
 {
-    public Symbol getValue();
+    Symbol getValue();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
index 8e2d385..d8708a2 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
@@ -91,12 +91,7 @@ public final class UnsignedByte extends Number implements Comparable<UnsignedByt
 
         UnsignedByte that = (UnsignedByte) o;
 
-        if (_underlying != that._underlying)
-        {
-            return false;
-        }
-
-        return true;
+        return _underlying == that._underlying;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
index d571f0a..99f312d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
@@ -84,12 +84,7 @@ public final class UnsignedInteger extends Number implements Comparable<Unsigned
 
         UnsignedInteger that = (UnsignedInteger) o;
 
-        if (_underlying != that._underlying)
-        {
-            return false;
-        }
-
-        return true;
+        return _underlying == that._underlying;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
index 510efda..975c0a1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
@@ -102,12 +102,7 @@ public final class UnsignedLong extends Number implements Comparable<UnsignedLon
 
         UnsignedLong that = (UnsignedLong) o;
 
-        if (_underlying != that._underlying)
-        {
-            return false;
-        }
-
-        return true;
+        return _underlying == that._underlying;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
index ba20b69..074ff53 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
@@ -87,12 +87,7 @@ public final class UnsignedShort extends Number implements Comparable<UnsignedSh
 
         UnsignedShort that = (UnsignedShort) o;
 
-        if (_underlying != that._underlying)
-        {
-            return false;
-        }
-
-        return true;
+        return _underlying == that._underlying;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
index 6f4d1e5..0e4d71f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
@@ -324,11 +324,11 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist
 
 
     @Override
-    public <V extends Object> ValueWriter<V> getValueWriter(V value)
+    public <V> ValueWriter<V> getValueWriter(V value)
     {
         ValueWriter writer;
 
-        Class<? extends Object> clazz = value == null ? Void.TYPE : value.getClass();
+        Class<?> clazz = value == null ? Void.TYPE : value.getClass();
 
         ValueWriter.Factory<V> factory = (ValueWriter.Factory<V>) (_writerMap.get(clazz));
 
@@ -382,7 +382,7 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist
     }
 
     @Override
-    public <V extends Object> ValueWriter<V> register(Class<V> clazz, ValueWriter.Factory<V> writer)
+    public <V> ValueWriter<V> register(Class<V> clazz, ValueWriter.Factory<V> writer)
     {
         return (ValueWriter<V>) _writerMap.put(clazz, writer);
     }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java
index 8acaeae..e3a3ef5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java
@@ -30,7 +30,7 @@ public class SoleConnectionDetectionPolicy implements RestrictedType<UnsignedInt
     public static final SoleConnectionDetectionPolicy
             WEAK = new SoleConnectionDetectionPolicy(UnsignedInteger.valueOf(1));
 
-    private UnsignedInteger _val;
+    private final UnsignedInteger _val;
 
     private SoleConnectionDetectionPolicy(final UnsignedInteger val)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java
index 35055ba..86a57b1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java
@@ -30,7 +30,7 @@ public class SoleConnectionEnforcementPolicy implements RestrictedType<UnsignedI
     public static final SoleConnectionEnforcementPolicy
             CLOSE_EXISTING = new SoleConnectionEnforcementPolicy(UnsignedInteger.valueOf(1));
 
-    private UnsignedInteger _val;
+    private final UnsignedInteger _val;
 
     private SoleConnectionEnforcementPolicy(final UnsignedInteger val)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
index 3b5918b..d34f9a5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
@@ -62,12 +62,7 @@ public class ExactSubjectFilter implements Filter
 
         ExactSubjectFilter that = (ExactSubjectFilter) o;
 
-        if(_value != null ? !_value.equals(that._value) : that._value != null)
-        {
-            return false;
-        }
-
-        return true;
+        return _value != null ? _value.equals(that._value) : that._value == null;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
index 8df2c0c..c801944 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
@@ -61,12 +61,7 @@ public class JMSSelectorFilter implements Filter
 
         JMSSelectorFilter that = (JMSSelectorFilter) o;
 
-        if(_value != null ? !_value.equals(that._value) : that._value != null)
-        {
-            return false;
-        }
-
-        return true;
+        return _value != null ? _value.equals(that._value) : that._value == null;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
index 5247164..70f0ddf 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
@@ -61,12 +61,7 @@ public class MatchingSubjectFilter implements Filter
 
         MatchingSubjectFilter that = (MatchingSubjectFilter) o;
 
-        if(_value != null ? !_value.equals(that._value) : that._value != null)
-        {
-            return false;
-        }
-
-        return true;
+        return _value != null ? _value.equals(that._value) : that._value == null;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
index e31b2fa..abb8b91 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
@@ -39,7 +39,7 @@ public class AcceptedWriter extends AbstractDescribedTypeWriter<Accepted>
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<Accepted> FACTORY = new Factory<Accepted>()
+    private static final Factory<Accepted> FACTORY = new Factory<Accepted>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
index f7c33fc..71289ac 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
@@ -40,7 +40,7 @@ public class AmqpSequenceWriter extends AbstractDescribedTypeWriter<AmqpSequence
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<AmqpSequence> FACTORY = new Factory<AmqpSequence>()
+    private static final Factory<AmqpSequence> FACTORY = new Factory<AmqpSequence>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
index 1af86b8..a8e51bc 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
@@ -36,7 +36,6 @@ import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValueSection;
 import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
-import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
 
 public class AmqpValueSectionConstructor implements DescribedTypeConstructor<AmqpValueSection>
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
index 6222a44..0aec014 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
@@ -39,7 +39,7 @@ public class AmqpValueWriter extends AbstractDescribedTypeWriter<AmqpValue>
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<AmqpValue> FACTORY = new Factory<AmqpValue>()
+    private static final Factory<AmqpValue> FACTORY = new Factory<AmqpValue>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
index 0517cb3..fae98ec 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
@@ -39,7 +39,7 @@ public class ApplicationPropertiesWriter extends AbstractDescribedTypeWriter<App
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<ApplicationProperties> FACTORY = new Factory<ApplicationProperties>()
+    private static final Factory<ApplicationProperties> FACTORY = new Factory<ApplicationProperties>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
index 8019109..ee6aef2 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
@@ -39,7 +39,7 @@ public class DataWriter extends AbstractDescribedTypeWriter<Data>
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<Data> FACTORY = new Factory<Data>()
+    private static final Factory<Data> FACTORY = new Factory<Data>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
index 43d472b..16a4cb9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
@@ -40,7 +40,7 @@ public class DeleteOnCloseWriter extends AbstractDescribedTypeWriter<DeleteOnClo
     }
 
 
-    private static Factory<DeleteOnClose> FACTORY = new Factory<DeleteOnClose>()
+    private static final Factory<DeleteOnClose> FACTORY = new Factory<DeleteOnClose>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
index 6987a48..ed0d336 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
@@ -39,7 +39,7 @@ public class DeleteOnNoLinksOrMessagesWriter extends AbstractDescribedTypeWriter
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<DeleteOnNoLinksOrMessages> FACTORY = new Factory<DeleteOnNoLinksOrMessages>()
+    private static final Factory<DeleteOnNoLinksOrMessages> FACTORY = new Factory<DeleteOnNoLinksOrMessages>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
index 2760491..d63e5bb 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
@@ -39,7 +39,7 @@ public class DeleteOnNoLinksWriter extends AbstractDescribedTypeWriter<DeleteOnN
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<DeleteOnNoLinks> FACTORY = new Factory<DeleteOnNoLinks>()
+    private static final Factory<DeleteOnNoLinks> FACTORY = new Factory<DeleteOnNoLinks>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
index dc735cd..770a1db 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
@@ -40,7 +40,7 @@ public class DeleteOnNoMessagesWriter extends AbstractDescribedTypeWriter<Delete
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<DeleteOnNoMessages> FACTORY = new Factory<DeleteOnNoMessages>()
+    private static final Factory<DeleteOnNoMessages> FACTORY = new Factory<DeleteOnNoMessages>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
index deefa35..dfdeba4 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
@@ -41,7 +41,7 @@ public class DeliveryAnnotationsWriter extends AbstractDescribedTypeWriter<Deliv
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<DeliveryAnnotations> FACTORY = new Factory<DeliveryAnnotations>()
+    private static final Factory<DeliveryAnnotations> FACTORY = new Factory<DeliveryAnnotations>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
index 1a60c01..061521b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
@@ -33,7 +33,6 @@ import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.AbstractSection;
 import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
-import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
 
 public abstract class DescribedListSectionConstructor<S extends AbstractSection> implements DescribedTypeConstructor<S>
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
index 7fc0ef7..80220e8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
@@ -39,7 +39,7 @@ public class ExactSubjectFilterWriter extends AbstractDescribedTypeWriter<ExactS
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<ExactSubjectFilter> FACTORY = new Factory<ExactSubjectFilter>()
+    private static final Factory<ExactSubjectFilter> FACTORY = new Factory<ExactSubjectFilter>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
index 1a655c3..c7e2356 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
@@ -40,7 +40,7 @@ public class FooterWriter extends AbstractDescribedTypeWriter<Footer>
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<Footer> FACTORY = new Factory<Footer>()
+    private static final Factory<Footer> FACTORY = new Factory<Footer>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
index 6e357dc..025b7bf 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
@@ -131,7 +131,7 @@ public class HeaderWriter extends AbstractDescribedTypeWriter<Header>
         }
     }
 
-    private static Factory<Header> FACTORY = new Factory<Header>()
+    private static final Factory<Header> FACTORY = new Factory<Header>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
index abcf2b5..48be9f4 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
@@ -40,7 +40,7 @@ public class JMSSelectorFilterWriter extends AbstractDescribedTypeWriter<JMSSele
     }
 
 
-    private static Factory<JMSSelectorFilter> FACTORY = new Factory<JMSSelectorFilter>()
+    private static final Factory<JMSSelectorFilter> FACTORY = new Factory<JMSSelectorFilter>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
index 84634d4..5368918 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
@@ -39,7 +39,7 @@ public class MatchingSubjectFilterWriter extends AbstractDescribedTypeWriter<Mat
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<MatchingSubjectFilter> FACTORY = new Factory<MatchingSubjectFilter>()
+    private static final Factory<MatchingSubjectFilter> FACTORY = new Factory<MatchingSubjectFilter>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
index 6a1216f..03945bc 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
@@ -40,7 +40,7 @@ public class MessageAnnotationsWriter extends AbstractDescribedTypeWriter<Messag
         super(DESCRIPTOR_WRITER, registry.getValueWriter(object.getValue()));
     }
 
-    private static Factory<MessageAnnotations> FACTORY = new Factory<MessageAnnotations>()
+    private static final Factory<MessageAnnotations> FACTORY = new Factory<MessageAnnotations>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java
index 925f3f9..9176f81 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java
@@ -114,7 +114,7 @@ public class ModifiedWriter extends AbstractDescribedTypeWriter<Modified>
         }
     }
 
-    private static Factory<Modified> FACTORY = new Factory<Modified>()
+    private static final Factory<Modified> FACTORY = new Factory<Modified>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java
index 06761e8..45ab03a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java
@@ -39,7 +39,7 @@ public class NoLocalFilterWriter extends AbstractDescribedTypeWriter<NoLocalFilt
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<NoLocalFilter> FACTORY = new Factory<NoLocalFilter>()
+    private static final Factory<NoLocalFilter> FACTORY = new Factory<NoLocalFilter>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java
index 4ea5eee..0a7dac4 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java
@@ -194,7 +194,7 @@ public class PropertiesWriter extends AbstractDescribedTypeWriter<Properties>
         }
     }
 
-    private static Factory<Properties> FACTORY = new Factory<Properties>()
+    private static final Factory<Properties> FACTORY = new Factory<Properties>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java
index 8b66051..cf068be 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java
@@ -106,7 +106,7 @@ public class ReceivedWriter extends AbstractDescribedTypeWriter<Received>
         }
     }
 
-    private static Factory<Received> FACTORY = new Factory<Received>()
+    private static final Factory<Received> FACTORY = new Factory<Received>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java
index d461480..66a881f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java
@@ -98,7 +98,7 @@ public class RejectedWriter extends AbstractDescribedTypeWriter<Rejected>
         }
     }
 
-    private static Factory<Rejected> FACTORY = new Factory<Rejected>()
+    private static final Factory<Rejected> FACTORY = new Factory<Rejected>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java
index feea601..58a95be 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java
@@ -39,7 +39,7 @@ public class ReleasedWriter extends AbstractDescribedTypeWriter<Released>
         super(DESCRIPTOR_WRITER, ListWriter.EMPTY_LIST_WRITER);
     }
 
-    private static Factory<Released> FACTORY = new Factory<Released>()
+    private static final Factory<Released> FACTORY = new Factory<Released>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java
index 9a73956..a154301 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java
@@ -177,7 +177,7 @@ public class SourceWriter extends AbstractDescribedTypeWriter<Source>
         }
     }
 
-    private static Factory<Source> FACTORY = new Factory<Source>()
+    private static final Factory<Source> FACTORY = new Factory<Source>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java
index 252ef50..5abe6f8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java
@@ -145,7 +145,7 @@ public class TargetWriter extends AbstractDescribedTypeWriter<Target>
         }
     }
 
-    private static Factory<Target> FACTORY = new Factory<Target>()
+    private static final Factory<Target> FACTORY = new Factory<Target>()
     {
 
         @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java
index 1d45e51..72c0dd7 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java
@@ -43,7 +43,7 @@ public class SaslChallengeWriter extends AbstractDescribedTypeWriter<SaslChallen
 
     private static class Writer extends AbstractListWriter<SaslChallenge>
     {
-        private SaslChallenge _value;
+        private final SaslChallenge _value;
         private int _count = -1;
         private int _field;
 
@@ -97,7 +97,7 @@ public class SaslChallengeWriter extends AbstractDescribedTypeWriter<SaslChallen
         }
     }
 
-    private static Factory<SaslChallenge> FACTORY = new Factory<SaslChallenge>()
+    private static final Factory<SaslChallenge> FACTORY = new Factory<SaslChallenge>()
     {
 
         @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message