Repository: incubator-stratos Updated Branches: refs/heads/master ff6da3ab3 -> c5a0142e8
implementing getSubscriptionDomain operation to retrieve a SubscriptionDomain and returning a list of SubscriptionDomains from getSubscriptionDomains operation Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5d1fe10b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5d1fe10b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5d1fe10b Branch: refs/heads/master Commit: 5d1fe10b27b8052735216c9d686f670478fd121a Parents: ff6da3a Author: Nirmal Fernando <[email protected]> Authored: Thu May 8 02:14:29 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu May 8 02:14:29 2014 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 27 +++++++++++++++----- .../subscription/CartridgeSubscription.java | 4 +++ 2 files changed, 25 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d1fe10b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 7c35c1c..1a7fbf3 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -448,7 +448,7 @@ public class CartridgeSubscriptionManager { eventPublisher.publish(event); } - public List<String> getSubscriptionDomains(int tenantId, String subscriptionAlias) + public List<SubscriptionDomain> getSubscriptionDomains(int tenantId, String subscriptionAlias) throws ADCException { try { @@ -456,17 +456,32 @@ public class CartridgeSubscriptionManager { if(cartridgeSubscription == null) { throw new ADCException("Cartridge subscription not found"); } - List<String> domainNames = new ArrayList<String>(); - for(SubscriptionDomain subscriptionDomain : cartridgeSubscription.getSubscriptionDomains()) { - domainNames.add(subscriptionDomain.getDomainName()); - } - return domainNames; + + return (List<SubscriptionDomain>) cartridgeSubscription.getSubscriptionDomains(); } catch (Exception e) { String errorMsg = "Could not get domains of cartridge subscription: [tenant-id] " + tenantId + " [subscription-alias] " + subscriptionAlias; log.error(errorMsg); throw new ADCException(errorMsg, e); } } + + public SubscriptionDomain getSubscriptionDomain(int tenantId, String subscriptionAlias, String domain) + throws ADCException { + + try { + CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(tenantId, subscriptionAlias); + if(cartridgeSubscription == null) { + throw new ADCException("Cartridge subscription not found"); + } + + return cartridgeSubscription.getSubscriptionDomain(domain); + } catch (Exception e) { + String errorMsg = "Could not check [domain] "+domain+" against cartridge subscription: [tenant-id] " + + tenantId + " [subscription-alias] " + subscriptionAlias; + log.error(errorMsg); + throw new ADCException(errorMsg, e); + } + } public boolean isSubscriptionDomainValid(String domainName) throws ADCException { try { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d1fe10b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java index 755b559..ebf7276 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java @@ -136,6 +136,10 @@ public abstract class CartridgeSubscription implements Serializable { public boolean subscriptionDomainExists(String domainName) { return subscriptionDomainMap.containsKey(domainName); } + + public SubscriptionDomain getSubscriptionDomain(String domainName) { + return subscriptionDomainMap.get(domainName); + } public Collection<SubscriptionDomain> getSubscriptionDomains() { return Collections.unmodifiableCollection(subscriptionDomainMap.values());
