You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2016/01/05 16:47:42 UTC
[33/50] [abbrv] stratos git commit: removing unused methods
removing unused methods
Conflicts:
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java
components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/334bb023
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/334bb023
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/334bb023
Branch: refs/heads/stratos-4.1.x
Commit: 334bb023be226373667ed9b04b1fcf302880afcf
Parents: 6afa5f2
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Dec 8 07:32:06 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Dec 25 15:47:46 2015 +0530
----------------------------------------------------------------------
.../StratosManagerServiceComponent.java | 25 ++++++++++++++
.../mapping/DomainMappingEventReceiver.java | 13 -------
.../notifier/InstanceNotifierEventReceiver.java | 36 --------------------
.../tests/PythonAgentIntegrationTest.java | 16 +++------
.../integration/common/TopologyHandler.java | 10 +-----
5 files changed, 30 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/334bb023/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
index 0dbc417..ddd2288 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
@@ -327,5 +327,30 @@ public class StratosManagerServiceComponent {
// Close event publisher connections to message broker
EventPublisherPool.close(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName());
EventPublisherPool.close(MessagingUtil.Topics.TENANT_TOPIC.getTopicName());
+
+ shutdownExecutorService(THREAD_POOL_ID);
+ shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID);
+ }
+
+ private void shutdownExecutorService(String executorServiceId) {
+ ExecutorService executorService = StratosThreadPool.getExecutorService(executorServiceId, 1);
+ if (executorService != null) {
+ shutdownExecutorService(executorService);
+ }
+ }
+
+ private void shutdownScheduledExecutorService(String executorServiceId) {
+ ExecutorService executorService = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1);
+ if (executorService != null) {
+ shutdownExecutorService(executorService);
+ }
+ }
+
+ private void shutdownExecutorService(ExecutorService executorService) {
+ try {
+ executorService.shutdownNow();
+ } catch (Exception e) {
+ log.warn("An error occurred while shutting down executor service", e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/334bb023/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
index 1348db0..7181850 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
@@ -89,17 +89,4 @@ public class DomainMappingEventReceiver extends StratosEventReceiver {
}
}
}
-
-// public void terminate() {
-// eventSubscriber.terminate();
-// messageDelegator.terminate();
-// }
-//
-// public ExecutorService getExecutorService() {
-// return executor;
-// }
-//
-// public void setExecutorService(ExecutorService executor) {
-// this.executor = executor;
-// }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/334bb023/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
index 2d8ed62..0e91c29 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
@@ -66,42 +66,6 @@ public class InstanceNotifierEventReceiver extends StratosEventReceiver {
messageDelegator.addEventListener(eventListener);
}
-// public void execute() {
-// synchronized (this) {
-// if (terminated) {
-// log.info("InstanceNotifierEventReceiver has been terminated. Event subscriber will not be created.");
-// return;
-// }
-// try {
-// Thread subscriberThread = new Thread(eventSubscriber);
-// subscriberThread.start();
-// if (log.isDebugEnabled()) {
-// log.debug("InstanceNotifier event message receiver thread started");
-// }
-//
-// // Start instance notifier event message delegator thread
-// Thread receiverThread = new Thread(messageDelegator);
-// receiverThread.start();
-// if (log.isDebugEnabled()) {
-// log.debug("InstanceNotifier event message delegator thread started");
-// }
-// } catch (Exception e) {
-// if (log.isErrorEnabled()) {
-// log.error("InstanceNotifier receiver failed", e);
-// }
-// }
-// }
-// log.info("InstanceNotifierEventReceiver started");
-//
-// // Keep the thread live until terminated
-// while (!terminated) {
-// try {
-// Thread.sleep(2000);
-// } catch (InterruptedException ignore) {
-// }
-// }
-// }
-
private void execute() {
try {
// Start topic subscriber thread
http://git-wip-us.apache.org/repos/asf/stratos/blob/334bb023/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
index 5b951dd..860e019 100644
--- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
+++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
@@ -123,15 +123,9 @@ public abstract class PythonAgentIntegrationTest {
startActiveMQInstance(Integer.parseInt(amqpBindPorts[i]), Integer.parseInt(mqttBindPorts[i]), true);
}
- //ExecutorService executorService = StratosThreadPool.getExecutorService
- // ("TEST_THREAD_POOL", testThreadPoolSize);
topologyEventReceiver = TopologyEventReceiver.getInstance();
-// topologyEventReceiver.setExecutorService(executorService);
-// topologyEventReceiver.execute();
instanceStatusEventReceiver = InstanceStatusEventReceiver.getInstance();
-// instanceStatusEventReceiver.setExecutorService(executorService);
-// instanceStatusEventReceiver.execute();
instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
@Override
@@ -150,8 +144,6 @@ public abstract class PythonAgentIntegrationTest {
});
initializerEventReceiver = InitializerEventReceiver.getInstance();
-// initializerEventReceiver.setExecutorService(executorService);
-// initializerEventReceiver.execute();
this.eventReceiverInitialized = true;
@@ -217,10 +209,10 @@ public abstract class PythonAgentIntegrationTest {
} catch (Exception ignore) {
}
}
- log.info("Terminating event receivers...");
- this.instanceStatusEventReceiver.terminate();
- this.topologyEventReceiver.terminate();
- this.initializerEventReceiver.terminate();
+// log.info("Terminating event receivers...");
+// this.instanceStatusEventReceiver.terminate();
+// this.topologyEventReceiver.terminate();
+// this.initializerEventReceiver.terminate();
this.instanceStatusEventReceiver = null;
this.topologyEventReceiver = null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/334bb023/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
index a91c034..d506b83 100644
--- a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
+++ b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
@@ -110,14 +110,10 @@ public class TopologyHandler {
private void initializeApplicationSignUpEventReceiver() {
applicationSignUpEventReceiver = ApplicationSignUpEventReceiver.getInstance();
-// applicationSignUpEventReceiver.setExecutorService(executor);
-// applicationSignUpEventReceiver.execute();
}
private void initializeTenantEventReceiver() {
tenantEventReceiver = TenantEventReceiver.getInstance();
-// tenantEventReceiver.setExecutorService(executor);
-// tenantEventReceiver.execute();
}
/**
@@ -125,7 +121,6 @@ public class TopologyHandler {
*/
private void initializeHealthStatsEventReceiver() {
healthStatEventReceiver = HealthStatEventReceiver.getInstance();
-// healthStatEventReceiver.setExecutorService(executor);
healthStatEventReceiver.addEventListener(new MemberFaultEventListener() {
@Override
protected void onEvent(Event event) {
@@ -134,7 +129,6 @@ public class TopologyHandler {
memberFaultEvent.getMemberId()));
}
});
-// healthStatEventReceiver.execute();
}
/**
@@ -142,7 +136,6 @@ public class TopologyHandler {
*/
private void initializeApplicationEventReceiver() {
applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
-// applicationsEventReceiver.setExecutorService(executor);
applicationsEventReceiver.addEventListener(new ApplicationInstanceActivatedEventListener() {
@Override
protected void onEvent(Event event) {
@@ -165,7 +158,7 @@ public class TopologyHandler {
appInstanceInactivatedEvent.getInstanceId()));
}
});
- //applicationsEventReceiver.execute();
+
}
/**
@@ -173,7 +166,6 @@ public class TopologyHandler {
*/
private void initializeTopologyEventReceiver() {
topologyEventReceiver = TopologyEventReceiver.getInstance();
-// topologyEventReceiver.setExecutorService(executor);
topologyEventReceiver.addEventListener(new MemberActivatedEventListener() {
@Override
protected void onEvent(Event event) {