NO-JIRA Inline some variables to simplify the code flow

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java

@@ -1496,8 +1496,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
    @Override
    public ClientProducerCredits getCredits(final SimpleString address, final boolean anon) {
       synchronized (producerCreditManager) {
-         ClientProducerCredits credits = producerCreditManager.getCredits(address, anon, sessionContext);
+         return producerCreditManager.getCredits(address, anon, sessionContext);
-         return credits;
       }
    }
 
@@ -2020,8 +2019,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
 
    private ClientConsumerInternal getConsumer(final ConsumerContext consumerContext) {
       synchronized (consumers) {
-         ClientConsumerInternal consumer = consumers.get(consumerContext);
+         return consumers.get(consumerContext);
-         return consumer;
       }
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java

@@ -741,8 +741,7 @@ public class LargeMessageControllerImpl implements LargeMessageController {
    }
 
    public int readInt(final int pos) {
-      int v = getInt(pos);
+      return getInt(pos);
-      return v;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java

@@ -317,8 +317,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
 
    private static DiscoveryGroup createDiscoveryGroup(String nodeID,
                                                       DiscoveryGroupConfiguration config) throws Exception {
-      DiscoveryGroup group = new DiscoveryGroup(nodeID, config.getName(), config.getRefreshTimeout(), config.getBroadcastEndpointFactory(), null);
+      return new DiscoveryGroup(nodeID, config.getName(), config.getRefreshTimeout(), config.getBroadcastEndpointFactory(), null);
-      return group;
    }
 
    private ServerLocatorImpl(final Topology topology,
@@ -672,8 +671,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       }
       if (topologyMember.getLive() == null && topologyMember.getBackup() != null) {
          // This shouldn't happen, however I wanted this to consider all possible cases
-         ClientSessionFactoryInternal factory = (ClientSessionFactoryInternal) createSessionFactory(topologyMember.getBackup());
+         return (ClientSessionFactoryInternal) createSessionFactory(topologyMember.getBackup());
-         return factory;
       }
       // it shouldn't happen
       return null;
@@ -1854,8 +1852,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
    }
 
    private Object writeReplace() throws ObjectStreamException {
-      ServerLocatorImpl clone = new ServerLocatorImpl(this);
+      return new ServerLocatorImpl(this);
-      return clone;
    }
 
    public boolean isReceivedTopology() {

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java

@@ -190,9 +190,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
    }
 
    public synchronized List<DiscoveryEntry> getDiscoveryEntries() {
-      List<DiscoveryEntry> list = new ArrayList<>(connectors.values());
+      return new ArrayList<>(connectors.values());
-
-      return list;
    }
 
    public boolean waitForBroadcast(final long timeout) {

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java

@@ -571,11 +571,9 @@ public final class ChannelImpl implements Channel {
 
          // And switch it
 
-         final CoreRemotingConnection rnewConnection = newConnection;
+         newConnection.putChannel(id, this);
 
-         rnewConnection.putChannel(id, this);
+         connection = newConnection;
-
-         connection = rnewConnection;
 
          transferring = true;
       }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java

@@ -288,7 +288,7 @@ public class SSLSupport {
          return new URL(storePath);
       } catch (MalformedURLException e) {
          File file = new File(storePath);
-         if (file.exists() == true && file.isFile()) {
+         if (file.exists() && file.isFile()) {
             return file.toURI().toURL();
          } else {
             URL url = findResource(storePath);

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueHashMap.java

@@ -316,8 +316,7 @@ public class SoftValueHashMap<K, V extends SoftValueHashMap.ValueCache> implemen
    }
 
    private AggregatedSoftReference createReference(final K key, final V value) {
-      AggregatedSoftReference ref = new AggregatedSoftReference(key, value);
+      return new AggregatedSoftReference(key, value);
-      return ref;
    }
 
    // Inner classes -------------------------------------------------

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java

@@ -43,8 +43,7 @@ public class XidCodecSupport {
       in.readBytes(bq);
       byte[] gtxid = new byte[in.readInt()];
       in.readBytes(gtxid);
-      Xid xid = new XidImpl(bq, formatID, gtxid);
+      return new XidImpl(bq, formatID, gtxid);
-      return xid;
    }
 
    public static int getXidEncodeLength(final Xid xid) {