This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 6999925 QPID-8553 - [Broker-J] Improve code with final keywords
6999925 is described below
commit 699992564fbb9231b5db5d5831540bafaafbc40f
Author: dakirily <daniel.kiril...@gmail.com>
AuthorDate: Tue Jul 20 12:55:32 2021 +0200
QPID-8553 - [Broker-J] Improve code with final keywords
This closes #104
---
.../qpid/server/logging/AbstractMessageLogger.java | 20 +++----
.../org/apache/qpid/server/model/BrokerImpl.java | 62 ++++++++++++----------
.../apache/qpid/server/queue/AbstractQueue.java | 51 ++++++++++--------
.../server/security/CompoundAccessControl.java | 2 +-
.../access/config/RuleBasedAccessControl.java | 4 +-
.../protocol/v0_10/AMQPConnection_0_10Impl.java | 6 +--
.../server/protocol/v0_10/ServerAssembler.java | 8 +--
.../qpid/server/protocol/v0_8/AMQChannel.java | 2 +-
.../protocol/v0_8/AMQPConnection_0_8Impl.java | 2 +-
.../qpid/server/protocol/v0_8/BrokerDecoder.java | 6 +--
.../protocol/v1_0/AMQPConnection_1_0Impl.java | 10 ++--
.../logback/ConnectionAndUserPredicate.java | 10 ++--
.../logging/logback/PrincipalLogEventFilter.java | 4 +-
.../management/amqp/ManagementAddressSpace.java | 12 ++---
.../server/management/amqp/ProxyMessageSource.java | 24 ++++-----
.../plugin/servlet/rest/SaslServlet.java | 18 ++++---
16 files changed, 128 insertions(+), 113 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
index e511920..0e251ab 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
@@ -95,40 +95,40 @@ public abstract class AbstractMessageLogger implements
MessageLogger
abstract void rawMessage(String message, Throwable throwable, String
logHierarchy);
- protected String getActor()
+ protected final String getActor()
{
return getLogActor();
}
static String getLogActor()
{
- Subject subject = Subject.getSubject(AccessController.getContext());
+ final Subject subject =
Subject.getSubject(AccessController.getContext());
- SessionPrincipal sessionPrincipal = getPrincipal(subject,
SessionPrincipal.class);
+ final SessionPrincipal sessionPrincipal = getPrincipal(subject,
SessionPrincipal.class);
String message;
- if(sessionPrincipal != null)
+ if (sessionPrincipal != null)
{
message = generateSessionActor(sessionPrincipal.getSession());
}
else
{
- ConnectionPrincipal connPrincipal = getPrincipal(subject,
ConnectionPrincipal.class);
+ final ConnectionPrincipal connPrincipal = getPrincipal(subject,
ConnectionPrincipal.class);
- if(connPrincipal != null)
+ if (connPrincipal != null)
{
message =
generateConnectionActor(connPrincipal.getConnection());
}
else
{
- TaskPrincipal taskPrincipal = getPrincipal(subject,
TaskPrincipal.class);
- if(taskPrincipal != null)
+ final TaskPrincipal taskPrincipal = getPrincipal(subject,
TaskPrincipal.class);
+ if (taskPrincipal != null)
{
message = generateTaskMessage(taskPrincipal);
}
else
{
- ManagementConnectionPrincipal managementConnection =
getPrincipal(subject,ManagementConnectionPrincipal.class);
- if(managementConnection != null)
+ final ManagementConnectionPrincipal managementConnection =
getPrincipal(subject,ManagementConnectionPrincipal.class);
+ if (managementConnection != null)
{
message =
generateManagementConnectionMessage(managementConnection, getPrincipal(subject,
AuthenticatedPrincipal.class));
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 7d0b77f..d2bd9d4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -1021,38 +1021,13 @@ public class BrokerImpl extends
AbstractContainer<BrokerImpl> implements Broker<
@Override
public SocketConnectionMetaData getConnectionMetaData()
{
- Subject subject = Subject.getSubject(AccessController.getContext());
- final SocketConnectionPrincipal principal;
- if(subject != null)
- {
- Set<SocketConnectionPrincipal> principals =
subject.getPrincipals(SocketConnectionPrincipal.class);
- if(!principals.isEmpty())
- {
- principal = principals.iterator().next();
- }
- else
- {
- principal = null;
- }
- }
- else
- {
- principal = null;
- }
- return principal == null ? null : principal.getConnectionMetaData();
+ return getConnectionMetaDataInternal();
}
@Override
public Set<Principal> getGroups()
{
- Subject currentSubject =
Subject.getSubject(AccessController.getContext());
- if (currentSubject == null)
- {
- return Collections.emptySet();
- }
-
- final Set<Principal> currentPrincipals =
Collections.<Principal>unmodifiableSet(currentSubject.getPrincipals(GroupPrincipal.class));
- return currentPrincipals;
+ return getGroupsInternal();
}
@Override
@@ -1344,4 +1319,37 @@ public class BrokerImpl extends
AbstractContainer<BrokerImpl> implements Broker<
}
}
}
+
+ private final SocketConnectionMetaData getConnectionMetaDataInternal()
+ {
+ final Subject subject =
Subject.getSubject(AccessController.getContext());
+ final SocketConnectionPrincipal principal;
+ if (subject != null)
+ {
+ Set<SocketConnectionPrincipal> principals =
subject.getPrincipals(SocketConnectionPrincipal.class);
+ if (!principals.isEmpty())
+ {
+ principal = principals.iterator().next();
+ }
+ else
+ {
+ principal = null;
+ }
+ }
+ else
+ {
+ principal = null;
+ }
+ return principal == null ? null : principal.getConnectionMetaData();
+ }
+
+ private final Set<Principal> getGroupsInternal()
+ {
+ final Subject currentSubject =
Subject.getSubject(AccessController.getContext());
+ if (currentSubject == null)
+ {
+ return Collections.emptySet();
+ }
+ return
Collections.<Principal>unmodifiableSet(currentSubject.getPrincipals(GroupPrincipal.class));
+ }
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 1673321..a0b6393 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -355,12 +355,18 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
}
}
+ private Set<SessionPrincipal> getSessionPrincipals()
+ {
+ Subject activeSubject =
Subject.getSubject(AccessController.getContext());
+ return activeSubject == null ? Collections.emptySet() :
activeSubject.getPrincipals(SessionPrincipal.class);
+ }
+
@Override
protected void onOpen()
{
super.onOpen();
- Map<String,Object> attributes = getActualAttributes();
+ final Map<String,Object> attributes = getActualAttributes();
final LinkedHashMap<String, Object> arguments = new
LinkedHashMap<>(attributes);
@@ -370,10 +376,9 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
_arguments = Collections.synchronizedMap(arguments);
_queueHouseKeepingTask = new AdvanceConsumersTask();
- Subject activeSubject =
Subject.getSubject(AccessController.getContext());
- Set<SessionPrincipal> sessionPrincipals = activeSubject == null ?
Collections.emptySet() : activeSubject.getPrincipals(SessionPrincipal.class);
- AMQPSession<?, ?> session;
- if(sessionPrincipals.isEmpty())
+ final Set<SessionPrincipal> sessionPrincipals = getSessionPrincipals();
+ final AMQPSession<?, ?> session;
+ if (sessionPrincipals.isEmpty())
{
session = null;
}
@@ -383,7 +388,7 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
session = sessionPrincipal.getSession();
}
- if(session != null)
+ if (session != null)
{
switch(_exclusive)
@@ -413,11 +418,11 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
+ " this is a
coding error inside Qpid");
}
}
- else if(_exclusive == ExclusivityPolicy.PRINCIPAL)
+ else if (_exclusive == ExclusivityPolicy.PRINCIPAL)
{
if (attributes.get(Queue.OWNER) != null)
{
- String owner = String.valueOf(attributes.get(Queue.OWNER));
+ final String owner =
String.valueOf(attributes.get(Queue.OWNER));
Principal ownerPrincipal;
try
{
@@ -430,7 +435,7 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
_exclusiveOwner = new AuthenticatedPrincipal(ownerPrincipal);
}
}
- else if(_exclusive == ExclusivityPolicy.CONTAINER)
+ else if (_exclusive == ExclusivityPolicy.CONTAINER)
{
if (attributes.get(Queue.OWNER) != null)
{
@@ -439,9 +444,9 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
}
- if(getLifetimePolicy() == LifetimePolicy.DELETE_ON_CONNECTION_CLOSE)
+ if (getLifetimePolicy() == LifetimePolicy.DELETE_ON_CONNECTION_CLOSE)
{
- if(session != null)
+ if (session != null)
{
addLifetimeConstraint(session.getAMQPConnection());
}
@@ -452,9 +457,9 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
+ " must be created from a
connection.");
}
}
- else if(getLifetimePolicy() == LifetimePolicy.DELETE_ON_SESSION_END)
+ else if (getLifetimePolicy() == LifetimePolicy.DELETE_ON_SESSION_END)
{
- if(session != null)
+ if (session != null)
{
addLifetimeConstraint(session);
}
@@ -489,7 +494,7 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
}
- switch(getMessageGroupType())
+ switch (getMessageGroupType())
{
case NONE:
_messageGroupManager = null;
@@ -510,21 +515,21 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
_flowToDiskThreshold =
getAncestor(Broker.class).getFlowToDiskThreshold();
- if(_defaultFilters != null)
+ if (_defaultFilters != null)
{
- QpidServiceLoader qpidServiceLoader = new QpidServiceLoader();
+ final QpidServiceLoader qpidServiceLoader = new
QpidServiceLoader();
final Map<String, MessageFilterFactory> messageFilterFactories =
qpidServiceLoader.getInstancesByType(MessageFilterFactory.class);
for (Map.Entry<String,Map<String,List<String>>> entry :
_defaultFilters.entrySet())
{
- String name = String.valueOf(entry.getKey());
- Map<String, List<String>> filterValue = entry.getValue();
- if(filterValue.size() == 1)
+ final String name = String.valueOf(entry.getKey());
+ final Map<String, List<String>> filterValue = entry.getValue();
+ if (filterValue.size() == 1)
{
- String filterTypeName =
String.valueOf(filterValue.keySet().iterator().next());
+ final String filterTypeName =
String.valueOf(filterValue.keySet().iterator().next());
final MessageFilterFactory filterFactory =
messageFilterFactories.get(filterTypeName);
- if(filterFactory != null)
+ if (filterFactory != null)
{
final List<String> filterArguments =
filterValue.values().iterator().next();
// check the arguments are valid
@@ -552,7 +557,7 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
}
}
- if(isHoldOnPublishEnabled())
+ if (isHoldOnPublishEnabled())
{
_holdMethods.add(new HoldMethod()
{
@@ -566,7 +571,7 @@ public abstract class AbstractQueue<X extends
AbstractQueue<X>>
if (getAlternateBinding() != null)
{
- String alternateDestination =
getAlternateBinding().getDestination();
+ final String alternateDestination =
getAlternateBinding().getDestination();
_alternateBindingDestination =
getOpenedMessageDestination(alternateDestination);
if (_alternateBindingDestination != null)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/CompoundAccessControl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/CompoundAccessControl.java
index afeb856..bf5b5a9 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/CompoundAccessControl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/CompoundAccessControl.java
@@ -65,7 +65,7 @@ public class CompoundAccessControl implements
AccessControl<CompoundSecurityToke
}
@Override
- public CompoundSecurityToken newToken()
+ public final CompoundSecurityToken newToken()
{
return new CompoundSecurityToken(_underlyingControls.get(),
Subject.getSubject(AccessController.getContext()));
}
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
index 07cb206..4ca6c38 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
@@ -55,7 +55,7 @@ public class RuleBasedAccessControl implements
AccessControl<CachingSecurityToke
}
@Override
- public CachingSecurityToken newToken()
+ public final CachingSecurityToken newToken()
{
return newToken(Subject.getSubject(AccessController.getContext()));
}
@@ -72,7 +72,7 @@ public class RuleBasedAccessControl implements
AccessControl<CachingSecurityToke
* user the plugin will abstain.
*/
@Override
- public Result authorise(LegacyOperation operation, ObjectType objectType,
ObjectProperties properties)
+ public final Result authorise(LegacyOperation operation, ObjectType
objectType, ObjectProperties properties)
{
final Subject subject =
Subject.getSubject(AccessController.getContext());
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
index f8c5d29..6665097 100755
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
@@ -159,7 +159,7 @@ public class AMQPConnection_0_10Impl extends
AbstractAMQPConnection<AMQPConnecti
}
@Override
- public void readerIdle()
+ public final void readerIdle()
{
AccessController.doPrivileged((PrivilegedAction<Object>) () ->
{
@@ -176,14 +176,14 @@ public class AMQPConnection_0_10Impl extends
AbstractAMQPConnection<AMQPConnecti
}
@Override
- public void closed()
+ public final void closed()
{
try
{
AccessController.doPrivileged((PrivilegedAction<Void>) () ->
{
_inputHandler.closed();
- if(_disassembler != null)
+ if (_disassembler != null)
{
_disassembler.closed();
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
index abe0842..fe6cdb8 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
@@ -69,21 +69,21 @@ public class ServerAssembler
_segments = new HashMap<>();
}
- public void received(final List<ServerFrame> frames)
+ public final void received(final List<ServerFrame> frames)
{
if (!frames.isEmpty())
{
- PeekingIterator<ServerFrame> itr =
Iterators.peekingIterator(frames.iterator());
+ final PeekingIterator<ServerFrame> itr =
Iterators.peekingIterator(frames.iterator());
boolean cleanExit = false;
try
{
- while(itr.hasNext())
+ while (itr.hasNext())
{
final ServerFrame frame = itr.next();
final int frameChannel = frame.getChannel();
- ServerSession channel =
_connection.getSession(frameChannel);
+ final ServerSession channel =
_connection.getSession(frameChannel);
if (channel != null)
{
final AccessControlContext context =
channel.getAccessControllerContext();
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index d526663..46b1109 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -300,7 +300,7 @@ public class AMQChannel extends
AbstractAMQPSession<AMQChannel, ConsumerTarget_0
return _transaction;
}
- public void receivedComplete()
+ public final void receivedComplete()
{
AccessController.doPrivileged(new PrivilegedAction<Void>()
{
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
index 26aaf95..e30b09e 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
@@ -705,7 +705,7 @@ public class AMQPConnection_0_8Impl
}
@Override
- public void readerIdle()
+ public final void readerIdle()
{
AccessController.doPrivileged(new PrivilegedAction<Object>()
{
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
index f0b5cdf..ba0196d 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
@@ -75,9 +75,9 @@ public class BrokerDecoder extends ServerDecoder
}
@Override
- protected int processAMQPFrames(final QpidByteBuffer buf) throws
AMQFrameDecodingException
+ protected final int processAMQPFrames(final QpidByteBuffer buf) throws
AMQFrameDecodingException
{
- int required = decodable(buf);
+ final int required = decodable(buf);
if (required == 0)
{
final int channelId = buf.getUnsignedShort(buf.position() + 1);
@@ -116,7 +116,7 @@ public class BrokerDecoder extends ServerDecoder
}
catch (PrivilegedActionException e)
{
- Throwable cause = e.getCause();
+ final Throwable cause = e.getCause();
if (cause instanceof AMQFrameDecodingException)
{
throw (AMQFrameDecodingException) cause;
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
index a7b6c81..8f8e351 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
@@ -442,11 +442,11 @@ public class AMQPConnection_1_0Impl extends
AbstractAMQPConnection<AMQPConnectio
}
@Override
- public void receive(final List<ChannelFrameBody> channelFrameBodies)
+ public final void receive(final List<ChannelFrameBody> channelFrameBodies)
{
if (!channelFrameBodies.isEmpty())
{
- PeekingIterator<ChannelFrameBody> itr =
Iterators.peekingIterator(channelFrameBodies.iterator());
+ final PeekingIterator<ChannelFrameBody> itr =
Iterators.peekingIterator(channelFrameBodies.iterator());
boolean cleanExit = false;
try
{
@@ -455,7 +455,7 @@ public class AMQPConnection_1_0Impl extends
AbstractAMQPConnection<AMQPConnectio
final ChannelFrameBody channelFrameBody = itr.next();
final int frameChannel = channelFrameBody.getChannel();
- Session_1_0 session = _receivingSessions == null ||
frameChannel >= _receivingSessions.length
+ final Session_1_0 session = _receivingSessions == null ||
frameChannel >= _receivingSessions.length
? null
: _receivingSessions[frameChannel];
if (session != null)
@@ -1271,7 +1271,7 @@ public class AMQPConnection_1_0Impl extends
AbstractAMQPConnection<AMQPConnectio
}
@Override
- public void readerIdle()
+ public final void readerIdle()
{
AccessController.doPrivileged((PrivilegedAction<Object>) () ->
{
@@ -1342,7 +1342,7 @@ public class AMQPConnection_1_0Impl extends
AbstractAMQPConnection<AMQPConnectio
}
@Override
- public void receivedComplete()
+ public final void receivedComplete()
{
if (_receivingSessions != null)
{
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicate.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicate.java
index f7df485..d75332e 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicate.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicate.java
@@ -40,18 +40,18 @@ class ConnectionAndUserPredicate implements
PredicateAndLoggerNameAndLevelFilter
private Pattern _remoteContainerIdPattern = MATCH_ALL;
@Override
- public boolean evaluate(final ILoggingEvent event)
+ public final boolean evaluate(final ILoggingEvent event)
{
String userPrincipalString = "";
String connectionString = "";
String remoteContainerName = "";
- Subject subject = Subject.getSubject(AccessController.getContext());
- Set<SocketConnectionPrincipal> connectionPrincipals =
subject.getPrincipals(SocketConnectionPrincipal.class);
- Set<AuthenticatedPrincipal> userPrincipals =
subject.getPrincipals(AuthenticatedPrincipal.class);
+ final Subject subject =
Subject.getSubject(AccessController.getContext());
+ final Set<SocketConnectionPrincipal> connectionPrincipals =
subject.getPrincipals(SocketConnectionPrincipal.class);
+ final Set<AuthenticatedPrincipal> userPrincipals =
subject.getPrincipals(AuthenticatedPrincipal.class);
if (!connectionPrincipals.isEmpty())
{
- SocketConnectionPrincipal socketConnectionPrincipal =
connectionPrincipals.iterator().next();
+ final SocketConnectionPrincipal socketConnectionPrincipal =
connectionPrincipals.iterator().next();
connectionString = socketConnectionPrincipal.getName();
if (socketConnectionPrincipal instanceof ConnectionPrincipal)
{
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
index 685fe7e..19af6f1 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
@@ -40,9 +40,9 @@ public class PrincipalLogEventFilter extends
Filter<ILoggingEvent> implements Lo
}
@Override
- public FilterReply decide(ILoggingEvent event)
+ public final FilterReply decide(ILoggingEvent event)
{
- Subject subject = Subject.getSubject(AccessController.getContext());
+ final Subject subject =
Subject.getSubject(AccessController.getContext());
if (subject != null && subject.getPrincipals().contains(_principal))
{
return FilterReply.NEUTRAL;
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
index 88df857..0e83704 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
@@ -169,17 +169,17 @@ public class ManagementAddressSpace implements
NamedAddressSpace
return null;
}
- ProxyMessageSource getProxyNode(final String name)
+ final ProxyMessageSource getProxyNode(final String name)
{
LOGGER.debug("RG: looking for proxy source {}", name);
- Subject currentSubject =
Subject.getSubject(AccessController.getContext());
- Set<SessionPrincipal> sessionPrincipals =
currentSubject.getPrincipals(SessionPrincipal.class);
+ final Subject currentSubject =
Subject.getSubject(AccessController.getContext());
+ final Set<SessionPrincipal> sessionPrincipals =
currentSubject.getPrincipals(SessionPrincipal.class);
if (!sessionPrincipals.isEmpty())
{
- Object connectionReference =
sessionPrincipals.iterator().next().getSession().getConnectionReference();
- Map<String, ProxyMessageSource>
+ final Object connectionReference =
sessionPrincipals.iterator().next().getSession().getConnectionReference();
+ final Map<String, ProxyMessageSource>
connectionSpecificDestinations =
_connectionSpecificDestinations.get(connectionReference);
- if(connectionSpecificDestinations != null)
+ if (connectionSpecificDestinations != null)
{
LOGGER.debug("RG: ", connectionSpecificDestinations);
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
index 8a44330..c49cffb 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
@@ -149,24 +149,24 @@ public class ProxyMessageSource implements MessageSource,
MessageDestination
}
@Override
- public <T extends ConsumerTarget<T>> MessageInstanceConsumer<T>
addConsumer(final T target,
-
final FilterManager filters,
-
final Class<? extends ServerMessage> messageClass,
-
final String consumerName,
-
final EnumSet<ConsumerOption> options,
-
final Integer priority)
- throws ExistingExclusiveConsumer,
ExistingConsumerPreventsExclusive,
- ConsumerAccessRefused, QueueDeleted
+ public final <T extends ConsumerTarget<T>> MessageInstanceConsumer<T>
addConsumer(
+ final T target,
+ final FilterManager filters,
+ final Class<? extends ServerMessage> messageClass,
+ final String consumerName,
+ final EnumSet<ConsumerOption> options,
+ final Integer priority
+ ) throws ExistingExclusiveConsumer, ExistingConsumerPreventsExclusive,
ConsumerAccessRefused, QueueDeleted
{
- if(_consumerSet.compareAndSet(false,true))
+ if (_consumerSet.compareAndSet(false,true))
{
- Subject currentSubject =
Subject.getSubject(AccessController.getContext());
- Set<SessionPrincipal> sessionPrincipals =
currentSubject.getPrincipals(SessionPrincipal.class);
+ final Subject currentSubject =
Subject.getSubject(AccessController.getContext());
+ final Set<SessionPrincipal> sessionPrincipals =
currentSubject.getPrincipals(SessionPrincipal.class);
if (!sessionPrincipals.isEmpty())
{
_connectionReference =
sessionPrincipals.iterator().next().getSession().getConnectionReference();
- WrappingTarget<T> wrapper = new WrappingTarget<>(target,
_name);
+ final WrappingTarget<T> wrapper = new WrappingTarget<>(target,
_name);
_managementAddressSpace.getManagementNode().addConsumer(wrapper, filters,
messageClass, _name, options, priority);
final MessageInstanceConsumer<T> consumer =
wrapper.getConsumer();
_consumer = consumer;
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
index f0daefb..6924a8e 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
@@ -76,20 +76,22 @@ public class SaslServlet extends AbstractServlet
@Override
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response,
- final ConfiguredObject<?> managedObject) throws
ServletException, IOException
+ protected final void doGet(
+ HttpServletRequest request,
+ HttpServletResponse response,
+ final ConfiguredObject<?> managedObject
+ ) throws ServletException, IOException
{
getRandom(request);
- AuthenticationProvider<?> authenticationProvider =
getAuthenticationProvider(request);
- List<String> mechanismsList =
authenticationProvider.getAvailableMechanisms(request.isSecure());
- String[] mechanisms = mechanismsList.toArray(new
String[mechanismsList.size()]);
- Map<String, Object> outputObject = new LinkedHashMap<String, Object>();
+ final AuthenticationProvider<?> authenticationProvider =
getAuthenticationProvider(request);
+ final List<String> mechanismsList =
authenticationProvider.getAvailableMechanisms(request.isSecure());
+ final String[] mechanisms = mechanismsList.toArray(new
String[mechanismsList.size()]);
+ final Map<String, Object> outputObject = new LinkedHashMap<String,
Object>();
final Subject subject =
Subject.getSubject(AccessController.getContext());
final Principal principal =
AuthenticatedPrincipal.getOptionalAuthenticatedPrincipalFromSubject(subject);
- if(principal != null)
+ if (principal != null)
{
outputObject.put("user", principal.getName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
