You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/17 05:50:18 UTC
[3/3] stratos git commit: Refactor with uuid
Refactor with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/eea557e5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/eea557e5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/eea557e5
Branch: refs/heads/tenant-isolation
Commit: eea557e584f8b193224436c845be9aa2f08420d9
Parents: f03aaa8
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Sun Aug 16 23:40:16 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sun Aug 16 23:40:16 2015 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 20 ++++++++++----------
.../monitor/component/ApplicationMonitor.java | 8 ++++----
.../domain/application/Application.java | 4 ++--
.../domain/application/ParentComponent.java | 4 ++--
.../tests/StratosTestServerManager.java | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/eea557e5/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 3ca1148..f865d4b 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
@@ -80,10 +80,10 @@ public class ApplicationBuilder {
ApplicationsEventPublisher.sendApplicationCreatedEvent(application);
}
- public static ApplicationInstance handleApplicationInstanceCreatedEvent(String appId,
- String networkPartitionId) {
+ public static ApplicationInstance handleApplicationInstanceCreatedEvent(String appUuid,
+ String networkPartitionUuid) {
if (log.isDebugEnabled()) {
- log.debug("Handling application instance creation event: [application-id] " + appId);
+ log.debug("Handling application instance creation event: [application-id] " + appUuid);
}
ApplicationInstance applicationInstance = null;
//acquiring write lock to add the required instances
@@ -91,26 +91,26 @@ public class ApplicationBuilder {
try {
Applications applications = ApplicationHolder.getApplications();
- Application application = applications.getApplication(appId);
+ Application application = applications.getApplication(appUuid);
//update the status of the Group
if (application == null) {
log.warn(String.format("Application does not exist: [application-id] %s",
- appId));
+ appUuid));
return null;
}
- String instanceId = application.getNextInstanceId(appId);
+ String instanceId = application.getNextInstanceId(appUuid);
if (!application.containsInstanceContext(instanceId)) {
//setting the status, persist and publish
- applicationInstance = new ApplicationInstance(appId, instanceId);
- applicationInstance.setNetworkPartitionUuid(networkPartitionId);
+ applicationInstance = new ApplicationInstance(appUuid, instanceId);
+ applicationInstance.setNetworkPartitionUuid(networkPartitionUuid);
application.addInstance(instanceId, applicationInstance);
//updateApplicationMonitor(appId, status);
ApplicationHolder.persistApplication(application);
- ApplicationsEventPublisher.sendApplicationInstanceCreatedEvent(appId, applicationInstance);
+ ApplicationsEventPublisher.sendApplicationInstanceCreatedEvent(appUuid, applicationInstance);
} else {
log.warn(String.format("Application Instance Context already exists" +
- " [appId] %s [ApplicationInstanceId] %s", appId, instanceId));
+ " [appId] %s [ApplicationInstanceId] %s", appUuid, instanceId));
}
} finally {
ApplicationHolder.releaseWriteLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/eea557e5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index dad15e9..8638dcb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -454,9 +454,9 @@ public class ApplicationMonitor extends ParentComponentMonitor {
return false;
}
- for (String networkPartitionIds : nextNetworkPartitions) {
+ for (String networkPartitionUuids : nextNetworkPartitions) {
ParentLevelNetworkPartitionContext context =
- new ParentLevelNetworkPartitionContext(networkPartitionIds);
+ new ParentLevelNetworkPartitionContext(networkPartitionUuids);
//If application instances found in the ApplicationsTopology,
// then have to add them first before creating new one
ApplicationInstance appInstance = (ApplicationInstance) application.
@@ -471,8 +471,8 @@ public class ApplicationMonitor extends ParentComponentMonitor {
}
instanceIds.add(instanceId);
- log.info("Application instance has been added for the [network partition] " +
- networkPartitionIds + " [appInstanceId] " + instanceId);
+ log.info("Application instance has been added for the [network partition uuid] " +
+ networkPartitionUuids + " [appInstanceId] " + instanceId);
}
//Find whether any other instances exists in cluster
http://git-wip-us.apache.org/repos/asf/stratos/blob/eea557e5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java
index 77c80aa..c9ccc91 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java
@@ -151,14 +151,14 @@ public class Application extends ParentComponent<ApplicationInstance> {
return uuid.hashCode();
}
- public Instance getInstanceByNetworkPartitionId(String networkPartitionId) {
+ public Instance getInstanceByNetworkPartitionId(String networkPartitionUuid) {
// if map is empty, return null
if (getInstanceIdToInstanceContextMap().isEmpty()) {
return null;
}
for (Instance instance : getInstanceIdToInstanceContextMap().values()) {
- if (instance.getNetworkPartitionUuid().equals(networkPartitionId)) {
+ if (instance.getNetworkPartitionUuid().equals(networkPartitionUuid)) {
return instance;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eea557e5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
index fdd83ef..4a54028 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
@@ -428,9 +428,9 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl
this.deploymentPolicy = deploymentPolicy;
}
- public String getNextInstanceId(String alias) {
+ public String getNextInstanceId(String appUuid) {
int nextSequence = instanceIdSequence.incrementAndGet();
- String instanceId = alias + "-" + nextSequence;
+ String instanceId = appUuid + "-" + nextSequence;
return instanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eea557e5/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 2a1d32a..1670a66 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -62,7 +62,7 @@ public class StratosTestServerManager extends TestServerManager {
protected RestClient restClientAdmin;
protected RestClient restClientTenant1;
protected RestClient restClientTenant2;
- private String endpoint = "https://localhost:9443";
+ private String endpoint = "http://localhost:9763";
private BrokerService broker = new BrokerService();
private TestLogAppender testLogAppender = new TestLogAppender();