You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/25 18:22:43 UTC
[1/8] activemq-artemis git commit: This closes #734
Repository: activemq-artemis
Updated Branches:
refs/heads/master 601ab120d -> 0a8c118a1
This closes #734
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0a8c118a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0a8c118a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0a8c118a
Branch: refs/heads/master
Commit: 0a8c118a14256c4880016e4229e5fff581214f60
Parents: 601ab12 4ef9c5e
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 25 14:22:32 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/utils/uri/URISchema.java | 12 ++++----
.../activemq/artemis/utils/uri/URISupport.java | 10 +++---
.../core/remoting/impl/ssl/SSLSupport.java | 4 +--
.../spi/core/protocol/RemotingConnection.java | 2 +-
.../artemis/utils/SecurityFormatter.java | 4 +--
.../apache/activemq/artemis/utils/XMLUtil.java | 4 +--
.../artemis/util/CompressionUtilTest.java | 32 ++++++++++----------
.../apache/activemq/artemis/dto/XmlUtil.java | 2 +-
.../activemq/artemis/jdbc/store/JDBCUtils.java | 5 +--
.../file/JDBCSequentialFileFactoryDriver.java | 5 +--
.../jms/client/ActiveMQBytesMessage.java | 3 +-
.../jms/client/ActiveMQConnectionFactory.java | 4 +++
.../artemis/jms/client/ActiveMQMapMessage.java | 3 +-
.../artemis/jms/client/ActiveMQMessage.java | 3 +-
.../jms/client/ActiveMQObjectMessage.java | 2 +-
.../jms/client/ActiveMQStreamMessage.java | 1 -
.../artemis/jms/client/ActiveMQTextMessage.java | 3 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 5 +--
.../jms/server/impl/JMSServerManagerImpl.java | 6 ++--
.../core/io/mapped/MappedByteBufferCache.java | 10 ++----
...che_activemq_artemis_jlibaio_LibaioContext.c | 2 +-
.../proton/converter/ActiveMQJMSVendor.java | 1 -
.../proton/converter/jms/ServerDestination.java | 2 +-
.../protocol/openwire/OpenWireConnection.java | 12 +++-----
.../openwire/OpenWireMessageConverter.java | 10 ++----
.../core/protocol/stomp/StompSession.java | 4 +--
.../ra/ActiveMQRAManagedConnectionFactory.java | 9 ++----
.../artemis/ra/ActiveMQRAMapMessage.java | 1 -
.../activemq/artemis/ra/ActiveMQRAMessage.java | 3 +-
.../ra/inflow/ActiveMQActivationSpec.java | 5 ++-
.../artemis/rest/queue/PostMessageNoDups.java | 4 +--
.../selector/filter/UnaryExpression.java | 4 +--
.../config/ClusterConnectionConfiguration.java | 4 +--
.../core/config/impl/ConfigurationImpl.java | 10 +++---
.../core/config/impl/SecurityConfiguration.java | 9 ++----
.../core/messagecounter/MessageCounter.java | 4 +--
.../impl/MessageCounterManagerImpl.java | 19 ++----------
.../wireformat/ReplicationSyncFileMessage.java | 2 +-
.../core/remoting/impl/netty/NettyAcceptor.java | 9 ++----
.../cluster/impl/ClusterConnectionBridge.java | 8 ++---
.../core/server/impl/ActiveMQServerImpl.java | 1 +
.../artemis/core/server/impl/QueueImpl.java | 3 +-
.../impl/SharedNothingLiveActivation.java | 2 +-
.../spi/core/protocol/ProtocolManager.java | 2 +-
.../core/security/jaas/JaasCallbackHandler.java | 3 +-
.../spi/core/security/jaas/LDAPLoginModule.java | 14 ++++-----
.../artemis/tests/util/ActiveMQTestBase.java | 20 ++----------
docs/hacking-guide/en/ide.md | 4 +--
docs/user-manual/en/aerogear-integration.md | 2 +-
docs/user-manual/en/vertx-integration.md | 2 +-
.../jms/example/HAPolicyAutoBackupExample.java | 2 +-
.../activemq/artemis/jms/example/PerfBase.java | 2 +-
.../artemis/jms/soak/example/SoakBase.java | 2 +-
.../aerogear/ActiveMQAeroGearLogger.java | 2 +-
pom.xml | 2 +-
.../transport/tcp/TcpTransportFactory.java | 1 -
.../activemq/EmbeddedBrokerTestSupport.java | 2 +-
.../org/apache/activemq/OptimizedAckTest.java | 2 +-
.../activemq/security/SecurityJMXTest.java | 2 +-
.../failover/FailoverTransactionTest.java | 2 +-
.../NonBlockingConsumerRedeliveryTest.java | 6 ++--
.../usecases/StartAndStopBrokerTest.java | 2 +-
.../transport/amqp/client/AmqpSender.java | 2 +-
.../amqp/client/AmqpTransactionContext.java | 1 -
.../amqp/client/sasl/CramMD5Mechanism.java | 4 +--
.../transport/amqp/client/sasl/Mechanism.java | 6 ++--
.../amqp/client/util/PropertyUtil.java | 21 ++++++-------
.../jms/tests/tools/container/Server.java | 2 +-
.../conform/connection/TopicConnectionTest.java | 2 +-
69 files changed, 145 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
[5/8] activemq-artemis git commit: Unnecessary @SuppressWarnings fixes
Posted by cl...@apache.org.
Unnecessary @SuppressWarnings fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/30c617da
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/30c617da
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/30c617da
Branch: refs/heads/master
Commit: 30c617da3c14885b3a81732e23c42889387a3f8b
Parents: 601ab12
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:07:24 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java | 3 +--
.../apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java | 2 +-
.../apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java | 1 -
.../artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java | 1 -
.../activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java | 2 +-
.../java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java | 1 -
.../java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java | 3 +--
.../org/apache/activemq/transport/tcp/TcpTransportFactory.java | 1 -
8 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index ab9e311..78acdb7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -609,7 +609,6 @@ public class ActiveMQMessage implements javax.jms.Message {
return val;
}
- @SuppressWarnings("rawtypes")
@Override
public Enumeration getPropertyNames() throws JMSException {
return Collections.enumeration(MessageUtil.getPropertyNames(message));
@@ -771,7 +770,7 @@ public class ActiveMQMessage implements javax.jms.Message {
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+ public boolean isBodyAssignableTo(Class c) {
/**
* From the specs:
* <p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 0e6bbda..a149dbd 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -176,7 +176,7 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+ public boolean isBodyAssignableTo(Class c) {
if (data == null) // we have no body
return true;
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 4b3f5c3..1c7772c 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -394,7 +394,6 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
return message.getBodyBuffer();
}
- @SuppressWarnings("rawtypes")
@Override
public boolean isBodyAssignableTo(Class c) {
return false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
index ed887cf..3cfb0a5 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
@@ -81,7 +81,6 @@ public class ActiveMQJMSVendor implements JMSVendor {
}
@Override
- @SuppressWarnings("deprecation")
public Destination createDestination(String name) {
return new ServerDestination(name);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index 73b443f..a3e5f4c 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -184,7 +184,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
* @throws ResourceException Thrown if the managed connection can not be found
*/
@Override
- public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") final Set connectionSet,
+ public ManagedConnection matchManagedConnections(final Set connectionSet,
final Subject subject,
final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if (ActiveMQRAManagedConnectionFactory.trace) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
index c22cc8d..0b2cb61 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
@@ -181,7 +181,6 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
* @throws JMSException Thrown if an error occurs
*/
@Override
- @SuppressWarnings("rawtypes")
public Enumeration getMapNames() throws JMSException {
if (ActiveMQRAMapMessage.trace) {
ActiveMQRALogger.LOGGER.trace("getMapNames()");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
index 7872459..d060009 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
@@ -384,7 +384,6 @@ public class ActiveMQRAMessage implements Message {
* @throws JMSException Thrown if an error occurs
*/
@Override
- @SuppressWarnings("rawtypes")
public Enumeration getPropertyNames() throws JMSException {
if (ActiveMQRAMessage.trace) {
ActiveMQRALogger.LOGGER.trace("getPropertyNames()");
@@ -776,7 +775,7 @@ public class ActiveMQRAMessage implements Message {
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) throws JMSException {
+ public boolean isBodyAssignableTo(Class c) throws JMSException {
if (ActiveMQRAMessage.trace) {
ActiveMQRALogger.LOGGER.trace("isBodyAssignableTo(" + c + ")");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c617da/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
index a81f9aa..1d10280 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
@@ -108,7 +108,6 @@ public class TcpTransportFactory extends TransportFactory {
}
@Override
- @SuppressWarnings("rawtypes")
public Transport compositeConfigure(Transport transport, WireFormat format, Map options) {
TcpTransport tcpTransport = transport.narrow(TcpTransport.class);
[7/8] activemq-artemis git commit: Javadoc error fixes
Posted by cl...@apache.org.
Javadoc error fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4ef9c5e2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4ef9c5e2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4ef9c5e2
Branch: refs/heads/master
Commit: 4ef9c5e238810f1f280d34edd34e957b69b6e483
Parents: d524297
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 16:00:20 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../core/impl/wireformat/ReplicationSyncFileMessage.java | 2 +-
.../org/apache/activemq/transport/amqp/client/AmqpSender.java | 2 +-
.../activemq/transport/amqp/client/AmqpTransactionContext.java | 1 -
.../apache/activemq/transport/amqp/client/sasl/Mechanism.java | 6 +++---
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ef9c5e2/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
index 6999741..208e86b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java
@@ -27,7 +27,7 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.AbstractJournal
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
/**
- * Message is used to sync {@link org.apache.activemq.artemis.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls
+ * Message is used to sync {@link org.apache.activemq.artemis.core.io.SequentialFile}s to a backup server. The {@link FileType} controls
* which extra information is sent.
*/
public final class ReplicationSyncFileMessage extends PacketImpl {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ef9c5e2/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
index 404b943..5ae2948 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSender.java
@@ -95,7 +95,7 @@ public class AmqpSender extends AmqpAbstractResource<Sender> {
* Create a new sender instance using the given Target when creating the link.
*
* @param session The parent session that created the session.
- * @param address The address that this sender produces to.
+ * @param target The target that this sender produces to.
* @param senderId The unique ID assigned to this sender.
*/
public AmqpSender(AmqpSession session, Target target, String senderId) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ef9c5e2/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
index 2f3e22a..939f040 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionContext.java
@@ -47,7 +47,6 @@ public class AmqpTransactionContext {
/**
* Begins a new transaction scoped to the target session.
*
- * @param txId The transaction Id to use for this new transaction.
* @throws Exception if an error occurs while starting the transaction.
*/
public void begin() throws Exception {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ef9c5e2/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/Mechanism.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/Mechanism.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/Mechanism.java
index a79406f..cc2687f 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/Mechanism.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/Mechanism.java
@@ -78,7 +78,7 @@ public interface Mechanism extends Comparable<Mechanism> {
*
* @param username The user name given.
*/
- void setUsername(String value);
+ void setUsername(String username);
/**
* Returns the configured user name value for this Mechanism.
@@ -91,9 +91,9 @@ public interface Mechanism extends Comparable<Mechanism> {
* Sets the password value for this Mechanism. The Mechanism can ignore this
* value if it does not utilize a password in it's authentication processing.
*
- * @param username The user name given.
+ * @param password The password given.
*/
- void setPassword(String value);
+ void setPassword(String password);
/**
* Returns the configured password value for this Mechanism.
[4/8] activemq-artemis git commit: Missing @Override fixes
Posted by cl...@apache.org.
Missing @Override fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d57378f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d57378f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d57378f2
Branch: refs/heads/master
Commit: d57378f2afba056b0f97daf35d27d11ba5dd0213
Parents: 9d0dcf7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:08:39 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/client/ActiveMQConnectionFactory.java | 4 ++++
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d57378f2/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 183745d..ce531f5 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -154,18 +154,22 @@ public class ActiveMQConnectionFactory implements ConnectionFactoryOptions, Exte
}
}
+ @Override
public String getDeserializationBlackList() {
return deserializationBlackList;
}
+ @Override
public void setDeserializationBlackList(String blackList) {
this.deserializationBlackList = blackList;
}
+ @Override
public String getDeserializationWhiteList() {
return deserializationWhiteList;
}
+ @Override
public void setDeserializationWhiteList(String whiteList) {
this.deserializationWhiteList = whiteList;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d57378f2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 25511b0..dba7e5b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -381,6 +381,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
this.serviceRegistry = serviceRegistry == null ? new ServiceRegistryImpl() : serviceRegistry;
}
+ @Override
public ReloadManager getReloadManager() {
return reloadManager;
}
[3/8] activemq-artemis git commit: Unchecked warning suppression fixes
Posted by cl...@apache.org.
Unchecked warning suppression fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9d0dcf7f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9d0dcf7f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9d0dcf7f
Branch: refs/heads/master
Commit: 9d0dcf7f63904928f1c69e110647d75b241b37d6
Parents: 30c617d
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:08:08 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java | 3 ++-
.../apache/activemq/artemis/jms/client/ActiveMQMapMessage.java | 3 ++-
.../apache/activemq/artemis/jms/client/ActiveMQTextMessage.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d0dcf7f/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index e170701..b585caf 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -378,7 +378,8 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+ @SuppressWarnings("unchecked")
+ public boolean isBodyAssignableTo(Class c) {
return c.isAssignableFrom(byte[].class);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d0dcf7f/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index d067593..a80d550 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -384,7 +384,8 @@ public final class ActiveMQMapMessage extends ActiveMQMessage implements MapMess
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+ @SuppressWarnings("unchecked")
+ public boolean isBodyAssignableTo(Class c) {
if (hasNoBody()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d0dcf7f/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index aa36336..7d84bd4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -120,7 +120,8 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
}
@Override
- public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+ @SuppressWarnings("unchecked")
+ public boolean isBodyAssignableTo(ctiClass c) {
if (text == null)
return true;
return c.isAssignableFrom(java.lang.String.class);
[8/8] activemq-artemis git commit: Spelling fixes
Posted by cl...@apache.org.
Spelling fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e1728f07
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e1728f07
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e1728f07
Branch: refs/heads/master
Commit: e1728f07976c870f5c6bf55d4b8afd363b7e3edc
Parents: 8c6e044
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:53:30 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../spi/core/protocol/RemotingConnection.java | 2 +-
.../artemis/util/CompressionUtilTest.java | 32 ++++++++++----------
.../apache/activemq/artemis/dto/XmlUtil.java | 2 +-
...che_activemq_artemis_jlibaio_LibaioContext.c | 2 +-
.../proton/converter/jms/ServerDestination.java | 2 +-
.../protocol/openwire/OpenWireConnection.java | 2 +-
.../artemis/rest/queue/PostMessageNoDups.java | 4 +--
.../artemis/core/server/impl/QueueImpl.java | 3 +-
.../impl/SharedNothingLiveActivation.java | 2 +-
.../spi/core/protocol/ProtocolManager.java | 2 +-
docs/hacking-guide/en/ide.md | 4 +--
docs/user-manual/en/aerogear-integration.md | 2 +-
docs/user-manual/en/vertx-integration.md | 2 +-
.../jms/example/HAPolicyAutoBackupExample.java | 2 +-
.../activemq/artemis/jms/example/PerfBase.java | 2 +-
.../artemis/jms/soak/example/SoakBase.java | 2 +-
.../aerogear/ActiveMQAeroGearLogger.java | 2 +-
pom.xml | 2 +-
.../activemq/EmbeddedBrokerTestSupport.java | 2 +-
.../org/apache/activemq/OptimizedAckTest.java | 2 +-
.../activemq/security/SecurityJMXTest.java | 2 +-
.../failover/FailoverTransactionTest.java | 2 +-
.../NonBlockingConsumerRedeliveryTest.java | 6 ++--
.../usecases/StartAndStopBrokerTest.java | 2 +-
.../jms/tests/tools/container/Server.java | 2 +-
.../conform/connection/TopicConnectionTest.java | 2 +-
26 files changed, 45 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
index 0f16db7..0f5abf3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
@@ -105,7 +105,7 @@ public interface RemotingConnection extends BufferHandler {
/**
* set the failure listeners.
* <p>
- * These will be called in the event of the connection being closed. Any previosuly added listeners will be removed.
+ * These will be called in the event of the connection being closed. Any previously added listeners will be removed.
*
* @param listeners the listeners to add.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
index 71e2ce0..e864822 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
@@ -60,10 +60,10 @@ public class CompressionUtilTest extends Assert {
}
byte[] output = new byte[30];
- Deflater compresser = new Deflater();
- compresser.setInput(input);
- compresser.finish();
- int compressedDataLength = compresser.deflate(output);
+ Deflater compressor = new Deflater();
+ compressor.setInput(input);
+ compressor.finish();
+ int compressedDataLength = compressor.deflate(output);
compareByteArray(allCompressed, output, compressedDataLength);
}
@@ -97,10 +97,10 @@ public class CompressionUtilTest extends Assert {
}
byte[] output = new byte[30];
- Deflater compresser = new Deflater();
- compresser.setInput(input);
- compresser.finish();
- int compressedDataLength = compresser.deflate(output);
+ Deflater compressor = new Deflater();
+ compressor.setInput(input);
+ compressor.finish();
+ int compressedDataLength = compressor.deflate(output);
compareByteArray(allCompressed, output, compressedDataLength);
}
@@ -110,10 +110,10 @@ public class CompressionUtilTest extends Assert {
String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
byte[] output = new byte[30];
- Deflater compresser = new Deflater();
- compresser.setInput(input);
- compresser.finish();
- int compressedDataLength = compresser.deflate(output);
+ Deflater compressor = new Deflater();
+ compressor.setInput(input);
+ compressor.finish();
+ int compressedDataLength = compressor.deflate(output);
byte[] zipBytes = new byte[compressedDataLength];
@@ -146,10 +146,10 @@ public class CompressionUtilTest extends Assert {
String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
byte[] output = new byte[30];
- Deflater compresser = new Deflater();
- compresser.setInput(input);
- compresser.finish();
- int compressedDataLength = compresser.deflate(output);
+ Deflater compressor = new Deflater();
+ compressor.setInput(input);
+ compressor.finish();
+ int compressedDataLength = compressor.deflate(output);
byte[] zipBytes = new byte[compressedDataLength];
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
index f474453..fa0ff9a 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
@@ -79,7 +79,7 @@ public class XmlUtil {
return decode(clazz, configuration, null, null);
}
- /** We offer parameters for artemisInstance and artemisHoms as they could be coming from the CLI or Maven Plugin */
+ /** We offer parameters for artemisInstance and artemisHome as they could be coming from the CLI or Maven Plugin */
public static <T> T decode(Class<T> clazz, File configuration, String artemisHome, String artemisInstance) throws Exception {
JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq.artemis.dto");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.c
----------------------------------------------------------------------
diff --git a/artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.c b/artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.c
index 860d192..74545fc 100644
--- a/artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.c
+++ b/artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.c
@@ -48,7 +48,7 @@ struct io_control {
pthread_mutex_t pollLock;
- // a resuable pool of iocb
+ // a reusable pool of iocb
struct iocb ** iocb;
int queueSize;
int iocbPut;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerDestination.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerDestination.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerDestination.java
index ab26264..0a8bb29 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerDestination.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerDestination.java
@@ -22,7 +22,7 @@ import javax.jms.JMSException;
import javax.jms.Queue;
/**
- * This is just here to avoid all the client checks we ned with valid JMS destinations, protocol convertors don't need to
+ * This is just here to avoid all the client checks we need with valid JMS destinations, protocol convertors don't need to
* adhere to the jms. semantics.
*/
public class ServerDestination extends ActiveMQDestination implements Queue {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 7c52b27..8f53bdb 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -477,7 +477,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
if (context.isReconnect() || (context.isNetworkConnection())) {
// once implemented ARTEMIS-194, we need to set the storedSequenceID here somehow
// We have different semantics on Artemis Journal, but we could adapt something for this
- // TBD during the implemetnation of ARTEMIS-194
+ // TBD during the implementation of ARTEMIS-194
result.setLastStoredSequenceId(0);
}
SessionState ss = state.getSessionState(id.getParentId());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
index b2b34e2..9c3a88d 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
@@ -24,7 +24,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
/**
- * implements reliable "create", "create-next" pattern defined by REST-* Messaging specificaiton
+ * implements reliable "create", "create-next" pattern defined by REST-* Messaging specification
*/
public class PostMessageNoDups extends PostMessage {
@@ -37,4 +37,4 @@ public class PostMessageNoDups extends PostMessage {
res.location(uriInfo.getAbsolutePathBuilder().path(id).build());
return res.build();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index dfcba27..1514748 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -615,7 +615,7 @@ public class QueueImpl implements Queue {
}
if (logger.isTraceEnabled()) {
- logger.trace("Force delivery deliverying async");
+ logger.trace("Force delivery delivering async");
}
deliverAsync();
@@ -3045,4 +3045,3 @@ public class QueueImpl implements Queue {
}
}
}
-
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
index f17bcc5..938f5dd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
@@ -304,7 +304,7 @@ public class SharedNothingLiveActivation extends LiveActivation {
NodeManager nodeManagerInUse = activeMQServer.getNodeManager();
if (nodeManagerInUse != null) {
- //todo does this actually make any difference, we only set a different flag in the lock file which replication doesnt use
+ //todo does this actually make any difference, we only set a different flag in the lock file which replication doesn't use
if (permanently) {
nodeManagerInUse.crashLiveServer();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
index 62befaf..3d5be39 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
@@ -56,7 +56,7 @@ public interface ProtocolManager<P extends BaseInterceptor> {
MessageConverter getConverter();
/** If this protocols accepts connectoins without an initial handshake.
- * If true this protocol will be the failback case no other conenctions are made.
+ * If true this protocol will be the failback case no other connections are made.
* New designed protocols should always require a handshake. This is only useful for legacy protocols. */
boolean acceptsNoHandshake();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/docs/hacking-guide/en/ide.md
----------------------------------------------------------------------
diff --git a/docs/hacking-guide/en/ide.md b/docs/hacking-guide/en/ide.md
index 8853780..c96ccef 100644
--- a/docs/hacking-guide/en/ide.md
+++ b/docs/hacking-guide/en/ide.md
@@ -49,7 +49,7 @@ imported properly. To (re)import the "tests" Maven profile in an existing proje
* Open the Maven Projects Tool Window: View -> Tool Windows -> Maven Projects
* Select the "profiles" drop down
* Unselect then reselect the checkbox next to "tests".
-* Click on the "Reimport all maven projects" button in the top left hand corner of the window. (It looks like a ciruclar
+* Click on the "Reimport all maven projects" button in the top left hand corner of the window. (It looks like a circular
blue arrow.
* Wait for IDEA to reload and try running a JUnit test again. The option to run should now be present.
@@ -94,4 +94,4 @@ Importing all ActiveMQ Artemis subprojects will create _too many_ projects in Ec
and _Project Explorer_ views. One way to address that is to use
[Eclipse's Working Sets](http://help.eclipse.org/juno/index.jsp?topic=%2Forg.eclipse.platform.doc.user%2Fconcepts%2Fcworkset.htm)
feature. A good introduction to it can be found at a
-[Dzone article on Eclipse Working Sets](http://eclipse.dzone.com/articles/categorise-projects-package).
\ No newline at end of file
+[Dzone article on Eclipse Working Sets](http://eclipse.dzone.com/articles/categorise-projects-package).
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/docs/user-manual/en/aerogear-integration.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/aerogear-integration.md b/docs/user-manual/en/aerogear-integration.md
index 2a83f4d..0dbafb2 100644
--- a/docs/user-manual/en/aerogear-integration.md
+++ b/docs/user-manual/en/aerogear-integration.md
@@ -35,7 +35,7 @@ Shown are the required params for the connector service and are:
- `master-secret`. The secret of your mobile application in AeroGear.
-As well as these required paramaters there are the following optional
+As well as these required parameters there are the following optional
parameters
- `ttl`. The time to live for the message once AeroGear receives it.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/docs/user-manual/en/vertx-integration.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/vertx-integration.md b/docs/user-manual/en/vertx-integration.md
index 9c52a0f..f823f11 100644
--- a/docs/user-manual/en/vertx-integration.md
+++ b/docs/user-manual/en/vertx-integration.md
@@ -64,7 +64,7 @@ Shown are the required params for the connector service:
- `queue`. The name of the Apache ActiveMQ Artemis queue to fetch message from.
-As well as these required paramaters there are the following optional
+As well as these required parameters there are the following optional
parameters
- `host`. The host name on which the vertx target container is
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/examples/features/ha/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
----------------------------------------------------------------------
diff --git a/examples/features/ha/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java b/examples/features/ha/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
index 0401617..d2b8d95 100644
--- a/examples/features/ha/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
+++ b/examples/features/ha/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
@@ -103,7 +103,7 @@ public class HAPolicyAutoBackupExample {
System.out.println("Got message: " + message0.getText() + " from node 0");
}
- // Step 14.close the consumer so it doesnt get any messages
+ // Step 14.close the consumer so it doesn't get any messages
consumer1.close();
// Step 15.now kill server1, messages will be scaled down to server0
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/examples/features/perf/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
----------------------------------------------------------------------
diff --git a/examples/features/perf/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java b/examples/features/perf/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
index 0b3e741..ad92b08 100644
--- a/examples/features/perf/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
+++ b/examples/features/perf/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
@@ -88,7 +88,7 @@ public abstract class PerfBase {
boolean drainQueue = Boolean.valueOf(props.getProperty("drain-queue"));
String destinationName = props.getProperty("destination-name");
int throttleRate = Integer.valueOf(props.getProperty("throttle-rate"));
- boolean dupsOK = Boolean.valueOf(props.getProperty("dups-ok-acknowlege"));
+ boolean dupsOK = Boolean.valueOf(props.getProperty("dups-ok-acknowledge"));
boolean disableMessageID = Boolean.valueOf(props.getProperty("disable-message-id"));
boolean disableTimestamp = Boolean.valueOf(props.getProperty("disable-message-timestamp"));
String clientLibrary = props.getProperty("client-library", "core");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/examples/features/perf/soak/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
----------------------------------------------------------------------
diff --git a/examples/features/perf/soak/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java b/examples/features/perf/soak/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
index 3b0b105..bd17b38 100644
--- a/examples/features/perf/soak/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
+++ b/examples/features/perf/soak/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
@@ -69,7 +69,7 @@ public class SoakBase {
String destinationLookup = props.getProperty("destination-lookup");
String connectionFactoryLookup = props.getProperty("connection-factory-lookup");
int throttleRate = Integer.valueOf(props.getProperty("throttle-rate"));
- boolean dupsOK = Boolean.valueOf(props.getProperty("dups-ok-acknowlege"));
+ boolean dupsOK = Boolean.valueOf(props.getProperty("dups-ok-acknowledge"));
boolean disableMessageID = Boolean.valueOf(props.getProperty("disable-message-id"));
boolean disableTimestamp = Boolean.valueOf(props.getProperty("disable-message-timestamp"));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
index c8e7c57..66c000e 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
@@ -57,7 +57,7 @@ public interface ActiveMQAeroGearLogger extends BasicLogger {
void reply404();
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 232005, value = "removing aerogear connector as unexpected respone {0} returned", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 232005, value = "removing aerogear connector as unexpected response {0} returned", format = Message.Format.MESSAGE_FORMAT)
void replyUnknown(int status);
@LogMessage(level = Logger.Level.WARN)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7781431..26dfb39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
<dependencyManagement>
<dependencies>
- <!-- ## Test Dependenices ## Note: Junit is required in certain module tests. We should control versions from here. -->
+ <!-- ## Test Dependencies ## Note: Junit is required in certain module tests. We should control versions from here. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
index 49ef298..9096c06 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
@@ -128,7 +128,7 @@ public abstract class EmbeddedBrokerTestSupport extends CombinationTestSupport {
/**
* Factory method to create a new {@link Destination}
*
- * @return newly created Destinaiton
+ * @return newly created Destination
*/
protected ActiveMQDestination createDestination() {
return createDestination(getDestinationString());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
index 8da4cf7..fb44c71 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
@@ -69,7 +69,7 @@ public class OptimizedAckTest extends TestSupport {
Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("jms.queue.test"));
final QueueImpl coreQueue = (QueueImpl) binding.getBindable();
- assertTrue("deliverying count is 10", Wait.waitFor(new Wait.Condition() {
+ assertTrue("delivering count is 10", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return 10 == coreQueue.getDeliveringCount();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
index eb7fc04..ab85bb4 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
@@ -85,7 +85,7 @@ public class SecurityJMXTest extends TestCase {
Connection c = new ActiveMQConnectionFactory("vm://localhost").createConnection("system", "manager");
c.start();
- // browser consumer will force expriation check on addConsumer
+ // browser consumer will force expiration check on addConsumer
QueueBrowser browser = c.createSession(false, Session.AUTO_ACKNOWLEDGE).createBrowser(new ActiveMQQueue("TEST.Q"));
assertTrue("no message in the q", !browser.getEnumeration().hasMoreElements());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 1557854..44f2f43 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -875,7 +875,7 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
try {
consumerSession.commit();
- Assert.fail("expected transaciton rolledback ex");
+ Assert.fail("expected transaction rolledback ex");
}
catch (TransactionRolledBackException expected) {
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
index f29680f..00e9c2b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java
@@ -312,7 +312,7 @@ public class NonBlockingConsumerRedeliveryTest {
count = 0;
}
catch (JMSException e) {
- LOG.warn("Caught an unexcepted exception: " + e.getMessage());
+ LOG.warn("Caught an unexpected exception: " + e.getMessage());
}
}
else {
@@ -321,7 +321,7 @@ public class NonBlockingConsumerRedeliveryTest {
session.commit();
}
catch (JMSException e) {
- LOG.warn("Caught an unexcepted exception: " + e.getMessage());
+ LOG.warn("Caught an unexpected exception: " + e.getMessage());
}
}
}
@@ -388,7 +388,7 @@ public class NonBlockingConsumerRedeliveryTest {
session.rollback();
}
catch (JMSException e) {
- LOG.warn("Caught an unexcepted exception: " + e.getMessage());
+ LOG.warn("Caught an unexpected exception: " + e.getMessage());
}
}
});
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
index eb20e10..2776548 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
@@ -36,7 +36,7 @@ public class StartAndStopBrokerTest extends TestCase {
// have persistence messages as a default
System.setProperty("activemq.persistenceAdapter", "org.apache.activemq.store.vm.VMPersistenceAdapter");
- // configuration of container and all protocolls
+ // configuration of container and all protocols
BrokerService broker = createBroker();
// start a client
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
index 55b717f..1180726 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
@@ -53,7 +53,7 @@ public interface Server extends Remote {
void kill() throws Exception;
/**
- * When kill is called you are actually schedulling the server to be killed in few milliseconds.
+ * When kill is called you are actually scheduling the server to be killed in few milliseconds.
* There are certain cases where we need to assure the server was really killed.
* For that we have this simple ping we can use to verify if the server still alive or not.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1728f07/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
index 129e6f9..2d8200f 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
@@ -26,7 +26,7 @@ import org.objectweb.jtests.jms.framework.PubSubTestCase;
/**
* Test topic-specific connection features.
*
- * Test setting of client ID which is relevant only for Durable Subscribtion
+ * Test setting of client ID which is relevant only for Durable Subscription
*/
public class TopicConnectionTest extends PubSubTestCase {
[6/8] activemq-artemis git commit: Potential resource leak fixes
Posted by cl...@apache.org.
Potential resource leak fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8c6e0447
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8c6e0447
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8c6e0447
Branch: refs/heads/master
Commit: 8c6e04474521399112f416da55be522560198398
Parents: d57378f
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:31:57 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jdbc/store/JDBCUtils.java | 5 +++--
.../file/JDBCSequentialFileFactoryDriver.java | 5 +++--
.../jms/server/impl/JMSServerManagerImpl.java | 6 ++++--
.../core/config/impl/ConfigurationImpl.java | 10 ++++------
.../artemis/tests/util/ActiveMQTestBase.java | 20 ++------------------
5 files changed, 16 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c6e0447/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
index 61293af..69747c9 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
@@ -70,8 +70,9 @@ public class JDBCUtils {
try (ResultSet rs = connection.getMetaData().getTables(null, null, tableName, null)) {
if (rs != null && !rs.next()) {
logger.tracef("Table %s did not exist, creating it with SQL=%s", tableName, sql);
- Statement statement = connection.createStatement();
- statement.executeUpdate(sql);
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate(sql);
+ }
}
}
connection.commit();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c6e0447/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index 0ce65db..8937992 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -294,8 +294,9 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
public synchronized void destroy() throws SQLException {
try {
connection.setAutoCommit(false);
- Statement statement = connection.createStatement();
- statement.executeUpdate(sqlProvider.getDropFileTableSQL());
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate(sqlProvider.getDropFileTableSQL());
+ }
connection.commit();
}
catch (SQLException e) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c6e0447/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 8e313a3..392a7d9 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1764,8 +1764,10 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
ActiveMQServerLogger.LOGGER.reloadingConfiguration("jms");
InputStream input = url.openStream();
- Reader reader = new InputStreamReader(input);
- String xml = XMLUtil.readerToString(reader);
+ String xml;
+ try (Reader reader = new InputStreamReader(input)) {
+ xml = XMLUtil.readerToString(reader);
+ }
xml = XMLUtil.replaceSystemProps(xml);
Element e = XMLUtil.stringToElement(xml);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c6e0447/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 216348c..0604c44 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -1332,15 +1332,13 @@ public class ConfigurationImpl implements Configuration, Serializable {
@Override
public String debugConnectors() {
StringWriter stringWriter = new StringWriter();
- PrintWriter writer = new PrintWriter(stringWriter);
-
- for (Map.Entry<String, TransportConfiguration> connector : getConnectorConfigurations().entrySet()) {
- writer.println("Connector::" + connector.getKey() + " value = " + connector.getValue());
+ try (PrintWriter writer = new PrintWriter(stringWriter)) {
+ for (Map.Entry<String, TransportConfiguration> connector : getConnectorConfigurations().entrySet()) {
+ writer.println("Connector::" + connector.getKey() + " value = " + connector.getValue());
+ }
}
- writer.close();
-
return stringWriter.toString();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c6e0447/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index f9a9535..761af7d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -2103,30 +2103,14 @@ public abstract class ActiveMQTestBase extends Assert {
}
}
else {
- InputStream in = null;
-
- OutputStream out = null;
-
- try {
- in = new BufferedInputStream(new FileInputStream(from));
-
- out = new BufferedOutputStream(new FileOutputStream(to));
-
+ try (InputStream in = new BufferedInputStream(new FileInputStream(from));
+ OutputStream out = new BufferedOutputStream(new FileOutputStream(to))) {
int b;
while ((b = in.read()) != -1) {
out.write(b);
}
}
- finally {
- if (in != null) {
- in.close();
- }
-
- if (out != null) {
- out.close();
- }
- }
}
}
[2/8] activemq-artemis git commit: for and while loop to foreach
conversions
Posted by cl...@apache.org.
for and while loop to foreach conversions
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d5242978
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d5242978
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d5242978
Branch: refs/heads/master
Commit: d5242978d55051ddf5b0ef245e48f851f5147f28
Parents: e1728f0
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 13:51:18 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/utils/uri/URISchema.java | 12 +++++------
.../activemq/artemis/utils/uri/URISupport.java | 10 +++++-----
.../core/remoting/impl/ssl/SSLSupport.java | 4 ++--
.../artemis/utils/SecurityFormatter.java | 4 ++--
.../apache/activemq/artemis/utils/XMLUtil.java | 4 ++--
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 5 +----
.../core/io/mapped/MappedByteBufferCache.java | 10 +++-------
.../protocol/openwire/OpenWireConnection.java | 10 +++-------
.../openwire/OpenWireMessageConverter.java | 10 ++--------
.../core/protocol/stomp/StompSession.java | 4 +---
.../ra/ActiveMQRAManagedConnectionFactory.java | 7 +------
.../ra/inflow/ActiveMQActivationSpec.java | 5 ++---
.../selector/filter/UnaryExpression.java | 4 +---
.../config/ClusterConnectionConfiguration.java | 4 ++--
.../core/config/impl/SecurityConfiguration.java | 9 ++-------
.../core/messagecounter/MessageCounter.java | 4 +---
.../impl/MessageCounterManagerImpl.java | 19 +++---------------
.../core/remoting/impl/netty/NettyAcceptor.java | 9 ++-------
.../cluster/impl/ClusterConnectionBridge.java | 8 ++++----
.../core/security/jaas/JaasCallbackHandler.java | 3 +--
.../spi/core/security/jaas/LDAPLoginModule.java | 14 ++++++-------
.../amqp/client/sasl/CramMD5Mechanism.java | 4 ++--
.../amqp/client/util/PropertyUtil.java | 21 +++++++++-----------
23 files changed, 64 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
index 3120292..9751659 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java
@@ -106,16 +106,16 @@ public abstract class URISchema<T, P> {
Map<String, String> rc = new HashMap<>();
if (uri != null && !uri.isEmpty()) {
String[] parameters = uri.split("&");
- for (int i = 0; i < parameters.length; i++) {
- int p = parameters[i].indexOf("=");
+ for (String parameter : parameters) {
+ int p = parameter.indexOf("=");
if (p >= 0) {
- String name = BeanSupport.decodeURI(parameters[i].substring(0, p));
- String value = BeanSupport.decodeURI(parameters[i].substring(p + 1));
+ String name = BeanSupport.decodeURI(parameter.substring(0, p));
+ String value = BeanSupport.decodeURI(parameter.substring(p + 1));
rc.put(name, value);
}
else {
- if (!parameters[i].trim().isEmpty()) {
- rc.put(parameters[i], null);
+ if (!parameter.trim().isEmpty()) {
+ rc.put(parameter, null);
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
index f3744f1..a95f810 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
@@ -135,15 +135,15 @@ public class URISupport {
private static void parseParameters(Map<String, String> rc,
String[] parameters) throws UnsupportedEncodingException {
- for (int i = 0; i < parameters.length; i++) {
- int p = parameters[i].indexOf("=");
+ for (String parameter : parameters) {
+ int p = parameter.indexOf("=");
if (p >= 0) {
- String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8");
- String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8");
+ String name = URLDecoder.decode(parameter.substring(0, p), "UTF-8");
+ String value = URLDecoder.decode(parameter.substring(p + 1), "UTF-8");
rc.put(name, value);
}
else {
- rc.put(parameters[i], null);
+ rc.put(parameter, null);
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 2b97c75..d5e0fdc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -67,8 +67,8 @@ public class SSLSupport {
public static String parseArrayIntoCommandSeparatedList(String[] suites) {
StringBuilder supportedSuites = new StringBuilder();
- for (int i = 0; i < suites.length; i++) {
- supportedSuites.append(suites[i]);
+ for (String suite : suites) {
+ supportedSuites.append(suite);
supportedSuites.append(", ");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java
index b64cc77..90994fb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java
@@ -65,8 +65,8 @@ public class SecurityFormatter {
return list;
}
String[] values = commaSeparatedString.split(",");
- for (int i = 0; i < values.length; i++) {
- list.add(values[i].trim());
+ for (String value : values) {
+ list.add(value.trim());
}
return list;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index ca51c08..7a492c4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -366,8 +366,8 @@ public final class XMLUtil {
for (int i = 0; i < nl.getLength(); i++) {
Node n = nl.item(i);
short type = n.getNodeType();
- for (int j = 0; j < typesToFilter.length; j++) {
- if (typesToFilter[j] == type) {
+ for (short typeToFilter : typesToFilter) {
+ if (typeToFilter == type) {
continue outer;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index c363651..339ebcf 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1602,11 +1602,8 @@ public final class JMSBridgeImpl implements JMSBridge {
msg.clearProperties();
if (oldProps != null) {
- Iterator<Entry<String, Object>> oldPropsIter = oldProps.entrySet().iterator();
-
- while (oldPropsIter.hasNext()) {
- Entry<String, Object> entry = oldPropsIter.next();
+ for (Entry<String, Object> entry : oldProps.entrySet()) {
String propName = entry.getKey();
Object val = entry.getValue();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
index d097055..5bba391 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
@@ -140,9 +140,7 @@ final class MappedByteBufferCache implements AutoCloseable {
public void closeAndResize(long length) {
if (!closed) {
//TO_FIX: unmap in this way is not portable BUT required on Windows that can't resize a memmory mapped file!
- final int mappedBuffers = this.byteBuffers.size();
- for (int i = 0; i < mappedBuffers; i++) {
- final WeakReference<MappedByteBuffer> mbbRef = byteBuffers.get(i);
+ for (final WeakReference<MappedByteBuffer> mbbRef : this.byteBuffers) {
if (mbbRef != null) {
final MappedByteBuffer mbb = mbbRef.get();
if (mbb != null) {
@@ -204,9 +202,7 @@ final class MappedByteBufferCache implements AutoCloseable {
public void close() {
if (!closed) {
//TO_FIX: unmap in this way is not portable BUT required on Windows that can't resize a memory mapped file!
- final int mappedBuffers = this.byteBuffers.size();
- for (int i = 0; i < mappedBuffers; i++) {
- final WeakReference<MappedByteBuffer> mbbRef = byteBuffers.get(i);
+ for (final WeakReference<MappedByteBuffer> mbbRef : this.byteBuffers) {
if (mbbRef != null) {
final MappedByteBuffer mbb = mbbRef.get();
if (mbb != null) {
@@ -237,4 +233,4 @@ final class MappedByteBufferCache implements AutoCloseable {
closed = true;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 8f53bdb..aeb0f2b 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -25,7 +25,6 @@ import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -764,9 +763,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
}
public void addSessions(Set<SessionId> sessionSet) {
- Iterator<SessionId> iter = sessionSet.iterator();
- while (iter.hasNext()) {
- SessionId sid = iter.next();
+ for (SessionId sid : sessionSet) {
addSession(getState().getSessionState(sid).getInfo(), true);
}
}
@@ -805,10 +802,9 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
}
else {
Bindings bindings = server.getPostOffice().getBindingsForAddress(OpenWireUtil.toCoreAddress(dest));
- Iterator<Binding> iterator = bindings.getBindings().iterator();
- while (iterator.hasNext()) {
- Queue b = (Queue) iterator.next().getBindable();
+ for (Binding binding : bindings.getBindings()) {
+ Queue b = (Queue) binding.getBindable();
if (b.getConsumerCount() > 0) {
throw new Exception("Destination still has an active subscription: " + dest.getPhysicalName());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
index 8096b93..fd6aef2 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -353,10 +352,7 @@ public class OpenWireMessageConverter implements MessageConverter {
//unmarshall properties to core so selector will work
Map<String, Object> props = messageSend.getProperties();
//Map<String, Object> props = MarshallingSupport.unmarshalPrimitiveMap(new DataInputStream(new ByteArrayInputStream(propBytes)));
- Iterator<Entry<String, Object>> iterEntries = props.entrySet().iterator();
- while (iterEntries.hasNext()) {
- Entry<String, Object> ent = iterEntries.next();
-
+ for (Entry<String, Object> ent : props.entrySet()) {
Object value = ent.getValue();
try {
coreMessage.putObjectProperty(ent.getKey(), value);
@@ -394,9 +390,7 @@ public class OpenWireMessageConverter implements MessageConverter {
}
private static void loadMapIntoProperties(TypedProperties props, Map<String, Object> map) {
- Iterator<Entry<String, Object>> iter = map.entrySet().iterator();
- while (iter.hasNext()) {
- Entry<String, Object> entry = iter.next();
+ for (Entry<String, Object> entry : map.entrySet()) {
SimpleString key = new SimpleString(entry.getKey());
Object value = entry.getValue();
if (value instanceof UTF8Buffer) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
index 1ab7c42..ba0abbf 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
@@ -343,9 +343,7 @@ public class StompSession implements SessionCallback {
}
boolean containsSubscription(String subscriptionID) {
- Iterator<Entry<Long, StompSubscription>> iterator = subscriptions.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry<Long, StompSubscription> entry = iterator.next();
+ for (Entry<Long, StompSubscription> entry : subscriptions.entrySet()) {
StompSubscription sub = entry.getValue();
if (sub.getID().equals(subscriptionID)) {
return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index a3e5f4c..c46efca 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -27,7 +27,6 @@ import javax.resource.spi.ResourceAdapterAssociation;
import javax.security.auth.Subject;
import java.io.PrintWriter;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -203,11 +202,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
ActiveMQRALogger.LOGGER.trace("Looking for connection matching credentials: " + credential);
}
- Iterator<?> connections = connectionSet.iterator();
-
- while (connections.hasNext()) {
- Object obj = connections.next();
-
+ for (Object obj : connectionSet) {
if (obj instanceof ActiveMQRAManagedConnection) {
ActiveMQRAManagedConnection mc = (ActiveMQRAManagedConnection) obj;
ManagedConnectionFactory mcf = mc.getManagedConnectionFactory();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 61dc37a..4d8b18f 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -28,7 +28,6 @@ import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import org.apache.activemq.artemis.ra.ConnectionFactoryProperties;
@@ -722,9 +721,9 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
if (propsNotSet.size() > 0) {
StringBuffer b = new StringBuffer();
b.append("Invalid settings:");
- for (Iterator<String> iter = errorMessages.iterator(); iter.hasNext(); ) {
+ for (String errorMessage : errorMessages) {
b.append(" ");
- b.append(iter.next());
+ b.append(errorMessage);
}
InvalidPropertyException e = new InvalidPropertyException(b.toString());
final PropertyDescriptor[] descriptors = propsNotSet.toArray(new PropertyDescriptor[propsNotSet.size()]);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
index e0853c6..ecdcf23 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.selector.filter;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
/**
@@ -98,8 +97,7 @@ public abstract class UnaryExpression implements Expression {
answer.append(" ( ");
int count = 0;
- for (Iterator<Object> i = inList.iterator(); i.hasNext(); ) {
- Object o = i.next();
+ for (Object o : inList) {
if (count != 0) {
answer.append(", ");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
index 3f57782..90c9db5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
@@ -382,8 +382,8 @@ public final class ClusterConnectionConfiguration implements Serializable {
List<TransportConfiguration> list = new LinkedList<>();
- for (int i = 0; i < members.length; i++) {
- list.addAll(connectorTransportConfigurationParser.newObject(members[i], null));
+ for (URI member : members) {
+ list.addAll(connectorTransportConfigurationParser.newObject(member, null));
}
return list.toArray(new TransportConfiguration[list.size()]);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java
index 3325d5d..76b814d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -47,14 +46,10 @@ public class SecurityConfiguration extends Configuration {
}
public SecurityConfiguration(Map<String, String> users, Map<String, List<String>> roles) {
- Iterator<Map.Entry<String, String>> iter = users.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry<String, String> entry = iter.next();
+ for (Map.Entry<String, String> entry : users.entrySet()) {
addUser(entry.getKey(), entry.getValue());
}
- Iterator<Map.Entry<String, List<String>>> iter1 = roles.entrySet().iterator();
- while (iter1.hasNext()) {
- Map.Entry<String, List<String>> entry = iter1.next();
+ for (Map.Entry<String, List<String>> entry : roles.entrySet()) {
for (String role : entry.getValue()) {
addRole(entry.getKey(), role);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
index 1d91279..9ceb8ea 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
@@ -288,9 +288,7 @@ public class MessageCounter {
ret.append(dayCounters.size() + "\n");
// following lines: day counter data
- for (int i = 0; i < dayCounters.size(); i++) {
- DayCounter counter = dayCounters.get(i);
-
+ for (DayCounter counter : dayCounters) {
ret.append(counter.getDayCounterAsString() + "\n");
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java
index 1183ce5..0f60cf6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.core.messagecounter.impl;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
@@ -141,11 +140,7 @@ public class MessageCounterManagerImpl implements MessageCounterManager {
@Override
public void resetAllCounters() {
synchronized (messageCounters) {
- Iterator<MessageCounter> iter = messageCounters.values().iterator();
-
- while (iter.hasNext()) {
- MessageCounter counter = iter.next();
-
+ for (MessageCounter counter : messageCounters.values()) {
counter.resetCounter();
}
}
@@ -154,11 +149,7 @@ public class MessageCounterManagerImpl implements MessageCounterManager {
@Override
public void resetAllCounterHistories() {
synchronized (messageCounters) {
- Iterator<MessageCounter> iter = messageCounters.values().iterator();
-
- while (iter.hasNext()) {
- MessageCounter counter = iter.next();
-
+ for (MessageCounter counter : messageCounters.values()) {
counter.resetHistory();
}
}
@@ -177,11 +168,7 @@ public class MessageCounterManagerImpl implements MessageCounterManager {
}
synchronized (messageCounters) {
- Iterator<MessageCounter> iter = messageCounters.values().iterator();
-
- while (iter.hasNext()) {
- MessageCounter counter = iter.next();
-
+ for (MessageCounter counter : messageCounters.values()) {
counter.onTimer();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index 783f4ac..8cff70b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -26,7 +26,6 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -513,9 +512,7 @@ public class NettyAcceptor extends AbstractAcceptor {
if (!future.isSuccess()) {
ActiveMQServerLogger.LOGGER.nettyChannelGroupError();
- Iterator<Channel> iterator = future.group().iterator();
- while (iterator.hasNext()) {
- Channel channel = iterator.next();
+ for (Channel channel : future.group()) {
if (channel.isActive()) {
ActiveMQServerLogger.LOGGER.nettyChannelStillOpen(channel, channel.remoteAddress());
}
@@ -573,9 +570,7 @@ public class NettyAcceptor extends AbstractAcceptor {
ChannelGroupFuture future = serverChannelGroup.close().awaitUninterruptibly();
if (!future.isSuccess()) {
ActiveMQServerLogger.LOGGER.nettyChannelGroupBindError();
- Iterator<Channel> iterator = future.group().iterator();
- while (iterator.hasNext()) {
- Channel channel = iterator.next();
+ for (Channel channel : future.group()) {
if (channel.isActive()) {
ActiveMQServerLogger.LOGGER.nettyChannelStillBound(channel, channel.remoteAddress());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index a8c87b9..425e26a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -295,12 +295,12 @@ public class ClusterConnectionBridge extends BridgeImpl {
List<String> excludes = new ArrayList<>();
// Split the list into addresses to match and addresses to exclude.
- for (int i = 0; i < list.length; i++) {
- if (list[i].startsWith("!")) {
- excludes.add(list[i].substring(1, list[i].length()));
+ for (String s : list) {
+ if (s.startsWith("!")) {
+ excludes.add(s.substring(1, s.length()));
}
else {
- includes.add(list[i]);
+ includes.add(s);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java
index 71a6172..97beffa 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java
@@ -41,8 +41,7 @@ public class JaasCallbackHandler implements CallbackHandler {
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- Callback callback = callbacks[i];
+ for (Callback callback : callbacks) {
if (callback instanceof PasswordCallback) {
PasswordCallback passwordCallback = (PasswordCallback) callback;
if (password == null) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
index 8bb5405..942b328 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
@@ -274,8 +274,8 @@ public class LDAPLoginModule implements LoginModule {
if (logger.isDebugEnabled()) {
logger.debug("Roles " + roles + " for user " + username);
}
- for (int i = 0; i < roles.size(); i++) {
- groups.add(new RolePrincipal(roles.get(i)));
+ for (String role : roles) {
+ groups.add(new RolePrincipal(role));
}
}
else {
@@ -488,15 +488,15 @@ public class LDAPLoginModule implements LoginModule {
}
private String getLDAPPropertyValue(String propertyName) {
- for (int i = 0; i < config.length; i++)
- if (config[i].getPropertyName().equals(propertyName))
- return config[i].getPropertyValue();
+ for (LDAPLoginProperty conf : config)
+ if (conf.getPropertyName().equals(propertyName))
+ return conf.getPropertyValue();
return null;
}
private boolean isLoginPropertySet(String propertyName) {
- for (int i = 0; i < config.length; i++) {
- if (config[i].getPropertyName().equals(propertyName) && (config[i].getPropertyValue() != null && !"".equals(config[i].getPropertyValue())))
+ for (LDAPLoginProperty conf : config) {
+ if (conf.getPropertyName().equals(propertyName) && (conf.getPropertyValue() != null && !"".equals(conf.getPropertyValue())))
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java
index 4821314..a7c8858 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java
@@ -61,8 +61,8 @@ public class CramMD5Mechanism extends AbstractMechanism {
StringBuffer hash = new StringBuffer(getUsername());
hash.append(' ');
- for (int i = 0; i < bytes.length; i++) {
- String hex = Integer.toHexString(0xFF & bytes[i]);
+ for (byte b : bytes) {
+ String hex = Integer.toHexString(0xFF & b);
if (hex.length() == 1) {
hash.append('0');
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5242978/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java
index 1285a0f..20979a8 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java
@@ -172,15 +172,15 @@ public class PropertyUtil {
if (queryString != null && !queryString.isEmpty()) {
Map<String, String> rc = new HashMap<>();
String[] parameters = queryString.split("&");
- for (int i = 0; i < parameters.length; i++) {
- int p = parameters[i].indexOf("=");
+ for (String parameter : parameters) {
+ int p = parameter.indexOf("=");
if (p >= 0) {
- String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8");
- String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8");
+ String name = URLDecoder.decode(parameter.substring(0, p), "UTF-8");
+ String value = URLDecoder.decode(parameter.substring(p + 1), "UTF-8");
rc.put(name, value);
}
else {
- rc.put(parameters[i], null);
+ rc.put(parameter, null);
}
}
return rc;
@@ -352,8 +352,7 @@ public class PropertyUtil {
Object[] NULL_ARG = {};
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
if (propertyDescriptors != null) {
- for (int i = 0; i < propertyDescriptors.length; i++) {
- PropertyDescriptor pd = propertyDescriptors[i];
+ for (PropertyDescriptor pd : propertyDescriptors) {
if (pd.getReadMethod() != null && !pd.getName().equals("class") && !pd.getName().equals("properties") && !pd.getName().equals("reference")) {
Object value = pd.getReadMethod().invoke(object, NULL_ARG);
if (value != null) {
@@ -365,7 +364,7 @@ public class PropertyUtil {
}
else {
Map<String, String> inner = getProperties(value);
- for (Map.Entry<String, String> entry : inner.entrySet()) {
+ for (Entry<String, String> entry : inner.entrySet()) {
properties.put(pd.getName() + "." + entry.getKey(), entry.getValue());
}
}
@@ -389,8 +388,7 @@ public class PropertyUtil {
BeanInfo beanInfo = Introspector.getBeanInfo(object.getClass());
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
if (propertyDescriptors != null) {
- for (int i = 0; i < propertyDescriptors.length; i++) {
- PropertyDescriptor pd = propertyDescriptors[i];
+ for (PropertyDescriptor pd : propertyDescriptors) {
if (pd.getReadMethod() != null && pd.getName().equals(name)) {
return pd.getReadMethod().invoke(object);
}
@@ -497,8 +495,7 @@ public class PropertyUtil {
// Build the method name.
name = "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
Method[] methods = clazz.getMethods();
- for (int i = 0; i < methods.length; i++) {
- Method method = methods[i];
+ for (Method method : methods) {
Class<?>[] params = method.getParameterTypes();
if (method.getName().equals(name) && params.length == 1) {
return method;