You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/21 21:39:10 UTC
[3/7] stratos git commit:
s/ScalingOverMaxEvent/ScalingBeyondLimitEvent in class usages
s/ScalingOverMaxEvent/ScalingBeyondLimitEvent in class usages
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f9fe5aae
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f9fe5aae
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f9fe5aae
Branch: refs/heads/master
Commit: f9fe5aae1c837661f67a756b950a7deed8e3f4d3
Parents: 4796b2b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 22 01:41:45 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 22 02:11:18 2014 +0530
----------------------------------------------------------------------
.../autoscaler/context/InstanceContext.java | 16 ++++++++--------
.../context/group/GroupInstanceContext.java | 4 ----
.../autoscaler/monitor/EventHandler.java | 6 +++---
.../monitor/cluster/ClusterMonitor.java | 4 ++--
.../monitor/component/GroupMonitor.java | 4 ++--
.../component/ParentComponentMonitor.java | 20 ++++++++++----------
.../builder/MonitorStatusEventBuilder.java | 8 ++++----
7 files changed, 29 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
index a5cf689..a2c240b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
@@ -19,7 +19,7 @@
package org.apache.stratos.autoscaler.context;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
import java.util.HashMap;
import java.util.Map;
@@ -35,13 +35,13 @@ public abstract class InstanceContext {
//key=id of the child, value=ScalingEvent
private Map<String, ScalingEvent> idToScalingEvent;
//key=id of the child, value=MaxOutScalingEvent
- private Map<String, ScalingOverMaxEvent> idToScalingOverMaxEvent;
+ private Map<String, ScalingBeyondLimitEvent> idToScalingOverMaxEvent;
public InstanceContext(String id) {
this.id = id;
setIdToScalingEvent(new HashMap<String, ScalingEvent>());
- setIdToScalingOverMaxEvent(new HashMap<String, ScalingOverMaxEvent>());
+ setIdToScalingOverMaxEvent(new HashMap<String, ScalingBeyondLimitEvent>());
}
public String getId() {
@@ -68,11 +68,11 @@ public abstract class InstanceContext {
this.idToScalingEvent = idToScalingEvent;
}
- public Map<String, ScalingOverMaxEvent> getIdToScalingOverMaxEvent() {
+ public Map<String, ScalingBeyondLimitEvent> getIdToScalingOverMaxEvent() {
return idToScalingOverMaxEvent;
}
- public void setIdToScalingOverMaxEvent(Map<String, ScalingOverMaxEvent> idToScalingOverMaxEvent) {
+ public void setIdToScalingOverMaxEvent(Map<String, ScalingBeyondLimitEvent> idToScalingOverMaxEvent) {
this.idToScalingOverMaxEvent = idToScalingOverMaxEvent;
}
@@ -88,7 +88,7 @@ public abstract class InstanceContext {
return this.idToScalingEvent.get(id);
}
- public ScalingOverMaxEvent getScalingMaxEvent(String id) {
+ public ScalingBeyondLimitEvent getScalingMaxEvent(String id) {
return this.idToScalingOverMaxEvent.get(id);
}
@@ -96,8 +96,8 @@ public abstract class InstanceContext {
this.idToScalingOverMaxEvent.remove(id);
}
- public void addScalingOverMaxEvent(ScalingOverMaxEvent scalingOverMaxEvent) {
- this.idToScalingOverMaxEvent.put(scalingOverMaxEvent.getId(), scalingOverMaxEvent);
+ public void addScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
+ this.idToScalingOverMaxEvent.put(scalingBeyondLimitEvent.getId(), scalingBeyondLimitEvent);
}
public boolean containsScalingEvent(String id) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
index 775b5f1..e128c2c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
@@ -20,13 +20,9 @@ package org.apache.stratos.autoscaler.context.group;
import org.apache.stratos.autoscaler.context.InstanceContext;
import org.apache.stratos.autoscaler.context.partition.GroupLevelPartitionContext;
-import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* This will hold the group instance related info
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
index 6cd48e1..444f585 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.monitor;
import org.apache.stratos.autoscaler.exception.application.MonitorNotFoundException;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
/**
* Event Handler to notify the observer/to receive notification
@@ -52,9 +52,9 @@ public interface EventHandler {
/**
* Triggered when a scaling over max event is received from a child.
*
- * @param scalingOverMaxEvent
+ * @param scalingBeyondLimitEvent
*/
- public abstract void onChildScalingOverMaxEvent(ScalingOverMaxEvent scalingOverMaxEvent);
+ public abstract void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent);
/**
* Triggered when a scaling event is received from the parent.
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index 27cad51..82df43e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -37,7 +37,7 @@ import org.apache.stratos.autoscaler.exception.partition.PartitionValidationExce
import org.apache.stratos.autoscaler.exception.policy.PolicyValidationException;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder;
import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusActiveProcessor;
@@ -385,7 +385,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
@Override
- public void onChildScalingOverMaxEvent(ScalingOverMaxEvent scalingOverMaxEvent) {
+ public void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
index 5780fbc..2f6dc72 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
@@ -37,7 +37,7 @@ import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor;
import org.apache.stratos.autoscaler.monitor.events.GroupStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder;
import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
import org.apache.stratos.autoscaler.pojo.policy.deployment.ChildPolicy;
@@ -164,7 +164,7 @@ public class GroupMonitor extends ParentComponentMonitor {
}
//Resetting the max events
instanceContext.setIdToScalingOverMaxEvent(
- new HashMap<String, ScalingOverMaxEvent>());
+ new HashMap<String, ScalingBeyondLimitEvent>());
} else {
handleDependentScaling(instanceContext, networkPartitionContext);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
index f4b164a..c0a68c4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
@@ -42,7 +42,7 @@ import org.apache.stratos.autoscaler.monitor.MonitorFactory;
import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor;
import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingOverMaxEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
import org.apache.stratos.autoscaler.util.ServiceReferenceHolder;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.apache.stratos.messaging.domain.applications.GroupStatus;
@@ -287,17 +287,17 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
}
@Override
- public void onChildScalingOverMaxEvent(ScalingOverMaxEvent scalingOverMaxEvent) {
+ public void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
if (log.isDebugEnabled()) {
log.debug("Child Scaling max out event received to [group]: " + this.getId()
- + ", [network partition]: " + scalingOverMaxEvent.getNetworkPartitionId()
- + ", [event] " + scalingOverMaxEvent.getId() + ", " +
- "[group instance] " + scalingOverMaxEvent.getInstanceId());
+ + ", [network partition]: " + scalingBeyondLimitEvent.getNetworkPartitionId()
+ + ", [event] " + scalingBeyondLimitEvent.getId() + ", " +
+ "[group instance] " + scalingBeyondLimitEvent.getInstanceId());
}
//adding the scaling over max event to group instance Context
- String networkPartitionId = scalingOverMaxEvent.getNetworkPartitionId();
- String instanceId = scalingOverMaxEvent.getInstanceId();
- String id = scalingOverMaxEvent.getId();
+ String networkPartitionId = scalingBeyondLimitEvent.getNetworkPartitionId();
+ String instanceId = scalingBeyondLimitEvent.getInstanceId();
+ String id = scalingBeyondLimitEvent.getId();
NetworkPartitionContext networkPartitionContext =
this.networkPartitionCtxts.get(networkPartitionId);
if (networkPartitionContext != null) {
@@ -306,9 +306,9 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
if (instanceContext != null) {
if (instanceContext.containsScalingEvent(id)) {
instanceContext.removeScalingOverMaxEvent(id);
- instanceContext.addScalingOverMaxEvent(scalingOverMaxEvent);
+ instanceContext.addScalingOverMaxEvent(scalingBeyondLimitEvent);
} else {
- instanceContext.addScalingOverMaxEvent(scalingOverMaxEvent);
+ instanceContext.addScalingOverMaxEvent(scalingBeyondLimitEvent);
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9fe5aae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
index 3c1c665..a7ff097 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
@@ -66,9 +66,9 @@ public class MonitorStatusEventBuilder {
String appId) {
//Send notifications to parent of the cluster monitor
- ScalingOverMaxEvent scalingOverMaxEvent = new ScalingOverMaxEvent(appId, networkPartitionId,
+ ScalingBeyondLimitEvent scalingBeyondLimitEvent = new ScalingBeyondLimitEvent(appId, networkPartitionId,
instanceId) ;
- notifyParent(parent, scalingOverMaxEvent);
+ notifyParent(parent, scalingBeyondLimitEvent);
}
private static void notifyParent(ParentComponentMonitor parent, MonitorStatusEvent statusEvent) {
@@ -109,8 +109,8 @@ public class MonitorStatusEventBuilder {
parent.onChildScalingEvent(scalingEvent);
}
- private static void notifyParent(ParentComponentMonitor parent, ScalingOverMaxEvent scalingOverMaxEvent) {
- parent.onChildScalingOverMaxEvent(scalingOverMaxEvent);
+ private static void notifyParent(ParentComponentMonitor parent, ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
+ parent.onChildScalingOverMaxEvent(scalingBeyondLimitEvent);
}
public static void notifyChildren (ParentComponentMonitor componentMonitor, ScalingEvent scalingEvent) {