You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/28 16:33:01 UTC
[6/9] activemq-artemis git commit: Remove dead code
Remove dead code
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/68c7c257
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/68c7c257
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/68c7c257
Branch: refs/heads/master
Commit: 68c7c2575d0a4f9d701d0880b819c6f54e0963af
Parents: b2a9be1
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Jul 28 18:16:58 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jul 28 12:28:18 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/rest/util/TimeoutTask.java | 1 -
.../artemis/tests/util/ColocatedActiveMQServer.java | 1 -
.../artemis/jms/example/ClusteredTopicExample.java | 12 ------------
.../broker/partition/SpringPartitionBrokerTest.java | 1 -
.../artemis/tests/extras/byteman/GroupingTest.java | 2 --
.../tests/integration/client/WildCardRoutingTest.java | 1 -
.../integration/jms/ActiveMQConnectionFactoryTest.java | 5 -----
.../tests/integration/openwire/OpenWireTestBase.java | 1 -
.../tests/integration/persistence/RestartSMTest.java | 7 -------
.../tests/integration/ra/ActiveMQClusteredTest.java | 3 ---
.../tests/integration/ra/ResourceAdapterTest.java | 2 --
.../artemis/tests/performance/sends/PreACKPerf.java | 2 --
12 files changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java
index ba87669..381a47c 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java
@@ -153,7 +153,6 @@ public class TimeoutTask implements Runnable {
// Finally, freely shutdown all expired consumers.
if (expiredCallbacks.size() > 0) {
- long startTime = System.currentTimeMillis();
List<String> tokens = new ArrayList<>(expiredCallbacks.size());
for (String token : expiredCallbacks.keySet()) {
tokens.add(token);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java
index d76a72c..806e0f2 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java
@@ -68,7 +68,6 @@ public class ColocatedActiveMQServer extends ActiveMQServerImpl {
@Override
protected NodeManager createNodeManager(final File directory, boolean replicatingBackup) {
if (replicatingBackup) {
- NodeManager manager;
if (getConfiguration().getJournalType() == JournalType.ASYNCIO && LibaioContext.isLoaded()) {
return new AIOFileLockNodeManager(directory, replicatingBackup, getConfiguration().getJournalLockAcquisitionTimeout());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/examples/features/clustered/clustered-topic-uri/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
----------------------------------------------------------------------
diff --git a/examples/features/clustered/clustered-topic-uri/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java b/examples/features/clustered/clustered-topic-uri/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
index f3ce9a0..2d8e2de 100644
--- a/examples/features/clustered/clustered-topic-uri/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
+++ b/examples/features/clustered/clustered-topic-uri/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
@@ -39,10 +39,6 @@ public class ClusteredTopicExample {
Connection connection1 = null;
- InitialContext ic0 = null;
-
- InitialContext ic1 = null;
-
try {
// Step 1. Instantiate topic
@@ -116,14 +112,6 @@ public class ClusteredTopicExample {
if (connection1 != null) {
connection1.close();
}
-
- if (ic0 != null) {
- ic0.close();
- }
-
- if (ic1 != null) {
- ic1.close();
- }
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/partition/SpringPartitionBrokerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/partition/SpringPartitionBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/partition/SpringPartitionBrokerTest.java
index c82cb1b..382db21 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/partition/SpringPartitionBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/partition/SpringPartitionBrokerTest.java
@@ -35,7 +35,6 @@ public class SpringPartitionBrokerTest extends TestCase {
Partitioning config = plugin.getConfig();
assertEquals(2, config.getBrokers().size());
- Object o;
String json = "{\n" +
" \"by_client_id\":{\n" +
" \"client1\":{\"ids\":[\"broker1\"]},\n" +
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
index d7d4181..6cc2e85 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
@@ -91,8 +91,6 @@ public class GroupingTest extends JMSTestBase {
connection.start();
connection2.start();
- final String jmsxgroupID = null;
-
Thread t = new Thread(new Runnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
index 64968dd..6a3619b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
@@ -484,7 +484,6 @@ public class WildCardRoutingTest extends ActiveMQTestBase {
public void testWildcardRoutingWithHashMultiLengthAddresses() throws Exception {
SimpleString addressAB = new SimpleString("a.b.c.f");
SimpleString addressAC = new SimpleString("a.c.f");
- SimpleString addressAD = new SimpleString("a.d");
SimpleString address = new SimpleString("a.#.f");
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
index 4df9c89..9e8bc8f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
@@ -215,9 +215,6 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
private void testSettersThrowException(final ActiveMQConnectionFactory cf) {
- String discoveryAddress = RandomUtil.randomString();
- int discoveryPort = RandomUtil.randomPositiveInt();
- long discoveryRefreshTimeout = RandomUtil.randomPositiveLong();
String clientID = RandomUtil.randomString();
long clientFailureCheckPeriod = RandomUtil.randomPositiveLong();
long connectionTTL = RandomUtil.randomPositiveLong();
@@ -235,14 +232,12 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
String loadBalancingPolicyClassName = RandomUtil.randomString();
int dupsOKBatchSize = RandomUtil.randomPositiveInt();
int transactionBatchSize = RandomUtil.randomPositiveInt();
- long initialWaitTimeout = RandomUtil.randomPositiveLong();
boolean useGlobalPools = RandomUtil.randomBoolean();
int scheduledThreadPoolMaxSize = RandomUtil.randomPositiveInt();
int threadPoolMaxSize = RandomUtil.randomPositiveInt();
long retryInterval = RandomUtil.randomPositiveLong();
double retryIntervalMultiplier = RandomUtil.randomDouble();
int reconnectAttempts = RandomUtil.randomPositiveInt();
- boolean failoverOnServerShutdown = RandomUtil.randomBoolean();
try {
cf.setClientID(clientID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 73c8695..8cafc07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -133,7 +133,6 @@ public class OpenWireTestBase extends ActiveMQTestBase {
final double retryIntervalMultiplier = 1.0;
final int reconnectAttempts = -1;
final int callTimeout = 30000;
- final boolean ha = false;
List<String> connectorNames = registerConnectors(server, connectorConfigs);
String cfName = name.getMethodName();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index a60e05f..15e96b2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -20,7 +20,6 @@ import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
-import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeJournalLoader;
import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
@@ -31,9 +30,7 @@ import org.junit.Test;
import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ExecutorService;
public class RestartSMTest extends ActiveMQTestBase {
@@ -78,8 +75,6 @@ public class RestartSMTest extends ActiveMQTestBase {
journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>());
- Map<Long, Queue> queues = new HashMap<>();
-
journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new FakeJournalLoader());
journal.stop();
@@ -88,8 +83,6 @@ public class RestartSMTest extends ActiveMQTestBase {
journal.start();
- queues = new HashMap<>();
-
journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new FakeJournalLoader());
queueBindingInfos = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
index b8fdfe0..676c8ad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
@@ -142,9 +142,6 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
managedConnections.add(mc);
ActiveMQConnectionFactory cf1 = mc.getConnectionFactory();
- long timeout = 10000;
- long now = System.currentTimeMillis();
-
while (!((ServerLocatorImpl)cf1.getServerLocator()).isReceivedTopology()) {
Thread.sleep(50);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
index aea899c..7bc678a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
@@ -133,7 +133,6 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
String testBalancer = "testBalancer";
String testParams = "key=val";
String testaddress = "testaddress";
- String loadbalancer = "loadbalancer";
String testpass = "testpass";
String testuser = "testuser";
ActiveMQResourceAdapter qResourceAdapter = new ActiveMQResourceAdapter();
@@ -153,7 +152,6 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
String testBalancer = "testBalancer2";
String testParams = "key=val2";
String testaddress = "testaddress2";
- String loadbalancer = "loadbalancer2";
String testpass = "testpass2";
String testuser = "testuser2";
ActiveMQResourceAdapter qResourceAdapter = new ActiveMQResourceAdapter();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68c7c257/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
----------------------------------------------------------------------
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
index acb5354..9a389ef 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
@@ -60,8 +60,6 @@ public class PreACKPerf extends AbstractSendReceivePerfTest {
}
- long end = System.currentTimeMillis();
-
printMsgsSec(start, nmessages);
}