Repository: stratos Updated Branches: refs/heads/tenant-isolation f1538fe3c -> 75940f85d
Refactor the method signatures with UUID Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/75940f85 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/75940f85 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/75940f85 Branch: refs/heads/tenant-isolation Commit: 75940f85d96d0bade8c9381de00b3aaf1665b36a Parents: f1538fe Author: Gayan Gunarathne <[email protected]> Authored: Mon Jul 13 16:24:29 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Jul 13 16:24:29 2015 +0530 ---------------------------------------------------------------------- .../client/StratosManagerServiceClient.java | 6 +-- .../manager/services/StratosManagerService.java | 40 +++++++++--------- .../impl/StratosManagerServiceImpl.java | 44 ++++++++++---------- 3 files changed, 45 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/75940f85/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java index fcafc0e..94455b5 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java @@ -159,12 +159,12 @@ public class StratosManagerServiceClient { /** * Adds the used cartridges in cartridge groups to cache. * - * @param cartridgeGroupName the cartridge group name + * @param cartridgeGroupUuid the cartridge group UUID * @param cartridgeNames the cartridge names * @throws RemoteException the remote exception */ - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) throws RemoteException { - stub.addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames); + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames) throws RemoteException { + stub.addUsedCartridgesInCartridgeGroups(cartridgeGroupUuid, cartridgeNames); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/75940f85/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java index b80aea7..9be1a92 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java @@ -111,80 +111,80 @@ public interface StratosManagerService { /** * Adds the used cartridges in cartridge groups to cache structure. * - * @param cartridgeGroupName the cartridge group name + * @param cartridgeGroupUuid the cartridge group name * @param cartridgeNames the cartridge names */ - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames); + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames); /** * Removes the used cartridges in cartridge groups from cache structure. * - * @param cartridgeGroupName the cartridge group name + * @param cartridgeGroupUuid the cartridge group UUID * @param cartridgeNames the cartridge names */ - public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames); + public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames); /** * Adds the used cartridges in applications to cache structure. * - * @param applicationName the application name + * @param applicationUuid the application name * @param cartridgeNames the cartridge names */ - public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames); + public void addUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames); /** * Removes the used cartridges in applications from cache structure. * - * @param applicationName the application name + * @param applicationUuid the application UUID * @param cartridgeNames the cartridge names */ - public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames); + public void removeUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames); /** * Verifies whether a cartridge can be removed. * - * @param cartridgeName the cartridge name + * @param cartridgeUuid the cartridge name * @return true, if successful */ - public boolean canCartridgeBeRemoved(String cartridgeName); + public boolean canCartridgeBeRemoved(String cartridgeUuid); /** * Adds the used cartridge groups in cartridge sub groups to cache structure. * - * @param cartridgeSubGroupName the cartridge sub group name + * @param cartridgeSubGroupUuid the cartridge sub group name * @param cartridgeGroupNames the cartridge group names */ - public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames); + public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames); /** * Removes the used cartridge groups in cartridge sub groups from cache structure. * - * @param cartridgeSubGroupName the cartridge sub group name + * @param cartridgeSubGroupUuid the cartridge sub group name * @param cartridgeGroupNames the cartridge group names */ - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames); + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames); /** * Adds the used cartridge groups in applications to cache structure. * - * @param applicationName the application name + * @param applicationUuid the application name * @param cartridgeGroupNames the cartridge group names */ - public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames); + public void addUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames); /** * Removes the used cartridge groups in applications from cache structure. * - * @param applicationName the application name + * @param applicationUuid the application name * @param cartridgeGroupNames the cartridge group names */ - public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames); + public void removeUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames); /** * Verifies whether a cartridge group can be removed. * - * @param cartridgeGroupName the cartridge group name + * @param cartridgeGroupUuid the cartridge group name * @return true, if successful */ - public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName); + public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupUuid); } http://git-wip-us.apache.org/repos/asf/stratos/blob/75940f85/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java index f7c0858..2864886 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java @@ -93,11 +93,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames); + StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupUuid, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -107,11 +107,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { + public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames); + StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupUuid, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -121,11 +121,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { + public void addUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationName, cartridgeNames); + StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationUuid, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -135,11 +135,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { + public void removeUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationName, cartridgeNames); + StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationUuid, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -149,20 +149,20 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public boolean canCartridgeBeRemoved(String cartridgeName) { - if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeName) || - StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeName)) { + public boolean canCartridgeBeRemoved(String cartridgeUuid) { + if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeUuid) || + StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeUuid)) { return false; } return true; } @Override - public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { + public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames); + StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupUuid, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -172,11 +172,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames); + StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupUuid, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -186,11 +186,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { + public void addUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames); + StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationUuid, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -200,11 +200,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { + public void removeUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames); + StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationUuid, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -214,9 +214,9 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName) { - if (StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupName) || - StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupName)) { + public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupUuid) { + if (StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupUuid) || + StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupUuid)) { return false; } return true;
