You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/09/30 15:26:40 UTC
[40/52] [partial] activemq-artemis git commit: ARTEMIS-765 Improve
Checkstyle
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
index 201d90b..dc2d459 100644
--- a/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
+++ b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
@@ -90,19 +90,16 @@ public class ConnectionFactoryURITest {
TransportConfiguration configuration = new TransportConfiguration(NettyConnector.class.getName(), params);
-
ActiveMQConnectionFactory factory = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, configuration);
URI uri = factory.toURI();
ActiveMQConnectionFactory newFactory = ActiveMQJMSClient.createConnectionFactory(uri.toString(), "somefactory");
-
- TransportConfiguration[] initialConnectors = ((ServerLocatorImpl)newFactory.getServerLocator()).getInitialConnectors();
+ TransportConfiguration[] initialConnectors = ((ServerLocatorImpl) newFactory.getServerLocator()).getInitialConnectors();
Assert.assertEquals(1, initialConnectors.length);
-
Assert.assertEquals(BROKEN_PROPERTY, initialConnectors[0].getParams().get(TransportConstants.LOCAL_ADDRESS_PROP_NAME).toString());
}
@@ -117,8 +114,7 @@ public class ConnectionFactoryURITest {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (ObjectOutputStream outStream = new ObjectOutputStream(baos)) {
outStream.writeObject(factory);
- }
- finally {
+ } finally {
baos.close();
}
try (ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -418,18 +414,15 @@ public class ConnectionFactoryURITest {
String value = RandomUtil.randomString();
bean.setProperty(factory, descriptor.getName(), value);
sb.append("&").append(descriptor.getName()).append("=").append(value);
- }
- else if (descriptor.getPropertyType() == int.class) {
+ } else if (descriptor.getPropertyType() == int.class) {
int value = RandomUtil.randomPositiveInt();
bean.setProperty(factory, descriptor.getName(), value);
sb.append("&").append(descriptor.getName()).append("=").append(value);
- }
- else if (descriptor.getPropertyType() == long.class) {
+ } else if (descriptor.getPropertyType() == long.class) {
long value = RandomUtil.randomPositiveLong();
bean.setProperty(factory, descriptor.getName(), value);
sb.append("&").append(descriptor.getName()).append("=").append(value);
- }
- else if (descriptor.getPropertyType() == double.class) {
+ } else if (descriptor.getPropertyType() == double.class) {
double value = RandomUtil.randomDouble();
bean.setProperty(factory, descriptor.getName(), value);
sb.append("&").append(descriptor.getName()).append("=").append(value);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
index 1af1492..8ddd8fa 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
@@ -49,7 +49,7 @@ public interface ActiveMQJMSBridgeLogger extends BasicLogger {
@LogMessage(level = Logger.Level.INFO)
@Message(id = 341000, value = "Failed to set up JMS bridge {1} connections. Most probably the source or target servers are unavailable." + " Will retry after a pause of {0} ms", format = Message.Format.MESSAGE_FORMAT)
- void failedToSetUpBridge(long failureRetryInterval,String bridgeName);
+ void failedToSetUpBridge(long failureRetryInterval, String bridgeName);
@LogMessage(level = Logger.Level.INFO)
@Message(id = 341001, value = "JMS Bridge {0} succeeded in reconnecting to servers", format = Message.Format.MESSAGE_FORMAT)
@@ -69,7 +69,7 @@ public interface ActiveMQJMSBridgeLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342002, value = "Failed to unregisted JMS Bridge {0} - {1}", format = Message.Format.MESSAGE_FORMAT)
- void errorUnregisteringBridge(ObjectName objectName,String bridgeName);
+ void errorUnregisteringBridge(ObjectName objectName, String bridgeName);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342003, value = "JMS Bridge {0} unable to set up connections, bridge will be stopped", format = Message.Format.MESSAGE_FORMAT)
@@ -77,7 +77,7 @@ public interface ActiveMQJMSBridgeLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342004, value = "JMS Bridge {1}, will retry after a pause of {0} ms", format = Message.Format.MESSAGE_FORMAT)
- void bridgeRetry(long failureRetryInterval,String bridgeName);
+ void bridgeRetry(long failureRetryInterval, String bridgeName);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342005, value = "JMS Bridge {0} unable to set up connections, bridge will not be started", format = Message.Format.MESSAGE_FORMAT)
@@ -85,21 +85,21 @@ public interface ActiveMQJMSBridgeLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342006, value = "JMS Bridge {0}, detected failure on bridge connection", format = Message.Format.MESSAGE_FORMAT)
- void bridgeFailure(@Cause Exception e,String bridgeName);
+ void bridgeFailure(@Cause Exception e, String bridgeName);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342009, value = "JMS Bridge {0} failed to send + acknowledge batch, closing JMS objects", format = Message.Format.MESSAGE_FORMAT)
- void bridgeAckError(@Cause Exception e,String bridgeName);
+ void bridgeAckError(@Cause Exception e, String bridgeName);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 342010, value = "Failed to connect JMS Bridge {0}", format = Message.Format.MESSAGE_FORMAT)
- void bridgeConnectError(@Cause Exception e,String bridgeName);
+ void bridgeConnectError(@Cause Exception e, String bridgeName);
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 344001, value = "JMS Bridge {0}, failed to start source connection", format = Message.Format.MESSAGE_FORMAT)
- void jmsBridgeSrcConnectError(@Cause Exception e,String bridgeName);
+ void jmsBridgeSrcConnectError(@Cause Exception e, String bridgeName);
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 344002, value = "Failed to start JMS Bridge {1}. QoS Mode: {0} requires a Transaction Manager, none found", format = Message.Format.MESSAGE_FORMAT)
- void jmsBridgeTransactionManagerMissing(QualityOfServiceMode qosMode,String bridgeName);
+ void jmsBridgeTransactionManagerMissing(QualityOfServiceMode qosMode, String bridgeName);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
index b457831..33e0799 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
@@ -16,12 +16,12 @@
*/
package org.apache.activemq.artemis.jms.bridge.impl;
+import javax.management.StandardMBean;
+
import org.apache.activemq.artemis.jms.bridge.JMSBridge;
import org.apache.activemq.artemis.jms.bridge.JMSBridgeControl;
import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
-import javax.management.StandardMBean;
-
public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeControl {
private final JMSBridge bridge;
@@ -90,8 +90,7 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
QualityOfServiceMode mode = bridge.getQualityOfServiceMode();
if (mode != null) {
return mode.name();
- }
- else {
+ } else {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/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 339ebcf..e06231a 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
@@ -16,28 +16,6 @@
*/
package org.apache.activemq.artemis.jms.bridge.impl;
-import org.apache.activemq.artemis.api.core.ActiveMQException;
-import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
-import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
-import org.apache.activemq.artemis.api.core.client.FailoverEventType;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.artemis.jms.bridge.ActiveMQJMSBridgeLogger;
-import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
-import org.apache.activemq.artemis.jms.bridge.JMSBridge;
-import org.apache.activemq.artemis.jms.bridge.JMSBridgeControl;
-import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
-import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerBundle;
-import org.apache.activemq.artemis.service.extensions.ServiceUtils;
-import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistry;
-import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
-import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
-import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
-import org.apache.activemq.artemis.utils.SensitiveDataCodec;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -72,6 +50,28 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.jms.bridge.ActiveMQJMSBridgeLogger;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
+import org.apache.activemq.artemis.jms.bridge.JMSBridge;
+import org.apache.activemq.artemis.jms.bridge.JMSBridgeControl;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerBundle;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistry;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
+import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
+import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
+import org.apache.activemq.artemis.utils.SensitiveDataCodec;
+
public final class JMSBridgeImpl implements JMSBridge {
private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"};
@@ -308,12 +308,10 @@ public final class JMSBridgeImpl implements JMSBridge {
StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class);
mbeanServer.registerMBean(mbean, this.objectName);
ActiveMQJMSBridgeLogger.LOGGER.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName());
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new IllegalStateException("Failed to register JMSBridge MBean", e);
}
- }
- else {
+ } else {
throw new IllegalArgumentException("objectName is required when specifying an MBeanServer");
}
}
@@ -380,7 +378,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
if (tm == null) {
- ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeTransactionManagerMissing(qualityOfServiceMode,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeTransactionManagerMissing(qualityOfServiceMode, bridgeName);
throw new RuntimeException();
}
@@ -391,14 +389,12 @@ public final class JMSBridgeImpl implements JMSBridge {
toResume = tm.suspend();
ok = setupJMSObjects();
- }
- finally {
+ } finally {
if (toResume != null) {
tm.resume(toResume);
}
}
- }
- else {
+ } else {
ok = setupJMSObjects();
}
@@ -406,8 +402,7 @@ public final class JMSBridgeImpl implements JMSBridge {
connectedSource = true;
connectedTarget = true;
startSource();
- }
- else {
+ } else {
ActiveMQJMSBridgeLogger.LOGGER.errorStartingBridge(bridgeName);
handleFailureOnStartup();
}
@@ -459,8 +454,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (this.targetPassword != null) {
targetPassword = codecInstance.decode(targetPassword);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw ActiveMQJMSServerBundle.BUNDLE.errorDecodingPassword(e);
}
@@ -506,8 +500,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.rollback();
abortedMessageCount += messages.size();
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
}
@@ -520,8 +513,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
sourceConn.close();
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close source conn", ignore);
}
@@ -530,8 +522,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (targetConn != null) {
try {
targetConn.close();
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close target conn", ignore);
}
@@ -553,9 +544,8 @@ public final class JMSBridgeImpl implements JMSBridge {
if (mbeanServer != null && objectName != null) {
try {
mbeanServer.unregisterMBean(objectName);
- }
- catch (Exception e) {
- ActiveMQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName,bridgeName);
+ } catch (Exception e) {
+ ActiveMQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName, bridgeName);
}
}
}
@@ -908,8 +898,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.delistResource(resSource, XAResource.TMSUCCESS);
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist source resource", e);
}
@@ -919,8 +908,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.delistResource(resDest, XAResource.TMSUCCESS);
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist target resource", e);
}
@@ -984,22 +972,19 @@ public final class JMSBridgeImpl implements JMSBridge {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
}
conn = ((XAConnectionFactory) cf).createXAConnection();
- }
- else {
+ } else {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
}
conn = ((ConnectionFactory) cf).createConnection();
}
- }
- else {
+ } else {
if (isXA) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
}
conn = ((XAConnectionFactory) cf).createXAConnection(username, password);
- }
- else {
+ } else {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
}
@@ -1071,14 +1056,12 @@ public final class JMSBridgeImpl implements JMSBridge {
// everything becomes once and only once
forwardMode = JMSBridgeImpl.FORWARD_MODE_LOCALTX;
- }
- else {
+ } else {
// Different servers
if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) {
// Use XA
forwardMode = JMSBridgeImpl.FORWARD_MODE_XA;
- }
- else {
+ } else {
forwardMode = JMSBridgeImpl.FORWARD_MODE_NONTX;
}
}
@@ -1094,8 +1077,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true);
sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED);
- }
- else { // bridging across different servers
+ } else { // bridging across different servers
// QoS = ONCE_AND_ONLY_ONCE
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
// Create an XASession for consuming from the source
@@ -1105,8 +1087,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true);
sourceSession = ((XAConnection) sourceConn).createXASession();
- }
- else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
+ } else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA source session");
}
@@ -1114,8 +1095,7 @@ public final class JMSBridgeImpl implements JMSBridge {
sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true);
if (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize == 1) {
sourceSession = sourceConn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- }
- else {
+ } else {
sourceSession = sourceConn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
}
}
@@ -1124,17 +1104,14 @@ public final class JMSBridgeImpl implements JMSBridge {
if (subName == null) {
if (selector == null) {
sourceConsumer = sourceSession.createConsumer(sourceDestination);
- }
- else {
+ } else {
sourceConsumer = sourceSession.createConsumer(sourceDestination, selector, false);
}
- }
- else {
+ } else {
// Durable subscription
if (selector == null) {
sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName);
- }
- else {
+ } else {
sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName, selector, false);
}
}
@@ -1145,8 +1122,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) {
targetConn = sourceConn;
targetSession = sourceSession;
- }
- else { // bridging across different servers
+ } else { // bridging across different servers
// QoS = ONCE_AND_ONLY_ONCE
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
if (JMSBridgeImpl.trace) {
@@ -1158,8 +1134,7 @@ public final class JMSBridgeImpl implements JMSBridge {
targetConn = createConnection(targetUsername, targetPassword, targetCff, null, true, false);
targetSession = ((XAConnection) targetConn).createXASession();
- }
- else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
+ } else { // QoS = DUPLICATES_OK || AT_MOST_ONCE
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session");
}
@@ -1189,14 +1164,13 @@ public final class JMSBridgeImpl implements JMSBridge {
targetProducer = targetSession.createProducer(null);
return true;
- }
- catch (Exception e) {
+ } catch (Exception e) {
// We shouldn't log this, as it's expected when trying to connect when target/source is not available
// If this fails we should attempt to cleanup or we might end up in some weird state
// Adding a log.warn, so the use may see the cause of the failure and take actions
- ActiveMQJMSBridgeLogger.LOGGER.bridgeConnectError(e,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeConnectError(e, bridgeName);
cleanup();
@@ -1208,8 +1182,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// Stop the source connection
try {
sourceConn.stop();
- }
- catch (Throwable ignore) {
+ } catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to stop source connection", ignore);
}
@@ -1218,8 +1191,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (tx != null) {
try {
delistResources(tx);
- }
- catch (Throwable ignore) {
+ } catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist resources", ignore);
}
@@ -1228,8 +1200,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// Terminate the tx
tx.rollback();
abortedMessageCount += messages.size();
- }
- catch (Throwable ignore) {
+ } catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
}
@@ -1239,8 +1210,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// Close the old objects
try {
sourceConn.close();
- }
- catch (Throwable ignore) {
+ } catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close source connection", ignore);
}
@@ -1249,8 +1219,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (targetConn != null) {
targetConn.close();
}
- }
- catch (Throwable ignore) {
+ } catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close target connection", ignore);
}
@@ -1262,8 +1231,7 @@ public final class JMSBridgeImpl implements JMSBridge {
while (System.currentTimeMillis() - start < failureRetryInterval) {
try {
Thread.sleep(failureRetryInterval);
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
}
}
}
@@ -1288,7 +1256,7 @@ public final class JMSBridgeImpl implements JMSBridge {
break;
}
- ActiveMQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval, bridgeName);
pause(failureRetryInterval);
}
@@ -1313,11 +1281,9 @@ public final class JMSBridgeImpl implements JMSBridge {
if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) {
sendBatchLocalTx();
- }
- else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
+ } else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) {
sendBatchXA();
- }
- else {
+ } else {
sendBatchNonTransacted();
}
}
@@ -1344,8 +1310,7 @@ public final class JMSBridgeImpl implements JMSBridge {
exHappened = false;
try {
sendMessages();
- }
- catch (TransactionRolledbackException e) {
+ } catch (TransactionRolledbackException e) {
ActiveMQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e);
exHappened = true;
}
@@ -1381,10 +1346,9 @@ public final class JMSBridgeImpl implements JMSBridge {
ActiveMQJMSBridgeLogger.LOGGER.trace("Client acked source session");
}
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (!stopping) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
}
// We don't call failure otherwise failover would be broken with ActiveMQ
@@ -1393,13 +1357,11 @@ public final class JMSBridgeImpl implements JMSBridge {
if (connectedSource) {
try {
sourceSession.recover();
- }
- catch (Throwable ignored) {
+ } catch (Throwable ignored) {
}
}
- }
- finally {
+ } finally {
// Clear the messages
messages.clear();
@@ -1422,24 +1384,21 @@ public final class JMSBridgeImpl implements JMSBridge {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Committed JTA transaction");
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
try {
// we call this just in case there is a failure other than failover
tx.rollback();
abortedMessageCount += messages.size();
- }
- catch (Throwable ignored) {
+ } catch (Throwable ignored) {
}
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
//we don't do handle failure here because the tx
//may be rolledback due to failover. All failure handling
//will be done through exception listener.
//handleFailureOnSend();
- }
- finally {
+ } finally {
try {
tx = startTx();
@@ -1448,9 +1407,8 @@ public final class JMSBridgeImpl implements JMSBridge {
// Clear the messages
messages.clear();
- }
- catch (Exception e) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e,bridgeName);
+ } catch (Exception e) {
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
handleFailureOnSend();
}
@@ -1471,24 +1429,20 @@ public final class JMSBridgeImpl implements JMSBridge {
ActiveMQJMSBridgeLogger.LOGGER.trace("Committed source session");
}
- }
- catch (Exception e) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e,bridgeName);
+ } catch (Exception e) {
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
try {
sourceSession.rollback();
- }
- catch (Throwable ignored) {
+ } catch (Throwable ignored) {
}
try {
targetSession.rollback();
- }
- catch (Throwable ignored) {
+ } catch (Throwable ignored) {
}
// We don't call failure here, we let the exception listener to deal with it
- }
- finally {
+ } finally {
messages.clear();
}
}
@@ -1567,8 +1521,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (val == null) {
val = msg.getJMSMessageID();
- }
- else {
+ } else {
StringBuffer sb = new StringBuffer(val);
sb.append(",").append(msg.getJMSMessageID());
@@ -1611,8 +1564,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (val instanceof byte[] == false) {
//Can't set byte[] array props through the JMS API - if we're bridging an ActiveMQ Artemis message it might have such props
msg.setObjectProperty(propName, entry.getValue());
- }
- else if (msg instanceof ActiveMQMessage) {
+ } else if (msg instanceof ActiveMQMessage) {
((ActiveMQMessage) msg).getCoreMessage().putBytesProperty(propName, (byte[]) val);
}
}
@@ -1671,8 +1623,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (paused || failed) {
try {
lock.wait(500);
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
if (stopping) {
return;
}
@@ -1690,8 +1641,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// As we need to reconstruct the buffer before resending the message
((ActiveMQMessage) msg).checkBuffer();
}
- }
- catch (JMSException jmse) {
+ } catch (JMSException jmse) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace(this + " exception while receiving a message", jmse);
}
@@ -1700,8 +1650,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (msg == null) {
try {
lock.wait(500);
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
}
@@ -1750,9 +1699,8 @@ public final class JMSBridgeImpl implements JMSBridge {
protected void startSourceConnection() {
try {
sourceConn.start();
- }
- catch (JMSException e) {
- ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e,bridgeName);
+ } catch (JMSException e) {
+ ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e, bridgeName);
}
}
@@ -1773,8 +1721,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
stop();
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
}
}
@@ -1792,7 +1739,7 @@ public final class JMSBridgeImpl implements JMSBridge {
boolean ok = false;
if (maxRetries > 0 || maxRetries == -1) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval, bridgeName);
pause(failureRetryInterval);
@@ -1802,8 +1749,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (!ok) {
failed();
- }
- else {
+ } else {
succeeded();
}
}
@@ -1834,9 +1780,8 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
startSource();
- }
- catch (JMSException e) {
- ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e,bridgeName);
+ } catch (JMSException e) {
+ ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e, bridgeName);
}
}
}
@@ -1874,8 +1819,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
batchExpiryTime = System.currentTimeMillis() + maxBatchTime;
- }
- else {
+ } else {
try {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace(this + " waiting for " + toWait);
@@ -1886,8 +1830,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace(this + " woke up");
}
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
}
@@ -1920,11 +1863,10 @@ public final class JMSBridgeImpl implements JMSBridge {
if (stopping) {
return;
}
- ActiveMQJMSBridgeLogger.LOGGER.bridgeFailure(e,bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeFailure(e, bridgeName);
if (isSource) {
connectedSource = false;
- }
- else {
+ } else {
connectedTarget = false;
}
@@ -1937,8 +1879,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Failure recovery already in progress");
}
- }
- else {
+ } else {
boolean shouldHandleFailure = true;
if (ha) {
//make sure failover happened
@@ -1961,8 +1902,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (sl.iterator().hasNext()) {
registry = sl.iterator().next();
}
- }
- catch (Throwable e) {
+ } catch (Throwable e) {
ActiveMQJMSBridgeLogger.LOGGER.debug("unable to load recovery registry " + locatorClasse, e);
}
if (registry != null) {
@@ -2012,8 +1952,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (eventType == FailoverEventType.FAILURE_DETECTED) {
if (isSource) {
connectedSource = false;
- }
- else {
+ } else {
connectedTarget = false;
}
}
@@ -2037,10 +1976,8 @@ public final class JMSBridgeImpl implements JMSBridge {
}
start = System.currentTimeMillis();
this.wait(toWait);
- }
- catch (InterruptedException e) {
- }
- finally {
+ } catch (InterruptedException e) {
+ } finally {
waited = System.currentTimeMillis() - start;
toWait = failoverTimeout - waited;
}
@@ -2061,8 +1998,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (result == FailoverEventType.FAILOVER_COMPLETED) {
if (isSource) {
connectedSource = true;
- }
- else {
+ } else {
connectedTarget = true;
}
return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
index 95c3ce9..67e0927 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.artemis.jms.bridge.impl;
-import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
-
import java.util.Hashtable;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+
public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory {
public JNDIConnectionFactoryFactory(final Hashtable<?, ?> jndiProperties, final String lookup) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
index 2fc864f..2869e1c 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
@@ -16,11 +16,10 @@
*/
package org.apache.activemq.artemis.jms.bridge.impl;
-import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
-
+import javax.jms.Destination;
import java.util.Hashtable;
-import javax.jms.Destination;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
public class JNDIDestinationFactory extends JNDIFactorySupport implements DestinationFactory {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java
index b94e3f5..31571ac 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java
@@ -16,9 +16,8 @@
*/
package org.apache.activemq.artemis.jms.bridge.impl;
-import java.util.Hashtable;
-
import javax.naming.InitialContext;
+import java.util.Hashtable;
public abstract class JNDIFactorySupport {
@@ -40,14 +39,12 @@ public abstract class JNDIFactorySupport {
try {
if (jndiProperties == null) {
ic = new InitialContext();
- }
- else {
+ } else {
ic = new InitialContext(jndiProperties);
}
obj = ic.lookup(lookup);
- }
- finally {
+ } finally {
if (ic != null) {
ic.close();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
index 71239c7..3175b9c 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
@@ -441,6 +441,7 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
public String getProtocolManagerFactoryStr() {
return cfConfig.getProtocolManagerFactoryStr();
}
+
@Override
public boolean isAutoGroup() {
return cfConfig.isAutoGroup();
@@ -459,8 +460,7 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
private void recreateCF() {
try {
this.cf = jmsManager.recreateCF(this.name, this.cfConfig);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
index 38ccd15..a836146 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
@@ -32,9 +32,9 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionException;
import org.apache.activemq.artemis.api.core.FilterConstants;
+import org.apache.activemq.artemis.api.core.JsonUtil;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.JsonUtil;
import org.apache.activemq.artemis.api.core.management.MessageCounterInfo;
import org.apache.activemq.artemis.api.core.management.Operation;
import org.apache.activemq.artemis.api.core.management.QueueControl;
@@ -211,8 +211,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
Map<String, Object>[] coreMessages = coreQueueControl.listMessages(filter);
return toJMSMap(coreMessages);
- }
- catch (ActiveMQException e) {
+ } catch (ActiveMQException e) {
throw new IllegalStateException(e.getMessage());
}
}
@@ -258,8 +257,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
}
return returnMap;
- }
- catch (ActiveMQException e) {
+ } catch (ActiveMQException e) {
throw new IllegalStateException(e.getMessage());
}
}
@@ -319,7 +317,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
for (String kv : kvs) {
String[] it = kv.split("=");
if (it.length == 2) {
- props.put(it[0],it[1]);
+ props.put(it[0], it[1]);
}
}
return sendTextMessage(props, props.remove("body"), props.remove("username"), props.remove("password"));
@@ -341,7 +339,10 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
}
@Override
- public String sendTextMessage(Map<String, String> headers, String body, String user, String password) throws Exception {
+ public String sendTextMessage(Map<String, String> headers,
+ String body,
+ String user,
+ String password) throws Exception {
boolean durable = false;
if (headers.containsKey("JMSDeliveryMode")) {
String jmsDeliveryMode = headers.remove("JMSDeliveryMode");
@@ -379,13 +380,13 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
// Figure out messageID from JMSMessageID.
final String filter = createFilterForJMSMessageID(jmsMessageID);
- Map<String,Object>[] messages = coreQueueControl.listMessages(filter);
- if ( messages.length != 1) { // if no messages. There should not be more than one, JMSMessageID should be unique.
+ Map<String, Object>[] messages = coreQueueControl.listMessages(filter);
+ if (messages.length != 1) { // if no messages. There should not be more than one, JMSMessageID should be unique.
return false;
}
- final Map<String,Object> messageToRedeliver = messages[0];
- Long messageID = (Long)messageToRedeliver.get("messageID");
+ final Map<String, Object> messageToRedeliver = messages[0];
+ Long messageID = (Long) messageToRedeliver.get("messageID");
return messageID != null && coreQueueControl.retryMessage(messageID);
}
@@ -394,7 +395,6 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
return coreQueueControl.retryMessages();
}
-
@Override
public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception {
return moveMessage(messageID, otherQueueName, false);
@@ -438,8 +438,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
public String listMessageCounter() {
try {
return MessageCounterInfo.toJSon(counter);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new IllegalStateException(e);
}
}
@@ -487,7 +486,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
@Override
public CompositeData[] browse(String filter) throws Exception {
try {
- CompositeData[] messages = coreQueueControl.browse(filter);
+ CompositeData[] messages = coreQueueControl.browse(filter);
ArrayList<CompositeData> c = new ArrayList<>();
@@ -497,8 +496,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
CompositeData[] rc = new CompositeData[c.size()];
c.toArray(rc);
return rc;
- }
- catch (ActiveMQInvalidFilterExpressionException e) {
+ } catch (ActiveMQInvalidFilterExpressionException e) {
throw new InvalidSelectorException(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
index 6f9f8c3..974d8fb 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
@@ -30,7 +30,6 @@ import javax.management.NotificationBroadcasterSupport;
import javax.management.NotificationEmitter;
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -107,20 +106,16 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
if (coreAddress.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX)) {
result[0] = coreAddress.substring(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX.length());
result[1] = "queue";
- }
- else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) {
+ } else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) {
result[0] = coreAddress.substring(ActiveMQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length());
result[1] = "tempqueue";
- }
- else if (coreAddress.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX)) {
+ } else if (coreAddress.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX)) {
result[0] = coreAddress.substring(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX.length());
result[1] = "topic";
- }
- else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) {
+ } else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) {
result[0] = coreAddress.substring(ActiveMQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length());
result[1] = "temptopic";
- }
- else {
+ } else {
ActiveMQJMSServerLogger.LOGGER.debug("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
// not related to JMS
return null;
@@ -170,8 +165,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
throw new IllegalArgumentException("no discovery group name supplied");
}
server.createConnectionFactory(name, ha, JMSFactoryType.valueOf(cfType), connectorNames[0], JMSServerControlImpl.convert(bindings));
- }
- else {
+ } else {
List<String> connectorList = new ArrayList<>(connectorNames.length);
for (String str : connectorNames) {
@@ -180,8 +174,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
server.createConnectionFactory(name, ha, JMSFactoryType.valueOf(cfType), connectorList, JMSServerControlImpl.convert(bindings));
}
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -270,8 +263,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
if (useDiscovery) {
configuration.setDiscoveryGroupName(connectorNames[0]);
- }
- else {
+ } else {
ArrayList<String> connectorNamesList = new ArrayList<>();
for (String nameC : connectorNames) {
connectorNamesList.add(nameC);
@@ -284,8 +276,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
}
server.createConnectionFactory(true, configuration, bindings);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -331,8 +322,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.createQueue(true, name, selector, durable, JMSServerControlImpl.toArray(bindings));
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -350,8 +340,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.destroyQueue(name, removeConsumers);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -369,8 +358,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.createTopic(true, topicName, JMSServerControlImpl.toArray(bindings));
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -388,8 +376,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.destroyTopic(name, removeConsumers);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -402,8 +389,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
server.destroyConnectionFactory(name);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -434,8 +420,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
names[i] = queueControl.getName();
}
return names;
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -454,8 +439,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
names[i] = topicControl.getName();
}
return names;
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -474,8 +458,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
names[i] = cfControl.getName();
}
return names;
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -519,8 +502,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listRemoteAddresses();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -533,8 +515,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listRemoteAddresses(ipAddress);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -547,8 +528,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.closeConnectionsForAddress(ipAddress);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -561,8 +541,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.closeConsumerConnectionsForAddress(address);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -575,8 +554,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.closeConnectionsForUser(userName);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -589,8 +567,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listConnectionIDs();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -620,10 +597,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
for (RemotingConnection connection : connections) {
ServerSession session = jmsSessions.get(connection.getID());
if (session != null) {
- JsonObjectBuilder objectBuilder = JsonLoader.createObjectBuilder()
- .add("connectionID", connection.getID().toString())
- .add("clientAddress", connection.getRemoteAddress())
- .add("creationTime", connection.getCreationTime());
+ JsonObjectBuilder objectBuilder = JsonLoader.createObjectBuilder().add("connectionID", connection.getID().toString()).add("clientAddress", connection.getRemoteAddress()).add("creationTime", connection.getCreationTime());
if (session.getMetaData(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY) != null) {
objectBuilder.add("clientID", session.getMetaData(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY));
@@ -637,8 +611,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
}
}
return array.build().toString();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -668,8 +641,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
}
}
return array.build().toString();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -683,8 +655,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
JsonArray jsonArray = toJsonArray(server.getActiveMQServer().getSessions());
return jsonArray.toString();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -697,8 +668,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listSessions(connectionID);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -711,8 +681,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listPreparedTransactionDetailsAsJSON();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -725,8 +694,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listPreparedTransactionDetailsAsHTML();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -810,8 +778,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
try {
return server.listSessionsAsJSON(connectionID);
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -834,8 +801,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
JsonObjectBuilder obj = JsonLoader.createObjectBuilder();
TransportConfiguration live = member.getLive();
if (live != null) {
- obj.add("nodeID", member.getNodeId())
- .add("live", live.getParams().get("host") + ":" + live.getParams().get("port"));
+ obj.add("nodeID", member.getNodeId()).add("live", live.getParams().get("host") + ":" + live.getParams().get("port"));
TransportConfiguration backup = member.getBackup();
if (backup != null) {
obj.add("backup", backup.getParams().get("host") + ":" + backup.getParams().get("port"));
@@ -846,8 +812,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
}
}
return brokers.build().toString();
- }
- finally {
+ } finally {
blockOnIO();
}
}
@@ -862,32 +827,21 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
if (destinationInfo == null) {
return null;
}
- JsonObjectBuilder obj = JsonLoader.createObjectBuilder()
- .add("consumerID", consumer.getID())
- .add("connectionID", consumer.getConnectionID().toString())
- .add("sessionID", consumer.getSessionID())
- .add("queueName", consumer.getQueue().getName().toString())
- .add("browseOnly", consumer.isBrowseOnly())
- .add("creationTime", consumer.getCreationTime())
- .add("destinationName", destinationInfo[0])
- .add("destinationType", destinationInfo[1]);
+ JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("consumerID", consumer.getID()).add("connectionID", consumer.getConnectionID().toString()).add("sessionID", consumer.getSessionID()).add("queueName", consumer.getQueue().getName().toString()).add("browseOnly", consumer.isBrowseOnly()).add("creationTime", consumer.getCreationTime()).add("destinationName", destinationInfo[0]).add("destinationType", destinationInfo[1]);
// JMS consumer with message filter use the queue's filter
Filter queueFilter = consumer.getQueue().getFilter();
if (queueFilter != null) {
obj.add("filter", queueFilter.getFilterString().toString());
}
-
if (destinationInfo[1].equals("topic")) {
try {
ActiveMQDestination.decomposeQueueNameForDurableSubscription(consumer.getQueue().getName().toString());
obj.add("durable", true);
- }
- catch (IllegalArgumentException | JMSRuntimeException e) {
+ } catch (IllegalArgumentException | JMSRuntimeException e) {
obj.add("durable", false);
}
- }
- else {
+ } else {
obj.add("durable", false);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
index 6706c17..d8c4179 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
@@ -16,20 +16,19 @@
*/
package org.apache.activemq.artemis.jms.management.impl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import javax.json.JsonArrayBuilder;
import javax.json.JsonObject;
import javax.management.MBeanInfo;
import javax.management.StandardMBean;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.Pair;
-import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.api.core.management.ResourceNames;
import org.apache.activemq.artemis.api.jms.management.TopicControl;
@@ -302,8 +301,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName());
clientID = pair.getA();
subName = pair.getB();
- }
- else if (queue.getName().startsWith(ResourceNames.JMS_TOPIC)) {
+ } else if (queue.getName().startsWith(ResourceNames.JMS_TOPIC)) {
// in the case of heirarchical topics the queue name will not follow the <part>.<part> pattern of normal
// durable subscribers so skip decomposing the name for the client ID and subscription name and just
// hard-code it
@@ -313,23 +311,13 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
String filter = queue.getFilter() != null ? queue.getFilter() : null;
- JsonObject info = JsonLoader.createObjectBuilder()
- .add("queueName", queue.getName())
- .add("clientID", nullSafe(clientID))
- .add("selector", nullSafe(filter))
- .add("name", nullSafe(subName))
- .add("durable", queue.isDurable())
- .add("messageCount", queue.getMessageCount())
- .add("deliveringCount", queue.getDeliveringCount())
- .add("consumers", queue.listConsumersAsJSON())
- .build();
+ JsonObject info = JsonLoader.createObjectBuilder().add("queueName", queue.getName()).add("clientID", nullSafe(clientID)).add("selector", nullSafe(filter)).add("name", nullSafe(subName)).add("durable", queue.isDurable()).add("messageCount", queue.getMessageCount()).add("deliveringCount", queue.getDeliveringCount()).add("consumers", queue.listConsumersAsJSON()).build();
array.add(info);
}
return array.build().toString();
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
return e.toString();
}
@@ -360,8 +348,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
}
}
return matchingQueues;
- }
- catch (Exception e) {
+ } catch (Exception e) {
return Collections.emptyList();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSCompositeDataConstants.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSCompositeDataConstants.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSCompositeDataConstants.java
index e75b2f5..dc5b33b 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSCompositeDataConstants.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSCompositeDataConstants.java
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,6 +17,7 @@
package org.apache.activemq.artemis.jms.management.impl.openmbean;
public interface JMSCompositeDataConstants {
+
String JMS_DESTINATION = "JMSDestination";
String JMS_MESSAGE_ID = "JMSMessageID";
String JMS_TYPE = "JMSType";
@@ -54,5 +54,4 @@ public interface JMSCompositeDataConstants {
String MESSAGE_TEXT = "Text";
String MESSAGE_URL = "Url";
-
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java
index 06ba26c..285657d 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java
@@ -16,14 +16,6 @@
*/
package org.apache.activemq.artemis.jms.management.impl.openmbean;
-import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
-import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
-import org.apache.activemq.artemis.api.core.Message;
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.core.management.impl.openmbean.CompositeDataConstants;
-import org.apache.activemq.artemis.reader.MapMessageUtil;
-import org.apache.activemq.artemis.utils.TypedProperties;
-
import javax.management.openmbean.ArrayType;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
@@ -39,9 +31,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.management.impl.openmbean.CompositeDataConstants;
+import org.apache.activemq.artemis.reader.MapMessageUtil;
+import org.apache.activemq.artemis.utils.TypedProperties;
+
public final class JMSOpenTypeSupport {
public interface OpenTypeFactory {
+
CompositeType getCompositeType() throws OpenDataException;
Map<String, Object> getFields(CompositeDataSupport data) throws OpenDataException;
@@ -95,6 +96,7 @@ public final class JMSOpenTypeSupport {
}
static class MessageOpenTypeFactory extends AbstractOpenTypeFactory {
+
protected TabularType stringPropertyTabularType;
protected TabularType booleanPropertyTabularType;
protected TabularType bytePropertyTabularType;
@@ -158,7 +160,7 @@ public final class JMSOpenTypeSupport {
putString(rc, data, JMSCompositeDataConstants.JMS_DESTINATION, CompositeDataConstants.ADDRESS);
putStringProperty(rc, data, JMSCompositeDataConstants.JMS_REPLY_TO, "JMSReplyTo");
rc.put(JMSCompositeDataConstants.JMS_TYPE, getType());
- rc.put(JMSCompositeDataConstants.JMS_DELIVERY_MODE, ((Boolean)data.get(CompositeDataConstants.DURABLE)) ? "PERSISTENT" : "NON-PERSISTENT");
+ rc.put(JMSCompositeDataConstants.JMS_DELIVERY_MODE, ((Boolean) data.get(CompositeDataConstants.DURABLE)) ? "PERSISTENT" : "NON-PERSISTENT");
rc.put(JMSCompositeDataConstants.JMS_EXPIRATION, data.get(CompositeDataConstants.EXPIRATION));
rc.put(JMSCompositeDataConstants.JMS_TIMESTAMP, new Date((Long) data.get(CompositeDataConstants.TIMESTAMP)));
rc.put(JMSCompositeDataConstants.JMS_PRIORITY, ((Byte) data.get(CompositeDataConstants.PRIORITY)).intValue());
@@ -187,8 +189,7 @@ public final class JMSOpenTypeSupport {
String prop = (String) data.get(source);
if (prop != null) {
rc.put(target, prop);
- }
- else {
+ } else {
rc.put(target, "");
}
}
@@ -226,7 +227,6 @@ public final class JMSOpenTypeSupport {
return value.toString();
}
-
protected <T> TabularType createTabularType(Class<T> type, OpenType openType) throws OpenDataException {
String typeName = "java.util.Map<java.lang.String, " + type.getName() + ">";
String[] keyValue = new String[]{"key", "value"};
@@ -238,7 +238,6 @@ public final class JMSOpenTypeSupport {
static class ByteMessageOpenTypeFactory extends MessageOpenTypeFactory {
-
@Override
protected String getTypeName() {
return "BytesMessage";
@@ -290,12 +289,15 @@ public final class JMSOpenTypeSupport {
}
static class ObjectMessageOpenTypeFactory extends MessageOpenTypeFactory {
+
@Override
protected String getTypeName() {
return "ObjectMessage";
}
}
+
static class StreamMessageOpenTypeFactory extends MessageOpenTypeFactory {
+
@Override
protected String getTypeName() {
return "StreamMessage";
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java
index 5a084e4..3e5e997 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java
@@ -19,9 +19,9 @@ package org.apache.activemq.artemis.jms.persistence;
import java.util.List;
import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
public interface JMSStorageManager extends ActiveMQComponent {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index f47f1bb..32c438d 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -26,19 +26,19 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.io.SequentialFileFactory;
+import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.journal.Journal;
import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
import org.apache.activemq.artemis.core.journal.RecordInfo;
-import org.apache.activemq.artemis.core.io.SequentialFileFactory;
import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
-import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.replication.ReplicatedJournal;
import org.apache.activemq.artemis.core.replication.ReplicationManager;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.jms.persistence.JMSStorageManager;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
import org.apache.activemq.artemis.utils.IDGenerator;
@@ -90,8 +90,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
if (replicator != null) {
jmsJournal = new ReplicatedJournal((byte) 2, localJMS, replicator);
- }
- else {
+ } else {
jmsJournal = localJMS;
}
@@ -152,8 +151,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
PersistedBindings currentBindings = mapBindings.get(key);
if (currentBindings != null) {
jmsJournal.appendDeleteRecordTransactional(tx, currentBindings.getId());
- }
- else {
+ } else {
currentBindings = new PersistedBindings(type, name);
}
@@ -181,8 +179,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
PersistedBindings currentBindings = mapBindings.get(key);
if (currentBindings == null) {
return;
- }
- else {
+ } else {
jmsJournal.appendDeleteRecordTransactional(tx, currentBindings.getId());
}
@@ -190,8 +187,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
if (currentBindings.getBindings().size() == 0) {
mapBindings.remove(key);
- }
- else {
+ } else {
long newId = idGenerator.generateID();
currentBindings.setId(newId);
jmsJournal.appendAddRecordTransactional(tx, newId, BINDING_RECORD, currentBindings);
@@ -261,21 +257,18 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
cf.decode(buffer);
cf.setId(id);
mapFactories.put(cf.getName(), cf);
- }
- else if (rec == DESTINATION_RECORD) {
+ } else if (rec == DESTINATION_RECORD) {
PersistedDestination destination = new PersistedDestination();
destination.decode(buffer);
destination.setId(id);
destinations.put(new Pair<>(destination.getType(), destination.getName()), destination);
- }
- else if (rec == BINDING_RECORD) {
+ } else if (rec == BINDING_RECORD) {
PersistedBindings bindings = new PersistedBindings();
bindings.decode(buffer);
bindings.setId(id);
Pair<PersistedType, String> key = new Pair<>(bindings.getType(), bindings.getName());
mapBindings.put(key, bindings);
- }
- else {
+ } else {
throw new IllegalStateException("Invalid record type " + rec);
}
@@ -296,8 +289,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
if (!dir.mkdirs()) {
throw new IllegalStateException("Failed to create directory " + dir);
}
- }
- else {
+ } else {
throw new IllegalArgumentException("Directory " + dir + " does not exist and will not create it");
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
index d1b69c1..7e1618d 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
@@ -20,9 +20,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.activemq.artemis.jms.persistence.JMSStorageManager;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
public class NullJMSStorageManagerImpl implements JMSStorageManager {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
index e591fa4..c442832 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
@@ -19,10 +19,10 @@ package org.apache.activemq.artemis.jms.server;
import org.apache.activemq.artemis.api.core.ActiveMQAddressExistsException;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.jboss.logging.Messages;
import org.jboss.logging.annotations.Cause;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;
-import org.jboss.logging.Messages;
/**
* Logger Code 12
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
index d5f1878..3284110 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
@@ -77,7 +77,6 @@ public interface JMSServerManager extends ActiveMQComponent {
boolean createTopic(boolean storeConfig, String topicName, String... bindings) throws Exception;
/**
- *
* @param storeConfig
* @param topicName
* @param autoCreated
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java
index edba5d1..538dbe5 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java
@@ -44,7 +44,7 @@ public interface ConnectionFactoryConfiguration extends EncodingSupport {
ConnectionFactoryConfiguration setConnectorNames(List<String> connectorNames);
- ConnectionFactoryConfiguration setConnectorNames(String...connectorNames);
+ ConnectionFactoryConfiguration setConnectorNames(String... connectorNames);
boolean isHA();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index b72a566..f456233 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -186,9 +186,8 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
return this;
}
-
@Override
- public ConnectionFactoryConfiguration setConnectorNames(final String...names) {
+ public ConnectionFactoryConfiguration setConnectorNames(final String... names) {
return this.setConnectorNames(Arrays.asList(names));
}
@@ -634,8 +633,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
if (this.connectorNames == null) {
buffer.writeInt(0);
- }
- else {
+ } else {
buffer.writeInt(connectorNames.size());
for (String tc : connectorNames) {
@@ -819,7 +817,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
BufferHelper.sizeOfNullableSimpleString(groupID) +
DataConstants.SIZE_INT +
- // factoryType
+ // factoryType
BufferHelper.sizeOfNullableSimpleString(protocolManagerFactoryStr) +
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
index a0c81f9..0fa203e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
@@ -16,6 +16,11 @@
*/
package org.apache.activemq.artemis.jms.server.config.impl;
+import javax.management.MBeanServer;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Map;
+
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.core.config.impl.Validators;
import org.apache.activemq.artemis.core.deployers.Deployable;
@@ -32,11 +37,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import javax.management.MBeanServer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-
public class FileJMSConfiguration extends JMSConfigurationImpl implements Deployable {
private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-jms.xsd";
@@ -111,8 +111,7 @@ public class FileJMSConfiguration extends JMSConfigurationImpl implements Deploy
if (node.getNodeName().equals(TOPIC_NODE_NAME)) {
topics.add(parseTopicConfiguration(node));
- }
- else if (node.getNodeName().equals(QUEUE_NODE_NAME)) {
+ } else if (node.getNodeName().equals(QUEUE_NODE_NAME)) {
queues.add(parseQueueConfiguration(node));
}
}