Repository: stratos Updated Branches: refs/heads/master 7b7c0280f -> b1a745ce4
introducing a generic type to InstanceContext Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b1a745ce Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b1a745ce Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b1a745ce Branch: refs/heads/master Commit: b1a745ce4e6ba18413eb39d4000656ecd54dd60e Parents: 7b7c028 Author: Isuru Haththotuwa <[email protected]> Authored: Fri Nov 21 21:05:57 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Nov 21 21:05:57 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/topic/ApplicationBuilder.java | 4 ++-- .../domain/instance/context/ApplicationInstanceContext.java | 5 +---- .../domain/instance/context/ClusterInstanceContext.java | 4 +--- .../domain/instance/context/GroupInstanceContext.java | 5 +---- .../messaging/domain/instance/context/InstanceContext.java | 9 +++++++-- 5 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b1a745ce/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index 707ed23..4959e51 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -28,8 +28,8 @@ import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher import org.apache.stratos.autoscaler.monitor.application.ApplicationMonitor; import org.apache.stratos.autoscaler.monitor.group.GroupMonitor; import org.apache.stratos.messaging.domain.applications.*; -import org.apache.stratos.messaging.domain.applications.scaling.instance.context.ApplicationInstanceContext; -import org.apache.stratos.messaging.domain.applications.scaling.instance.context.GroupInstanceContext; +import org.apache.stratos.messaging.domain.instance.context.ApplicationInstanceContext; +import org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext; import java.util.Collection; import java.util.Set; http://git-wip-us.apache.org/repos/asf/stratos/blob/b1a745ce/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ApplicationInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ApplicationInstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ApplicationInstanceContext.java index df8e720..28fe31a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ApplicationInstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ApplicationInstanceContext.java @@ -25,10 +25,7 @@ import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateMana import java.util.Stack; -public class ApplicationInstanceContext extends InstanceContext implements LifeCycleStateTransitionBehavior<ApplicationStatus> { - - // Life cycle state manager - protected LifeCycleStateManager<ApplicationStatus> lifeCycleStateManager; +public class ApplicationInstanceContext extends InstanceContext<ApplicationStatus> implements LifeCycleStateTransitionBehavior<ApplicationStatus> { public ApplicationInstanceContext(String alias, String instanceId) { super(alias, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/b1a745ce/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ClusterInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ClusterInstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ClusterInstanceContext.java index 4475d67..93e2d10 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ClusterInstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/ClusterInstanceContext.java @@ -25,10 +25,8 @@ import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateMana import java.util.Stack; -public class ClusterInstanceContext extends InstanceContext implements LifeCycleStateTransitionBehavior<ClusterStatus> { +public class ClusterInstanceContext extends InstanceContext<ClusterStatus> implements LifeCycleStateTransitionBehavior<ClusterStatus> { - // Life cycle state manager - protected LifeCycleStateManager<ClusterStatus> lifeCycleStateManager; public ClusterInstanceContext(String alias, String clusterId, String instanceId) { super(alias, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/b1a745ce/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/GroupInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/GroupInstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/GroupInstanceContext.java index 845015f..56161af 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/GroupInstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/GroupInstanceContext.java @@ -25,10 +25,7 @@ import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateMana import java.util.Stack; -public class GroupInstanceContext extends InstanceContext implements LifeCycleStateTransitionBehavior<GroupStatus> { - - // Life cycle state manager - protected LifeCycleStateManager<GroupStatus> lifeCycleStateManager; +public class GroupInstanceContext extends InstanceContext<GroupStatus> implements LifeCycleStateTransitionBehavior<GroupStatus> { public GroupInstanceContext(String alias, String instanceId) { super(alias, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/b1a745ce/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/InstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/InstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/InstanceContext.java index c001d20..1f8ef7a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/InstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/context/InstanceContext.java @@ -19,17 +19,22 @@ package org.apache.stratos.messaging.domain.instance.context; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleState; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; + import java.io.Serializable; import java.util.Properties; -public abstract class InstanceContext implements Serializable { +public abstract class InstanceContext<T extends LifeCycleState> implements Serializable { // group/cluster level alias protected String alias; // instance id protected String instanceId; - + // instance properties protected Properties instanceProperties; + // Life cycle state manager + protected LifeCycleStateManager<T> lifeCycleStateManager; public InstanceContext (String alias, String instanceId) { this.alias = alias;
