You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 08:20:02 UTC
[2/6] stratos git commit: Formatting rest endpoint component code
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 2c9df3e..c317b4c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.rest.endpoint.mock;
@@ -39,52 +39,50 @@ public class MockContext {
private Map<Integer, List<String>> tenantIdToAliasesMap = new HashMap<Integer, List<String>>();
private Map<Integer, List<CartridgeBean>> cartridgeDefinitionBeanList = new HashMap<Integer, List<CartridgeBean>>();
- private Map<Integer, Map<String,CartridgeBean>> availableSingleTenantCartridges = new HashMap<Integer, Map<String,CartridgeBean>>();
- private Map<Integer, Map<String,CartridgeBean>> availableMultiTenantCartridges = new HashMap<Integer, Map<String,CartridgeBean>>();
- private Map<Integer, Map<String,CartridgeBean>> subscribedCartridges = new HashMap<Integer, Map<String,CartridgeBean>>();
- private Map<String,TenantInfoBean> tenantMap = new HashMap<String, TenantInfoBean>();
- private Map<Integer, Map<String, UserInfoBean>> tenantUserMap= new HashMap<Integer, Map<String, UserInfoBean>>();
+ private Map<Integer, Map<String, CartridgeBean>> availableSingleTenantCartridges = new HashMap<Integer, Map<String, CartridgeBean>>();
+ private Map<Integer, Map<String, CartridgeBean>> availableMultiTenantCartridges = new HashMap<Integer, Map<String, CartridgeBean>>();
+ private Map<Integer, Map<String, CartridgeBean>> subscribedCartridges = new HashMap<Integer, Map<String, CartridgeBean>>();
+ private Map<String, TenantInfoBean> tenantMap = new HashMap<String, TenantInfoBean>();
+ private Map<Integer, Map<String, UserInfoBean>> tenantUserMap = new HashMap<Integer, Map<String, UserInfoBean>>();
private Map<String, Integer> tenantIdMap = new HashMap<String, Integer>();
- private Map<Integer, Map<String,PartitionBean>> partitionMap = new HashMap<Integer, Map<String, PartitionBean>>();
- private Map<Integer, Map<String,AutoscalePolicyBean>> autoscalePolicyMap = new HashMap<Integer, Map<String, AutoscalePolicyBean>>();
- private Map<Integer, Map<String,DeploymentPolicyBean>> deploymentPolicyMap = new HashMap<Integer, Map<String, DeploymentPolicyBean>>();
- private Map<String,ClusterBean> clusterMap = new HashMap<String, ClusterBean>();
-
- private int tenantIdCount=1;
+ private Map<Integer, Map<String, PartitionBean>> partitionMap = new HashMap<Integer, Map<String, PartitionBean>>();
+ private Map<Integer, Map<String, AutoscalePolicyBean>> autoscalePolicyMap = new HashMap<Integer, Map<String, AutoscalePolicyBean>>();
+ private Map<Integer, Map<String, DeploymentPolicyBean>> deploymentPolicyMap = new HashMap<Integer, Map<String, DeploymentPolicyBean>>();
+ private Map<String, ClusterBean> clusterMap = new HashMap<String, ClusterBean>();
+
+ private int tenantIdCount = 1;
public static final int PUBLIC_DEFINITION = 0;
- private MockContext(){} // do not allow to initialize
+ private MockContext() {
+ } // do not allow to initialize
- public static MockContext getInstance(){
+ public static MockContext getInstance() {
return mockContext;
}
- public ApiResponseBean addCartirdgeDefinition(CartridgeBean cartridgeDefinitionBean){
- int tenantId = getTenantId();
- List<CartridgeBean> tenantCartridges;
-
- if(!cartridgeDefinitionBean.isPublic()){
- if(this.cartridgeDefinitionBeanList.containsKey(tenantId)){
- tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
- }
- else{
- tenantCartridges = new LinkedList<CartridgeBean>();
- this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
- }
- }
- else{
- if(this.cartridgeDefinitionBeanList.containsKey(PUBLIC_DEFINITION)){
- tenantCartridges = this.cartridgeDefinitionBeanList.get(PUBLIC_DEFINITION);
- }
- else{
- tenantCartridges = new LinkedList<CartridgeBean>();
- this.cartridgeDefinitionBeanList.put(PUBLIC_DEFINITION, tenantCartridges);
- }
- }
-
- tenantCartridges.add(cartridgeDefinitionBean);
-
- CartridgeBean cartridge = new CartridgeBean();
+ public ApiResponseBean addCartirdgeDefinition(CartridgeBean cartridgeDefinitionBean) {
+ int tenantId = getTenantId();
+ List<CartridgeBean> tenantCartridges;
+
+ if (!cartridgeDefinitionBean.isPublic()) {
+ if (this.cartridgeDefinitionBeanList.containsKey(tenantId)) {
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
+ } else {
+ tenantCartridges = new LinkedList<CartridgeBean>();
+ this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
+ }
+ } else {
+ if (this.cartridgeDefinitionBeanList.containsKey(PUBLIC_DEFINITION)) {
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(PUBLIC_DEFINITION);
+ } else {
+ tenantCartridges = new LinkedList<CartridgeBean>();
+ this.cartridgeDefinitionBeanList.put(PUBLIC_DEFINITION, tenantCartridges);
+ }
+ }
+
+ tenantCartridges.add(cartridgeDefinitionBean);
+
+ CartridgeBean cartridge = new CartridgeBean();
cartridge.setType(cartridgeDefinitionBean.getType());
cartridge.setDescription(cartridgeDefinitionBean.getDescription());
cartridge.setDisplayName(cartridgeDefinitionBean.getDisplayName());
@@ -93,48 +91,44 @@ public class MockContext {
cartridge.setVersion(cartridgeDefinitionBean.getVersion());
//cartridge.setIsPublic(cartridgeDefinitionBean.isPublic());
- Map<String,CartridgeBean> cartridges;
- if(cartridge.isMultiTenant()){
- if(!cartridge.isPublic()){
- if(this.availableMultiTenantCartridges.containsKey(tenantId)){
- cartridges = availableMultiTenantCartridges.get(tenantId);
- }
- else{
- cartridges = new HashMap<String,CartridgeBean>();
- this.availableMultiTenantCartridges.put(tenantId, cartridges);
- }
- }else{
- if(this.availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- cartridges = availableMultiTenantCartridges.get(PUBLIC_DEFINITION);
- }
- else{
- cartridges = new HashMap<String,CartridgeBean>();
- this.availableMultiTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
- }
- }
-
+ Map<String, CartridgeBean> cartridges;
+ if (cartridge.isMultiTenant()) {
+ if (!cartridge.isPublic()) {
+ if (this.availableMultiTenantCartridges.containsKey(tenantId)) {
+ cartridges = availableMultiTenantCartridges.get(tenantId);
+ } else {
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableMultiTenantCartridges.put(tenantId, cartridges);
+ }
+ } else {
+ if (this.availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ cartridges = availableMultiTenantCartridges.get(PUBLIC_DEFINITION);
+ } else {
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableMultiTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
+ }
+ }
+
cartridges.put(cartridge.getType(), cartridge);
System.out.println(cartridges.size());
- }else{
- if(!cartridge.isPublic()){
- if(this.availableSingleTenantCartridges.containsKey(tenantId)){
- cartridges = availableSingleTenantCartridges.get(tenantId);
- }
- else{
- cartridges = new HashMap<String,CartridgeBean>();
- this.availableSingleTenantCartridges.put(tenantId, cartridges);
- }
- }else{
- if(this.availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- cartridges = availableSingleTenantCartridges.get(PUBLIC_DEFINITION);
- }
- else{
- cartridges = new HashMap<String,CartridgeBean>();
- this.availableSingleTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
- }
- }
-
- cartridges.put(cartridge.getType(), cartridge);
+ } else {
+ if (!cartridge.isPublic()) {
+ if (this.availableSingleTenantCartridges.containsKey(tenantId)) {
+ cartridges = availableSingleTenantCartridges.get(tenantId);
+ } else {
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableSingleTenantCartridges.put(tenantId, cartridges);
+ }
+ } else {
+ if (this.availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ cartridges = availableSingleTenantCartridges.get(PUBLIC_DEFINITION);
+ } else {
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableSingleTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
+ }
+ }
+
+ cartridges.put(cartridge.getType(), cartridge);
System.out.println(cartridges.size());
}
@@ -143,44 +137,44 @@ public class MockContext {
return stratosApiResponse;
}
- public CartridgeBean[] getAvailableMultiTenantCartridges() throws RestAPIException{
- int tenantId = getTenantId();
- if(!availableMultiTenantCartridges.containsKey(tenantId) && !availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ public CartridgeBean[] getAvailableMultiTenantCartridges() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!availableMultiTenantCartridges.containsKey(tenantId) && !availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
Collection<CartridgeBean> cartridges = new HashMap<String, CartridgeBean>().values();
return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
-
- List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
-
- if(availableMultiTenantCartridges.get(tenantId) != null)
- cartridges.addAll(availableMultiTenantCartridges.get(tenantId).values());
-
- if(availableMultiTenantCartridges.get(PUBLIC_DEFINITION) != null)
- cartridges.addAll(availableMultiTenantCartridges.get(PUBLIC_DEFINITION).values());
-
- return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
-
-
- public CartridgeBean[] getAvailableSingleTenantCartridges() throws RestAPIException{
- int tenantId = getTenantId();
- if(!availableSingleTenantCartridges.containsKey(tenantId) && !availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ }
+
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
+
+ if (availableMultiTenantCartridges.get(tenantId) != null)
+ cartridges.addAll(availableMultiTenantCartridges.get(tenantId).values());
+
+ if (availableMultiTenantCartridges.get(PUBLIC_DEFINITION) != null)
+ cartridges.addAll(availableMultiTenantCartridges.get(PUBLIC_DEFINITION).values());
+
+ return cartridges.toArray(new CartridgeBean[cartridges.size()]);
+ }
+
+
+ public CartridgeBean[] getAvailableSingleTenantCartridges() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!availableSingleTenantCartridges.containsKey(tenantId) && !availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
Collection<CartridgeBean> cartridges = new HashMap<String, CartridgeBean>().values();
return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
-
- List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
-
- if(availableSingleTenantCartridges.get(tenantId) != null)
- cartridges.addAll(availableSingleTenantCartridges.get(tenantId).values());
-
- if(availableSingleTenantCartridges.get(PUBLIC_DEFINITION) != null)
- cartridges.addAll(availableSingleTenantCartridges.get(PUBLIC_DEFINITION).values());
-
- return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
-
- public CartridgeBean[] getAvailableLbCartridges() throws RestAPIException{
+ }
+
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
+
+ if (availableSingleTenantCartridges.get(tenantId) != null)
+ cartridges.addAll(availableSingleTenantCartridges.get(tenantId).values());
+
+ if (availableSingleTenantCartridges.get(PUBLIC_DEFINITION) != null)
+ cartridges.addAll(availableSingleTenantCartridges.get(PUBLIC_DEFINITION).values());
+
+ return cartridges.toArray(new CartridgeBean[cartridges.size()]);
+ }
+
+ public CartridgeBean[] getAvailableLbCartridges() throws RestAPIException {
/*Map<String,Cartridge> availableLbCartridges = new HashMap<String,Cartridge>();
Iterator it = availableSingleTenantCartridges.entrySet().iterator();
while(it.hasNext()){
@@ -206,7 +200,7 @@ public class MockContext {
return getAvailableSingleTenantCartridges();
}
- public CartridgeBean[] getAvailableCartridges() throws RestAPIException{
+ public CartridgeBean[] getAvailableCartridges() throws RestAPIException {
/*Map<String, Cartridge> availableCartridges = new HashMap<String,Cartridge>();
Iterator it = availableSingleTenantCartridges.entrySet().iterator();
while(it.hasNext()){
@@ -230,196 +224,196 @@ public class MockContext {
System.out.println(availableCartridges.size());
return availableCartridges.values().toArray(new Cartridge[0]);*/
//return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
- return getAvailableSingleTenantCartridges();
+ return getAvailableSingleTenantCartridges();
}
- public CartridgeBean[] getSubscribedCartridges() throws RestAPIException{
- int tenantId = getTenantId();
- if(!subscribedCartridges.containsKey(tenantId) && !subscribedCartridges.containsKey(PUBLIC_DEFINITION)){
+ public CartridgeBean[] getSubscribedCartridges() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!subscribedCartridges.containsKey(tenantId) && !subscribedCartridges.containsKey(PUBLIC_DEFINITION)) {
Collection<CartridgeBean> cartridges = new HashMap<String, CartridgeBean>().values();
return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
+ }
List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
-
- if(subscribedCartridges.get(tenantId) != null)
- cartridges.addAll(subscribedCartridges.get(tenantId).values());
-
- if(subscribedCartridges.get(PUBLIC_DEFINITION) != null)
- cartridges.addAll(subscribedCartridges.get(PUBLIC_DEFINITION).values());
-
- return cartridges.toArray(new CartridgeBean[cartridges.size()]);
- }
-
- public ApiResponseBean unsubscribe(String alias) throws RestAPIException{
- int tenantId = getTenantId();
- if(subscribedCartridges.containsKey(tenantId)){
- if((subscribedCartridges.get(tenantId)).containsKey(alias)){
- (subscribedCartridges.get(tenantId)).remove(alias);
- }
- }else{
- throw new RestAPIException(Status.NO_CONTENT,"Unable to un-subscribe");
+
+ if (subscribedCartridges.get(tenantId) != null)
+ cartridges.addAll(subscribedCartridges.get(tenantId).values());
+
+ if (subscribedCartridges.get(PUBLIC_DEFINITION) != null)
+ cartridges.addAll(subscribedCartridges.get(PUBLIC_DEFINITION).values());
+
+ return cartridges.toArray(new CartridgeBean[cartridges.size()]);
+ }
+
+ public ApiResponseBean unsubscribe(String alias) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (subscribedCartridges.containsKey(tenantId)) {
+ if ((subscribedCartridges.get(tenantId)).containsKey(alias)) {
+ (subscribedCartridges.get(tenantId)).remove(alias);
+ }
+ } else {
+ throw new RestAPIException(Status.NO_CONTENT, "Unable to un-subscribe");
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully un-subscribed");
return stratosApiResponse;
}
- public CartridgeBean getCartridgeInfo(String alias) throws RestAPIException{
- int tenantId = getTenantId();
- if(!subscribedCartridges.containsKey(tenantId))
- throw new RestAPIException(Status.NO_CONTENT, "No cartridges subscribed for current tenant.");
-
- if(!(subscribedCartridges.get(tenantId)).containsKey(alias))
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge information is not available.");
-
+ public CartridgeBean getCartridgeInfo(String alias) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!subscribedCartridges.containsKey(tenantId))
+ throw new RestAPIException(Status.NO_CONTENT, "No cartridges subscribed for current tenant.");
+
+ if (!(subscribedCartridges.get(tenantId)).containsKey(alias))
+ throw new RestAPIException(Status.NO_CONTENT, "Cartridge information is not available.");
+
return (subscribedCartridges.get(tenantId)).get(alias);
}
- public CartridgeBean getAvailableSingleTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
- int tenantId = getTenantId();
- if(!availableSingleTenantCartridges.containsKey(tenantId)){
- if(!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
- }
- if(!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
-
+ public CartridgeBean getAvailableSingleTenantCartridgeInfo(String cartridgeType) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!availableSingleTenantCartridges.containsKey(tenantId)) {
+ if (!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No cartridges defined for current tenant");
+ }
+ if (!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT, "Cartridge is not available.");
+
return (availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).get(cartridgeType);
- }
- if(!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
-
+ }
+ if (!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT, "Cartridge is not available.");
+
return (availableSingleTenantCartridges.get(tenantId)).get(cartridgeType);
}
-
- public CartridgeBean getAvailableMultiTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
- int tenantId = getTenantId();
- if(!availableMultiTenantCartridges.containsKey(tenantId)){
- if(!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
- }
- if(!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
-
+
+ public CartridgeBean getAvailableMultiTenantCartridgeInfo(String cartridgeType) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!availableMultiTenantCartridges.containsKey(tenantId)) {
+ if (!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No cartridges defined for current tenant");
+ }
+ if (!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT, "Cartridge is not available.");
+
return (availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).get(cartridgeType);
- }
- if(!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
-
+ }
+ if (!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT, "Cartridge is not available.");
+
return (availableMultiTenantCartridges.get(tenantId)).get(cartridgeType);
}
-
- public ApiResponseBean deleteCartridgeDefinition(String cartridgeType) throws RestAPIException{
- if(!deleteFromAvailableSingleTenantCartridgeDefinitions(cartridgeType) && !deleteFromAvailableMultiTenantCartridgeDefinitions(cartridgeType)){
- throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for tenant");
- }
+
+ public ApiResponseBean deleteCartridgeDefinition(String cartridgeType) throws RestAPIException {
+ if (!deleteFromAvailableSingleTenantCartridgeDefinitions(cartridgeType) && !deleteFromAvailableMultiTenantCartridgeDefinitions(cartridgeType)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No cartridges defined for tenant");
+ }
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully delete cartridge definition");
return stratosApiResponse;
}
-
- private boolean deleteFromAvailableSingleTenantCartridgeDefinitions(String cartridgeType){
- int tenantId = getTenantId();
- if(!availableSingleTenantCartridges.containsKey(tenantId)){
- if(!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- return false;
- }
- if(!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+
+ private boolean deleteFromAvailableSingleTenantCartridgeDefinitions(String cartridgeType) {
+ int tenantId = getTenantId();
+ if (!availableSingleTenantCartridges.containsKey(tenantId)) {
+ if (!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ return false;
+ }
+ if (!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
return false;
-
+
(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).remove(cartridgeType);
return true;
- }
- if(!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ }
+ if (!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
return false;
-
+
(availableSingleTenantCartridges.get(tenantId)).remove(cartridgeType);
return true;
}
-
- private boolean deleteFromAvailableMultiTenantCartridgeDefinitions(String cartridgeType){
- int tenantId = getTenantId();
- if(!availableMultiTenantCartridges.containsKey(tenantId)){
- if(!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
- return false;
- }
- if(!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+
+ private boolean deleteFromAvailableMultiTenantCartridgeDefinitions(String cartridgeType) {
+ int tenantId = getTenantId();
+ if (!availableMultiTenantCartridges.containsKey(tenantId)) {
+ if (!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
+ return false;
+ }
+ if (!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
return false;
-
+
(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).remove(cartridgeType);
return true;
- }
- if(!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ }
+ if (!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
return false;
-
+
(availableMultiTenantCartridges.get(tenantId)).remove(cartridgeType);
return true;
}
- public ApiResponseBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException{
- try{
- tenantMap.put(tenantInfoBean.getTenantDomain(),tenantInfoBean);
+ public ApiResponseBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException {
+ try {
+ tenantMap.put(tenantInfoBean.getTenantDomain(), tenantInfoBean);
tenantInfoBean.setTenantId(tenantIdCount);
tenantIdMap.put(tenantInfoBean.getAdmin(), tenantIdCount++);
- }catch (Exception e){
- throw new RestAPIException(Status.INTERNAL_SERVER_ERROR,e.getMessage());
+ } catch (Exception e) {
+ throw new RestAPIException(Status.INTERNAL_SERVER_ERROR, e.getMessage());
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully added new Tenant");
return stratosApiResponse;
}
- public TenantInfoBean getTenant(String tenantDomain) throws RestAPIException{
- if(!tenantMap.containsKey(tenantDomain)){
- throw new RestAPIException(Status.NO_CONTENT,"Information for tenant: " + tenantDomain + " is not available");
+ public TenantInfoBean getTenant(String tenantDomain) throws RestAPIException {
+ if (!tenantMap.containsKey(tenantDomain)) {
+ throw new RestAPIException(Status.NO_CONTENT, "Information for tenant: " + tenantDomain + " is not available");
}
return tenantMap.get(tenantDomain);
}
-
+
public ApiResponseBean deleteTenant(String tenantDomain) {
- if(tenantMap.containsKey(tenantDomain)){
- TenantInfoBean tenant=tenantMap.get(tenantDomain);
- tenantMap.remove(tenantDomain);
- tenantIdMap.remove(tenant.getTenantId());
+ if (tenantMap.containsKey(tenantDomain)) {
+ TenantInfoBean tenant = tenantMap.get(tenantDomain);
+ tenantMap.remove(tenantDomain);
+ tenantIdMap.remove(tenant.getTenantId());
}
-
+
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deleted tenant");
return stratosApiResponse;
}
- public TenantInfoBean[] getTenants() throws RestAPIException{
+ public TenantInfoBean[] getTenants() throws RestAPIException {
Collection<TenantInfoBean> tenants = tenantMap.values();
return tenants.toArray(new TenantInfoBean[tenants.size()]);
}
- public TenantInfoBean[] retrievePartialSearchTenants(String searchDomain) throws RestAPIException{
+ public TenantInfoBean[] retrievePartialSearchTenants(String searchDomain) throws RestAPIException {
List<TenantInfoBean> searchResult = new LinkedList<TenantInfoBean>();
- for(String tenantDomain : tenantMap.keySet()){
- if(tenantDomain.contains(searchDomain)){
- searchResult.add(new TenantInfoBean(tenantMap.get(tenantDomain)));
+ for (String tenantDomain : tenantMap.keySet()) {
+ if (tenantDomain.contains(searchDomain)) {
+ searchResult.add(new TenantInfoBean(tenantMap.get(tenantDomain)));
}
}
return searchResult.toArray(new TenantInfoBean[searchResult.size()]);
}
- public ApiResponseBean activateTenant(String tenantDomain) throws RestAPIException{
- if(tenantMap.containsKey(tenantDomain)){
+ public ApiResponseBean activateTenant(String tenantDomain) throws RestAPIException {
+ if (tenantMap.containsKey(tenantDomain)) {
tenantMap.get(tenantDomain).setActive(true);
- } else{
- throw new RestAPIException(Status.BAD_REQUEST,"Invalid tenant domain");
+ } else {
+ throw new RestAPIException(Status.BAD_REQUEST, "Invalid tenant domain");
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully activated Tenant");
return stratosApiResponse;
}
- public ApiResponseBean deactivateTenant(String tenantDomain) throws RestAPIException{
- if(tenantMap.containsKey(tenantDomain)){
+ public ApiResponseBean deactivateTenant(String tenantDomain) throws RestAPIException {
+ if (tenantMap.containsKey(tenantDomain)) {
tenantMap.get(tenantDomain).setActive(false);
- } else{
- throw new RestAPIException(Status.BAD_REQUEST,"Invalid tenant domain");
+ } else {
+ throw new RestAPIException(Status.BAD_REQUEST, "Invalid tenant domain");
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deactivated Tenant");
@@ -427,137 +421,128 @@ public class MockContext {
}
public ApiResponseBean addPartition(PartitionBean partition) {
- int tenantId = getTenantId();
- Map<String,PartitionBean> partitions;
-
- if(!partition.isPublic()){
- if (partitionMap.containsKey(tenantId)){
- partitions = partitionMap.get(tenantId);
- }
- else{
- partitions = new HashMap<String, PartitionBean>();
- partitionMap.put(tenantId, partitions);
- }
- }
- else {
- if (partitionMap.containsKey(PUBLIC_DEFINITION)){
- partitions = partitionMap.get(PUBLIC_DEFINITION);
- }
- else{
- partitions = new HashMap<String, PartitionBean>();
- partitionMap.put(PUBLIC_DEFINITION, partitions);
- }
- }
-
- partitions.put(partition.getId(), partition);
+ int tenantId = getTenantId();
+ Map<String, PartitionBean> partitions;
+
+ if (!partition.isPublic()) {
+ if (partitionMap.containsKey(tenantId)) {
+ partitions = partitionMap.get(tenantId);
+ } else {
+ partitions = new HashMap<String, PartitionBean>();
+ partitionMap.put(tenantId, partitions);
+ }
+ } else {
+ if (partitionMap.containsKey(PUBLIC_DEFINITION)) {
+ partitions = partitionMap.get(PUBLIC_DEFINITION);
+ } else {
+ partitions = new HashMap<String, PartitionBean>();
+ partitionMap.put(PUBLIC_DEFINITION, partitions);
+ }
+ }
+
+ partitions.put(partition.getId(), partition);
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deployed partition");
return stratosApiResponse;
}
public ApiResponseBean addAutoScalingPolicyDefinition(AutoscalePolicyBean autoscalePolicy) {
- int tenantId = getTenantId();
- Map<String,AutoscalePolicyBean> policies;
-
- if(!autoscalePolicy.getIsPublic()){
- if (autoscalePolicyMap.containsKey(tenantId)){
- policies = autoscalePolicyMap.get(tenantId);
- }
- else{
- policies = new HashMap<String, AutoscalePolicyBean>();
- autoscalePolicyMap.put(tenantId, policies);
- }
- }
- else{
- if (autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
- policies = autoscalePolicyMap.get(PUBLIC_DEFINITION);
- }
- else{
- policies = new HashMap<String, AutoscalePolicyBean>();
- autoscalePolicyMap.put(PUBLIC_DEFINITION, policies);
- }
- }
-
- policies.put(autoscalePolicy.getId(), autoscalePolicy);
+ int tenantId = getTenantId();
+ Map<String, AutoscalePolicyBean> policies;
+
+ if (!autoscalePolicy.getIsPublic()) {
+ if (autoscalePolicyMap.containsKey(tenantId)) {
+ policies = autoscalePolicyMap.get(tenantId);
+ } else {
+ policies = new HashMap<String, AutoscalePolicyBean>();
+ autoscalePolicyMap.put(tenantId, policies);
+ }
+ } else {
+ if (autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ policies = autoscalePolicyMap.get(PUBLIC_DEFINITION);
+ } else {
+ policies = new HashMap<String, AutoscalePolicyBean>();
+ autoscalePolicyMap.put(PUBLIC_DEFINITION, policies);
+ }
+ }
+
+ policies.put(autoscalePolicy.getId(), autoscalePolicy);
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deployed auto scaling policy definition");
return stratosApiResponse;
}
public ApiResponseBean addDeploymentPolicyDefinition(String applicationId, DeploymentPolicyBean deploymentPolicy) {
- int tenantId = getTenantId();
- Map<String,DeploymentPolicyBean> policies;
-
+ int tenantId = getTenantId();
+ Map<String, DeploymentPolicyBean> policies;
- if (deploymentPolicyMap.containsKey(tenantId)){
- policies = deploymentPolicyMap.get(tenantId);
- }
- else{
- policies = new HashMap<String, DeploymentPolicyBean>();
- deploymentPolicyMap.put(tenantId, policies);
+
+ if (deploymentPolicyMap.containsKey(tenantId)) {
+ policies = deploymentPolicyMap.get(tenantId);
+ } else {
+ policies = new HashMap<String, DeploymentPolicyBean>();
+ deploymentPolicyMap.put(tenantId, policies);
}
-
- policies.put(applicationId + UUID.randomUUID().getLeastSignificantBits(),deploymentPolicy);
+
+ policies.put(applicationId + UUID.randomUUID().getLeastSignificantBits(), deploymentPolicy);
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deployed deployment policy definition");
return stratosApiResponse;
}
- public PartitionBean[] getPartitions() throws RestAPIException{
- int tenantId = getTenantId();
- if(!partitionMap.containsKey(tenantId) && !partitionMap.containsKey(PUBLIC_DEFINITION)){
+ public PartitionBean[] getPartitions() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!partitionMap.containsKey(tenantId) && !partitionMap.containsKey(PUBLIC_DEFINITION)) {
Collection<PartitionBean> partitions = new HashMap<String, PartitionBean>().values();
return partitions.toArray(new PartitionBean[partitions.size()]);
- }
-
- List<PartitionBean> partitions = new ArrayList<PartitionBean>();
-
- if(partitionMap.get(tenantId) != null)
- partitions.addAll(partitionMap.get(tenantId).values());
-
- if(partitionMap.get(PUBLIC_DEFINITION) != null)
- partitions.addAll(partitionMap.get(PUBLIC_DEFINITION).values());
-
- return partitions.toArray(new PartitionBean[partitions.size()]);
- }
-
- public PartitionBean getPartition(String partitionId) throws RestAPIException{
- int tenantId = getTenantId();
- if(!partitionMap.containsKey(tenantId)){
- if(!partitionMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No partitions have been defined for the tenant");
- }
- if(!(partitionMap.get(PUBLIC_DEFINITION)).containsKey(partitionId)){
- throw new RestAPIException("There is no partition with the id: " + partitionId);
- }
- return (partitionMap.get(PUBLIC_DEFINITION)).get(partitionId);
- }
- else{
- if(!(partitionMap.get(tenantId)).containsKey(partitionId)){
- throw new RestAPIException("There is no partition with the id: " + partitionId);
- }
- return (partitionMap.get(tenantId)).get(partitionId);
- }
- }
-
- public PartitionBean[] getPartitionsOfPolicy(String deploymentPolicyId) throws RestAPIException{
- int tenantId = getTenantId();
- if(!deploymentPolicyMap.containsKey(tenantId)){
- if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
- }
- else{
- if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
- }
+ }
+
+ List<PartitionBean> partitions = new ArrayList<PartitionBean>();
+
+ if (partitionMap.get(tenantId) != null)
+ partitions.addAll(partitionMap.get(tenantId).values());
+
+ if (partitionMap.get(PUBLIC_DEFINITION) != null)
+ partitions.addAll(partitionMap.get(PUBLIC_DEFINITION).values());
+
+ return partitions.toArray(new PartitionBean[partitions.size()]);
+ }
+
+ public PartitionBean getPartition(String partitionId) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!partitionMap.containsKey(tenantId)) {
+ if (!partitionMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No partitions have been defined for the tenant");
+ }
+ if (!(partitionMap.get(PUBLIC_DEFINITION)).containsKey(partitionId)) {
+ throw new RestAPIException("There is no partition with the id: " + partitionId);
+ }
+ return (partitionMap.get(PUBLIC_DEFINITION)).get(partitionId);
+ } else {
+ if (!(partitionMap.get(tenantId)).containsKey(partitionId)) {
+ throw new RestAPIException("There is no partition with the id: " + partitionId);
+ }
+ return (partitionMap.get(tenantId)).get(partitionId);
+ }
+ }
+
+ public PartitionBean[] getPartitionsOfPolicy(String deploymentPolicyId) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!deploymentPolicyMap.containsKey(tenantId)) {
+ if (!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No deployment policies have been defined for tenant");
+ } else {
+ if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
+ }
List<PartitionBean> partitions = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions().get(0).getPartitions();
return partitions.toArray(new PartitionBean[partitions.size()]);
- }
- }
-
- if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ }
+
+ if (!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
//FIXME to parse thr all the NW partitions
List<PartitionBean> partitions = (deploymentPolicyMap.get(tenantId)).
@@ -565,104 +550,100 @@ public class MockContext {
return partitions.toArray(new PartitionBean[partitions.size()]);
}
- public NetworkPartitionBean[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{
- int tenantId = getTenantId();
- if(!deploymentPolicyMap.containsKey(tenantId)){
- if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
- }
- else{
- if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
- }
+ public NetworkPartitionBean[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!deploymentPolicyMap.containsKey(tenantId)) {
+ if (!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No deployment policies have been defined for tenant");
+ } else {
+ if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
+ }
List<NetworkPartitionBean> networkPartitionsList = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions();
return networkPartitionsList.toArray(new NetworkPartitionBean[networkPartitionsList.size()]);
- }
- }
-
- if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ }
+
+ if (!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
List<NetworkPartitionBean> networkPartitionsList = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartitions();
return networkPartitionsList.toArray(new NetworkPartitionBean[networkPartitionsList.size()]);
}
- public AutoscalePolicyBean[] getAutoscalePolicies() throws RestAPIException{
- int tenantId = getTenantId();
- if(!autoscalePolicyMap.containsKey(tenantId) && !autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
+ public AutoscalePolicyBean[] getAutoscalePolicies() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!autoscalePolicyMap.containsKey(tenantId) && !autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)) {
Collection<AutoscalePolicyBean> autoscalePolicies = new HashMap<String, AutoscalePolicyBean>().values();
return autoscalePolicies.toArray(new AutoscalePolicyBean[autoscalePolicies.size()]);
- }
-
- List<AutoscalePolicyBean> autoscalePolicies = new ArrayList<AutoscalePolicyBean>();
-
- if(autoscalePolicyMap.get(tenantId) != null)
- autoscalePolicies.addAll(autoscalePolicyMap.get(tenantId).values());
-
- if(autoscalePolicyMap.get(PUBLIC_DEFINITION) != null)
- autoscalePolicies.addAll(autoscalePolicyMap.get(PUBLIC_DEFINITION).values());
-
- return autoscalePolicies.toArray(new AutoscalePolicyBean[autoscalePolicies.size()]);
- }
-
- public AutoscalePolicyBean getAutoscalePolicies(String autoscalePolicyId) throws RestAPIException{
- int tenantId = getTenantId();
- if(!autoscalePolicyMap.containsKey(tenantId)){
- if(!autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No autoscaling policies have been defined for tenant");
- }
- if(!(autoscalePolicyMap.get(PUBLIC_DEFINITION)).containsKey(autoscalePolicyId)){
- throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
+ }
+
+ List<AutoscalePolicyBean> autoscalePolicies = new ArrayList<AutoscalePolicyBean>();
+
+ if (autoscalePolicyMap.get(tenantId) != null)
+ autoscalePolicies.addAll(autoscalePolicyMap.get(tenantId).values());
+
+ if (autoscalePolicyMap.get(PUBLIC_DEFINITION) != null)
+ autoscalePolicies.addAll(autoscalePolicyMap.get(PUBLIC_DEFINITION).values());
+
+ return autoscalePolicies.toArray(new AutoscalePolicyBean[autoscalePolicies.size()]);
+ }
+
+ public AutoscalePolicyBean getAutoscalePolicies(String autoscalePolicyId) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!autoscalePolicyMap.containsKey(tenantId)) {
+ if (!autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No autoscaling policies have been defined for tenant");
+ }
+ if (!(autoscalePolicyMap.get(PUBLIC_DEFINITION)).containsKey(autoscalePolicyId)) {
+ throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
}
return (autoscalePolicyMap.get(PUBLIC_DEFINITION)).get(autoscalePolicyId);
- }
- else{
- if(!(autoscalePolicyMap.get(tenantId)).containsKey(autoscalePolicyId)){
- throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
+ } else {
+ if (!(autoscalePolicyMap.get(tenantId)).containsKey(autoscalePolicyId)) {
+ throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
}
return (autoscalePolicyMap.get(tenantId)).get(autoscalePolicyId);
- }
+ }
}
- public DeploymentPolicyBean[] getDeploymentPolicies() throws RestAPIException{
- int tenantId = getTenantId();
- if(!deploymentPolicyMap.containsKey(tenantId) && !deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ public DeploymentPolicyBean[] getDeploymentPolicies() throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!deploymentPolicyMap.containsKey(tenantId) && !deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
Collection<DeploymentPolicyBean> depPolicies = new HashMap<String, DeploymentPolicyBean>().values();
return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
- }
-
- List<DeploymentPolicyBean> depPolicies = new ArrayList<DeploymentPolicyBean>();
-
- if(deploymentPolicyMap.get(tenantId) != null)
- depPolicies.addAll(deploymentPolicyMap.get(tenantId).values());
-
- if(deploymentPolicyMap.get(PUBLIC_DEFINITION) != null)
- depPolicies.addAll(deploymentPolicyMap.get(PUBLIC_DEFINITION).values());
-
- return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
- }
-
- public DeploymentPolicyBean getDeploymentPolicies(String deploymentPolicyId) throws RestAPIException{
- int tenantId = getTenantId();
- if(!deploymentPolicyMap.containsKey(tenantId)){
- if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException("No deployment policies have been defined for tenant");
- }
- else{
- if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
- throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
- }
- return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
- }
- }
- else{
- if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
+ }
+
+ List<DeploymentPolicyBean> depPolicies = new ArrayList<DeploymentPolicyBean>();
+
+ if (deploymentPolicyMap.get(tenantId) != null)
+ depPolicies.addAll(deploymentPolicyMap.get(tenantId).values());
+
+ if (deploymentPolicyMap.get(PUBLIC_DEFINITION) != null)
+ depPolicies.addAll(deploymentPolicyMap.get(PUBLIC_DEFINITION).values());
+
+ return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
+ }
+
+ public DeploymentPolicyBean getDeploymentPolicies(String deploymentPolicyId) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!deploymentPolicyMap.containsKey(tenantId)) {
+ if (!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException("No deployment policies have been defined for tenant");
+ } else {
+ if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
+ }
+ } else {
+ if (!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)) {
throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
}
return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId);
- }
+ }
}
-
+
public ApiResponseBean deployService(Object serviceDefinitionBean) {
// int tenantId = getTenantId();
// Map<String,ServiceDefinitionBean> serviceDefinitions;
@@ -693,126 +674,118 @@ public class MockContext {
}
- public PartitionBean[] getPartitions(String deploymentPolicyId, String partitionGroupId) throws RestAPIException{
- int tenantId = getTenantId();
- DeploymentPolicyBean deploymentPolicy;
-
- if(!deploymentPolicyMap.containsKey(tenantId)){
- if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
- }
- else{
- if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ public PartitionBean[] getPartitions(String deploymentPolicyId, String partitionGroupId) throws RestAPIException {
+ int tenantId = getTenantId();
+ DeploymentPolicyBean deploymentPolicy;
+
+ if (!deploymentPolicyMap.containsKey(tenantId)) {
+ if (!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
+ throw new RestAPIException(Status.NO_CONTENT, "No deployment policies have been defined for tenant");
+ } else {
+ if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
+ } else {
+ deploymentPolicy = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
}
- else{
- deploymentPolicy = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
- }
- }
- }
- else{
- if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
- }
- else{
- deploymentPolicy = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId);
- }
- }
-
+ }
+ } else {
+ if (!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)) {
+ throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
+ } else {
+ deploymentPolicy = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId);
+ }
+ }
+
PartitionBean[] partitionsArray = null;
- for(NetworkPartitionBean networkPartition : deploymentPolicy.getNetworkPartitions()){
- if(networkPartition.getId().equals(partitionGroupId)){
- List<PartitionBean> partitions = networkPartition.getPartitions();
- partitionsArray = partitions.toArray(new PartitionBean[partitions.size()]);
- }
- }
- if(partitionsArray == null){
- throw new RestAPIException(Status.NO_CONTENT,"Partition not found");
+ for (NetworkPartitionBean networkPartition : deploymentPolicy.getNetworkPartitions()) {
+ if (networkPartition.getId().equals(partitionGroupId)) {
+ List<PartitionBean> partitions = networkPartition.getPartitions();
+ partitionsArray = partitions.toArray(new PartitionBean[partitions.size()]);
+ }
+ }
+ if (partitionsArray == null) {
+ throw new RestAPIException(Status.NO_CONTENT, "Partition not found");
}
return partitionsArray;
}
-
- public ClusterBean[] getClusters() throws RestAPIException{
+
+ public ClusterBean[] getClusters() throws RestAPIException {
Collection<ClusterBean> clusters = clusterMap.values();
return clusters.toArray(new ClusterBean[clusters.size()]);
}
-
- public DeploymentPolicyBean[] getDeploymentPoliciesForCartridgeType(String cartridgeType) throws RestAPIException{
- int tenantId = getTenantId();
- if(!deploymentPolicyMap.containsKey(tenantId)){
- if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+
+ public DeploymentPolicyBean[] getDeploymentPoliciesForCartridgeType(String cartridgeType) throws RestAPIException {
+ int tenantId = getTenantId();
+ if (!deploymentPolicyMap.containsKey(tenantId)) {
+ if (!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)) {
Collection<DeploymentPolicyBean> depPolicies = new HashMap<String, DeploymentPolicyBean>().values();
return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
- }
- else{
+ } else {
Collection<DeploymentPolicyBean> depPolicies = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).values();
return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
- }
- }
- else{
+ }
+ } else {
Collection<DeploymentPolicyBean> depPolicies = (deploymentPolicyMap.get(tenantId)).values();
return depPolicies.toArray(new DeploymentPolicyBean[depPolicies.size()]);
}
}
-
- public void addUser(UserInfoBean user) {
- int tenantId = getTenantId();
- Map<String, UserInfoBean> users;
-
- if(tenantUserMap.containsKey(tenantId)) {
- users = tenantUserMap.get(tenantId);
- }
- else {
- users = new HashMap<String, UserInfoBean>();
- tenantUserMap.put(tenantId, users);
- }
-
- users.put(user.getUserName(), user);
- }
-
- public void deleteUser(String userName) {
- int tenantId = getTenantId();
- Map<String, UserInfoBean> users;
-
- if(!tenantUserMap.containsKey(tenantId)) {
- return;
- }
-
- users = tenantUserMap.get(tenantId);
- users.remove(userName);
- }
-
- public void updateUser(UserInfoBean user) {
- int tenantId = getTenantId();
- Map<String, UserInfoBean> users;
-
- if(!tenantUserMap.containsKey(tenantId)) {
- return;
- }
-
- users = tenantUserMap.get(tenantId);
- if(users.containsKey(user.getUserName())) {
- users.put(user.getUserName(), user);
- }
- }
-
- public List<UserInfoBean> getAllUsers() {
- int tenantId = getTenantId();
+
+ public void addUser(UserInfoBean user) {
+ int tenantId = getTenantId();
+ Map<String, UserInfoBean> users;
+
+ if (tenantUserMap.containsKey(tenantId)) {
+ users = tenantUserMap.get(tenantId);
+ } else {
+ users = new HashMap<String, UserInfoBean>();
+ tenantUserMap.put(tenantId, users);
+ }
+
+ users.put(user.getUserName(), user);
+ }
+
+ public void deleteUser(String userName) {
+ int tenantId = getTenantId();
+ Map<String, UserInfoBean> users;
+
+ if (!tenantUserMap.containsKey(tenantId)) {
+ return;
+ }
+
+ users = tenantUserMap.get(tenantId);
+ users.remove(userName);
+ }
+
+ public void updateUser(UserInfoBean user) {
+ int tenantId = getTenantId();
+ Map<String, UserInfoBean> users;
+
+ if (!tenantUserMap.containsKey(tenantId)) {
+ return;
+ }
+
+ users = tenantUserMap.get(tenantId);
+ if (users.containsKey(user.getUserName())) {
+ users.put(user.getUserName(), user);
+ }
+ }
+
+ public List<UserInfoBean> getAllUsers() {
+ int tenantId = getTenantId();
List<UserInfoBean> userList = new ArrayList<UserInfoBean>();
-
- if(tenantUserMap.containsKey(tenantId)) {
- userList.addAll(tenantUserMap.get(tenantId).values());
- }
+
+ if (tenantUserMap.containsKey(tenantId)) {
+ userList.addAll(tenantUserMap.get(tenantId).values());
+ }
return userList;
}
-
+
private int getTenantId() {
- String userName = CarbonContext.getThreadLocalCarbonContext().getUsername();
- if (tenantIdMap.containsKey(userName)){
- return tenantIdMap.get(userName);
- }
- else {
- return -1;
- }
+ String userName = CarbonContext.getThreadLocalCarbonContext().getUsername();
+ if (tenantIdMap.containsKey(userName)) {
+ return tenantIdMap.get(userName);
+ } else {
+ return -1;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
index feca47d..e22131c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
@@ -56,7 +56,7 @@ public class StratosApiV40Mock {
@POST
@Path("/init")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public ApiResponseBean initialize ()
+ public ApiResponseBean initialize()
throws RestAPIException {
ApiResponseBean stratosApiResponse = new ApiResponseBean();
@@ -70,7 +70,7 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getCookie(){
+ public Response getCookie() {
HttpSession httpSession = httpServletRequest.getSession(true);//create session if not found
String sessionId = httpSession.getId();
return Response.ok().header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON).
@@ -83,7 +83,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public CartridgeBean[] getAvailableMultiTenantCartridges() throws RestAPIException {
- return MockContext.getInstance().getAvailableMultiTenantCartridges();
+ return MockContext.getInstance().getAvailableMultiTenantCartridges();
}
@GET
@@ -92,7 +92,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public CartridgeBean[] getAvailableSingleTenantCartridges() throws RestAPIException {
- return MockContext.getInstance().getAvailableSingleTenantCartridges();
+ return MockContext.getInstance().getAvailableSingleTenantCartridges();
}
@GET
@@ -101,7 +101,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public CartridgeBean[] getAvailableCartridges() throws RestAPIException {
- return MockContext.getInstance().getAvailableCartridges();
+ return MockContext.getInstance().getAvailableCartridges();
}
@GET
@@ -110,7 +110,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public CartridgeBean[] getSubscribedCartridges() throws RestAPIException {
- return MockContext.getInstance().getSubscribedCartridges();
+ return MockContext.getInstance().getSubscribedCartridges();
}
@POST
@@ -118,8 +118,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response subscribe(Object cartridgeInfoBean) throws RestAPIException{
- throw new RuntimeException("Not implemented");
+ public Response subscribe(Object cartridgeInfoBean) throws RestAPIException {
+ throw new RuntimeException("Not implemented");
}
@@ -137,8 +137,8 @@ public class StratosApiV40Mock {
@Path("/cartridge/unsubscribe")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public ApiResponseBean unsubscribe(String alias) throws RestAPIException{
- return MockContext.getInstance().unsubscribe(alias);
+ public ApiResponseBean unsubscribe(String alias) throws RestAPIException {
+ return MockContext.getInstance().unsubscribe(alias);
}
@POST
@@ -148,7 +148,7 @@ public class StratosApiV40Mock {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public ApiResponseBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException {
- return MockContext.getInstance().addTenant(tenantInfoBean);
+ return MockContext.getInstance().addTenant(tenantInfoBean);
}
@@ -178,7 +178,7 @@ public class StratosApiV40Mock {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public ApiResponseBean deleteTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
- return MockContext.getInstance().deleteTenant(tenantDomain);
+ return MockContext.getInstance().deleteTenant(tenantDomain);
}
@@ -188,7 +188,7 @@ public class StratosApiV40Mock {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public TenantInfoBean[] retrieveTenants() throws RestAPIException {
- return MockContext.getInstance().getTenants();
+ return MockContext.getInstance().getTenants();
}
@GET
@@ -197,8 +197,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public TenantInfoBean[] retrievePartialSearchTenants(@PathParam("domain")String domain) throws RestAPIException {
- return MockContext.getInstance().retrievePartialSearchTenants(domain);
+ public TenantInfoBean[] retrievePartialSearchTenants(@PathParam("domain") String domain) throws RestAPIException {
+ return MockContext.getInstance().retrievePartialSearchTenants(domain);
}
@@ -208,7 +208,7 @@ public class StratosApiV40Mock {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public void activateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
- MockContext.getInstance().activateTenant(tenantDomain);
+ MockContext.getInstance().activateTenant(tenantDomain);
}
@POST
@@ -217,19 +217,19 @@ public class StratosApiV40Mock {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public ApiResponseBean deactivateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
- return MockContext.getInstance().deactivateTenant(tenantDomain);
+ return MockContext.getInstance().deactivateTenant(tenantDomain);
}
- @POST
- @Path("/service/definition")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- @SuperTenantService(true)
- public ApiResponseBean deployService(Object serviceDefinitionBean)
- throws RestAPIException {
- throw new RestAPIException("Not implemented");
- }
+ @POST
+ @Path("/service/definition")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ @SuperTenantService(true)
+ public ApiResponseBean deployService(Object serviceDefinitionBean)
+ throws RestAPIException {
+ throw new RestAPIException("Not implemented");
+ }
@POST
@Path("/cartridge/definition/")
@@ -237,7 +237,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean deployCartridgeDefinition (CartridgeBean cartridgeDefinitionBean)
+ public ApiResponseBean deployCartridgeDefinition(CartridgeBean cartridgeDefinitionBean)
throws RestAPIException {
return MockContext.getInstance().addCartirdgeDefinition(cartridgeDefinitionBean);
}
@@ -248,8 +248,8 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public void unDeployCartridgeDefinition (@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
- MockContext.getInstance().deleteCartridgeDefinition(cartridgeType);
+ public void unDeployCartridgeDefinition(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
+ MockContext.getInstance().deleteCartridgeDefinition(cartridgeType);
}
@GET
@@ -272,14 +272,13 @@ public class StratosApiV40Mock {
}
-
@POST
@Path("/policy/deployment/partition")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean deployPartition (PartitionBean partition)
+ public ApiResponseBean deployPartition(PartitionBean partition)
throws RestAPIException {
return MockContext.getInstance().addPartition(partition);
}
@@ -290,9 +289,9 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean deployAutoscalingPolicyDefintion (AutoscalePolicyBean autoscalePolicy)
+ public ApiResponseBean deployAutoscalingPolicyDefintion(AutoscalePolicyBean autoscalePolicy)
throws RestAPIException {
- return MockContext.getInstance().addAutoScalingPolicyDefinition(autoscalePolicy);
+ return MockContext.getInstance().addAutoScalingPolicyDefinition(autoscalePolicy);
}
@@ -302,9 +301,9 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean deployDeploymentPolicyDefinition (DeploymentPolicyBean deploymentPolicy)
+ public ApiResponseBean deployDeploymentPolicyDefinition(DeploymentPolicyBean deploymentPolicy)
throws RestAPIException {
- throw new RestAPIException("Not supported");
+ throw new RestAPIException("Not supported");
}
@GET
@@ -312,8 +311,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public PartitionBean[] getPartitions () throws RestAPIException {
- return MockContext.getInstance().getPartitions();
+ public PartitionBean[] getPartitions() throws RestAPIException {
+ return MockContext.getInstance().getPartitions();
}
@@ -322,8 +321,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public PartitionBean getPartition (@PathParam("partitionId") String partitionId) throws RestAPIException {
- return MockContext.getInstance().getPartition(partitionId);
+ public PartitionBean getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException {
+ return MockContext.getInstance().getPartition(partitionId);
}
@@ -332,9 +331,9 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public NetworkPartitionBean[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId)
+ public NetworkPartitionBean[] getPartitionGroups(@PathParam("deploymentPolicyId") String deploymentPolicyId)
throws RestAPIException {
- return MockContext.getInstance().getPartitionGroups(deploymentPolicyId);
+ return MockContext.getInstance().getPartitionGroups(deploymentPolicyId);
}
@@ -343,9 +342,9 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public PartitionBean[] getPartitions (@PathParam("deploymentPolicyId") String deploymentPolicyId,
- @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException {
- return MockContext.getInstance().getPartitions(deploymentPolicyId, partitionGroupId);
+ public PartitionBean[] getPartitions(@PathParam("deploymentPolicyId") String deploymentPolicyId,
+ @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException {
+ return MockContext.getInstance().getPartitions(deploymentPolicyId, partitionGroupId);
}
@@ -354,9 +353,9 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public PartitionBean[] getPartitionsOfPolicy (@PathParam("deploymentPolicyId") String deploymentPolicyId)
+ public PartitionBean[] getPartitionsOfPolicy(@PathParam("deploymentPolicyId") String deploymentPolicyId)
throws RestAPIException {
- return MockContext.getInstance().getPartitionsOfPolicy(deploymentPolicyId);
+ return MockContext.getInstance().getPartitionsOfPolicy(deploymentPolicyId);
}
@@ -365,8 +364,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public AutoscalePolicyBean[] getAutoscalePolicies () throws RestAPIException {
- return MockContext.getInstance().getAutoscalePolicies();
+ public AutoscalePolicyBean[] getAutoscalePolicies() throws RestAPIException {
+ return MockContext.getInstance().getAutoscalePolicies();
}
@@ -375,7 +374,7 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public AutoscalePolicyBean getAutoscalePolicies (@PathParam("autoscalePolicyId") String autoscalePolicyId)
+ public AutoscalePolicyBean getAutoscalePolicies(@PathParam("autoscalePolicyId") String autoscalePolicyId)
throws RestAPIException {
return MockContext.getInstance().getAutoscalePolicies(autoscalePolicyId);
@@ -386,8 +385,8 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public DeploymentPolicyBean[] getDeploymentPolicies () throws RestAPIException {
- return MockContext.getInstance().getDeploymentPolicies();
+ public DeploymentPolicyBean[] getDeploymentPolicies() throws RestAPIException {
+ return MockContext.getInstance().getDeploymentPolicies();
}
@@ -396,7 +395,7 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public DeploymentPolicyBean getDeploymentPolicies (@PathParam("deploymentPolicyId") String deploymentPolicyId)
+ public DeploymentPolicyBean getDeploymentPolicies(@PathParam("deploymentPolicyId") String deploymentPolicyId)
throws RestAPIException {
return MockContext.getInstance().getDeploymentPolicies(deploymentPolicyId);
@@ -428,7 +427,7 @@ public class StratosApiV40Mock {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public ClusterBean[] getCluster(@PathParam("cartridgeType") String cartridgeType,
- @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException, RestAPIException {
+ @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException, RestAPIException {
return MockContext.getInstance().getClusters();
}
@@ -447,27 +446,27 @@ public class StratosApiV40Mock {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public DeploymentPolicyBean[] getValidDeploymentPolicies (@PathParam("cartridgeType") String cartridgeType)
+ public DeploymentPolicyBean[] getValidDeploymentPolicies(@PathParam("cartridgeType") String cartridgeType)
throws RestAPIException {
return MockContext.getInstance().getDeploymentPoliciesForCartridgeType(cartridgeType);
}
-
+
@POST
- @Path("/cartridge/sync")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response synchronizeRepository(String alias) throws RestAPIException {
- return Response.noContent().build();
- }
-
+ @Path("/cartridge/sync")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ public Response synchronizeRepository(String alias) throws RestAPIException {
+ return Response.noContent().build();
+ }
+
@POST
@Path("/user")
@Consumes("application/json")
@Produces("application/json")
@AuthorizationAction("/permission/admin/manage/add/users")
public Response addUser(UserInfoBean userInfoBean) throws RestAPIException {
- MockContext.getInstance().addUser(userInfoBean);
+ MockContext.getInstance().addUser(userInfoBean);
URI url = uriInfo.getAbsolutePathBuilder().path(userInfoBean.getUserName()).build();
return Response.created(url).build();
}
@@ -478,7 +477,7 @@ public class StratosApiV40Mock {
@Produces("application/json")
@AuthorizationAction("/permission/admin/manage/add/users")
public Response deleteUser(@PathParam("userName") String userName) throws RestAPIException {
- MockContext.getInstance().deleteUser(userName);
+ MockContext.getInstance().deleteUser(userName);
return Response.noContent().build();
}
@@ -488,7 +487,7 @@ public class StratosApiV40Mock {
@Produces("application/json")
@AuthorizationAction("/permission/admin/manage/add/users")
public Response updateUser(UserInfoBean userInfoBean) throws RestAPIException {
- MockContext.getInstance().updateUser(userInfoBean);
+ MockContext.getInstance().updateUser(userInfoBean);
URI url = uriInfo.getAbsolutePathBuilder().path(userInfoBean.getUserName()).build();
return Response.created(url).build();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
index 2826009..aaf1f5b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
@@ -37,7 +37,7 @@ public class ValidationServiceClient {
private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class);
- public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception{
+ public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception {
String serviceURL = backendServerURL + "OAuth2TokenValidationService";
try {
stub = new OAuth2TokenValidationServiceStub(serviceURL);
@@ -49,8 +49,8 @@ public class ValidationServiceClient {
}
- public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception{
- OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
+ public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception {
+ OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
oauthReq.setAccessToken(accessToken);
oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
try {
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
index 78b4e25..cf538f1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
@@ -36,7 +36,7 @@ public class StratosPrincipal implements Principal {
}
public boolean equals(Object another) {
- return userName.equals((another));
+ return userName.equals((another));
}
public String toString() {