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:16 UTC
[16/52] [partial] activemq-artemis git commit: ARTEMIS-765 Improve
Checkstyle
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
index abf5fac..2861182 100644
--- a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
+++ b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
@@ -58,8 +58,7 @@ public class SecurityExample {
try {
failConnection = cf.createConnection();
result = false;
- }
- catch (JMSSecurityException e) {
+ } catch (JMSSecurityException e) {
System.out.println("Default user cannot get a connection. Details: " + e.getMessage());
}
@@ -67,8 +66,7 @@ public class SecurityExample {
try {
billConnection = createConnection("bill", "activemq1", cf);
result = false;
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User bill failed to connect. Details: " + e.getMessage());
}
@@ -125,8 +123,7 @@ public class SecurityExample {
// Step 18. Check permissions on news.us.usTopic for sam: can't send but can receive
checkUserReceiveNoSend(usTopic, samConnection, "sam", frankConnection);
System.out.println("-------------------------------------------------------------------------------------");
- }
- finally {
+ } finally {
// Step 19. Be sure to close our JMS resources!
if (failConnection != null) {
failConnection.close();
@@ -170,8 +167,7 @@ public class SecurityExample {
msg.getText() +
"] to topic " +
topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot send message [" + msg.getText() + "] to topic: " + topic);
}
@@ -184,8 +180,7 @@ public class SecurityExample {
if (receivedMsg != null) {
System.out.println("User " + user + " can receive message [" + receivedMsg.getText() + "] from topic " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Security setting is broken! User " + user + " cannot receive message from topic " + topic);
}
@@ -202,8 +197,7 @@ public class SecurityExample {
MessageProducer producer = session.createProducer(topic);
try {
session.createConsumer(topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot receive any message from topic " + topic);
}
@@ -216,8 +210,7 @@ public class SecurityExample {
TextMessage receivedMsg = (TextMessage) goodConsumer.receive(2000);
if (receivedMsg != null) {
System.out.println("User " + user + " can send message [" + receivedMsg.getText() + "] to topic " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Security setting is broken! User " + user +
" cannot send message [" +
msg.getText() +
@@ -238,8 +231,7 @@ public class SecurityExample {
try {
session.createConsumer(topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot create consumer on topic " + topic);
}
@@ -251,8 +243,7 @@ public class SecurityExample {
msg.getText() +
"] to topic " +
topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot send message [" + msg.getText() + "] to topic: " + topic);
}
@@ -272,8 +263,7 @@ public class SecurityExample {
if (receivedMsg != null) {
System.out.println("User " + user + " can send message: [" + msg.getText() + "] to topic: " + topic);
System.out.println("User " + user + " can receive message: [" + msg.getText() + "] from topic: " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Error! User " + user + " cannot receive the message! ");
}
session.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
index d7ebde4..f6aaf44 100644
--- a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
+++ b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
@@ -23,7 +23,6 @@ import java.util.List;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
-
import org.apache.commons.io.FileUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.LdapComparator;
@@ -65,8 +64,7 @@ public class InMemoryDirectoryServiceFactory implements DirectoryServiceFactory
public InMemoryDirectoryServiceFactory() {
try {
directoryService = new DefaultDirectoryService();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException(e);
}
directoryService.setShutdownHookEnabled(false);
@@ -100,8 +98,7 @@ public class InMemoryDirectoryServiceFactory implements DirectoryServiceFactory
if (instanceLayout.getInstanceDirectory().exists()) {
try {
FileUtils.deleteDirectory(instanceLayout.getInstanceDirectory());
- }
- catch (IOException e) {
+ } catch (IOException e) {
LOG.warn("couldn't delete the instance directory before initializing the DirectoryService", e);
}
}
@@ -109,11 +106,7 @@ public class InMemoryDirectoryServiceFactory implements DirectoryServiceFactory
// EhCache in disabled-like-mode
Configuration ehCacheConfig = new Configuration();
- CacheConfiguration defaultCache = new CacheConfiguration("default", 1)
- .eternal(false)
- .timeToIdleSeconds(30)
- .timeToLiveSeconds(30)
- .overflowToDisk(false);
+ CacheConfiguration defaultCache = new CacheConfiguration("default", 1).eternal(false).timeToIdleSeconds(30).timeToLiveSeconds(30).overflowToDisk(false);
ehCacheConfig.addDefaultCache(defaultCache);
CacheService cacheService = new CacheService(new CacheManager(ehCacheConfig));
directoryService.setCacheService(cacheService);
@@ -141,10 +134,7 @@ public class InMemoryDirectoryServiceFactory implements DirectoryServiceFactory
}
// Init system partition
- Partition systemPartition = partitionFactory.createPartition(directoryService.getSchemaManager(), directoryService
- .getDnFactory(), "system", ServerDNConstants.SYSTEM_DN, 500, new File(directoryService
- .getInstanceLayout()
- .getPartitionsDirectory(), "system"));
+ Partition systemPartition = partitionFactory.createPartition(directoryService.getSchemaManager(), directoryService.getDnFactory(), "system", ServerDNConstants.SYSTEM_DN, 500, new File(directoryService.getInstanceLayout().getPartitionsDirectory(), "system"));
systemPartition.setSchemaManager(directoryService.getSchemaManager());
partitionFactory.addIndex(systemPartition, SchemaConstants.OBJECT_CLASS_AT, 100);
directoryService.setSystemPartition(systemPartition);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java
index f7ec24d..28f39e8 100644
--- a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java
+++ b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java
@@ -16,14 +16,13 @@
*/
package org.apache.activemq.artemis.jms.example.ldap;
+import javax.naming.InvalidNameException;
import java.net.URL;
import java.util.Map;
import java.util.TreeSet;
import java.util.UUID;
import java.util.regex.Pattern;
-import javax.naming.InvalidNameException;
-
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/LdapServer.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/LdapServer.java b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/LdapServer.java
index 1161922..c9a4b3c 100644
--- a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/LdapServer.java
+++ b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/LdapServer.java
@@ -39,7 +39,6 @@ public class LdapServer {
* Create a single LDAP server.
*
* @param ldifFile
- *
* @throws Exception
*/
public LdapServer(String ldifFile) throws Exception {
@@ -68,18 +67,18 @@ public class LdapServer {
directoryService.shutdown();
}
- private void importLdif(DirectoryService directoryService, final SchemaManager schemaManager, LdifReader ldifReader) throws Exception {
+ private void importLdif(DirectoryService directoryService,
+ final SchemaManager schemaManager,
+ LdifReader ldifReader) throws Exception {
try {
for (LdifEntry ldifEntry : ldifReader) {
checkPartition(ldifEntry);
directoryService.getAdminSession().add(new DefaultEntry(schemaManager, ldifEntry.getEntry()));
}
- }
- finally {
+ } finally {
try {
ldifReader.close();
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
// ignore
}
}
@@ -90,8 +89,7 @@ public class LdapServer {
Dn parent = dn.getParent();
try {
directoryService.getAdminSession().exists(parent);
- }
- catch (Exception e) {
+ } catch (Exception e) {
System.out.println("Creating new partition for DN=" + dn + "\n");
AvlPartition partition = new AvlPartition(directoryService.getSchemaManager());
partition.setId(dn.getName());
@@ -99,4 +97,4 @@ public class LdapServer {
directoryService.addPartition(partition);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java b/examples/features/standard/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
index 90cf72c..04d8c50 100644
--- a/examples/features/standard/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
+++ b/examples/features/standard/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
@@ -54,8 +54,7 @@ public class SecurityExample {
try {
failConnection = cf.createConnection();
result = false;
- }
- catch (JMSSecurityException e) {
+ } catch (JMSSecurityException e) {
System.out.println("Default user cannot get a connection. Details: " + e.getMessage());
}
@@ -63,8 +62,7 @@ public class SecurityExample {
try {
billConnection = createConnection("bill", "activemq1", cf);
result = false;
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User bill failed to connect. Details: " + e.getMessage());
}
@@ -121,8 +119,7 @@ public class SecurityExample {
// Step 18. Check permissions on news.us.usTopic for sam: can't send but can receive
checkUserReceiveNoSend(usTopic, samConnection, "sam", frankConnection);
System.out.println("-------------------------------------------------------------------------------------");
- }
- finally {
+ } finally {
// Step 19. Be sure to close our JMS resources!
if (failConnection != null) {
failConnection.close();
@@ -164,8 +161,7 @@ public class SecurityExample {
msg.getText() +
"] to topic " +
topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot send message [" + msg.getText() + "] to topic: " + topic);
}
@@ -178,8 +174,7 @@ public class SecurityExample {
if (receivedMsg != null) {
System.out.println("User " + user + " can receive message [" + receivedMsg.getText() + "] from topic " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Security setting is broken! User " + user + " cannot receive message from topic " + topic);
}
@@ -196,8 +191,7 @@ public class SecurityExample {
MessageProducer producer = session.createProducer(topic);
try {
session.createConsumer(topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot receive any message from topic " + topic);
}
@@ -210,8 +204,7 @@ public class SecurityExample {
TextMessage receivedMsg = (TextMessage) goodConsumer.receive(2000);
if (receivedMsg != null) {
System.out.println("User " + user + " can send message [" + receivedMsg.getText() + "] to topic " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Security setting is broken! User " + user +
" cannot send message [" +
msg.getText() +
@@ -232,8 +225,7 @@ public class SecurityExample {
try {
session.createConsumer(topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot create consumer on topic " + topic);
}
@@ -245,8 +237,7 @@ public class SecurityExample {
msg.getText() +
"] to topic " +
topic);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("User " + user + " cannot send message [" + msg.getText() + "] to topic: " + topic);
}
@@ -266,8 +257,7 @@ public class SecurityExample {
if (receivedMsg != null) {
System.out.println("User " + user + " can send message: [" + msg.getText() + "] to topic: " + topic);
System.out.println("User " + user + " can receive message: [" + msg.getText() + "] from topic: " + topic);
- }
- else {
+ } else {
throw new IllegalStateException("Error! User " + user + " cannot receive the message! ");
}
session.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java b/examples/features/standard/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
index f49d834..a3097d2 100644
--- a/examples/features/standard/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
+++ b/examples/features/standard/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
@@ -90,8 +90,7 @@ public class SendAcknowledgementsExample {
System.out.println("Sent message " + i);
}
- }
- finally {
+ } finally {
// Step 12. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java b/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
index 174f092..25b0068 100644
--- a/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
+++ b/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
@@ -29,8 +29,7 @@ public class ExampleListener implements MessageListener {
public void onMessage(Message message) {
try {
lastMessage = ((TextMessage) message).getText();
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
throw new RuntimeException(e);
}
System.out.println("MESSAGE RECEIVED: " + lastMessage);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java b/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
index 594c69b..0d75bed 100644
--- a/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
+++ b/examples/features/standard/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
@@ -53,16 +53,13 @@ public class MessageSender {
MessageProducer producer = session.createProducer(destination);
TextMessage message = session.createTextMessage(msg);
producer.send(message);
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
ex.printStackTrace();
- }
- finally {
+ } finally {
if (conn != null) {
try {
conn.close();
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/ssl-enabled-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/SSLDualAuthenticationExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/ssl-enabled-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/SSLDualAuthenticationExample.java b/examples/features/standard/ssl-enabled-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/SSLDualAuthenticationExample.java
index a3c928e..29c186e 100644
--- a/examples/features/standard/ssl-enabled-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/SSLDualAuthenticationExample.java
+++ b/examples/features/standard/ssl-enabled-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/SSLDualAuthenticationExample.java
@@ -82,8 +82,7 @@ public class SSLDualAuthenticationExample {
System.out.println("Received message: " + messageReceived.getText());
initialContext.close();
- }
- finally {
+ } finally {
// Step 15. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java b/examples/features/standard/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
index 27bf739..cceedfc 100644
--- a/examples/features/standard/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
+++ b/examples/features/standard/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
@@ -72,8 +72,7 @@ public class SSLExample {
System.out.println("Received message: " + messageReceived.getText());
initialContext.close();
- }
- finally {
+ } finally {
// Step 12. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java b/examples/features/standard/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
index 627ef7d..d930890 100644
--- a/examples/features/standard/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
+++ b/examples/features/standard/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
@@ -93,8 +93,7 @@ public class StaticSelectorExample {
if (!result.get())
throw new IllegalStateException();
- }
- finally {
+ } finally {
// Step 12. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
@@ -129,8 +128,7 @@ class SimpleMessageListener implements MessageListener {
if (colorProp != null && !colorProp.equals(name)) {
result.set(false);
}
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
result.set(false);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java b/examples/features/standard/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
index 5747fae..7f3fab7 100644
--- a/examples/features/standard/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
+++ b/examples/features/standard/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
@@ -99,12 +99,10 @@ public class TemporaryQueueExample {
try {
messageConsumer = session.createConsumer(tempQueue2);
throw new Exception("Temporary queue cannot be accessed outside its lifecycle!");
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
System.out.println("Exception got when trying to access a temp queue outside its scope: " + e);
}
- }
- finally {
+ } finally {
if (connection != null) {
// Step 20. Be sure to close our JMS resources!
connection.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java b/examples/features/standard/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
index 5b9a084..41bda55 100644
--- a/examples/features/standard/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
+++ b/examples/features/standard/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
@@ -102,8 +102,7 @@ public class TopicHierarchyExample {
}
System.out.println("Didn't received any more message: " + message);
- }
- finally {
+ } finally {
// Step 12. Be sure to close our resources!
if (connection != null) {
connection.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java b/examples/features/standard/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
index 53aee12..8fe570f 100644
--- a/examples/features/standard/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
+++ b/examples/features/standard/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
@@ -131,8 +131,7 @@ public class TopicSelectorExample1 {
messageConsumer1.close();
messageConsumer2.close();
messageConsumer3.close();
- }
- finally {
+ } finally {
// Step 15. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java b/examples/features/standard/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
index 037e5fb..5620251 100644
--- a/examples/features/standard/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
+++ b/examples/features/standard/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
@@ -99,8 +99,7 @@ public class TopicSelectorExample2 {
if (!result.get())
throw new IllegalStateException();
- }
- finally {
+ } finally {
// Step 14. Be sure to close our JMS resources!
if (connection != null) {
connection.close();
@@ -137,10 +136,9 @@ class SimpleMessageListener implements MessageListener {
if (!colorProp.equals(name) && !name.equals("all")) {
result.set(false);
}
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
result.set(false);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java b/examples/features/standard/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
index 1c8695b..2265dfd 100644
--- a/examples/features/standard/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
+++ b/examples/features/standard/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
@@ -78,8 +78,7 @@ public class TopicExample {
messageReceived = (TextMessage) messageConsumer2.receive();
System.out.println("Consumer 2 Received message: " + messageReceived.getText());
- }
- finally {
+ } finally {
// Step 14. Be sure to close our JMS resources!
if (connection != null) {
connection.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java b/examples/features/standard/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
index 09c2a3d..d7be85e 100644
--- a/examples/features/standard/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
+++ b/examples/features/standard/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
@@ -111,8 +111,7 @@ public class TransactionalExample {
System.out.println("Message received after receive commit: " + receivedMessage);
- }
- finally {
+ } finally {
if (connection != null) {
// Step 18. Be sure to close our JMS resources!
connection.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
index 6025b32..2d5a2ac 100644
--- a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
+++ b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
@@ -166,8 +166,7 @@ public class XAHeuristicExample {
// Step 32. Close the JMX Connector
connector.close();
- }
- finally {
+ } finally {
// Step 32. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
@@ -212,8 +211,7 @@ class SimpleMessageListener implements MessageListener {
try {
System.out.println("Message received: " + ((TextMessage) message).getText());
receiveHolder.add(((TextMessage) message).getText());
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
result = false;
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index 6427bd4..a570770 100644
--- a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.artemis.jms.example;
-import org.apache.activemq.artemis.utils.Base64;
-
import javax.transaction.xa.Xid;
+import org.apache.activemq.artemis.utils.Base64;
+
public class DummyXid implements Xid {
private static final long serialVersionUID = 407053232840068514L;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
index 4c4448d..4e21c0f 100644
--- a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
+++ b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
@@ -127,12 +127,10 @@ public class XAReceiveExample {
TextMessage rm3 = (TextMessage) xaConsumer.receive(2000);
if (rm3 == null) {
System.out.println("No message received after commit.");
- }
- else {
+ } else {
throw new IllegalStateException();
}
- }
- finally {
+ } finally {
// Step 27. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index 6427bd4..a570770 100644
--- a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.artemis.jms.example;
-import org.apache.activemq.artemis.utils.Base64;
-
import javax.transaction.xa.Xid;
+import org.apache.activemq.artemis.utils.Base64;
+
public class DummyXid implements Xid {
private static final long serialVersionUID = 407053232840068514L;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
index 769727b..5c65f11 100644
--- a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
+++ b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
@@ -141,8 +141,7 @@ public class XASendExample {
if (!result.get())
throw new IllegalStateException();
- }
- finally {
+ } finally {
// Step 29. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
@@ -183,8 +182,7 @@ class SimpleMessageListener implements MessageListener {
try {
System.out.println("Message received: " + message);
receiveHolder.add(((TextMessage) message).getText());
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
result.set(false);
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/sub-modules/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java b/examples/features/sub-modules/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
index b412d87..7d1a662 100644
--- a/examples/features/sub-modules/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
+++ b/examples/features/sub-modules/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
@@ -63,8 +63,7 @@ public class AerogearExample {
System.out.println("now check your mobile app and press enter");
System.in.read();
- }
- finally {
+ } finally {
// Step 12. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java b/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
index ac6ccdc..3f248af 100644
--- a/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
+++ b/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
@@ -47,8 +47,7 @@ public class ExampleVerticle extends Verticle {
try {
latch0.await(5000, TimeUnit.MILLISECONDS);
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java b/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
index e7f6d62..b8e6d98 100644
--- a/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
+++ b/examples/features/sub-modules/vertx/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
@@ -75,8 +75,7 @@ public class VertxConnectorExample {
// Step 4 Waiting for the Verticle to process the message
latch.await(10000, TimeUnit.MILLISECONDS);
- }
- finally {
+ } finally {
if (platformManager != null) {
platformManager.undeployAll(null);
platformManager.stop();
@@ -92,8 +91,7 @@ public class VertxConnectorExample {
System.err.println("### FAILURE! ###");
System.err.println("#####################");
System.exit(1);
- }
- else {
+ } else {
System.out.println();
System.out.println("#####################");
System.out.println("### SUCCESS! ###");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
index be9c2f3..c8fd1ff 100644
--- a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
+++ b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
@@ -77,15 +77,13 @@ public class ProtonCPPExample {
// We are not going to issue this as an error because
// we also use this example as part of our tests on artemis
// this is not considered an error, just that no messages arrived (i.e. hello wasn't called)
- }
- else {
+ } else {
System.out.println("message received: " + messageReceived);
// Sending message back to client
producerAnswer.send(session.createTextMessage("HELLO from Apache ActiveMQ Artemis"));
}
- }
- finally {
+ } finally {
// Step 9. Be sure to close our resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
index ea3f006..8386fc4 100644
--- a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
+++ b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
@@ -56,8 +56,7 @@ public class AMQPQueueExample {
TextMessage m = (TextMessage) consumer.receive(5000);
System.out.println("message = " + m.getText());
- }
- finally {
+ } finally {
if (connection != null) {
// Step 9. close the connection
connection.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Chat.java
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Chat.java b/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Chat.java
index 0195894..73e44ff 100644
--- a/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Chat.java
+++ b/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Chat.java
@@ -41,8 +41,7 @@ public class Chat implements javax.jms.MessageListener {
connect = factory.createConnection(username, password);
pubSession = connect.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
subSession = connect.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
- }
- catch (javax.jms.JMSException jmse) {
+ } catch (javax.jms.JMSException jmse) {
System.err.println("error: Cannot connect to Broker - " + broker);
jmse.printStackTrace();
System.exit(1);
@@ -56,8 +55,7 @@ public class Chat implements javax.jms.MessageListener {
publisher = pubSession.createProducer(topic);
// Now that setup is complete, start the Connection
connect.start();
- }
- catch (javax.jms.JMSException jmse) {
+ } catch (javax.jms.JMSException jmse) {
jmse.printStackTrace();
}
@@ -76,11 +74,9 @@ public class Chat implements javax.jms.MessageListener {
publisher.send(msg);
}
}
- }
- catch (java.io.IOException ioe) {
+ } catch (java.io.IOException ioe) {
ioe.printStackTrace();
- }
- catch (javax.jms.JMSException jmse) {
+ } catch (javax.jms.JMSException jmse) {
jmse.printStackTrace();
}
}
@@ -100,12 +96,10 @@ public class Chat implements javax.jms.MessageListener {
try {
String string = textMessage.getText();
System.out.println(string);
- }
- catch (javax.jms.JMSException jmse) {
+ } catch (javax.jms.JMSException jmse) {
jmse.printStackTrace();
}
- }
- catch (java.lang.RuntimeException rte) {
+ } catch (java.lang.RuntimeException rte) {
rte.printStackTrace();
}
}
@@ -116,8 +110,7 @@ public class Chat implements javax.jms.MessageListener {
private void exit() {
try {
connect.close();
- }
- catch (javax.jms.JMSException jmse) {
+ } catch (javax.jms.JMSException jmse) {
jmse.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Server.java
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Server.java b/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Server.java
index a3d021c..c3e838e 100644
--- a/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Server.java
+++ b/examples/protocols/openwire/chat/src/main/java/org/apache/activemq/artemis/openwire/example/Server.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,6 +22,7 @@ import java.util.Scanner;
import org.apache.activemq.artemis.util.ServerUtil;
public class Server {
+
private static Process server0;
private static Scanner scanner;
@@ -30,15 +31,13 @@ public class Server {
try {
server0 = ServerUtil.startServer(args[0], Server.class.getSimpleName(), 0, 5000);
-
Scanner scanner = new Scanner(System.in);
System.out.println("Alternatively you could start the server under ./target/server0");
System.out.println("Press enter to stop the server:");
scanner.nextLine();
- }
- finally {
+ } finally {
ServerUtil.killServer(server0);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/openwire/message-listener/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-listener/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java b/examples/protocols/openwire/message-listener/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
index 59f1809..cfb0aca 100644
--- a/examples/protocols/openwire/message-listener/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
+++ b/examples/protocols/openwire/message-listener/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
@@ -25,7 +25,6 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -72,9 +71,7 @@ public class QueueExample {
System.out.println("Finished ok!");
-
- }
- finally {
+ } finally {
if (connection != null) {
connection.close();
}
@@ -93,9 +90,8 @@ public class QueueExample {
public void onMessage(Message message) {
latch.countDown();
try {
- System.out.println("Received " + ((TextMessage)message).getText());
- }
- catch (Exception e) {
+ System.out.println("Received " + ((TextMessage) message).getText());
+ } catch (Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/openwire/message-recovery/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-recovery/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java b/examples/protocols/openwire/message-recovery/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
index 0ce9c94..4ecbb50 100644
--- a/examples/protocols/openwire/message-recovery/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
+++ b/examples/protocols/openwire/message-recovery/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
@@ -25,7 +25,6 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -81,14 +80,12 @@ public class QueueExample {
connection.start();
-
if (!latch.await(5, TimeUnit.SECONDS)) {
throw new RuntimeException("listener didn't receive all the messages");
}
System.out.println("Finished ok!");
- }
- finally {
+ } finally {
if (connection != null) {
connection.close();
}
@@ -109,9 +106,8 @@ public class QueueExample {
public void onMessage(Message message) {
latch.countDown();
try {
- System.out.println("Received " + ((TextMessage)message).getText());
- }
- catch (Exception e) {
+ System.out.println("Received " + ((TextMessage) message).getText());
+ } catch (Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/openwire/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java b/examples/protocols/openwire/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
index ca3f510..5aebd13 100644
--- a/examples/protocols/openwire/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
+++ b/examples/protocols/openwire/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
@@ -58,8 +58,7 @@ public class QueueExample {
TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);
System.out.println("Received message: " + messageReceived.getText());
- }
- finally {
+ } finally {
if (connection != null) {
connection.close();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
index 1694cf1..6aa5c81 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
+++ b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
@@ -106,8 +106,7 @@ public class StompDualAuthenticationExample {
// Step 10. Receive the message
TextMessage messageReceived = (TextMessage) consumer.receive(5000);
System.out.println("Received JMS message: " + messageReceived.getText());
- }
- finally {
+ } finally {
// Step 11. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/MyStompInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/MyStompInterceptor.java b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/MyStompInterceptor.java
index c11cc03..3e9f211 100644
--- a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/MyStompInterceptor.java
+++ b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/MyStompInterceptor.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,8 +26,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
public class MyStompInterceptor implements StompFrameInterceptor {
@Override
- public boolean intercept(StompFrame frame, RemotingConnection remotingConnection)
- throws ActiveMQException {
+ public boolean intercept(StompFrame frame, RemotingConnection remotingConnection) throws ActiveMQException {
StompConnection connection = (StompConnection) remotingConnection;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/RegularInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/RegularInterceptor.java b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/RegularInterceptor.java
index 8457d68..bb3c6eb 100644
--- a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/RegularInterceptor.java
+++ b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/RegularInterceptor.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,7 +29,7 @@ public class RegularInterceptor implements Interceptor {
public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException {
System.out.println("Regular Intercept on " + packet);
if (packet instanceof MessagePacket) {
- MessagePacket messagePacket = (MessagePacket)packet;
+ MessagePacket messagePacket = (MessagePacket) packet;
messagePacket.getMessage().putStringProperty("regularIntercepted", "HelloAgain");
}
return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index 5c7b330..d466ab6 100644
--- a/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
+++ b/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -45,7 +45,6 @@ public class StompExample {
connection.start();
-
System.out.println("Waiting 20 seconds");
Thread.sleep(10000); // increase this and it will fail
System.out.println("waited");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java b/examples/protocols/stomp/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
index 87af3ab..0f76679 100644
--- a/examples/protocols/stomp/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
+++ b/examples/protocols/stomp/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
@@ -46,8 +46,7 @@ public class StompWebSocketExample {
System.in.read();
TextMessage message = session.createTextMessage("Server stopping!");
producer.send(message);
- }
- finally {
+ } finally {
if (connection != null) {
connection.close();
}
@@ -57,4 +56,4 @@ public class StompWebSocketExample {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index 78fed5e..98cae66 100644
--- a/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
+++ b/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -16,11 +16,6 @@
*/
package org.apache.activemq.artemis.jms.example;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -28,6 +23,10 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.InitialContext;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
/**
* An example where a client will send a Stomp message on a TCP socket
@@ -96,8 +95,7 @@ public class StompExample {
// Step 10. Receive the message
TextMessage messageReceived = (TextMessage) consumer.receive(5000);
System.out.println("Received JMS message: " + messageReceived.getText());
- }
- finally {
+ } finally {
// Step 11. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index 4e22435..02937bf 100644
--- a/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
+++ b/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -16,11 +16,6 @@
*/
package org.apache.activemq.artemis.jms.example;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -28,6 +23,10 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.InitialContext;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
/**
* An example where a Stomp 1.1 client sends a message on a TCP socket
@@ -99,8 +98,7 @@ public class StompExample {
// Step 10. Receive the message
TextMessage messageReceived = (TextMessage) consumer.receive(5000);
System.out.println("Received JMS message: " + messageReceived.getText());
- }
- finally {
+ } finally {
// Step 11. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index 318de16..05bf1fe 100644
--- a/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
+++ b/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -16,11 +16,6 @@
*/
package org.apache.activemq.artemis.jms.example;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -28,6 +23,10 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.InitialContext;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
/**
* An example where a Stomp 1.2 client sends a message on a TCP socket
@@ -99,8 +98,7 @@ public class StompExample {
// Step 10. Receive the message
TextMessage messageReceived = (TextMessage) consumer.receive(5000);
System.out.println("Received JMS message: " + messageReceived.getText());
- }
- finally {
+ } finally {
// Step 11. Be sure to close our JMS resources!
if (initialContext != null) {
initialContext.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
index e389def..5855abe 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
@@ -17,9 +17,9 @@
package org.apache.activemq.artemis.integration.aerogear;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
+import org.jboss.logging.Messages;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;
-import org.jboss.logging.Messages;
/**
* Logger Code 23
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
index 6da582c..5191524 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
@@ -272,10 +272,9 @@ public class AeroGearConnectorService implements ConnectorService, Consumer, Mes
if (handled) {
reference.acknowledge();
return HandleStatus.HANDLED;
- }
- //if we have been stopped we must return no match as we have been removed as a consumer,
- // anything else will cause an exception
- else if (!started) {
+ } else if (!started) {
+ //if we have been stopped we must return no match as we have been removed as a consumer,
+ // anything else will cause an exception
return HandleStatus.NO_MATCH;
}
//we must be reconnecting
@@ -288,18 +287,15 @@ public class AeroGearConnectorService implements ConnectorService, Consumer, Mes
handled = false;
if (statusCode == 401) {
ActiveMQAeroGearLogger.LOGGER.reply401();
- }
- else if (statusCode == 404) {
+ } else if (statusCode == 404) {
ActiveMQAeroGearLogger.LOGGER.reply404();
- }
- else {
+ } else {
ActiveMQAeroGearLogger.LOGGER.replyUnknown(statusCode);
}
queue.removeConsumer(this);
started = false;
- }
- else {
+ } else {
handled = true;
}
}
@@ -328,13 +324,11 @@ public class AeroGearConnectorService implements ConnectorService, Consumer, Mes
reconnecting = false;
ActiveMQAeroGearLogger.LOGGER.connected(endpoint);
queue.deliverAsync();
- }
- catch (Exception e) {
+ } catch (Exception e) {
retryAttempt++;
if (retryAttempts == -1 || retryAttempt < retryAttempts) {
scheduledThreadPool.schedule(this, retryInterval, TimeUnit.SECONDS);
- }
- else {
+ } else {
ActiveMQAeroGearLogger.LOGGER.unableToReconnect(retryAttempt);
started = false;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
index 585fa1b..749c87a 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
@@ -16,15 +16,15 @@
*/
package org.apache.activemq.artemis.integration.aerogear;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
import org.apache.activemq.artemis.core.server.ConnectorService;
import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-
public class AeroGearConnectorServiceFactory implements ConnectorServiceFactory {
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
index 4e92128..07eda77 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
@@ -16,11 +16,11 @@
*/
package org.apache.activemq.artemis.integration.aerogear;
-import org.apache.activemq.artemis.api.core.SimpleString;
-
import java.util.HashSet;
import java.util.Set;
+import org.apache.activemq.artemis.api.core.SimpleString;
+
public class AeroGearConstants {
public static final Set<String> ALLOWABLE_PROPERTIES = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
index 1451366..cda3f8a 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
@@ -33,8 +33,7 @@ public class SpringBindingRegistry implements BindingRegistry {
Object obj = null;
try {
obj = factory.getBean(name);
- }
- catch (NoSuchBeanDefinitionException e) {
+ } catch (NoSuchBeanDefinitionException e) {
//ignore
}
return obj;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
index 49be35c..a5a5015 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
@@ -92,8 +92,7 @@ class IncomingVertxEventHandler implements ConnectorService {
System.setProperty("vertx.clusterManagerFactory", HazelcastClusterManagerFactory.class.getName());
if (quorumSize != -1) {
platformManager = PlatformLocator.factory.createPlatformManager(port, host, quorumSize, haGroup);
- }
- else {
+ } else {
platformManager = PlatformLocator.factory.createPlatformManager(port, host);
}
@@ -156,8 +155,7 @@ class IncomingVertxEventHandler implements ConnectorService {
try {
postOffice.route(msg, null, false);
- }
- catch (Exception e) {
+ } catch (Exception e) {
ActiveMQVertxLogger.LOGGER.error("failed to route msg " + msg, e);
}
}
@@ -226,47 +224,33 @@ class IncomingVertxEventHandler implements ConnectorService {
if (message instanceof PingMessage) {
return VertxConstants.TYPE_PING;
- }
- else if (body instanceof Buffer) {
+ } else if (body instanceof Buffer) {
return VertxConstants.TYPE_BUFFER;
- }
- else if (body instanceof Boolean) {
+ } else if (body instanceof Boolean) {
return VertxConstants.TYPE_BOOLEAN;
- }
- else if (body instanceof byte[]) {
+ } else if (body instanceof byte[]) {
return VertxConstants.TYPE_BYTEARRAY;
- }
- else if (body instanceof Byte) {
+ } else if (body instanceof Byte) {
return VertxConstants.TYPE_BYTE;
- }
- else if (body instanceof Character) {
+ } else if (body instanceof Character) {
return VertxConstants.TYPE_CHARACTER;
- }
- else if (body instanceof Double) {
+ } else if (body instanceof Double) {
return VertxConstants.TYPE_DOUBLE;
- }
- else if (body instanceof Float) {
+ } else if (body instanceof Float) {
return VertxConstants.TYPE_FLOAT;
- }
- else if (body instanceof Integer) {
+ } else if (body instanceof Integer) {
return VertxConstants.TYPE_INT;
- }
- else if (body instanceof Long) {
+ } else if (body instanceof Long) {
return VertxConstants.TYPE_LONG;
- }
- else if (body instanceof Short) {
+ } else if (body instanceof Short) {
return VertxConstants.TYPE_SHORT;
- }
- else if (body instanceof String) {
+ } else if (body instanceof String) {
return VertxConstants.TYPE_STRING;
- }
- else if (body instanceof JsonArray) {
+ } else if (body instanceof JsonArray) {
return VertxConstants.TYPE_JSON_ARRAY;
- }
- else if (body instanceof JsonObject) {
+ } else if (body instanceof JsonObject) {
return VertxConstants.TYPE_JSON_OBJECT;
- }
- else if (body instanceof ReplyException) {
+ } else if (body instanceof ReplyException) {
return VertxConstants.TYPE_REPLY_FAILURE;
}
throw new IllegalArgumentException("Type not supported: " + message);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
index 6c50b26..8820c39 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
@@ -92,8 +92,7 @@ class OutgoingVertxEventHandler implements Consumer, ConnectorService {
System.setProperty("vertx.clusterManagerFactory", HazelcastClusterManagerFactory.class.getName());
if (quorumSize != -1) {
platformManager = PlatformLocator.factory.createPlatformManager(port, host, quorumSize, haGroup);
- }
- else {
+ } else {
platformManager = PlatformLocator.factory.createPlatformManager(port, host);
}
@@ -178,8 +177,7 @@ class OutgoingVertxEventHandler implements Consumer, ConnectorService {
// send to bus
if (!publish) {
eventBus.send(vertxAddress, vertxMsgBody);
- }
- else {
+ } else {
eventBus.publish(vertxAddress, vertxMsgBody);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
index ef91f4d..54f5a7f 100644
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
+++ b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
@@ -19,9 +19,6 @@
package org.apache.artemis.client.cdi.extension;
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import org.apache.artemis.client.cdi.configuration.DefaultArtemisClientConfigurationImpl;
-
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -31,6 +28,9 @@ import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
+import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
+import org.apache.artemis.client.cdi.configuration.DefaultArtemisClientConfigurationImpl;
+
import static java.util.Collections.emptySet;
class ArtemisClientConfigBean implements Bean<ArtemisClientConfiguration> {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
index 07ae6cd..5f38240 100644
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
+++ b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
@@ -19,11 +19,6 @@
package org.apache.artemis.client.cdi.extension;
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
-
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -35,6 +30,11 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+
import static java.util.Collections.emptySet;
public class ArtemisEmbeddedServerConfigBean implements Bean<Configuration> {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
index 1b644f9..d9a0d54 100644
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
+++ b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
@@ -19,15 +19,15 @@
package org.apache.artemis.client.cdi.extension;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import org.apache.artemis.client.cdi.logger.ActiveMQCDILogger;
-
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
+import org.apache.artemis.client.cdi.logger.ActiveMQCDILogger;
+
public class ArtemisExtension implements Extension {
private boolean foundEmbeddedConfig = false;
@@ -46,14 +46,12 @@ public class ArtemisExtension implements Extension {
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery) {
if (!foundConfiguration) {
afterBeanDiscovery.addBean(new ArtemisClientConfigBean());
- }
- else {
+ } else {
ActiveMQCDILogger.LOGGER.notUsingDefaultConfiguration();
}
if (!foundEmbeddedConfig) {
afterBeanDiscovery.addBean(new ArtemisEmbeddedServerConfigBean());
- }
- else {
+ } else {
ActiveMQCDILogger.LOGGER.notUsingDefaultClientConfiguration();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
index 9a6fe9d..b57b771 100644
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
+++ b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
@@ -19,6 +19,14 @@
package org.apache.artemis.client.cdi.factory;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.jms.JMSContext;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
@@ -30,14 +38,6 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.jms.JMSContext;
-import java.util.HashMap;
-import java.util.Map;
-
@ApplicationScoped
public class ConnectionFactoryProvider {
@@ -58,16 +58,14 @@ public class ConnectionFactoryProvider {
ActiveMQServer activeMQServer = ActiveMQServers.newActiveMQServer(embeddedConfiguration, false);
JMSServerManagerImpl jmsServerManager = new JMSServerManagerImpl(activeMQServer);
jmsServerManager.start();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException("Unable to start embedded JMS", e);
}
}
try {
this.activeMQConnectionFactory = createConnectionFactory();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException("Unable to connect to remote server", e);
}
}
@@ -84,16 +82,14 @@ public class ConnectionFactoryProvider {
final ActiveMQConnectionFactory activeMQConnectionFactory;
if (configuration.getUrl() != null) {
activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactory(configuration.getUrl(), null);
- }
- else {
+ } else {
if (configuration.getHost() != null) {
params.put(TransportConstants.HOST_PROP_NAME, configuration.getHost());
params.put(TransportConstants.PORT_PROP_NAME, configuration.getPort());
}
if (configuration.isHa()) {
activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(configuration.getConnectorFactory(), params));
- }
- else {
+ } else {
activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(configuration.getConnectorFactory(), params));
}
}