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
apache · Dec 24, 2015 · 933be1a · 933be1a
1 parent 412cb2c
commit 933be1a
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 234 deletions.
diff --git a/...rg/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java b/...rg/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
@@ -39,16 +39,19 @@
 public class AutoscalerHealthStatEventReceiver {
 
  private static final Log log = LogFactory.getLog(AutoscalerHealthStatEventReceiver.class);
- private boolean terminated = false;
 
  private HealthStatEventReceiver healthStatEventReceiver;
+<<<<<<< HEAD
  private ExecutorService executorService;
+=======
+>>>>>>> d4b35c0... removing unused methods
 
  public AutoscalerHealthStatEventReceiver() {
  this.healthStatEventReceiver = HealthStatEventReceiver.getInstance();
  addEventListeners();
  }
 
+<<<<<<< HEAD
 // public void execute() {
 // healthStatEventReceiver.setExecutorService(executorService);
 // healthStatEventReceiver.execute();
@@ -58,6 +61,8 @@ public AutoscalerHealthStatEventReceiver() {
 // }
 // }
 
+=======
+>>>>>>> d4b35c0... removing unused methods
  private void addEventListeners() {
  // Listen to health stat events that affect clusters
  healthStatEventReceiver.addEventListener(new AverageLoadAverageEventListener() {
@@ -475,6 +480,7 @@ private Member getMemberByMemberId(String memberId) {
  TopologyManager.releaseReadLock();
  }
  }
+<<<<<<< HEAD
 
  public void terminate() {
  this.terminated = true;
@@ -487,4 +493,6 @@ public ExecutorService getExecutorService() {
  public void setExecutorService(ExecutorService executorService) {
  this.executorService = executorService;
  }
+=======
+>>>>>>> d4b35c0... removing unused methods
 }
diff --git a/...che/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java b/...che/stratos/autoscaler/event/receiver/initializer/AutoscalerInitializerTopicReceiver.java
@@ -31,21 +31,12 @@
 public class AutoscalerInitializerTopicReceiver {
  private static final Log log = LogFactory.getLog(AutoscalerInitializerTopicReceiver.class);
  private InitializerEventReceiver initializerEventReceiver;
- private ExecutorService executorService;
 
  public AutoscalerInitializerTopicReceiver() {
  this.initializerEventReceiver = InitializerEventReceiver.getInstance();
  addEventListeners();
  }
 
-// public void execute() {
-// initializerEventReceiver.setExecutorService(executorService);
-// initializerEventReceiver.execute();
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller initializer topic receiver started");
-// }
-// }
-
  private void addEventListeners() {
  initializerEventReceiver.addEventListener(new CompleteApplicationsRequestEventListener() {
  @Override
@@ -61,12 +52,4 @@ protected void onEvent(Event event) {
  }
  });
  }
-
- public ExecutorService getExecutorService() {
- return executorService;
- }
-
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
 }
diff --git a/...rg/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/...rg/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -55,7 +55,6 @@
 public class AutoscalerTopologyEventReceiver {
  private static final Log log = LogFactory.getLog(AutoscalerTopologyEventReceiver.class);
  private TopologyEventReceiver topologyEventReceiver;
- private boolean terminated;
  private boolean topologyInitialized;
  private ExecutorService executorService;
 
@@ -506,20 +505,4 @@ protected void onEvent(Event event) {
  }
  });
  }
-
- /**
- * Terminate load balancer topology receiver thread.
- */
-// public void terminate() {
-// topologyEventReceiver.terminate();
-// terminated = true;
-// }
-//
-// public ExecutorService getExecutorService() {
-// return executorService;
-// }
-//
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
 }
diff --git a/...aler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/...aler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
@@ -173,27 +173,10 @@ private void executeCoordinatorTasks()
 
  // Start topology receiver
  asTopologyReceiver = new AutoscalerTopologyEventReceiver();
-// asTopologyReceiver.setExecutorService(executorService);
- //asTopologyReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Topology receiver executor service started");
- }
-
  // Start health stat receiver
  autoscalerHealthStatEventReceiver = new AutoscalerHealthStatEventReceiver();
-// autoscalerHealthStatEventReceiver.setExecutorService(executorService);
-// autoscalerHealthStatEventReceiver.execute();
- if (log.isDebugEnabled()) {
- log.debug("Health statistics receiver thread started");
- }
-
  // Start initializer receiver
  autoscalerInitializerTopicReceiver = new AutoscalerInitializerTopicReceiver();
-// autoscalerInitializerTopicReceiver.setExecutorService(executorService);
-// autoscalerInitializerTopicReceiver.execute();
-// if (log.isDebugEnabled()) {
-// log.debug("Initializer receiver thread started");
-// }
 
  if (log.isInfoEnabled()) {
  log.info("Scheduling tasks to publish applications");
@@ -245,54 +228,8 @@ private void syncInMemoryWithRegistry() throws AutoScalingPolicyAlreadyExistExce
  }
 
  protected void deactivate(ComponentContext context) {
-// if (asTopologyReceiver != null) {
-// try {
-// asTopologyReceiver.terminate();
-// } catch (Exception e) {
-// log.warn("An error occurred while terminating autoscaler topology event receiver", e);
-// }
-// }
-
- if (autoscalerHealthStatEventReceiver != null) {
- try {
- autoscalerHealthStatEventReceiver.terminate();
- } catch (Exception e) {
- log.warn("An error occurred while terminating autoscaler health statistics event receiver", e);
- }
- }
-
- // Shutdown executor service
- shutdownExecutorService(AutoscalerConstants.AUTOSCALER_THREAD_POOL_ID);
-
- // Shutdown scheduler
- shutdownScheduledExecutorService(AutoscalerConstants.AUTOSCALER_SCHEDULER_ID);
-
- // Shutdown application monitor executor service
- shutdownExecutorService(AutoscalerConstants.MONITOR_THREAD_POOL_ID);
-
- // Shutdown cluster monitor scheduler executor service
- shutdownScheduledExecutorService(AutoscalerConstants.CLUSTER_MONITOR_SCHEDULER_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);
+ if (log.isDebugEnabled()) {
+ log.debug("Autoscaler Component de-activated");
  }
  }
 

diff --git a/...in/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/...in/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -146,40 +146,9 @@ public void run() {
 
  private void executeCoordinatorTasks() {
  applicationEventReceiver = new ApplicationEventReceiver();
-// applicationEventReceiver.setExecutorService(executorService);
-// applicationEventReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Application event receiver thread started");
- }
-
  clusterStatusTopicReceiver = new ClusterStatusTopicReceiver();
-// clusterStatusTopicReceiver.setExecutorService(executorService);
-// clusterStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Cluster status event receiver thread started");
- }
-
  instanceStatusTopicReceiver = new InstanceStatusTopicReceiver();
-// instanceStatusTopicReceiver.setExecutorService(executorService);
-// instanceStatusTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Instance status event receiver thread started");
- }
-
  initializerTopicReceiver = new InitializerTopicReceiver();
-// initializerTopicReceiver.setExecutorService(executorService);
-// initializerTopicReceiver.execute();
-
- if (log.isInfoEnabled()) {
- log.info("Initializer event receiver thread started");
- }
-
- if (log.isInfoEnabled()) {
- log.info("Scheduling topology synchronizer task");
- }
  Runnable topologySynchronizer = new TopologyEventSynchronizer();
  scheduler.scheduleAtFixedRate(topologySynchronizer, 0, 1, TimeUnit.MINUTES);
  }
@@ -260,33 +229,5 @@ protected void deactivate(ComponentContext ctx) {
  } catch (Exception e) {
  log.warn("An error occurred while closing cloud controller topology event publisher", e);
  }
-
- // Shutdown executor service
- shutdownExecutorService(THREAD_POOL_ID);
-
- // Shutdown scheduler
- 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);
- }
  }
 }
diff --git a/...che/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java b/...che/stratos/cloud/controller/messaging/receiver/application/ApplicationEventReceiver.java
@@ -37,21 +37,12 @@
 public class ApplicationEventReceiver {
  private static final Log log = LogFactory.getLog(ApplicationEventReceiver.class);
  private ApplicationsEventReceiver applicationsEventReceiver;
- // private ExecutorService executorService;
 
  public ApplicationEventReceiver() {
  this.applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
  addEventListeners();
  }
 
-// public void execute() {
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller application event receiver thread started");
-// }
-// applicationsEventReceiver.setExecutorService(executorService);
-// applicationsEventReceiver.execute();
-// }
-
  private void addEventListeners() {
  applicationsEventReceiver.addEventListener(new ApplicationInstanceTerminatedEventListener() {
  @Override
@@ -75,8 +66,4 @@ protected void onEvent(Event event) {
  }
  });
  }
-
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
 }
diff --git a/...ger/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/...ger/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
@@ -193,35 +193,47 @@ private void executeCoordinatorTasks(ComponentContext componentContext)
 
  private void initializeInitializerEventReceiver() {
  initializerTopicReceiver = new StratosManagerInitializerTopicReceiver();
+<<<<<<< HEAD
 // initializerTopicReceiver.setExecutorService(executorService);
 // initializerTopicReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
  }
 
  /**
  * Initialize instance status event receiver
  */
  private void initializeInstanceStatusEventReceiver() {
  instanceStatusEventReceiver = new StratosManagerInstanceStatusEventReceiver();
+<<<<<<< HEAD
 // instanceStatusEventReceiver.setExecutorService(executorService);
 // instanceStatusEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
  }
 
  /**
  * Initialize topology event receiver
  */
  private void initializeTopologyEventReceiver() {
  topologyEventReceiver = new StratosManagerTopologyEventReceiver();
+<<<<<<< HEAD
 // topologyEventReceiver.setExecutorService(executorService);
 // topologyEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
  }
 
  /**
  * Initialize application event receiver
  */
  private void initializeApplicationEventReceiver() {
  applicationEventReceiver = new StratosManagerApplicationEventReceiver();
+<<<<<<< HEAD
 // applicationEventReceiver.setExecutorService(executorService);
 // applicationEventReceiver.execute();
+=======
+>>>>>>> d4b35c0... removing unused methods
  }
 
  /**
@@ -336,6 +348,7 @@ protected void deactivate(ComponentContext context) {
  // Close event publisher connections to message broker
  EventPublisherPool.close(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName());
  EventPublisherPool.close(MessagingUtil.Topics.TENANT_TOPIC.getTopicName());
+<<<<<<< HEAD
 
  shutdownExecutorService(THREAD_POOL_ID);
  shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID);
@@ -362,4 +375,7 @@ private void shutdownExecutorService(ExecutorService executorService) {
  log.warn("An error occurred while shutting down executor service", e);
  }
  }
+=======
+ }
+>>>>>>> d4b35c0... removing unused methods
 }
diff --git a/.../apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java b/.../apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java
@@ -91,17 +91,4 @@ private void execute() {
  }
  }
  }
-
-// public void terminate() {
-// eventSubscriber.terminate();
-// messageDelegator.terminate();
-// }
-//
-// public ExecutorService getExecutorService() {
-// return executorService;
-// }
-//
-// public void setExecutorService(ExecutorService executorService) {
-// this.executorService = executorService;
-// }
 }