ARTEMIS-4181 make try-with-resources style consistent

apache · Mar 3, 2023 · 97c7852 · 97c7852
1 parent 5d024b7
commit 97c7852
Show file tree

Hide file tree

Showing 23 changed files with 151 additions and 72 deletions.
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java
@@ -340,7 +340,7 @@ private void upgradeLogging(ActionContext context, File etcFolder, File bkpFolde
          if (!newLogging.exists()) {
             context.out.println("Creating " + newLogging);
             try (InputStream inputStream = openStream("etc/" + Create.ETC_LOG4J2_PROPERTIES);
-                 OutputStream outputStream = new FileOutputStream(newLogging);) {
+                 OutputStream outputStream = new FileOutputStream(newLogging)) {
                copy(inputStream, outputStream);
             }
          }

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
@@ -134,7 +134,8 @@ public static boolean waitForServerToStart(String uri, long timeout) throws Inte
    public static boolean waitForServerToStart(String uri, String username, String password, long timeout) throws InterruptedException {
       long realTimeout = System.currentTimeMillis() + timeout;
       while (System.currentTimeMillis() < realTimeout) {
-         try (ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory(uri, null); Connection c = cf.createConnection(username, password)) {
+         try (ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory(uri, null);
+              Connection c = cf.createConnection(username, password)) {
             System.out.println("server " + uri + " started");
          } catch (Exception e) {
             System.out.println("awaiting server " + uri + " start at ");

diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -1582,7 +1582,8 @@ public void testQstat() throws Exception {
       System.setProperty("artemis.instance", instanceQstat.getAbsolutePath());
       Artemis.internalExecute("run");
 
-      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616"); Connection connection = cf.createConnection("admin", "admin");) {
+      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
+           Connection connection = cf.createConnection("admin", "admin")) {
 
          //set up some queues with messages and consumers
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1858,7 +1859,8 @@ public void testQstatColumnWidth() throws Exception {
       System.setProperty("artemis.instance", instanceQstat.getAbsolutePath());
       Artemis.internalExecute("run");
 
-      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616"); Connection connection = cf.createConnection("admin", "admin");) {
+      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
+           Connection connection = cf.createConnection("admin", "admin")) {
 
          //set up some queues with messages and consumers
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -2035,7 +2037,8 @@ public void testQstatWarnings() throws Exception {
       System.setProperty("artemis.instance", instanceQstat.getAbsolutePath());
       Artemis.internalExecute("run");
 
-      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616"); Connection connection = cf.createConnection("admin", "admin");) {
+      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
+           Connection connection = cf.createConnection("admin", "admin")) {
 
          TestActionContext context;
          StatQueue statQueue;
@@ -2119,7 +2122,8 @@ public void testRunPropertiesArgumentSetsAcceptorPort() throws Exception {
       Artemis.internalExecute("run", "--properties", new File(brokerPropertiesFromClasspath.toURI()).getAbsolutePath());
 
       // verify
-      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61618"); Connection connection = cf.createConnection("admin", "admin");) {
+      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61618");
+           Connection connection = cf.createConnection("admin", "admin")) {
          connection.start();
       } finally {
          stopServer();

diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/MessageSerializerTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/MessageSerializerTest.java
@@ -281,7 +281,8 @@ private void internalTestSendDirectToQueue(RoutingType routingType) throws Excep
       createQueue(routingType, address, queue1Name);
       createQueue(routingType, address, queue2Name);
 
-      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616"); Connection connection = cf.createConnection("admin", "admin");) {
+      try (ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
+           Connection connection = cf.createConnection("admin", "admin")) {
 
          // send messages to queue
          Session session = createSession(connection);

diff --git a/...e/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java b/...e/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java
@@ -561,7 +561,8 @@ private CoreObjectMessageWrapper createObjectMessage() {
    private CoreObjectMessageWrapper createObjectMessage(Serializable payload) {
       CoreObjectMessageWrapper result = AMQPMessageSupport.createObjectMessage(0, null);
 
-      try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos);) {
+      try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+           ObjectOutputStream oos = new ObjectOutputStream(baos)) {
 
          oos.writeObject(payload);
          byte[] data = baos.toByteArray();
@@ -589,7 +590,8 @@ private CoreTextMessageWrapper createTextMessage(String text) {
    }
 
    private Object deserialize(byte[] payload) throws Exception {
-      try (ByteArrayInputStream bis = new ByteArrayInputStream(payload); ObjectInputStream ois = new ObjectInputStream(bis);) {
+      try (ByteArrayInputStream bis = new ByteArrayInputStream(payload);
+           ObjectInputStream ois = new ObjectInputStream(bis)) {
 
          return ois.readObject();
       }

diff --git a/...ain/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/...ain/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -865,7 +865,8 @@ private static byte[] toAMQMessageDefaultType(final ActiveMQBuffer buffer,
       byte[] bytes = new byte[n];
       buffer.readBytes(bytes);
       if (isCompressed) {
-         try (ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); DeflaterOutputStream out = new DeflaterOutputStream(bytesOut, true)) {
+         try (ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+              DeflaterOutputStream out = new DeflaterOutputStream(bytesOut, true)) {
             out.write(bytes);
             out.flush();
             bytes = bytesOut.toByteArray();

diff --git a/...-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/...-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -522,7 +522,8 @@ public boolean accept(File file, String s) {
                   if (files != null && files.length > 0) {
                      Arrays.sort(files);
                      for (String fileName : files) {
-                        try (FileInputStream fileInputStream = new FileInputStream(new File(dir, fileName)); BufferedInputStream reader = new BufferedInputStream(fileInputStream)) {
+                        try (FileInputStream fileInputStream = new FileInputStream(new File(dir, fileName));
+                             BufferedInputStream reader = new BufferedInputStream(fileInputStream)) {
                            brokerProperties.clear();
                            brokerProperties.load(reader);
                            parsePrefixedProperties(fileName, brokerProperties, null);
@@ -532,7 +533,8 @@ public boolean accept(File file, String s) {
                }
             } else {
                File file = new File(fileUrl);
-               try (FileInputStream fileInputStream = new FileInputStream(file); BufferedInputStream reader = new BufferedInputStream(fileInputStream)) {
+               try (FileInputStream fileInputStream = new FileInputStream(file);
+                    BufferedInputStream reader = new BufferedInputStream(fileInputStream)) {
                   brokerProperties.load(reader);
                   parsePrefixedProperties(file.getName(), brokerProperties, null);
                }

diff --git a/...server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/...server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -741,7 +741,8 @@ private void sendLargeFile(AbstractJournalStorageManager.JournalContent content,
       final ReusableLatch flushed = new ReusableLatch(1);
 
       try {
-         try (FileInputStream fis = new FileInputStream(file.getJavaFile()); FileChannel channel = fis.getChannel()) {
+         try (FileInputStream fis = new FileInputStream(file.getJavaFile());
+              FileChannel channel = fis.getChannel()) {
 
             // We cannot afford having a single buffer here for this entire loop
             // because sendReplicatePacket will encode the packet as a NettyBuffer

diff --git a/...c/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleTest.java b/...c/test/java/org/apache/activemq/artemis/core/security/jaas/PropertiesLoginModuleTest.java
@@ -146,7 +146,8 @@ public void testLoginReload() throws Exception {
    private String genHash(File usersFile) {
       Checksum hash = new Adler32();
 
-      try (FileReader fileReader = new FileReader(usersFile); BufferedReader bufferedReader = new BufferedReader(fileReader)) {
+      try (FileReader fileReader = new FileReader(usersFile);
+           BufferedReader bufferedReader = new BufferedReader(fileReader)) {
          String line = null;
          while ((line = bufferedReader.readLine()) != null) {
             if (!line.startsWith("#") && !line.isBlank()) {

diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
@@ -107,5 +107,7 @@ under the License.
          <property name="requiredParameters" value="name"/>
       </module>
 
+      <module name="UnnecessarySemicolonInTryWithResources"/>
+
    </module>
 </module>
diff --git a/...test-support/src/main/java/org/apache/activemq/transport/netty/NettyTransportSupport.java b/...test-support/src/main/java/org/apache/activemq/transport/netty/NettyTransportSupport.java
@@ -279,7 +279,7 @@ private static void validateAlias(KeyStore store, String alias) throws IllegalAr
 
    private static KeyStore loadStore(String storePath, final String password, String storeType) throws Exception {
       KeyStore store = KeyStore.getInstance(storeType);
-      try (InputStream in = new FileInputStream(new File(storePath));) {
+      try (InputStream in = new FileInputStream(new File(storePath))) {
          store.load(in, password != null ? password.toCharArray() : null);
       }
 

diff --git a/...g/apache/activemq/artemis/tests/integration/amqp/AmqpBridgeApplicationPropertiesTest.java b/...g/apache/activemq/artemis/tests/integration/amqp/AmqpBridgeApplicationPropertiesTest.java
@@ -134,7 +134,10 @@ public void testApplicationPropertiesFromTransformerForwardBridge() throws Excep
 
       sendMessages("uswest.Provider.AMC.Agent.f261d0fa-51bd-44bd-abe0-ce22d2a387cd.CustomNotification", 1, RoutingType.ANYCAST, true);
 
-      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer1URL()); ClientSessionFactory sessionFactory = locator.createSessionFactory(); ClientSession session = sessionFactory.createSession(); ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
+      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer1URL());
+           ClientSessionFactory sessionFactory = locator.createSessionFactory();
+           ClientSession session = sessionFactory.createSession();
+           ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
 
          session.start();
 

diff --git a/...g/apache/activemq/artemis/tests/integration/amqp/AmqpBridgeClusterRedistributionTest.java b/...g/apache/activemq/artemis/tests/integration/amqp/AmqpBridgeClusterRedistributionTest.java
@@ -165,7 +165,10 @@ public void tearDown() throws Exception {
 
    @Test
    public void testSendMessageToBroker0GetFromBroker1() throws Exception {
-      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer1URL()); ClientSessionFactory sessionFactory = locator.createSessionFactory(); ClientSession session = sessionFactory.createSession(); ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
+      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer1URL());
+           ClientSessionFactory sessionFactory = locator.createSessionFactory();
+           ClientSession session = sessionFactory.createSession();
+           ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
 
          session.start();
 
@@ -187,7 +190,10 @@ public void testSendMessageToBroker0GetFromBroker1() throws Exception {
 
    @Test
    public void testSendMessageToBroker0GetFromBroker2() throws Exception {
-      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer2URL()); ClientSessionFactory sessionFactory = locator.createSessionFactory(); ClientSession session = sessionFactory.createSession(); ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
+      try (ServerLocator locator = ActiveMQClient.createServerLocator(getServer2URL());
+           ClientSessionFactory sessionFactory = locator.createSessionFactory();
+           ClientSession session = sessionFactory.createSession();
+           ClientConsumer consumer = session.createConsumer(notificationsQueue)) {
 
          session.start();
 

diff --git a/...ctivemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java b/...ctivemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java
@@ -439,12 +439,16 @@ private void jmsTest(boolean persistent, boolean tx) throws JMSException {
       int MESSAGES = 10;
       String producerUri = "amqp://localhost:5672";
       final JmsConnectionFactory producerFactory = new JmsConnectionFactory(producerUri);
-      try (Connection producerConnection = producerFactory.createConnection(); Session producerSession = producerConnection.createSession(tx, tx ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE)) {
+      try (Connection producerConnection = producerFactory.createConnection();
+           Session producerSession = producerConnection.createSession(tx, tx ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE)) {
          producerConnection.start();
          final Destination queue = producerSession.createQueue(getQueueName());
          String consumerUri = "amqp://localhost:5672";
          final JmsConnectionFactory consumerConnectionFactory = new JmsConnectionFactory(consumerUri);
-         try (Connection consumerConnection = consumerConnectionFactory.createConnection(); Session consumerSession = consumerConnection.createSession(tx, tx ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = consumerSession.createConsumer(queue); MessageProducer producer = producerSession.createProducer(queue)) {
+         try (Connection consumerConnection = consumerConnectionFactory.createConnection();
+              Session consumerSession = consumerConnection.createSession(tx, tx ? Session.SESSION_TRANSACTED : Session.AUTO_ACKNOWLEDGE);
+              MessageConsumer consumer = consumerSession.createConsumer(queue);
+              MessageProducer producer = producerSession.createProducer(queue)) {
             if (persistent) {
                producer.setDeliveryMode(DeliveryMode.PERSISTENT);
             } else {

diff --git a/...t/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java b/...t/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java
@@ -136,7 +136,8 @@ public void testDownstreamFederatedAddressReplicationRefOneWayTransformer() thro
    private void verifyTransformer(String address) throws Exception {
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -343,7 +344,8 @@ protected void testFederatedAddressDivert(boolean downstream, boolean addressFir
 
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -395,7 +397,8 @@ private void testFederatedAddressReplication(String address) throws Exception {
 
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -452,7 +455,8 @@ public void testFederatedAddressDeployAfterQueuesExist() throws Exception {
 
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -492,7 +496,8 @@ public void testFederatedAddressRemoteBrokerRestart() throws Exception {
 
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -550,7 +555,8 @@ public void testFederatedAddressLocalBrokerRestart() throws Exception {
 
       ConnectionFactory cf1 = getCF(1);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection1 = cf1.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection1 = cf1.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection1.start();
          connection0.start();
 
@@ -624,7 +630,8 @@ public void testFederatedAddressChainOfBrokers() throws Exception {
 
       ConnectionFactory cf2 = getCF(2);
       ConnectionFactory cf0 = getCF(0);
-      try (Connection connection2 = cf2.createConnection(); Connection connection0 = cf0.createConnection()) {
+      try (Connection connection2 = cf2.createConnection();
+           Connection connection0 = cf0.createConnection()) {
          connection0.start();
          Session session0 = connection0.createSession();
          Topic topic0 = session0.createTopic(address);