You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/10/06 14:48:19 UTC
[2/4] qpid-broker-j git commit: QPID-7531: [Java Broker,
AMQP 1.0] Code clean-up
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/SaslInitWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitWriter.java
index b6e108d..2785e00 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitWriter.java
@@ -111,7 +111,7 @@ public class SaslInitWriter extends AbstractDescribedTypeWriter<SaslInit>
}
}
- private static Factory<SaslInit> FACTORY = new Factory<SaslInit>()
+ private static final Factory<SaslInit> FACTORY = new Factory<SaslInit>()
{
@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/SaslMechanismsWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsWriter.java
index 5fc4ea3..9a50d07 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsWriter.java
@@ -97,7 +97,7 @@ public class SaslMechanismsWriter extends AbstractDescribedTypeWriter<SaslMechan
}
}
- private static Factory<SaslMechanisms> FACTORY = new Factory<SaslMechanisms>()
+ private static final Factory<SaslMechanisms> FACTORY = new Factory<SaslMechanisms>()
{
@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/SaslOutcomeWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeWriter.java
index 968f739..40b9b2a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeWriter.java
@@ -104,7 +104,7 @@ public class SaslOutcomeWriter extends AbstractDescribedTypeWriter<SaslOutcome>
}
}
- private static Factory<SaslOutcome> FACTORY = new Factory<SaslOutcome>()
+ private static final Factory<SaslOutcome> FACTORY = new Factory<SaslOutcome>()
{
@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/SaslResponseWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseWriter.java
index 4c789f0..f37413c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseWriter.java
@@ -43,8 +43,8 @@ public class SaslResponseWriter extends AbstractDescribedTypeWriter<SaslResponse
private static class Writer extends AbstractListWriter<SaslResponse>
{
- private SaslResponse _value;
- private int _count;
+ private final SaslResponse _value;
+ private final int _count;
private int _field;
public Writer(final Registry registry, final SaslResponse object)
@@ -98,7 +98,7 @@ public class SaslResponseWriter extends AbstractDescribedTypeWriter<SaslResponse
}
}
- private static Factory<SaslResponse> FACTORY = new Factory<SaslResponse>()
+ private static final Factory<SaslResponse> FACTORY = new Factory<SaslResponse>()
{
@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/transaction/codec/CoordinatorWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
index 334c79f..e09e6c1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
@@ -98,7 +98,7 @@ public class CoordinatorWriter extends AbstractDescribedTypeWriter<Coordinator>
}
}
- private static Factory<Coordinator> FACTORY = new Factory<Coordinator>()
+ private static final Factory<Coordinator> FACTORY = new Factory<Coordinator>()
{
@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/transaction/codec/DeclareWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
index ac17c35..530c899 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
@@ -97,7 +97,7 @@ public class DeclareWriter extends AbstractDescribedTypeWriter<Declare>
}
}
- private static Factory<Declare> FACTORY = new Factory<Declare>()
+ private static final Factory<Declare> FACTORY = new Factory<Declare>()
{
@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/transaction/codec/DeclaredWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredWriter.java
index 196e5f6..be85da3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredWriter.java
@@ -99,7 +99,7 @@ public class DeclaredWriter extends AbstractDescribedTypeWriter<Declared>
}
}
- private static Factory<Declared> FACTORY = new Factory<Declared>()
+ private static final Factory<Declared> FACTORY = new Factory<Declared>()
{
@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/transaction/codec/DischargeWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeWriter.java
index 88728bc..9579743 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeWriter.java
@@ -42,7 +42,7 @@ public class DischargeWriter extends AbstractDescribedTypeWriter<Discharge>
private static class Writer extends AbstractListWriter<Discharge>
{
- private Discharge _value;
+ private final Discharge _value;
private int _count = -1;
private int _field;
@@ -106,7 +106,7 @@ public class DischargeWriter extends AbstractDescribedTypeWriter<Discharge>
}
}
- private static Factory<Discharge> FACTORY = new Factory<Discharge>()
+ private static final Factory<Discharge> FACTORY = new Factory<Discharge>()
{
@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/transaction/codec/TransactionalStateWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateWriter.java
index 4be6235..775f583 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateWriter.java
@@ -104,7 +104,7 @@ public class TransactionalStateWriter extends AbstractDescribedTypeWriter<Transa
}
}
- private static Factory<TransactionalState> FACTORY = new Factory<TransactionalState>()
+ private static final Factory<TransactionalState> FACTORY = new Factory<TransactionalState>()
{
@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/transport/Attach.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
index 5a40cb3..51b9c98 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
@@ -159,7 +159,7 @@ public class Attach implements FrameBody
return _unsettled;
}
- public void setUnsettled(Map unsettled)
+ public void setUnsettled(Map<Binary, DeliveryState> unsettled)
{
_unsettled = unsettled;
}
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/transport/codec/AttachWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java
index 4d253f9..d11569e 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java
@@ -202,7 +202,7 @@ public class AttachWriter extends AbstractDescribedTypeWriter<Attach>
}
}
- private static Factory<Attach> FACTORY = new Factory<Attach>()
+ private static final Factory<Attach> FACTORY = new Factory<Attach>()
{
@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/transport/codec/BeginWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java
index bf2c7ea..696fdc8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java
@@ -157,7 +157,7 @@ public class BeginWriter extends AbstractDescribedTypeWriter<Begin>
}
}
- private static Factory<Begin> FACTORY = new Factory<Begin>()
+ private static final Factory<Begin> FACTORY = new Factory<Begin>()
{
@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/transport/codec/CloseWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java
index 17ebd4c..a9ca6d1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java
@@ -99,7 +99,7 @@ public class CloseWriter extends AbstractDescribedTypeWriter<Close>
}
}
- private static Factory<Close> FACTORY = new Factory<Close>()
+ private static final Factory<Close> FACTORY = new Factory<Close>()
{
@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/transport/codec/DetachWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java
index fde219e..a76572b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java
@@ -114,7 +114,7 @@ public class DetachWriter extends AbstractDescribedTypeWriter<Detach>
}
}
- private static Factory<Detach> FACTORY = new Factory<Detach>()
+ private static final Factory<Detach> FACTORY = new Factory<Detach>()
{
@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/transport/codec/DispositionWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java
index c3b02e0..195b2a2 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java
@@ -140,7 +140,7 @@ public class DispositionWriter extends AbstractDescribedTypeWriter<Disposition>
}
}
- private static Factory<Disposition> FACTORY = new Factory<Disposition>()
+ private static final Factory<Disposition> FACTORY = new Factory<Disposition>()
{
@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/transport/codec/EndWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java
index fa68f3a..2f2697a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java
@@ -97,7 +97,7 @@ public class EndWriter extends AbstractDescribedTypeWriter<End>
}
}
- private static Factory<End> FACTORY = new Factory<End>()
+ private static final Factory<End> FACTORY = new Factory<End>()
{
@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/transport/codec/ErrorWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java
index 6e20432..0401ce5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java
@@ -112,7 +112,7 @@ public class ErrorWriter extends AbstractDescribedTypeWriter<Error>
}
}
- private static Factory<Error> FACTORY = new Factory<Error>()
+ private static final Factory<Error> FACTORY = new Factory<Error>()
{
@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/transport/codec/FlowWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java
index a06db6e..1f40a31 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java
@@ -179,7 +179,7 @@ public class FlowWriter extends AbstractDescribedTypeWriter<Flow>
}
}
- private static Factory<Flow> FACTORY = new Factory<Flow>()
+ private static final Factory<Flow> FACTORY = new Factory<Flow>()
{
@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/transport/codec/OpenWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java
index 701d28e..6fbe975 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java
@@ -170,7 +170,7 @@ public class OpenWriter extends AbstractDescribedTypeWriter<Open>
}
}
- private static Factory<Open> FACTORY = new Factory<Open>()
+ private static final Factory<Open> FACTORY = new Factory<Open>()
{
@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/transport/codec/TransferWriter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java
index 2839a08..412a00a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java
@@ -179,7 +179,7 @@ public class TransferWriter extends AbstractDescribedTypeWriter<Transfer>
}
}
- private static Factory<Transfer> FACTORY = new Factory<Transfer>()
+ private static final Factory<Transfer> FACTORY = new Factory<Transfer>()
{
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
index f171e80..9d3ef53 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
@@ -59,12 +59,12 @@ import org.apache.qpid.server.store.StoredMessage;
public class ConsumerTarget_1_0Test extends TestCase
{
- private AMQPDescribedTypeRegistry _describedTypeRegistry = AMQPDescribedTypeRegistry.newInstance()
- .registerTransportLayer()
- .registerMessagingLayer()
- .registerTransactionLayer()
- .registerSecurityLayer()
- .registerExtensionSoleconnLayer();
+ private final AMQPDescribedTypeRegistry _describedTypeRegistry = AMQPDescribedTypeRegistry.newInstance()
+ .registerTransportLayer()
+ .registerMessagingLayer()
+ .registerTransactionLayer()
+ .registerSecurityLayer()
+ .registerExtensionSoleconnLayer();
private ConsumerTarget_1_0 _consumerTarget;
private SendingLinkEndpoint _sendingLinkEndpoint;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
index e45bc0b..e61e124 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
@@ -27,15 +27,14 @@ import org.apache.qpid.test.utils.QpidTestCase;
public class LinkRegistryTest extends QpidTestCase
{
- private QueueManagingVirtualHost _virtualHost;
private LinkRegistryImpl _linkRegistry;
@Override
protected void setUp() throws Exception
{
super.setUp();
- _virtualHost = mock(QueueManagingVirtualHost.class);
- _linkRegistry = new LinkRegistryImpl(_virtualHost);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
+ _linkRegistry = new LinkRegistryImpl(virtualHost);
}
public void testGetSendingLink() throws Exception
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
index 6d8c89c..d29175c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -60,7 +59,6 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.DataSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.EncodingRetainingSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotationsSection;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.typedmessage.TypedBytesContentWriter;
import org.apache.qpid.test.utils.QpidTestCase;
public class MessageConverter_Internal_to_1_0Test extends QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
index 6c68154..3b2ac14 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
@@ -56,7 +56,6 @@ import org.apache.qpid.server.protocol.v1_0.type.messaging.Footer;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotations;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.Source;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ByteBufferUtils;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -716,7 +715,7 @@ public class MessageConverter_v1_0_to_InternalTest extends QpidTestCase
private void doTestDataWithAnnotation(final byte[] data,
final MessageAnnotations messageAnnotations,
- final String mimeType, final String expectedMimeType) throws Exception
+ final String mimeType, final String expectedMimeType)
{
final Data value = new Data(new Binary(data));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
index 27f275f..726adc9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
@@ -296,7 +296,7 @@ public class PropertyConverter_Internal_to_v1_0Test extends QpidTestCase
}
}
- private InternalMessage createTestMessage(String to) throws IOException
+ private InternalMessage createTestMessage(String to)
{
final InternalMessageHeader internalMessageHeader = new InternalMessageHeader(mock(AMQMessageHeader.class));
final StoredMessage<InternalMessageMetaData> handle =
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index c315c2d..6876e22 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@ -75,7 +75,6 @@ import org.apache.qpid.server.transport.AggregateTicker;
import org.apache.qpid.server.transport.ByteBufferSender;
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.virtualhost.ConnectionEstablishmentPolicy;
-import org.apache.qpid.server.virtualhost.NoopConnectionEstablishmentPolicy;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -85,9 +84,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
private ServerNetworkConnection _networkConnection;
private Broker<?> _broker;
private AmqpPort _port;
- private SubjectCreator _subjectCreator;
private AuthenticationProvider _authenticationProvider;
- private List<ByteBuffer> _sentBuffers;
private FrameWriter _frameWriter;
private AMQPConnection _connection;
private VirtualHost<?> _virtualHost;
@@ -112,7 +109,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
when(_port.getChildExecutor()).thenReturn(taskExecutor);
when(_port.getCategoryClass()).thenReturn(Port.class);
when(_port.getModel()).thenReturn(BrokerModel.getInstance());
- _subjectCreator = mock(SubjectCreator.class);
+ final SubjectCreator subjectCreator = mock(SubjectCreator.class);
_authenticationProvider = mock(AuthenticationProvider.class);
when(_port.getAuthenticationProvider()).thenReturn(_authenticationProvider);
@@ -135,10 +132,10 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
}).when(_virtualHost).registerConnection(connectionCaptor.capture(), establishmentPolicyCaptor.capture());
when(_virtualHost.getPrincipal()).thenReturn(mock(VirtualHostPrincipal.class));
when(_port.getAddressSpace(anyString())).thenReturn(_virtualHost);
- when(_port.getSubjectCreator(anyBoolean(), anyString())).thenReturn(_subjectCreator);
+ when(_port.getSubjectCreator(anyBoolean(), anyString())).thenReturn(subjectCreator);
final ArgumentCaptor<Principal> userCaptor = ArgumentCaptor.forClass(Principal.class);
- when(_subjectCreator.createSubjectWithGroups(userCaptor.capture())).then(new Answer<Subject>()
+ when(subjectCreator.createSubjectWithGroups(userCaptor.capture())).then(new Answer<Subject>()
{
@Override
public Subject answer(final InvocationOnMock invocation) throws Throwable
@@ -152,19 +149,6 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
final ByteBufferSender sender = mock(ByteBufferSender.class);
when(_networkConnection.getSender()).thenReturn(sender);
- final ArgumentCaptor<QpidByteBuffer> byteBufferCaptor = ArgumentCaptor.forClass(QpidByteBuffer.class);
-
- doAnswer(new Answer()
- {
- @Override
- public Object answer(final InvocationOnMock invocation) throws Throwable
- {
- _sentBuffers.add(byteBufferCaptor.getValue().asByteBuffer());
- return null;
- }
- }).when(sender).send(byteBufferCaptor.capture());
- _sentBuffers = new ArrayList<>();
-
AMQPDescribedTypeRegistry registry = AMQPDescribedTypeRegistry.newInstance().registerTransportLayer()
.registerMessagingLayer()
.registerTransactionLayer()
@@ -201,7 +185,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
public void testProtocolEngineWithNoSaslNonTLSandAnon() throws Exception
{
- final Map<String, Object> attrs = Collections.<String, Object>singletonMap(ConfiguredObject.NAME, getTestName());
+ final Map<String, Object> attrs = Collections.singletonMap(ConfiguredObject.NAME, getTestName());
final AnonymousAuthenticationManager anonymousAuthenticationManager =
(new AnonymousAuthenticationManagerFactory()).create(null, attrs, _broker);
when(_port.getAuthenticationProvider()).thenReturn(anonymousAuthenticationManager);
@@ -262,7 +246,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
public void testProtocolEngineWithSaslNonTLSandAnon() throws Exception
{
- final Map<String, Object> attrs = Collections.<String, Object>singletonMap(ConfiguredObject.NAME, getTestName());
+ final Map<String, Object> attrs = Collections.singletonMap(ConfiguredObject.NAME, getTestName());
final AnonymousAuthenticationManager anonymousAuthenticationManager =
(new AnonymousAuthenticationManagerFactory()).create(null, attrs, _broker);
when(_port.getAuthenticationProvider()).thenReturn(anonymousAuthenticationManager);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
index 468fe15..2dacac3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
@@ -356,12 +356,11 @@ public class Session_1_0Test extends QpidTestCase
public void testReceiveAttachToExistingQueue() throws Exception
{
final String linkName = "testLink";
- final String address = QUEUE_NAME;
- Attach attach = createQueueAttach(false, linkName, address);
+ Attach attach = createQueueAttach(false, linkName, QUEUE_NAME);
- Queue<?> queue = _virtualHost.createChild(Queue.class, Collections.<String, Object>singletonMap(Queue.NAME, QUEUE_NAME));
+ Queue<?> queue = _virtualHost.createChild(Queue.class, Collections.singletonMap(Queue.NAME, QUEUE_NAME));
Exchange<?> exchange = _virtualHost.getChildByName(Exchange.class, "amq.direct");
- exchange.bind(QUEUE_NAME, QUEUE_NAME, Collections.<String, Object>emptyMap(), false);
+ exchange.bind(QUEUE_NAME, QUEUE_NAME, Collections.emptyMap(), false);
_session.receiveAttach(attach);
@@ -371,8 +370,7 @@ public class Session_1_0Test extends QpidTestCase
public void testReceiveAttachToNonExistingQueue() throws Exception
{
final String linkName = "testLink";
- final String address = QUEUE_NAME;
- Attach attach = createQueueAttach(false, linkName, address);
+ Attach attach = createQueueAttach(false, linkName, QUEUE_NAME);
_session.receiveAttach(attach);
assertAttachFailed(_connection, _session, attach);
}
@@ -525,7 +523,7 @@ public class Session_1_0Test extends QpidTestCase
{
JMSSelectorFilter selector = new JMSSelectorFilter(selectorExpression);
final Map<Symbol, Filter>
- filter = Collections.<Symbol,Filter>singletonMap(Symbol.getSymbol("jms-selector"), selector);
+ filter = Collections.singletonMap(Symbol.getSymbol("jms-selector"), selector);
((Source)attach.getSource()).setFilter(filter);
}
@@ -718,7 +716,7 @@ public class Session_1_0Test extends QpidTestCase
{
AMQPConnection_1_0 connection = mock(AMQPConnection_1_0.class);
Subject subject =
- new Subject(true, Collections.<Principal>emptySet(), Collections.emptySet(), Collections.emptySet());
+ new Subject(true, Collections.emptySet(), Collections.emptySet(), Collections.emptySet());
when(connection.getSubject()).thenReturn(subject);
when(connection.getAddressSpace()).thenReturn(_virtualHost);
when(connection.getEventLogger()).thenReturn(mock(EventLogger.class));
@@ -759,8 +757,7 @@ public class Session_1_0Test extends QpidTestCase
{
Begin begin = mock(Begin.class);
when(begin.getNextOutgoingId()).thenReturn(new UnsignedInteger(channelId));
- Session_1_0 session = new Session_1_0(connection, begin, channelId, channelId, 2048);
- return session;
+ return new Session_1_0(connection, begin, channelId, channelId, 2048);
}
private void sendDetach(final Session_1_0 session,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
index d142b15..7c65225 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
@@ -20,9 +20,6 @@
package org.apache.qpid.server.protocol.v1_0.codec;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
@@ -32,7 +29,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
public class ValueHandlerTest extends QpidTestCase
{
- private byte[] FORMAT_CODES = {
+ private final byte[] FORMAT_CODES = {
0x00,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56,
0x60, 0x61,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
index af4bd9a..79172a7 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
@@ -171,7 +171,7 @@ public class MessageConverter_0_10_to_1_0 extends MessageConverter_to_1_0<Messa
{
originalContentMimeType = msgProps.getContentType();
final Symbol contentType =
- MessageConverter_to_1_0.getContentType(originalContentMimeType, bodySection);
+ MessageConverter_to_1_0.getContentType(originalContentMimeType);
props.setContentType(contentType);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/024f9a21/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index 5034ce7..32a076c 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
@@ -82,7 +82,7 @@ public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMess
props.setContentEncoding(Symbol.valueOf(contentHeader.getEncodingAsString()));
}
- Symbol contentType = getContentType(contentHeader.getContentTypeAsString(), bodySection);
+ Symbol contentType = getContentType(contentHeader.getContentTypeAsString());
props.setContentType(contentType);
final AMQShortString correlationId = contentHeader.getCorrelationId();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org