removing Application from Topology - I
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d4f90be2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d4f90be2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d4f90be2 Branch: refs/heads/4.0.0-grouping Commit: d4f90be212976c529b6970c673b4eddf6461e0a4 Parents: 836b71f Author: Isuru Haththotuwa <[email protected]> Authored: Fri Oct 31 14:55:36 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Oct 31 16:07:05 2014 +0530 ---------------------------------------------------------------------- .../domain/applications/Applications.java | 13 ++- .../messaging/domain/topology/Topology.java | 111 ------------------- 2 files changed, 11 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d4f90be2/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/Applications.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/Applications.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/Applications.java index 9e8cf3e..e5a7921 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/Applications.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/Applications.java @@ -21,6 +21,8 @@ package org.apache.stratos.messaging.domain.applications; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.messaging.domain.applications.locking.ApplicationLock; +import org.apache.stratos.messaging.domain.applications.locking.ApplicationLockHierarchy; import java.io.Serializable; import java.util.HashMap; @@ -38,8 +40,10 @@ public class Applications implements Serializable { this.applicationMap = new HashMap<String, Application>(); } - public void addApplication (Application application) { - this.getApplications().put(application.getUniqueIdentifier(), application); + public synchronized void addApplication (Application application) { + this.applicationMap.put(application.getUniqueIdentifier(), application); + ApplicationLockHierarchy.getInstance().addApplicationLock(application.getUniqueIdentifier(), + new ApplicationLock()); } public Application getApplication (String appId) { @@ -61,4 +65,9 @@ public class Applications implements Serializable { public Map<String, Application> getApplications() { return applicationMap; } + + public synchronized void removeApplication (String appId) { + this.applicationMap.remove(appId); + ApplicationLockHierarchy.getInstance().removeLock(appId); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d4f90be2/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java index 0f128fa..a5780bb 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java @@ -37,42 +37,12 @@ public class Topology implements Serializable { private static final long serialVersionUID = -2453583548027402122L; // Key: Service.serviceName private Map<String, Service> serviceMap; - //Grouping - private Map<String, CompositeApplication> compositeApplicationMap; - // grouping_poc private Map<String, ConfigCompositeApplication> configCompositeApplicationMap; - // Key: Application.id - private Map<String, Application> applicationMap; private boolean initialized; private static Log log = LogFactory.getLog(Topology.class); public Topology() { this.serviceMap = new HashMap<String, Service>(); - this.compositeApplicationMap = new HashMap<String, CompositeApplication>(); - // grouping_poc this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>(); - this.applicationMap = new HashMap<String, Application>(); - } - - public void addApplication (Application application) { - this.applicationMap.put(application.getUniqueIdentifier(), application); - TopologyLockHierarchy.getInstance().addApplicationLock(application.getUniqueIdentifier(), new TopologyLock()); - } - - public Application getApplication (String applicationId) { - return applicationMap.get(applicationId); - } - - public void removeApplication (String applicationId) { - applicationMap.remove(applicationId); - TopologyLockHierarchy.getInstance().removeTopologyLockForApplication(applicationId); - } - - public Collection<Application> getApplications () { - return applicationMap.values(); - } - - public boolean applicationExists (String applicationId) { - return this.applicationMap.containsKey(applicationId); } public Collection<Service> getServices() { @@ -111,87 +81,6 @@ public class Topology implements Serializable { public void clear() { this.serviceMap.clear(); } - - // Grouping - public Collection<CompositeApplication> getCompositeApplication() { - return this.compositeApplicationMap.values(); - } - - public void addCompositeApplication(String alias, CompositeApplication app) { - this.compositeApplicationMap.put(alias, app); - } - - public void removeCompositeApplication(String alias) { - this.compositeApplicationMap.remove(alias); - } - - /* grouping_poc - public Collection<ConfigCompositeApplication> getConfigCompositeApplication() { - - if (this.configCompositeApplicationMap == null) { - log.info("adding new config comp in topology while retrieving it, ConfigCompositeApplication is null"); - this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>(); - } - return this.configCompositeApplicationMap.values(); - } - - public void addConfigCompositeApplication(String alias, ConfigCompositeApplication configApp) { - log.info("adding config comp in topology" + alias + " / " + configApp); - if (this.configCompositeApplicationMap != null) { - log.info("adding config comp in topology, ConfigCompositeApplication is not null"); - this.configCompositeApplicationMap.put(alias, configApp); - log.info("successful config comp in topology, ConfigCompositeApplication is not null"); - } else { - log.info("adding config comp in topology, ConfigCompositeApplication is null, adding one"); - this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>(); - this.configCompositeApplicationMap.put(alias, configApp); - } - } - - public void removeConfigCompositeApplication(String alias) { - this.configCompositeApplicationMap.remove(alias); - } - - public void removeAllCompositeApplication() { - java.util.Set<String> keys = this.compositeApplicationMap.keySet(); - for (String key : keys) { - compositeApplicationMap.remove(key); - } - } - - public void removeAllConfigCompositeApplication() { - java.util.Set<String> keys = this.configCompositeApplicationMap.keySet(); - for (String key : keys) { - configCompositeApplicationMap.remove(key); - } - } - - public CompositeApplication getCompositeApplication(String appAlias) { - return this.compositeApplicationMap.get(appAlias); - } - - public boolean compositeApplicationExists(String appAlias) { - return this.compositeApplicationMap.containsKey(appAlias); - } - - public ConfigCompositeApplication getConfigCompositeApplication(String appAlias) { - return this.configCompositeApplicationMap.get(appAlias); - } - - public boolean configCompositeApplicationExists(String appAlias) { - return this.configCompositeApplicationMap.containsKey(appAlias); - } - - - public Map<String, ConfigCompositeApplication> getConfigCompositeApplicationMap() { - return configCompositeApplicationMap; - } - - public void setConfigCompositeApplicationMap(Map<String, ConfigCompositeApplication> configCompositeApplicationMap) { - this.configCompositeApplicationMap = configCompositeApplicationMap; - } - - */ public void setInitialized(boolean initialized) { this.initialized = initialized;
