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:04 UTC
[4/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/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 162922c..c716bd7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.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.api;
@@ -92,15 +92,15 @@ public class StratosApiV41Utils {
public static void addCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
try {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
}
- Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
+ Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
cloudControllerServiceClient.addCartridge(cartridgeConfig);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Successfully added cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
}
} catch (Exception e) {
@@ -110,69 +110,69 @@ public class StratosApiV41Utils {
}
}
- public static void updateCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
-
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
- }
-
- Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
- CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
- cloudControllerServiceClient.updateCartridge(cartridgeConfig);
-
- if (log.isDebugEnabled()) {
- log.debug(String.format("Successfully update cartridge: [cartridge-type] %s ",
- cartridgeDefinition.getType()));
- }
- } catch (CloudControllerServiceCartridgeDefinitionNotExistsExceptionException e) {
- String msg = "No cartridge definition exists with this definition.Please use the POST method to add the cartridge";
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (Exception e) {
- String msg = "Could not update cartridge";
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
-
- private static Cartridge createCartridgeConfig(CartridgeBean cartridgeDefinition)
- throws RestAPIException {
- Cartridge cartridgeConfig =
- ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinition);
- if (cartridgeConfig == null) {
- throw new RestAPIException("Could not read cartridge definition, cartridge deployment failed");
- }
- if (StringUtils.isEmpty(cartridgeConfig.getCategory())) {
- throw new RestAPIException(String.format("Category is not specified in cartridge: [cartridge-type] %s",
- cartridgeConfig.getType()));
- }
- return cartridgeConfig;
- }
-
- public static void removeCartridge(String cartridgeType) throws RestAPIException {
+ public static void updateCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
try {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
+ }
+
+ Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
+ CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
+ cloudControllerServiceClient.updateCartridge(cartridgeConfig);
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Successfully update cartridge: [cartridge-type] %s ",
+ cartridgeDefinition.getType()));
+ }
+ } catch (CloudControllerServiceCartridgeDefinitionNotExistsExceptionException e) {
+ String msg = "No cartridge definition exists with this definition.Please use the POST method to add the cartridge";
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (Exception e) {
+ String msg = "Could not update cartridge";
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
+
+ private static Cartridge createCartridgeConfig(CartridgeBean cartridgeDefinition)
+ throws RestAPIException {
+ Cartridge cartridgeConfig =
+ ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinition);
+ if (cartridgeConfig == null) {
+ throw new RestAPIException("Could not read cartridge definition, cartridge deployment failed");
+ }
+ if (StringUtils.isEmpty(cartridgeConfig.getCategory())) {
+ throw new RestAPIException(String.format("Category is not specified in cartridge: [cartridge-type] %s",
+ cartridgeConfig.getType()));
+ }
+ return cartridgeConfig;
+ }
+
+ public static void removeCartridge(String cartridgeType) throws RestAPIException {
+
+ try {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Removing cartridge: [cartridge-type] %s ", cartridgeType));
}
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
- if(cloudControllerServiceClient.getCartridge(cartridgeType) == null) {
+ if (cloudControllerServiceClient.getCartridge(cartridgeType) == null) {
throw new RuntimeException("Cartridge not found: [cartridge-type] " + cartridgeType);
}
-
+
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
-
+
// Validate whether cartridge can be removed
- if(!smServiceClient.canCartridgeBeRemoved(cartridgeType)) {
- String message = "Cannot remove cartridge : [cartridge-type] " + cartridgeType + " since it is used in another cartridge group or an application";
+ if (!smServiceClient.canCartridgeBeRemoved(cartridgeType)) {
+ String message = "Cannot remove cartridge : [cartridge-type] " + cartridgeType + " since it is used in another cartridge group or an application";
log.error(message);
throw new RestAPIException(message);
}
cloudControllerServiceClient.removeCartridge(cartridgeType);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Successfully removed cartridge: [cartridge-type] %s ", cartridgeType));
}
} catch (Exception e) {
@@ -183,38 +183,38 @@ public class StratosApiV41Utils {
}
public static List<CartridgeBean> getCartridgesByFilter(String filter, String criteria, ConfigurationContext configurationContext)
- throws RestAPIException {
- List<CartridgeBean> cartridges = null;
-
- if (filter.equals("singleTenant")) {
- cartridges = getAvailableCartridges(null, false, configurationContext);
- } else if (filter.equals("multiTenant")) {
- cartridges = getAvailableCartridges(null, true, configurationContext);
- } else if (filter.equals("loadBalancer")) {
- cartridges = getAvailableLbCartridges(false, configurationContext);
- } else if (filter.equals("provider")) {
- cartridges = getAvailableCartridgesByProvider(criteria, configurationContext);
- }
-
- return cartridges;
- }
-
- public static CartridgeBean getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
- throws RestAPIException {
- List<CartridgeBean> cartridges = getCartridgesByFilter(filter, null, configurationContext);
-
- for (CartridgeBean cartridge : cartridges) {
- if (cartridge.getType().equals(cartridgeType)) {
- return cartridge;
- }
- }
- String msg = "Unavailable cartridge type: " + cartridgeType;
- log.error(msg);
- throw new RestAPIException(msg);
- }
+ throws RestAPIException {
+ List<CartridgeBean> cartridges = null;
+
+ if (filter.equals("singleTenant")) {
+ cartridges = getAvailableCartridges(null, false, configurationContext);
+ } else if (filter.equals("multiTenant")) {
+ cartridges = getAvailableCartridges(null, true, configurationContext);
+ } else if (filter.equals("loadBalancer")) {
+ cartridges = getAvailableLbCartridges(false, configurationContext);
+ } else if (filter.equals("provider")) {
+ cartridges = getAvailableCartridgesByProvider(criteria, configurationContext);
+ }
+
+ return cartridges;
+ }
+
+ public static CartridgeBean getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
+ throws RestAPIException {
+ List<CartridgeBean> cartridges = getCartridgesByFilter(filter, null, configurationContext);
+
+ for (CartridgeBean cartridge : cartridges) {
+ if (cartridge.getType().equals(cartridgeType)) {
+ return cartridge;
+ }
+ }
+ String msg = "Unavailable cartridge type: " + cartridgeType;
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
private static List<CartridgeBean> getAvailableLbCartridges(Boolean multiTenant,
- ConfigurationContext configurationContext) throws RestAPIException {
+ ConfigurationContext configurationContext) throws RestAPIException {
List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant,
configurationContext);
List<CartridgeBean> lbCartridges = new ArrayList<CartridgeBean>();
@@ -226,74 +226,74 @@ public class StratosApiV41Utils {
return lbCartridges;
}
- /**
- * Get the available cartridges by provider
- * @param provider provide name
- * @param configurationContext configuration context
- * @return List of the cartridge definitions
- * @throws RestAPIException
- */
- private static List<CartridgeBean> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
- List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
-
- if (log.isDebugEnabled()) {
- log.debug("Reading cartridges: [provider-name] " + provider );
- }
-
- try {
- String[] availableCartridges = CloudControllerServiceClient.getInstance().getRegisteredCartridges();
-
- if (availableCartridges != null) {
- for (String cartridgeType : availableCartridges) {
- Cartridge cartridgeInfo = null;
- try {
- cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
- } catch (Exception e) {
- if (log.isWarnEnabled()) {
- log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: "
- + e.getMessage());
- }
- }
- if (cartridgeInfo == null) {
- // This cannot happen. But continue
- if (log.isDebugEnabled()) {
- log.debug("Cartridge Info not found: " + cartridgeType);
- }
- continue;
- }
-
-
- if (!cartridgeInfo.getProvider().equals(provider)) {
- continue;
- }
+ /**
+ * Get the available cartridges by provider
+ * @param provider provide name
+ * @param configurationContext configuration context
+ * @return List of the cartridge definitions
+ * @throws RestAPIException
+ */
+ private static List<CartridgeBean> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Reading cartridges: [provider-name] " + provider);
+ }
+
+ try {
+ String[] availableCartridges = CloudControllerServiceClient.getInstance().getRegisteredCartridges();
+
+ if (availableCartridges != null) {
+ for (String cartridgeType : availableCartridges) {
+ Cartridge cartridgeInfo = null;
+ try {
+ cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
+ } catch (Exception e) {
+ if (log.isWarnEnabled()) {
+ log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: "
+ + e.getMessage());
+ }
+ }
+ if (cartridgeInfo == null) {
+ // This cannot happen. But continue
+ if (log.isDebugEnabled()) {
+ log.debug("Cartridge Info not found: " + cartridgeType);
+ }
+ continue;
+ }
+
+
+ if (!cartridgeInfo.getProvider().equals(provider)) {
+ continue;
+ }
CartridgeBean cartridge = convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
- cartridges.add(cartridge);
- }
- } else {
- if (log.isDebugEnabled()) {
- log.debug("There are no available cartridges");
- }
- }
- } catch (AxisFault axisFault) {
- String errorMsg = String.format(
- "Error while getting CloudControllerServiceClient instance to connect to the Cloud Controller. " +
- "Cause: %s ", axisFault.getMessage());
- log.error(errorMsg, axisFault);
- throw new RestAPIException(errorMsg, axisFault);
- } catch (RemoteException e) {
- String errorMsg =
- String.format("Error while getting cartridge information for provider %s Cause: %s ", provider,
- e.getMessage());
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg, e);
- }
-
- if (log.isDebugEnabled()) {
- log.debug("Returning available cartridges " + cartridges.size());
- }
-
- return cartridges;
+ cartridges.add(cartridge);
+ }
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("There are no available cartridges");
+ }
+ }
+ } catch (AxisFault axisFault) {
+ String errorMsg = String.format(
+ "Error while getting CloudControllerServiceClient instance to connect to the Cloud Controller. " +
+ "Cause: %s ", axisFault.getMessage());
+ log.error(errorMsg, axisFault);
+ throw new RestAPIException(errorMsg, axisFault);
+ } catch (RemoteException e) {
+ String errorMsg =
+ String.format("Error while getting cartridge information for provider %s Cause: %s ", provider,
+ e.getMessage());
+ log.error(errorMsg, e);
+ throw new RestAPIException(errorMsg, e);
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("Returning available cartridges " + cartridges.size());
+ }
+
+ return cartridges;
}
public static List<CartridgeBean> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
@@ -382,7 +382,7 @@ public class StratosApiV41Utils {
public static CartridgeBean getCartridge(String cartridgeType) throws RestAPIException {
try {
Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
- if(cartridgeInfo == null) {
+ if (cartridgeInfo == null) {
return null;
}
return convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
@@ -397,24 +397,22 @@ public class StratosApiV41Utils {
}
}
- public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException {
- try {
- Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
- if (cartridgeInfo == null) {
- return null;
- }
- return convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
- }
- catch(CloudControllerServiceCartridgeNotFoundExceptionException e){
- return null;
- }
- catch (RemoteException e) {
- String message = e.getMessage();
- log.error(message, e);
- throw new RestAPIException(message, e);
- }
+ public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException {
+ try {
+ Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
+ if (cartridgeInfo == null) {
+ return null;
+ }
+ return convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
+ } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
+ return null;
+ } catch (RemoteException e) {
+ String message = e.getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
- }
+ }
private static CartridgeBean convertCartridgeToCartridgeDefinitionBean(Cartridge cartridgeInfo) {
CartridgeBean cartridge = new CartridgeBean();
@@ -433,7 +431,7 @@ public class StratosApiV41Utils {
}
private static PersistenceBean convertPersistenceToPersistenceBean(Persistence persistence) {
- if(persistence == null) {
+ if (persistence == null) {
return null;
}
@@ -445,7 +443,7 @@ public class StratosApiV41Utils {
private static List<VolumeBean> convertVolumesToVolumeBeans(Volume[] volumes) {
List<VolumeBean> list = new ArrayList<VolumeBean>();
- for(Volume volume : volumes) {
+ for (Volume volume : volumes) {
VolumeBean volumeBean = new VolumeBean();
volumeBean.setId(volume.getId());
volumeBean.setDevice(volume.getDevice());
@@ -517,7 +515,7 @@ public class StratosApiV41Utils {
throw new RestAPIException(errorMsg, axisFault);
}
}
-
+
private static StratosManagerServiceClient getStratosManagerServiceClient() throws RestAPIException {
try {
return StratosManagerServiceClient.getInstance();
@@ -555,104 +553,104 @@ public class StratosApiV41Utils {
}
}
}
-
+
public static void addApplicationPolicy(ApplicationPolicyBean applicationPolicyBean) throws RestAPIException {
-
- if (applicationPolicyBean == null) {
- String msg = "Application policy bean is null";
- log.error(msg);
- throw new RestAPIException(msg);
- }
-
- AutoscalerServiceClient serviceClient = getAutoscalerServiceClient();
- try {
- ApplicationPolicy applicationPolicy = ObjectConverter.convertApplicationPolicyBeanToStubAppPolicy(applicationPolicyBean);
- if (applicationPolicy == null) {
- String msg = "Application policy is null";
- log.error(msg);
- throw new RestAPIException(msg);
- }
- serviceClient.addApplicationPolicy(applicationPolicy);
- } catch (RemoteException e) {
- String msg = "Could not add application policy" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
- String msg = "Could not add application policy. Invalid policy. " + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceRemoteExceptionException e) {
- String msg = "Could not add application policy" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException e) {
- String msg = "Could not add application policy. Invalid application policy. " + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
-
+
+ if (applicationPolicyBean == null) {
+ String msg = "Application policy bean is null";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
+ AutoscalerServiceClient serviceClient = getAutoscalerServiceClient();
+ try {
+ ApplicationPolicy applicationPolicy = ObjectConverter.convertApplicationPolicyBeanToStubAppPolicy(applicationPolicyBean);
+ if (applicationPolicy == null) {
+ String msg = "Application policy is null";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+ serviceClient.addApplicationPolicy(applicationPolicy);
+ } catch (RemoteException e) {
+ String msg = "Could not add application policy" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
+ String msg = "Could not add application policy. Invalid policy. " + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceRemoteExceptionException e) {
+ String msg = "Could not add application policy" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException e) {
+ String msg = "Could not add application policy. Invalid application policy. " + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
+
public static void updateApplicationPolicy(ApplicationPolicyBean applicationPolicyBean) throws RestAPIException {
log.info(String.format("Updating application policy: [id] %s", applicationPolicyBean.getId()));
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
-
- ApplicationPolicy applicationPolicy = ObjectConverter.convertApplicationPolicyBeanToStubAppPolicy(applicationPolicyBean);
+
+ ApplicationPolicy applicationPolicy = ObjectConverter.convertApplicationPolicyBeanToStubAppPolicy(applicationPolicyBean);
try {
- autoscalerServiceClient.updateApplicationPolicy(applicationPolicy);
- } catch (RemoteException e) {
- String msg = "Could not update application policy" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceApplicatioinPolicyNotExistsExceptionException e) {
- String msg = "Could not update application policy. Application policy not exists" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceRemoteExceptionException e) {
- String msg = "Could not update application policy" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException e) {
- String msg = "Could not update application policy. Invalid application policy" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
- }
-
+ autoscalerServiceClient.updateApplicationPolicy(applicationPolicy);
+ } catch (RemoteException e) {
+ String msg = "Could not update application policy" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceApplicatioinPolicyNotExistsExceptionException e) {
+ String msg = "Could not update application policy. Application policy not exists" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceRemoteExceptionException e) {
+ String msg = "Could not update application policy" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException e) {
+ String msg = "Could not update application policy. Invalid application policy" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
+ }
+
public static ApplicationPolicyBean[] getApplicationPolicies() throws RestAPIException {
- ApplicationPolicy[] applicationPolicies = null;
+ ApplicationPolicy[] applicationPolicies = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
try {
- applicationPolicies = autoscalerServiceClient.getApplicationPolicies();
- } catch (RemoteException e) {
- String msg = "Could not get application policies" + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
+ applicationPolicies = autoscalerServiceClient.getApplicationPolicies();
+ } catch (RemoteException e) {
+ String msg = "Could not get application policies" + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
}
return ObjectConverter.convertASStubApplicationPoliciesToApplicationPolicies(applicationPolicies);
}
-
+
public static ApplicationPolicyBean getApplicationPolicy(String applicationPolicyId) throws RestAPIException {
-
- if (applicationPolicyId == null) {
- String msg = "Application policy bean id null";
- log.error(msg);
- throw new RestAPIException(msg);
- }
-
- if (StringUtils.isBlank(applicationPolicyId)) {
- String msg = "Application policy id is empty";
- log.error(msg);
- throw new RestAPIException(msg);
- }
-
+
+ if (applicationPolicyId == null) {
+ String msg = "Application policy bean id null";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
+ if (StringUtils.isBlank(applicationPolicyId)) {
+ String msg = "Application policy id is empty";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
try {
AutoscalerServiceClient serviceClient = AutoscalerServiceClient.getInstance();
ApplicationPolicy applicationPolicy = serviceClient.getApplicationPolicy(applicationPolicyId);
@@ -663,33 +661,33 @@ public class StratosApiV41Utils {
throw new RuntimeException(message, e);
}
}
-
+
public static void removeApplicationPolicy(String applicationPolicyId) throws RestAPIException {
-
- if (applicationPolicyId == null) {
- String msg = "Application policy bean id null";
- log.error(msg);
- throw new RestAPIException(msg);
- }
-
- if (StringUtils.isBlank(applicationPolicyId)) {
- String msg = "Application policy id is empty";
- log.error(msg);
- throw new RestAPIException(msg);
- }
-
- AutoscalerServiceClient serviceClient = getAutoscalerServiceClient();
- try {
- serviceClient.removeApplicationPolicy(applicationPolicyId);
- } catch (RemoteException e) {
- String msg = "Could not remove application policy. " + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
- String msg = "Could not update application policy. " + e.getLocalizedMessage();
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
+
+ if (applicationPolicyId == null) {
+ String msg = "Application policy bean id null";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
+ if (StringUtils.isBlank(applicationPolicyId)) {
+ String msg = "Application policy id is empty";
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
+ AutoscalerServiceClient serviceClient = getAutoscalerServiceClient();
+ try {
+ serviceClient.removeApplicationPolicy(applicationPolicyId);
+ } catch (RemoteException e) {
+ String msg = "Could not remove application policy. " + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
+ String msg = "Could not update application policy. " + e.getLocalizedMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
}
public static void updateAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException {
@@ -715,25 +713,25 @@ public class StratosApiV41Utils {
}
}
- public static void removeAutoscalingPolicy(String autoscalePolicyId) throws RestAPIException {
+ public static void removeAutoscalingPolicy(String autoscalePolicyId) throws RestAPIException {
- log.info(String.format("Removing autoscaling policy: [id] %s", autoscalePolicyId));
+ log.info(String.format("Removing autoscaling policy: [id] %s", autoscalePolicyId));
- AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
- if (autoscalerServiceClient != null) {
+ AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
+ if (autoscalerServiceClient != null) {
- try {
- autoscalerServiceClient.removeAutoscalingPolicy(autoscalePolicyId);
- } catch (RemoteException e) {
- log.error(e.getMessage(), e);
- throw new RestAPIException(e.getMessage(), e);
- } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
- String message = e.getFaultMessage().getInvalidPolicyException().getMessage();
- log.error(message, e);
- throw new RestAPIException(message, e);
- }
- }
- }
+ try {
+ autoscalerServiceClient.removeAutoscalingPolicy(autoscalePolicyId);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
+ String message = e.getFaultMessage().getInvalidPolicyException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
+ }
+ }
public static AutoscalePolicyBean[] getAutoScalePolicies() throws RestAPIException {
@@ -791,7 +789,7 @@ public class StratosApiV41Utils {
if (serviceGroupDefinition == null) {
throw new RuntimeException("Service Group definition is null");
}
-
+
List<String> cartridgeTypes = new ArrayList<String>();
String[] cartridgeNames = null;
List<String> groupNames = null;
@@ -799,7 +797,7 @@ public class StratosApiV41Utils {
// if any cartridges are specified in the group, they should be already deployed
if (serviceGroupDefinition.getCartridges() != null) {
-
+
if (log.isDebugEnabled()) {
log.debug("checking cartridges in cartridge group " + serviceGroupDefinition.getName());
}
@@ -819,9 +817,9 @@ public class StratosApiV41Utils {
}
CloudControllerServiceClient ccServiceClient = getCloudControllerServiceClient();
-
+
cartridgeNames = new String[cartridgeTypes.size()];
- int i=0;
+ int i = 0;
for (String cartridgeType : cartridgeTypes) {
try {
if (ccServiceClient.getCartridge(cartridgeType) == null) {
@@ -829,8 +827,8 @@ public class StratosApiV41Utils {
log.error("invalid cartridge found in cartridge group " + cartridgeType);
throw new RestAPIException("No Cartridge Definition found with type " + cartridgeType);
} else {
- cartridgeNames[i] = cartridgeType;
- i++;
+ cartridgeNames[i] = cartridgeType;
+ i++;
}
} catch (RemoteException e) {
throw new RestAPIException(e);
@@ -849,7 +847,7 @@ public class StratosApiV41Utils {
List<GroupBean> groupDefinitions = serviceGroupDefinition.getGroups();
groupNames = new ArrayList<String>();
cartridgeGroupNames = new String[groupDefinitions.size()];
- int i=0;
+ int i = 0;
for (GroupBean groupList : groupDefinitions) {
groupNames.add(groupList.getName());
cartridgeGroupNames[i] = groupList.getName();
@@ -867,20 +865,20 @@ public class StratosApiV41Utils {
log.debug("duplicate subGroups defined: " + buf.toString());
}
throw new RestAPIException("Invalid Service Group definition, duplicate subGroups defined:" + buf.toString());
- }
+ }
}
ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(serviceGroupDefinition);
AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
asServiceClient.addServiceGroup(serviceGroup);
-
+
// Add cartridge group elements to SM cache - done after service group has been added
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
- if(cartridgeTypes != null) {
- smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroupDefinition.getName(), cartridgeNames);
+ if (cartridgeTypes != null) {
+ smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroupDefinition.getName(), cartridgeNames);
}
-
+
} catch (Exception e) {
String message = "Could not add cartridge group";
log.error(message, e);
@@ -960,79 +958,79 @@ public class StratosApiV41Utils {
if (log.isDebugEnabled()) {
log.debug("Removing cartridge group: [name] " + name);
}
-
+
AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
-
+
// Check whether cartridge group exists
- if(asServiceClient.getServiceGroup(name) == null) {
- String message = "Cartridge group: [group-name] " + name + " cannot be removed since it does not exist";
+ if (asServiceClient.getServiceGroup(name) == null) {
+ String message = "Cartridge group: [group-name] " + name + " cannot be removed since it does not exist";
log.error(message);
throw new RestAPIException(message);
}
-
+
// Validate whether cartridge group can be removed
- if(!smServiceClient.canCartirdgeGroupBeRemoved(name)) {
- String message = "Cannot remove cartridge group: [group-name] " + name + " since it is used in another cartridge group or an application";
+ if (!smServiceClient.canCartirdgeGroupBeRemoved(name)) {
+ String message = "Cannot remove cartridge group: [group-name] " + name + " since it is used in another cartridge group or an application";
log.error(message);
throw new RestAPIException(message);
}
-
+
ServiceGroup serviceGroup = asServiceClient.getServiceGroup(name);
-
+
asServiceClient.undeployServiceGroupDefinition(name);
-
+
// Remove the dependent cartridges and cartridge groups from Stratos Manager cache - done after service group has been removed
if (serviceGroup.getCartridges() != null) {
- List<String> cartridgeList = new ArrayList<String>();
- findCartridgesInServiceGroup(serviceGroup, cartridgeList);
- String[] cartridgeNames = cartridgeList.toArray(new String[cartridgeList.size()]);
- smServiceClient.removeUsedCartridgesInCartridgeGroups(name, cartridgeNames);
+ List<String> cartridgeList = new ArrayList<String>();
+ findCartridgesInServiceGroup(serviceGroup, cartridgeList);
+ String[] cartridgeNames = cartridgeList.toArray(new String[cartridgeList.size()]);
+ smServiceClient.removeUsedCartridgesInCartridgeGroups(name, cartridgeNames);
}
-
+
} catch (Exception e) {
throw new RestAPIException(e);
}
log.info("Successfully removed the cartridge group: [group-name] " + name);
}
-
+
private static void findCartridgesInServiceGroup(ServiceGroup serviceGroup, List<String> cartridges) {
-
- if (serviceGroup == null || cartridges == null) {
- return;
- }
-
- for (String cartridge : serviceGroup.getCartridges()) {
- if (!cartridges.contains(cartridge)) {
- cartridges.add(cartridge);
- }
- }
-
- if (serviceGroup.getGroups() != null) {
- for (ServiceGroup seGroup : serviceGroup.getGroups()) {
- findCartridgesInServiceGroup(seGroup, cartridges);
- }
- }
- }
-
+
+ if (serviceGroup == null || cartridges == null) {
+ return;
+ }
+
+ for (String cartridge : serviceGroup.getCartridges()) {
+ if (!cartridges.contains(cartridge)) {
+ cartridges.add(cartridge);
+ }
+ }
+
+ if (serviceGroup.getGroups() != null) {
+ for (ServiceGroup seGroup : serviceGroup.getGroups()) {
+ findCartridgesInServiceGroup(seGroup, cartridges);
+ }
+ }
+ }
+
private static void findCartridgesInGroupBean(GroupBean groupBean, List<String> cartridges) {
-
- if (groupBean == null || cartridges == null) {
- return;
- }
-
- for (String cartridge : groupBean.getCartridges()) {
- if (!cartridges.contains(cartridge)) {
- cartridges.add(cartridge);
- }
- }
-
- if (groupBean.getGroups() != null) {
- for (GroupBean seGroup : groupBean.getGroups()) {
- findCartridgesInGroupBean(seGroup, cartridges);
- }
- }
+
+ if (groupBean == null || cartridges == null) {
+ return;
+ }
+
+ for (String cartridge : groupBean.getCartridges()) {
+ if (!cartridges.contains(cartridge)) {
+ cartridges.add(cartridge);
+ }
+ }
+
+ if (groupBean.getGroups() != null) {
+ for (GroupBean seGroup : groupBean.getGroups()) {
+ findCartridgesInGroupBean(seGroup, cartridges);
+ }
+ }
}
// Util methods for Applications
@@ -1046,14 +1044,14 @@ public class StratosApiV41Utils {
* @throws RestAPIException
*/
public static void addApplication(ApplicationBean appDefinition, ConfigurationContext ctxt,
- String userName, String tenantDomain)
+ String userName, String tenantDomain)
throws RestAPIException {
- if (StringUtils.isBlank(appDefinition.getApplicationId())) {
- String message = "Please specify the application name";
- log.error(message);
- throw new RestAPIException(message);
- }
+ if (StringUtils.isBlank(appDefinition.getApplicationId())) {
+ String message = "Please specify the application name";
+ log.error(message);
+ throw new RestAPIException(message);
+ }
// check if an application with same id already exists
try {
if (AutoscalerServiceClient.getInstance().getApplication(appDefinition.getApplicationId()) != null) {
@@ -1064,7 +1062,7 @@ public class StratosApiV41Utils {
throw new RestAPIException("Could not read application", e);
}
- validateApplication(appDefinition);
+ validateApplication(appDefinition);
ApplicationContext applicationContext = ObjectConverter.convertApplicationDefinitionToStubApplicationContext(appDefinition);
applicationContext.setTenantId(ApplicationManagementUtil.getTenantId(ctxt));
@@ -1084,99 +1082,99 @@ public class StratosApiV41Utils {
try {
AutoscalerServiceClient.getInstance().addApplication(applicationContext);
-
+
List<String> usedCartridges = new ArrayList<String>();
List<String> usedCartridgeGroups = new ArrayList<String>();
findCartridgesAndGroupsInApplication(appDefinition, usedCartridges, usedCartridgeGroups);
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
smServiceClient.addUsedCartridgesInApplications(appDefinition.getApplicationId(), usedCartridges.toArray(new String[usedCartridges.size()]));
smServiceClient.addUsedCartridgeGroupsInApplications(appDefinition.getApplicationId(), usedCartridgeGroups.toArray(new String[usedCartridgeGroups.size()]));
-
+
} catch (AutoscalerServiceApplicationDefinitionExceptionException e) {
throw new RestAPIException(e);
} catch (RemoteException e) {
throw new RestAPIException(e);
}
}
-
+
private static void findCartridgesAndGroupsInApplication(ApplicationBean applicationBean, List<String> cartridges, List<String> cartridgeGroups) {
-
- if (applicationBean == null || applicationBean.getComponents() == null) {
- return;
- }
-
- ComponentBean componentBean = applicationBean.getComponents();
-
- List<GroupReferenceBean> groupReferenceBeans = componentBean.getGroups();
- if (groupReferenceBeans != null) {
- for (GroupReferenceBean groupReferenceBean : groupReferenceBeans) {
- findCartridgesAndGroupsInCartridgeGroup(groupReferenceBean, cartridges, cartridgeGroups);
- }
- }
-
- List<CartridgeReferenceBean> cartridgeReferenceBeans = componentBean.getCartridges();
- findCartridgeNamesInCartridges(cartridgeReferenceBeans, cartridges);
- }
-
+
+ if (applicationBean == null || applicationBean.getComponents() == null) {
+ return;
+ }
+
+ ComponentBean componentBean = applicationBean.getComponents();
+
+ List<GroupReferenceBean> groupReferenceBeans = componentBean.getGroups();
+ if (groupReferenceBeans != null) {
+ for (GroupReferenceBean groupReferenceBean : groupReferenceBeans) {
+ findCartridgesAndGroupsInCartridgeGroup(groupReferenceBean, cartridges, cartridgeGroups);
+ }
+ }
+
+ List<CartridgeReferenceBean> cartridgeReferenceBeans = componentBean.getCartridges();
+ findCartridgeNamesInCartridges(cartridgeReferenceBeans, cartridges);
+ }
+
private static void findCartridgesAndGroupsInCartridgeGroup(GroupReferenceBean groupReferenceBean, List<String> cartridges, List<String> cartridgeGroups) {
-
- if (groupReferenceBean == null || cartridgeGroups == null) {
- return;
- }
-
- if (!cartridgeGroups.contains(groupReferenceBean.getName())) {
- cartridgeGroups.add(groupReferenceBean.getName());
- }
-
- if (groupReferenceBean.getGroups() != null) {
- for (GroupReferenceBean grReferenceBean : groupReferenceBean.getGroups()) {
- findCartridgesAndGroupsInCartridgeGroup(grReferenceBean, cartridges, cartridgeGroups);
- findCartridgeNamesInCartridges(groupReferenceBean.getCartridges(), cartridges);
- }
- }
-
- findCartridgeNamesInCartridges(groupReferenceBean.getCartridges(), cartridges);
- }
-
+
+ if (groupReferenceBean == null || cartridgeGroups == null) {
+ return;
+ }
+
+ if (!cartridgeGroups.contains(groupReferenceBean.getName())) {
+ cartridgeGroups.add(groupReferenceBean.getName());
+ }
+
+ if (groupReferenceBean.getGroups() != null) {
+ for (GroupReferenceBean grReferenceBean : groupReferenceBean.getGroups()) {
+ findCartridgesAndGroupsInCartridgeGroup(grReferenceBean, cartridges, cartridgeGroups);
+ findCartridgeNamesInCartridges(groupReferenceBean.getCartridges(), cartridges);
+ }
+ }
+
+ findCartridgeNamesInCartridges(groupReferenceBean.getCartridges(), cartridges);
+ }
+
private static void findCartridgeNamesInCartridges(List<CartridgeReferenceBean> cartridgeReferenceBeans, List<String> cartridges) {
-
- if (cartridgeReferenceBeans == null || cartridges == null) {
- return;
- }
-
- for (CartridgeReferenceBean cartridgeReferenceBean : cartridgeReferenceBeans) {
- if (cartridgeReferenceBean != null && !cartridges.contains(cartridgeReferenceBean.getType())) {
- cartridges.add(cartridgeReferenceBean.getType());
- }
- }
- }
-
- private static void validateApplication(ApplicationBean appDefinition) throws RestAPIException {
-
- if(StringUtils.isBlank(appDefinition.getAlias())){
- String message ="Please specify the application alias";
- log.error(message);
- throw new RestAPIException(message);
- }
- }
-
- /**
- * Deploy application with an application policy.
- *
- * @param applicationId
- * @param applicationPolicyId
- * @throws RestAPIException
- */
+
+ if (cartridgeReferenceBeans == null || cartridges == null) {
+ return;
+ }
+
+ for (CartridgeReferenceBean cartridgeReferenceBean : cartridgeReferenceBeans) {
+ if (cartridgeReferenceBean != null && !cartridges.contains(cartridgeReferenceBean.getType())) {
+ cartridges.add(cartridgeReferenceBean.getType());
+ }
+ }
+ }
+
+ private static void validateApplication(ApplicationBean appDefinition) throws RestAPIException {
+
+ if (StringUtils.isBlank(appDefinition.getAlias())) {
+ String message = "Please specify the application alias";
+ log.error(message);
+ throw new RestAPIException(message);
+ }
+ }
+
+ /**
+ * Deploy application with an application policy.
+ *
+ * @param applicationId
+ * @param applicationPolicyId
+ * @throws RestAPIException
+ */
public static void deployApplication(String applicationId, String applicationPolicyId)
throws RestAPIException {
- if(StringUtils.isEmpty(applicationPolicyId)) {
+ if (StringUtils.isEmpty(applicationPolicyId)) {
String message = "Application policy id is Empty";
log.error(message);
throw new RestAPIException(message);
}
- if(StringUtils.isEmpty(applicationPolicyId)) {
+ if (StringUtils.isEmpty(applicationPolicyId)) {
String message = "Application policy id is Empty";
log.error(message);
throw new RestAPIException(message);
@@ -1196,7 +1194,7 @@ public class StratosApiV41Utils {
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
ApplicationContext application = autoscalerServiceClient.getApplication(applicationId);
- if(application == null) {
+ if (application == null) {
String message = String.format("Application is not found: [application-id] %s", applicationId);
log.error(message);
throw new RestAPIException(message);
@@ -1240,7 +1238,7 @@ public class StratosApiV41Utils {
throw new RestAPIException(message, e);
}
}
-
+
public static ApplicationNetworkPartitionIdListBean getApplicationNetworkPartitions(String applicationId) {
try {
AutoscalerServiceClient serviceClient = AutoscalerServiceClient.getInstance();
@@ -1255,42 +1253,42 @@ public class StratosApiV41Utils {
}
}
- /**
- * Validate deployment policy
- * @param deploymentPolicy
- */
- private static void validateDeploymentPolicy(DeploymentPolicyBean deploymentPolicy) throws RestAPIException {
- if(StringUtils.isBlank(deploymentPolicy.getId())){
- String message = "No deployment policy id specify with the policy";
- log.error(message);
- throw new RestAPIException(message);
- }
- if(deploymentPolicy.getNetworkPartitions().size()==0){
- String message="No network partitions specify with the policy";
- log.error(message);
- throw new RestAPIException(message);
- }
+ /**
+ * Validate deployment policy
+ * @param deploymentPolicy
+ */
+ private static void validateDeploymentPolicy(DeploymentPolicyBean deploymentPolicy) throws RestAPIException {
+ if (StringUtils.isBlank(deploymentPolicy.getId())) {
+ String message = "No deployment policy id specify with the policy";
+ log.error(message);
+ throw new RestAPIException(message);
+ }
+ if (deploymentPolicy.getNetworkPartitions().size() == 0) {
+ String message = "No network partitions specify with the policy";
+ log.error(message);
+ throw new RestAPIException(message);
+ }
- }
+ }
- public static void removeApplication(String applicationId) throws RestAPIException {
+ public static void removeApplication(String applicationId) throws RestAPIException {
try {
log.info(String.format("Starting to remove application [application-id %s", applicationId));
- AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
-
- ApplicationBean application = ObjectConverter.convertStubApplicationContextToApplicationDefinition(asServiceClient.getApplication(applicationId));
- asServiceClient.deleteApplication(applicationId);
-
+ AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
+
+ ApplicationBean application = ObjectConverter.convertStubApplicationContextToApplicationDefinition(asServiceClient.getApplication(applicationId));
+ asServiceClient.deleteApplication(applicationId);
+
List<String> usedCartridges = new ArrayList<String>();
List<String> usedCartridgeGroups = new ArrayList<String>();
findCartridgesAndGroupsInApplication(application, usedCartridges, usedCartridgeGroups);
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
smServiceClient.removeUsedCartridgesInApplications(application.getApplicationId(), usedCartridges.toArray(new String[usedCartridges.size()]));
smServiceClient.removeUsedCartridgeGroupsInApplications(application.getApplicationId(), usedCartridgeGroups.toArray(new String[usedCartridgeGroups.size()]));
-
+
} catch (RemoteException e) {
String message = "Could not delete application: [application-id] " + applicationId;
log.error(message, e);
@@ -1313,9 +1311,9 @@ public class StratosApiV41Utils {
try {
List<ApplicationBean> applicationDefinitions = new ArrayList<ApplicationBean>();
ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications();
- if(applicationContexts != null) {
+ if (applicationContexts != null) {
for (ApplicationContext applicationContext : applicationContexts) {
- if(applicationContext != null) {
+ if (applicationContext != null) {
ApplicationBean applicationDefinition =
ObjectConverter.convertStubApplicationContextToApplicationDefinition(applicationContext);
applicationDefinitions.add(applicationDefinition);
@@ -1332,12 +1330,12 @@ public class StratosApiV41Utils {
public static void undeployApplication(String applicationId, boolean force) throws RestAPIException {
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
- if(force){
- if(log.isDebugEnabled()){
+ if (force) {
+ if (log.isDebugEnabled()) {
log.debug("Forcefully undeploying application [application-id] " + applicationId);
}
- }else{
- if(log.isDebugEnabled()){
+ } else {
+ if (log.isDebugEnabled()) {
log.debug("Gracefully undeploying application [application-id] " + applicationId);
}
}
@@ -1355,7 +1353,7 @@ public class StratosApiV41Utils {
}
}
}
-
+
public static ApplicationInfoBean[] getApplicationRuntimes() {
List<ApplicationInfoBean> applicationBeanList = new ArrayList<ApplicationInfoBean>();
try {
@@ -1363,7 +1361,7 @@ public class StratosApiV41Utils {
ApplicationInfoBean applicationInfoBean;
for (Application application : ApplicationManager.getApplications().getApplications().values()) {
applicationInfoBean = ObjectConverter.convertApplicationToApplicationBean(application);
- for(ApplicationInstanceBean instanceBean : applicationInfoBean.getApplicationInstances()) {
+ for (ApplicationInstanceBean instanceBean : applicationInfoBean.getApplicationInstances()) {
addClustersInstancesToApplicationInstanceBean(instanceBean, application);
addGroupsInstancesToApplicationInstanceBean(instanceBean, application);
}
@@ -1385,7 +1383,7 @@ public class StratosApiV41Utils {
return null;
}
applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application);
- for(ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
+ for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
addClustersInstancesToApplicationInstanceBean(instanceBean, application);
addGroupsInstancesToApplicationInstanceBean(instanceBean, application);
}
@@ -1398,11 +1396,11 @@ public class StratosApiV41Utils {
private static void addGroupsInstancesToApplicationInstanceBean(ApplicationInstanceBean applicationInstanceBean,
Application application) {
Collection<Group> groups = application.getGroups();
- if(groups != null && !groups.isEmpty()) {
+ if (groups != null && !groups.isEmpty()) {
for (Group group : groups) {
List<GroupInstanceBean> groupInstanceBeans = ObjectConverter.convertGroupToGroupInstancesBean(
applicationInstanceBean.getInstanceId(), group);
- for(GroupInstanceBean groupInstanceBean : groupInstanceBeans) {
+ for (GroupInstanceBean groupInstanceBean : groupInstanceBeans) {
setSubGroupInstances(group, groupInstanceBean);
applicationInstanceBean.getGroupInstances().add(groupInstanceBean);
}
@@ -1411,10 +1409,10 @@ public class StratosApiV41Utils {
}
- private static void addClustersInstancesToApplicationInstanceBean(ApplicationInstanceBean applicationInstanceBean,Application application) {
+ private static void addClustersInstancesToApplicationInstanceBean(ApplicationInstanceBean applicationInstanceBean, Application application) {
Map<String, ClusterDataHolder> topLevelClusterDataMap = application.getClusterDataMap();
- if(topLevelClusterDataMap != null) {
+ if (topLevelClusterDataMap != null) {
for (Map.Entry<String, ClusterDataHolder> entry : topLevelClusterDataMap.entrySet()) {
ClusterDataHolder clusterDataHolder = entry.getValue();
String clusterId = clusterDataHolder.getClusterId();
@@ -1426,9 +1424,9 @@ public class StratosApiV41Utils {
applicationInstanceBean.getClusterInstances().add(ObjectConverter.
convertClusterToClusterInstanceBean(applicationInstanceBean.getInstanceId(),
cluster, entry.getKey()));
- } finally {
- TopologyManager.releaseReadLockForCluster(serviceType, clusterId);
- }
+ } finally {
+ TopologyManager.releaseReadLockForCluster(serviceType, clusterId);
+ }
}
}
}
@@ -1437,7 +1435,7 @@ public class StratosApiV41Utils {
GroupInstanceBean groupInstanceBean,
Group group) {
Map<String, ClusterDataHolder> topLevelClusterDataMap = group.getClusterDataMap();
- if(topLevelClusterDataMap != null && !topLevelClusterDataMap.isEmpty()) {
+ if (topLevelClusterDataMap != null && !topLevelClusterDataMap.isEmpty()) {
for (Map.Entry<String, ClusterDataHolder> entry : topLevelClusterDataMap.entrySet()) {
ClusterDataHolder clusterDataHolder = entry.getValue();
String clusterId = clusterDataHolder.getClusterId();
@@ -1459,12 +1457,12 @@ public class StratosApiV41Utils {
private static void setSubGroupInstances(Group group, GroupInstanceBean groupInstanceBean) {
Collection<Group> subgroups = group.getGroups();
addClustersInstancesToGroupInstanceBean(groupInstanceBean, group);
- if(subgroups != null && !subgroups.isEmpty()) {
+ if (subgroups != null && !subgroups.isEmpty()) {
for (Group subGroup : subgroups) {
List<GroupInstanceBean> groupInstanceBeans = ObjectConverter.
convertGroupToGroupInstancesBean(groupInstanceBean.getInstanceId(),
subGroup);
- for(GroupInstanceBean groupInstanceBean1 : groupInstanceBeans) {
+ for (GroupInstanceBean groupInstanceBean1 : groupInstanceBeans) {
setSubGroupInstances(subGroup, groupInstanceBean1);
groupInstanceBean.getGroupInstances().add(groupInstanceBean1);
}
@@ -1475,7 +1473,7 @@ public class StratosApiV41Utils {
}
// Util methods for Kubernetes clusters
-
+
public static boolean addKubernetesCluster(KubernetesClusterBean kubernetesClusterBean) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
@@ -1692,31 +1690,31 @@ public class StratosApiV41Utils {
}
public static void addApplicationSignUp(String applicationId, ApplicationSignUpBean applicationSignUpBean) throws RestAPIException {
- if(StringUtils.isBlank(applicationId)) {
+ if (StringUtils.isBlank(applicationId)) {
throw new RestAPIException("Application id is null");
}
ApplicationBean applicationBean = getApplication(applicationId);
Application application = ApplicationManager.getApplications().getApplication(applicationId);
- if((applicationBean == null) || (application == null)) {
+ if ((applicationBean == null) || (application == null)) {
throw new RestAPIException("Application not found: [application-id] " + applicationId);
}
- if(!APPLICATION_STATUS_DEPLOYED.equals(applicationBean.getStatus())) {
+ if (!APPLICATION_STATUS_DEPLOYED.equals(applicationBean.getStatus())) {
throw new RestAPIException("Application has not been deployed: [application-id] " + applicationId);
}
- if(!applicationBean.isMultiTenant()) {
+ if (!applicationBean.isMultiTenant()) {
throw new RestAPIException("Application signups cannot be added to single-tenant applications");
}
- if(applicationSignUpBean == null) {
+ if (applicationSignUpBean == null) {
throw new RestAPIException("Application signup is null");
}
try {
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Adding applicationBean signup: [application-id] %s", applicationId));
}
@@ -1735,13 +1733,13 @@ public class StratosApiV41Utils {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.addApplicationSignUp(applicationSignUp);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Application signup added successfully: [application-id] %s [tenant-id] %d",
applicationId, tenantId));
}
serviceClient.notifyArtifactUpdatedEventForSignUp(applicationId, tenantId);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Artifact updated event sent: [application-id] %s [tenant-id] %d",
applicationId, tenantId));
}
@@ -1759,7 +1757,7 @@ public class StratosApiV41Utils {
*/
private static List<String> findApplicationClusterIds(Application application) {
List<String> clusterIds = new ArrayList<String>();
- for(ClusterDataHolder clusterDataHolder : application.getClusterDataRecursively()) {
+ for (ClusterDataHolder clusterDataHolder : application.getClusterDataRecursively()) {
clusterIds.add(clusterDataHolder.getClusterId());
}
return clusterIds;
@@ -1790,16 +1788,16 @@ public class StratosApiV41Utils {
}
public static ApplicationSignUpBean getApplicationSignUp(String applicationId) throws RestAPIException {
- if(StringUtils.isBlank(applicationId)) {
+ if (StringUtils.isBlank(applicationId)) {
throw new RestAPIException("Application id is null");
}
ApplicationBean application = getApplication(applicationId);
- if(application == null) {
+ if (application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
- if(!application.isMultiTenant()) {
+ if (!application.isMultiTenant()) {
throw new RestAPIException("Application singups not available for single-tenant applications");
}
@@ -1808,7 +1806,7 @@ public class StratosApiV41Utils {
try {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
ApplicationSignUp applicationSignUp = serviceClient.getApplicationSignUp(applicationId, tenantId);
- if(applicationSignUp != null) {
+ if (applicationSignUp != null) {
return ObjectConverter.convertStubApplicationSignUpToApplicationSignUpBean(applicationSignUp);
}
return null;
@@ -1821,16 +1819,16 @@ public class StratosApiV41Utils {
}
public static void removeApplicationSignUp(String applicationId) throws RestAPIException {
- if(StringUtils.isBlank(applicationId)) {
+ if (StringUtils.isBlank(applicationId)) {
throw new RestAPIException("Application id is null");
}
ApplicationBean application = getApplication(applicationId);
- if(application == null) {
+ if (application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
- if(!application.isMultiTenant()) {
+ if (!application.isMultiTenant()) {
throw new RestAPIException("Application singups not available for single-tenant applications");
}
@@ -1840,7 +1838,7 @@ public class StratosApiV41Utils {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.removeApplicationSignUp(applicationId, tenantId);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Application signup removed successfully: [application-id] %s" +
"[tenant-id] %d", applicationId, tenantId));
}
@@ -1853,16 +1851,16 @@ public class StratosApiV41Utils {
}
public static List<ApplicationSignUpBean> getApplicationSignUps(String applicationId) throws RestAPIException {
- if(StringUtils.isBlank(applicationId)) {
+ if (StringUtils.isBlank(applicationId)) {
throw new RestAPIException("Application id is null");
}
ApplicationBean application = getApplication(applicationId);
- if(application == null) {
+ if (application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
- if(!application.isMultiTenant()) {
+ if (!application.isMultiTenant()) {
throw new RestAPIException("Application singups not available for single-tenant applications");
}
@@ -1870,9 +1868,9 @@ public class StratosApiV41Utils {
List<ApplicationSignUpBean> applicationSignUpBeans = new ArrayList<ApplicationSignUpBean>();
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
ApplicationSignUp[] applicationSignUps = serviceClient.getApplicationSignUps(applicationId);
- if(applicationSignUps != null) {
- for(ApplicationSignUp applicationSignUp : applicationSignUps) {
- if(applicationSignUp != null) {
+ if (applicationSignUps != null) {
+ for (ApplicationSignUp applicationSignUp : applicationSignUps) {
+ if (applicationSignUp != null) {
ApplicationSignUpBean applicationSignUpBean =
ObjectConverter.convertStubApplicationSignUpToApplicationSignUpBean(applicationSignUp);
applicationSignUpBeans.add(applicationSignUpBean);
@@ -1892,10 +1890,10 @@ public class StratosApiV41Utils {
try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
- if(domainMapppingsBean.getDomainMappings() != null) {
+ if (domainMapppingsBean.getDomainMappings() != null) {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
- for(DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
+ for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
ClusterDataHolder clusterDataHolder = findClusterDataHolder(applicationId, domainMappingBean.getCartridgeAlias());
DomainMapping domainMapping = ObjectConverter.convertDomainMappingBeanToStubDomainMapping(domainMappingBean);
@@ -1905,9 +1903,9 @@ public class StratosApiV41Utils {
domainMapping.setClusterId(clusterDataHolder.getClusterId());
serviceClient.addDomainMapping(domainMapping);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping added: [application-id] %s [tenant-id] %d " +
- "[domain-name] %s [context-path] %s", applicationId, tenantId,
+ "[domain-name] %s [context-path] %s", applicationId, tenantId,
domainMapping.getDomainName(), domainMapping.getContextPath()));
}
}
@@ -1921,12 +1919,12 @@ public class StratosApiV41Utils {
private static ClusterDataHolder findClusterDataHolder(String applicationId, String cartridgeAlias) {
Application application = ApplicationManager.getApplications().getApplication(applicationId);
- if(application == null) {
+ if (application == null) {
throw new RuntimeException(String.format("Application not found: [application-id] %s", applicationId));
}
ClusterDataHolder clusterDataHolder = application.getClusterData(cartridgeAlias);
- if(clusterDataHolder == null) {
+ if (clusterDataHolder == null) {
throw new RuntimeException(String.format("Cluster data not found for cartridge alias: [application-id] %s " +
"[cartridge-alias] %s", applicationId, cartridgeAlias));
}
@@ -1940,12 +1938,12 @@ public class StratosApiV41Utils {
try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
- if(domainMapppingsBean.getDomainMappings() != null) {
+ if (domainMapppingsBean.getDomainMappings() != null) {
- for(DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
+ for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
serviceClient.removeDomainMapping(applicationId, tenantId, domainMappingBean.getDomainName());
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " +
"[domain-name] %s", applicationId, tenantId,
domainMappingBean.getDomainName()));
@@ -1965,9 +1963,9 @@ public class StratosApiV41Utils {
List<DomainMappingBean> domainMappingsBeans = new ArrayList<DomainMappingBean>();
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
DomainMapping[] domainMappings = serviceClient.getDomainMappings(applicationId, tenantId);
- if(domainMappings != null) {
- for(DomainMapping domainMapping : domainMappings) {
- if(domainMapping != null) {
+ if (domainMappings != null) {
+ for (DomainMapping domainMapping : domainMappings) {
+ if (domainMapping != null) {
DomainMappingBean domainMappingBean = ObjectConverter.convertStubDomainMappingToDomainMappingBean(domainMapping);
domainMappingsBeans.add(domainMappingBean);
}
@@ -2032,7 +2030,7 @@ public class StratosApiV41Utils {
CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance();
serviceClient.updateNetworkPartition(ObjectConverter.
convertNetworkPartitionToCCStubNetworkPartition(networkPartition));
- }catch (Exception e) {
+ } catch (Exception e) {
String message = String.format("Could not update network partition: [network-partition-id] %s,",
networkPartition.getId());
log.error(message);
@@ -2040,18 +2038,18 @@ public class StratosApiV41Utils {
}
}
- /**
- * Add deployment policy
- *
- * @param deployementPolicyDefinitionBean DeploymentPolicyBean
- */
- public static void addDeploymentPolicy(DeploymentPolicyBean deployementPolicyDefinitionBean)
- throws RestAPIException {
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format("Adding deployment policy: [deployment-policy-id] %s ",
- deployementPolicyDefinitionBean.getId()));
- }
+ /**
+ * Add deployment policy
+ *
+ * @param deployementPolicyDefinitionBean DeploymentPolicyBean
+ */
+ public static void addDeploymentPolicy(DeploymentPolicyBean deployementPolicyDefinitionBean)
+ throws RestAPIException {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Adding deployment policy: [deployment-policy-id] %s ",
+ deployementPolicyDefinitionBean.getId()));
+ }
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
@@ -2063,30 +2061,30 @@ public class StratosApiV41Utils {
deployementPolicyDefinitionBean.getId()));
}
} catch (AutoscalerServiceDeploymentPolicyNotExistsExceptionException e) {
- String msg =
- "Deployment policy already exist [Deployment-policy-id]" + deployementPolicyDefinitionBean.getId();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (Exception e) {
- String msg = "Could not add deployment policy";
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
-
- /**
- * Get deployment policy by deployment policy id
- * @param deploymentPolicyID deployment policy id
- * @return {@link DeploymentPolicyBean}
- */
- public static DeploymentPolicyBean getDeployementPolicy(String deploymentPolicyID) throws RestAPIException {
+ String msg =
+ "Deployment policy already exist [Deployment-policy-id]" + deployementPolicyDefinitionBean.getId();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (Exception e) {
+ String msg = "Could not add deployment policy";
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
+
+ /**
+ * Get deployment policy by deployment policy id
+ * @param deploymentPolicyID deployment policy id
+ * @return {@link DeploymentPolicyBean}
+ */
+ public static DeploymentPolicyBean getDeployementPolicy(String deploymentPolicyID) throws RestAPIException {
DeploymentPolicyBean deploymentPolicyBean = null;
try {
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy
= AutoscalerServiceClient.getInstance().getDeploymentPolicy(deploymentPolicyID);
- if(deploymentPolicy == null) {
+ if (deploymentPolicy == null) {
return null;
}
deploymentPolicyBean = ObjectConverter.convetCCStubDeploymentPolicytoDeploymentPolicy(deploymentPolicy);
@@ -2115,60 +2113,59 @@ public class StratosApiV41Utils {
}
}
- /**
- * Update deployement policy
- * @param deploymentPolicyDefinitionBean DeploymentPolicyBean
- * @throws RestAPIException
- */
- public static void updateDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefinitionBean)
- throws RestAPIException {
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format("Adding deployment policy: [deployment-policy-id] %s ",
- deploymentPolicyDefinitionBean.getId()));
- }
+ /**
+ * Update deployement policy
+ * @param deploymentPolicyDefinitionBean DeploymentPolicyBean
+ * @throws RestAPIException
+ */
+ public static void updateDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefinitionBean)
+ throws RestAPIException {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Adding deployment policy: [deployment-policy-id] %s ",
+ deploymentPolicyDefinitionBean.getId()));
+ }
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
ObjectConverter.convertToASDeploymentPolicy(deploymentPolicyDefinitionBean);
AutoscalerServiceClient.getInstance().updateDeploymentPolicy(deploymentPolicy);
- if (log.isDebugEnabled()) {
- log.debug(String.format("DeploymentPolicy updates successfully : [deployment-policy-id] %s ",
- deploymentPolicyDefinitionBean.getId()));
- }
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("DeploymentPolicy updates successfully : [deployment-policy-id] %s ",
+ deploymentPolicyDefinitionBean.getId()));
+ }
} catch (AutoscalerServiceDeploymentPolicyNotExistsExceptionException e) {
- String msg =
- "Deployment policy already exist [Deployment-policy-id]" + deploymentPolicyDefinitionBean.getId();
- log.error(msg, e);
- throw new RestAPIException(msg);
- } catch (Exception e) {
- String msg = "Could not add deployment policy";
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
-
- /**
- * Remove deployment policy
- * @param deploymentPolicyID Deployment policy ID
- * @throws RestAPIException
- */
- public static void removeDeploymentPolicy(String deploymentPolicyID)
- throws RestAPIException {
- try {
+ String msg =
+ "Deployment policy already exist [Deployment-policy-id]" + deploymentPolicyDefinitionBean.getId();
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ } catch (Exception e) {
+ String msg = "Could not add deployment policy";
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
+
+ /**
+ * Remove deployment policy
+ * @param deploymentPolicyID Deployment policy ID
+ * @throws RestAPIException
+ */
+ public static void removeDeploymentPolicy(String deploymentPolicyID)
+ throws RestAPIException {
+ try {
AutoscalerServiceClient.getInstance().removeDeploymentPolicy(deploymentPolicyID);
- }
- catch(Exception e){
- String msg = "Could not remove deployment policy";
- log.error(msg, e);
- throw new RestAPIException(msg);
- }
- }
+ } catch (Exception e) {
+ String msg = "Could not remove deployment policy";
+ log.error(msg, e);
+ throw new RestAPIException(msg);
+ }
+ }
public static ClusterBean getClusterInfo(String clusterId) throws RestAPIException {
- if(StringUtils.isEmpty(clusterId)){
+ if (StringUtils.isEmpty(clusterId)) {
throw new RestAPIException("Cluster Id can not be empty");
}
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/context/AuthenticationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/context/AuthenticationContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/context/AuthenticationContext.java
index a5cab41..9efaf94 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/context/AuthenticationContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/context/AuthenticationContext.java
@@ -20,7 +20,7 @@ package org.apache.stratos.rest.endpoint.context;/*
public class AuthenticationContext {
// maintaining the authenticated state in threadLocal. We want to skip subsequent authentication handlers
// once a request get authenticated by a handler.
- private static final ThreadLocal<Boolean> authenticated = new ThreadLocal<Boolean>(){
+ private static final ThreadLocal<Boolean> authenticated = new ThreadLocal<Boolean>() {
@Override
protected Boolean initialValue() {
return false;
@@ -28,11 +28,11 @@ public class AuthenticationContext {
};
- public static boolean isAthenticated(){
+ public static boolean isAthenticated() {
return authenticated.get();
}
- public static void setAuthenticated(boolean isAuthenticated){
+ public static void setAuthenticated(boolean isAuthenticated) {
authenticated.set(isAuthenticated);
}
}
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/exception/RestAPIException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/RestAPIException.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/RestAPIException.java
index f10d2a2..3edca99 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/RestAPIException.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/RestAPIException.java
@@ -37,7 +37,7 @@ public class RestAPIException extends Exception {
this.message = message;
}
- public RestAPIException(Response.Status httpStatusCode,String message, Throwable cause) {
+ public RestAPIException(Response.Status httpStatusCode, String message, Throwable cause) {
super(message, cause);
this.message = message;
this.httpStatusCode = httpStatusCode;
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/handlers/AbstractAuthenticationAuthorizationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/AbstractAuthenticationAuthorizationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/AbstractAuthenticationAuthorizationHandler.java
index 1209860..e3f8550 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/AbstractAuthenticationAuthorizationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/AbstractAuthenticationAuthorizationHandler.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.handlers;
@@ -36,12 +36,12 @@ public abstract class AbstractAuthenticationAuthorizationHandler implements Requ
public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
HttpHeaders headers = new HttpHeadersImpl(message);
List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Executing " + this.getClass());
}
- if(!AuthenticationContext.isAthenticated() && authHeader != null && authHeader.size() > 0 &&
- canHandle(authHeader.get(0).trim().split(" ")[0])){
- return handle(message,classResourceInfo);
+ if (!AuthenticationContext.isAthenticated() && authHeader != null && authHeader.size() > 0 &&
+ canHandle(authHeader.get(0).trim().split(" ")[0])) {
+ return handle(message, classResourceInfo);
}
// give the control to the next handler
return null;
@@ -49,5 +49,5 @@ public abstract class AbstractAuthenticationAuthorizationHandler implements Requ
protected abstract boolean canHandle(String authHeaderPrefix);
- protected abstract Response handle(Message message,ClassResourceInfo classResourceInfo);
+ protected abstract Response handle(Message message, ClassResourceInfo classResourceInfo);
}