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:01 UTC
[1/6] stratos git commit: Formatting rest endpoint component code
Repository: stratos
Updated Branches:
refs/heads/master 367f91a13 -> 169909a57
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/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 4e6f1d7..f12d270 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -64,10 +64,10 @@ public class ObjectConverter {
public static Cartridge convertCartridgeBeanToStubCartridgeConfig(
CartridgeBean cartridgeBean) {
-
- if (cartridgeBean == null) {
- return null;
- }
+
+ if (cartridgeBean == null) {
+ return null;
+ }
Cartridge cartridgeConfig = new Cartridge();
@@ -115,10 +115,10 @@ public class ObjectConverter {
}
private static PortMapping[] convertPortMappingBeansToStubPortMappings(List<PortMappingBean> portMappingBeans) {
-
- if (portMappingBeans == null) {
- return null;
- }
+
+ if (portMappingBeans == null) {
+ return null;
+ }
//convert to an array
PortMappingBean[] portMappingBeanArray = new PortMappingBean[portMappingBeans.size()];
@@ -137,10 +137,10 @@ public class ObjectConverter {
}
private static IaasConfig[] convertIaasProviderBeansToStubIaasConfig(List<IaasProviderBean> iaasProviderBeans) {
-
- if (iaasProviderBeans == null) {
- return null;
- }
+
+ if (iaasProviderBeans == null) {
+ return null;
+ }
//convert to an array
IaasProviderBean[] iaasProviderBeansArray = new IaasProviderBean[iaasProviderBeans.size()];
@@ -175,11 +175,11 @@ public class ObjectConverter {
public static Persistence convertPersistenceBeanToStubPersistence(
org.apache.stratos.common.beans.cartridge.PersistenceBean persistenceBean) {
-
- if (persistenceBean == null) {
- return null;
- }
-
+
+ if (persistenceBean == null) {
+ return null;
+ }
+
Persistence persistence = new Persistence();
persistence.setPersistenceRequired(true);
VolumeBean[] volumeBean = new VolumeBean[persistenceBean.getVolume().size()];
@@ -207,11 +207,11 @@ public class ObjectConverter {
public static Properties convertPropertyBeansToProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
-
- if (propertyBeans == null) {
- return null;
- }
-
+
+ if (propertyBeans == null) {
+ return null;
+ }
+
org.apache.stratos.common.beans.cartridge.PropertyBean[] propertyBeansArray
= new org.apache.stratos.common.beans.cartridge.PropertyBean[propertyBeans.size()];
propertyBeans.toArray(propertyBeansArray);
@@ -231,7 +231,7 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.Properties convertPropertyBeansToCCStubProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
-
+
if (propertyBeans == null) {
return null;
}
@@ -259,7 +259,7 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.Properties convertProperyBeansToStubProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
-
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -285,11 +285,11 @@ public class ObjectConverter {
private static NetworkInterfaces convertNetworkInterfaceBeansToNetworkInterfaces(
List<NetworkInterfaceBean> networkInterfaceBeans) {
-
- if (networkInterfaceBeans == null) {
- return null;
- }
-
+
+ if (networkInterfaceBeans == null) {
+ return null;
+ }
+
NetworkInterface[] networkInterfacesArray = new NetworkInterface[networkInterfaceBeans.size()];
int i = 0;
@@ -313,10 +313,10 @@ public class ObjectConverter {
private static FloatingNetworks convertFloatingNetworkBeansToFloatingNetworks(
List<FloatingNetworkBean> floatingNetworkBeans) {
-
- if (floatingNetworkBeans == null) {
- return null;
- }
+
+ if (floatingNetworkBeans == null) {
+ return null;
+ }
FloatingNetwork[] floatingNetworksArray = new FloatingNetwork[floatingNetworkBeans.size()];
@@ -336,10 +336,10 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.domain.Partition convertPartitionToStubPartition
(PartitionBean partition) {
-
- if (partition == null) {
- return null;
- }
+
+ if (partition == null) {
+ return null;
+ }
org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition = new
org.apache.stratos.cloud.controller.stub.domain.Partition();
@@ -347,16 +347,16 @@ public class ObjectConverter {
stubPartition.setId(partition.getId());
stubPartition.setPartitionMax(partition.getPartitionMax());
stubPartition.setProperties(convertPropertyBeansToCCStubProperties(partition.getProperty()));
-
+
return stubPartition;
}
public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo(
AutoscalePolicyBean autoscalePolicyBean) {
-
- if (autoscalePolicyBean == null) {
- return null;
- }
+
+ if (autoscalePolicyBean == null) {
+ return null;
+ }
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = new
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy();
@@ -464,7 +464,7 @@ public class ObjectConverter {
}
public static org.apache.stratos.autoscaler.stub.Properties getASProperties(List<PropertyBean> propertyBeans) {
-
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -489,7 +489,7 @@ public class ObjectConverter {
public static org.apache.stratos.autoscaler.stub.Properties getASPropertiesFromCommonProperties(
List<org.apache.stratos.common.beans.PropertyBean> propertyBeans) {
-
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -514,7 +514,7 @@ public class ObjectConverter {
}
public static org.apache.stratos.cloud.controller.stub.Properties getCCProperties(List<PropertyBean> propertyBeans) {
-
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -539,7 +539,7 @@ public class ObjectConverter {
}
private static PartitionBean convertCCStubPartitionToPartition(org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition) {
-
+
if (stubPartition == null) {
return null;
}
@@ -551,7 +551,7 @@ public class ObjectConverter {
if (stubPartition.getProperties() != null) {
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeanList
= new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>();
- if(stubPartition.getProperties().getProperties() != null){
+ if (stubPartition.getProperties().getProperties() != null) {
for (org.apache.stratos.cloud.controller.stub.Property stubProperty :
stubPartition.getProperties().getProperties()) {
if (stubProperty != null) {
@@ -607,6 +607,7 @@ public class ObjectConverter {
return networkPartitionBeans;
}
+
public static List<NetworkPartitionBean> convertASStubNetwotkPartitionsToNetworkPartitions(
org.apache.stratos.autoscaler.stub.partition.NetworkPartition[] networkPartitions) {
@@ -797,6 +798,7 @@ public class ObjectConverter {
return partitionBeans;
}
+
private static List<PartitionBean> convertASStubPartitionsToPartitions(
org.apache.stratos.autoscaler.stub.partition.Partition[] partitions) {
@@ -1346,7 +1348,7 @@ public class ObjectConverter {
subscribableInfo.setArtifactRepository(artifactRepository);
}
- if (subscribableInfoContext.getPersistenceContext() != null){
+ if (subscribableInfoContext.getPersistenceContext() != null) {
PersistenceContext persistenceContext = subscribableInfoContext.getPersistenceContext();
PersistenceBean persistenceBean = new PersistenceBean();
@@ -1361,7 +1363,7 @@ public class ObjectConverter {
private static List<VolumeBean> convertStubVolumeToVolume(VolumeContext[] volumes) {
List<VolumeBean> volumeBeans = new ArrayList<VolumeBean>();
- for(VolumeContext volumeContext: volumes){
+ for (VolumeContext volumeContext : volumes) {
VolumeBean volumeBean = new VolumeBean();
volumeBean.setRemoveOnTermination(volumeContext.getRemoveOntermination());
@@ -1398,10 +1400,10 @@ public class ObjectConverter {
private static CartridgeContext[] convertCartridgeReferenceBeansToStubCartridgeContexts(
List<CartridgeReferenceBean> cartridges) {
-
- if (cartridges == null) {
- return null;
- }
+
+ if (cartridges == null) {
+ return null;
+ }
CartridgeContext[] cartridgeContextArray = new CartridgeContext[cartridges.size()];
int i = 0;
@@ -1418,10 +1420,10 @@ public class ObjectConverter {
}
private static SubscribableInfoContext convertSubscribableInfo(SubscribableInfo subscribableInfo) {
-
- if (subscribableInfo == null) {
- return null;
- }
+
+ if (subscribableInfo == null) {
+ return null;
+ }
SubscribableInfoContext infoContext = new SubscribableInfoContext();
infoContext.setAlias(subscribableInfo.getAlias());
@@ -1443,7 +1445,7 @@ public class ObjectConverter {
infoContext.setArtifactRepositoryContext(artifactRepositoryContext);
}
- if (subscribableInfo.getPersistence() != null){
+ if (subscribableInfo.getPersistence() != null) {
PersistenceBean persistenceBean = subscribableInfo.getPersistence();
PersistenceContext persistenceContext = new PersistenceContext();
@@ -1457,13 +1459,13 @@ public class ObjectConverter {
}
private static VolumeContext[] convertVolumeToStubVolume(List<VolumeBean> volumes) {
-
- if (volumes == null) {
- return null;
- }
+
+ if (volumes == null) {
+ return null;
+ }
List<VolumeContext> volumeContexts = new ArrayList<VolumeContext>();
- for(VolumeBean volumeBean: volumes){
+ for (VolumeBean volumeBean : volumes) {
VolumeContext volumeContext = new VolumeContext();
volumeContext.setRemoveOntermination(volumeBean.isRemoveOnTermination());
@@ -1472,7 +1474,7 @@ public class ObjectConverter {
volumeContext.setDevice(volumeBean.getDevice());
// When volumeId is specified, volume size is not relavent.
- if(volumeBean.getSize() != null){
+ if (volumeBean.getSize() != null) {
volumeContext.setSize(Integer.parseInt(volumeBean.getSize()));
}
@@ -1500,11 +1502,11 @@ public class ObjectConverter {
private static DependencyContext convertDependencyDefinitionsToDependencyContexts(DependencyBean dependencyDefinitions) {
-
- if (dependencyDefinitions == null) {
- return null;
- }
-
+
+ if (dependencyDefinitions == null) {
+ return null;
+ }
+
DependencyContext dependencyContext = new DependencyContext();
dependencyContext.setTerminationBehaviour(dependencyDefinitions.getTerminationBehaviour());
@@ -1525,10 +1527,10 @@ public class ObjectConverter {
private static org.apache.stratos.autoscaler.stub.pojo.GroupContext[]
convertGroupDefinitionsToStubGroupContexts(List<GroupReferenceBean> groupDefinitions) {
-
- if (groupDefinitions == null) {
- return null;
- }
+
+ if (groupDefinitions == null) {
+ return null;
+ }
GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()];
int i = 0;
@@ -1545,11 +1547,11 @@ public class ObjectConverter {
if (groupDefinition.getGroups() != null) {
groupContext.setGroupContexts(convertGroupDefinitionsToStubGroupContexts(groupDefinition.getGroups()));
}
-
+
// Cartridges
if (groupDefinition.getCartridges() != null) {
- groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(groupDefinition.getCartridges()));
- }
+ groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(groupDefinition.getCartridges()));
+ }
groupContexts[i++] = groupContext;
}
return groupContexts;
@@ -1557,7 +1559,7 @@ public class ObjectConverter {
public static ApplicationInfoBean convertApplicationToApplicationBean(Application application) {
-
+
if (application == null) {
return null;
}
@@ -1573,7 +1575,7 @@ public class ObjectConverter {
}
public static ApplicationInfoBean convertApplicationToApplicationInstanceBean(Application application) {
-
+
if (application == null) {
return null;
}
@@ -1592,11 +1594,11 @@ public class ObjectConverter {
private static List<ApplicationInstanceBean> convertApplicationInstancesToApplicationInstances(
Application application) {
-
- if (application == null) {
- return null;
- }
-
+
+ if (application == null) {
+ return null;
+ }
+
List<ApplicationInstanceBean> applicationInstanceList = new ArrayList<ApplicationInstanceBean>();
Collection<ApplicationInstance> applicationInstancesInTopology =
application.getInstanceIdToInstanceContextMap().values();
@@ -1654,11 +1656,11 @@ public class ObjectConverter {
}
private static List<InstanceBean> convertGroupInstancesToInstances(Group group) {
-
- if (group == null) {
- return null;
- }
-
+
+ if (group == null) {
+ return null;
+ }
+
List<InstanceBean> instanceList = new ArrayList<InstanceBean>();
Collection<GroupInstance> instancesInTopology = group.getInstanceIdToInstanceContextMap().values();
if (instancesInTopology != null) {
@@ -1719,11 +1721,11 @@ public class ObjectConverter {
public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(GroupBean serviceGroupDefinition)
throws ServiceGroupDefinitionException {
-
- if (serviceGroupDefinition == null) {
- return null;
- }
-
+
+ if (serviceGroupDefinition == null) {
+ return null;
+ }
+
ServiceGroup servicegroup = new ServiceGroup();
// implement conversion (mostly List -> Array)
servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled());
@@ -1845,10 +1847,10 @@ public class ObjectConverter {
}
public static ApplicationSignUp convertApplicationSignUpBeanToStubApplicationSignUp(ApplicationSignUpBean applicationSignUpBean) {
-
- if (applicationSignUpBean == null) {
- return null;
- }
+
+ if (applicationSignUpBean == null) {
+ return null;
+ }
ApplicationSignUp applicationSignUp = new ApplicationSignUp();
if (applicationSignUpBean.getArtifactRepositories() != null) {
@@ -1872,10 +1874,10 @@ public class ObjectConverter {
}
public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(ApplicationSignUp applicationSignUp) {
-
- if (applicationSignUp == null) {
- return null;
- }
+
+ if (applicationSignUp == null) {
+ return null;
+ }
ApplicationSignUpBean applicationSignUpBean = new ApplicationSignUpBean();
if (applicationSignUp.getArtifactRepositories() != null) {
@@ -1899,11 +1901,11 @@ public class ObjectConverter {
}
public static DomainMapping convertDomainMappingBeanToStubDomainMapping(DomainMappingBean domainMappingBean) {
-
- if (domainMappingBean == null) {
- return null;
- }
-
+
+ if (domainMappingBean == null) {
+ return null;
+ }
+
DomainMapping domainMapping = new DomainMapping();
domainMapping.setDomainName(domainMappingBean.getDomainName());
domainMapping.setContextPath(domainMappingBean.getContextPath());
@@ -1911,11 +1913,11 @@ public class ObjectConverter {
}
public static DomainMappingBean convertStubDomainMappingToDomainMappingBean(DomainMapping domainMapping) {
-
- if (domainMapping == null) {
- return null;
- }
-
+
+ if (domainMapping == null) {
+ return null;
+ }
+
DomainMappingBean domainMappingBean = new DomainMappingBean();
domainMappingBean.setDomainName(domainMapping.getDomainName());
domainMappingBean.setContextPath(domainMapping.getContextPath());
@@ -1923,11 +1925,11 @@ public class ObjectConverter {
}
public static DeploymentPolicyBean convetCCStubDeploymentPolicytoDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
-
- if (deploymentPolicy == null) {
- return null;
- }
-
+
+ if (deploymentPolicy == null) {
+ return null;
+ }
+
DeploymentPolicyBean deploymentPolicyBean = new DeploymentPolicyBean();
deploymentPolicyBean.setId(deploymentPolicy.getDeploymentPolicyID());
deploymentPolicyBean.setNetworkPartitions(convertASStubNetwotkPartitionsToNetworkPartitions(
@@ -2041,7 +2043,7 @@ public class ObjectConverter {
}
org.apache.stratos.autoscaler.stub.partition.Partition stubPartition = new
- org.apache.stratos.autoscaler.stub.partition.Partition();
+ org.apache.stratos.autoscaler.stub.partition.Partition();
stubPartition.setId(partition.getId());
stubPartition.setPartitionMax(partition.getPartitionMax());
@@ -2050,10 +2052,6 @@ public class ObjectConverter {
}
-
-
-
-
private static org.apache.stratos.autoscaler.stub.partition.Partition[] convertToASStubPartitions
(List<PartitionBean> partitionList) {
@@ -2067,8 +2065,6 @@ public class ObjectConverter {
}
-
-
public static org.apache.stratos.autoscaler.stub.partition.NetworkPartition[] convertNetworkPartitionToASStubNetworkPartition(
List<NetworkPartitionBean> networkPartitionBean) {
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/util/type/list/ListType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/list/ListType.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/list/ListType.java
index 4d567fd..9bc3a79 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/list/ListType.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/list/ListType.java
@@ -28,7 +28,7 @@ public class ListType<T> {
private List<T> list;
- @XmlElement(name="Item")
+ @XmlElement(name = "Item")
public List<T> getList() {
return list;
}
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/util/type/map/MapAdapter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapAdapter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapAdapter.java
index cf701e8..0b704ec 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapAdapter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapAdapter.java
@@ -23,14 +23,14 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.util.HashMap;
import java.util.Map;
-public class MapAdapter<S, T> extends XmlAdapter<MapType,Map<S, T>> {
+public class MapAdapter<S, T> extends XmlAdapter<MapType, Map<S, T>> {
@Override
public MapType marshal(Map<S, T> v) throws Exception {
MapType mapType = new MapType();
- for(Map.Entry entry : v.entrySet()) {
+ for (Map.Entry entry : v.entrySet()) {
MapEntryType myMapEntryType = new MapEntryType();
myMapEntryType.key = entry.getKey();
myMapEntryType.value = entry.getValue();
@@ -44,7 +44,7 @@ public class MapAdapter<S, T> extends XmlAdapter<MapType,Map<S, T>> {
Map hashMap = new HashMap();
- for(MapEntryType mapEntryType : v.entry) {
+ for (MapEntryType mapEntryType : v.entry) {
hashMap.put(mapEntryType.key, mapEntryType.value);
}
return hashMap;
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/util/type/map/MapEntryType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapEntryType.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapEntryType.java
index 7d88a2d..6bcc4a4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapEntryType.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/type/map/MapEntryType.java
@@ -22,7 +22,7 @@ package org.apache.stratos.rest.endpoint.util.type.map;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlValue;
-public class MapEntryType <S,T> {
+public class MapEntryType<S, T> {
@XmlAttribute
public S key;
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
index fdecda7..244bbef 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
@@ -37,8 +37,8 @@
<ref bean="genericExceptionHandler"/>
<ref bean="badRequestExceptionHandler"/>
<ref bean="jsonProvider"/>
- <ref bean="throwableExceptionHandler"/>
- <ref bean="basicAuthenticationFilter"/>
+ <ref bean="throwableExceptionHandler"/>
+ <ref bean="basicAuthenticationFilter"/>
<bean class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="dropRootElement" value="true"/>
<property name="supportUnwrapped" value="true"/>
@@ -52,8 +52,10 @@
<bean id="exceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomExceptionMapper"/>
<bean id="badRequestExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.BadRequestExceptionMapper"/>
<bean id="genericExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.GenericExceptionMapper"/>
- <bean id="throwableExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
- <bean id="componentSynrhronizerHandler" class="org.apache.stratos.rest.endpoint.handlers.ComponentSynchronizerHandler"/>
+ <bean id="throwableExceptionHandler"
+ class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
+ <bean id="componentSynrhronizerHandler"
+ class="org.apache.stratos.rest.endpoint.handlers.ComponentSynchronizerHandler"/>
<!--The below config enables OAuth based authentication/authorization for REST API-->
<bean id="OAuthFilter" class="org.apache.stratos.rest.endpoint.handlers.OAuthHandler">
<property name="password" value="admin"/>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
index 9e919c9..66f5c10 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
@@ -56,9 +56,12 @@
<xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false">
<xs:complexType>
<xs:all>
- <xs:element name="requestsInFlight" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="memoryConsumption" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="loadAverage" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="requestsInFlight" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="memoryConsumption" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="loadAverage" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -87,10 +90,14 @@
<xs:element name="partition" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
- <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1"
+ nillable="false"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"
+ nillable="true"/>
+ <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -111,7 +118,8 @@
<xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="defaultAutoscalingPolicy" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="defaultAutoscalingPolicy" type="xs:string" minOccurs="0" maxOccurs="1"
+ nillable="false"/>
<xs:element name="multiTenant" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="portMapping" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
@@ -130,15 +138,18 @@
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
<xs:element name="networkInterfaces" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="networkUuid" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="networkUuid" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -152,8 +163,10 @@
<xs:element name="property" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -205,19 +218,20 @@
</xs:all>
</xs:complexType>
</xs:element>
-
+
<xs:element name="subscriptionDomainRequest">
<xs:complexType>
<xs:sequence>
- <xs:element name="domains" type="subscriptionDomain" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="domains" type="subscriptionDomain" minOccurs="1" maxOccurs="unbounded"
+ nillable="false"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:complexType name="subscriptionDomain">
<xs:all>
- <xs:element name="domainName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="applicationContext" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="domainName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="applicationContext" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
</xs:all>
</xs:complexType>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index 3e6aa55..39faa64 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -83,8 +83,10 @@
<bean id="stratosApiBeanV40" class="org.apache.stratos.rest.endpoint.api.StratosApiV40"/>
<bean id="stratosApiBeanV41" class="org.apache.stratos.rest.endpoint.api.StratosApiV41"/>
- <bean id="basicAuthenticationFilter" class="org.apache.stratos.rest.endpoint.handlers.StratosAuthenticationHandler"/>
- <bean id="sessionAuthenticationFilter" class="org.apache.stratos.rest.endpoint.handlers.CookieBasedAuthenticationHandler"/>
+ <bean id="basicAuthenticationFilter"
+ class="org.apache.stratos.rest.endpoint.handlers.StratosAuthenticationHandler"/>
+ <bean id="sessionAuthenticationFilter"
+ class="org.apache.stratos.rest.endpoint.handlers.CookieBasedAuthenticationHandler"/>
<bean id="authorizationFilterV40" class="org.apache.stratos.rest.endpoint.handlers.StratosAuthorizingHandler">
<property name="securedObject" ref="stratosApiBeanV40"/>
</bean>
@@ -94,8 +96,10 @@
<bean id="exceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomExceptionMapper"/>
<bean id="badRequestExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.BadRequestExceptionMapper"/>
<bean id="genericExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.GenericExceptionMapper"/>
- <bean id="throwableExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
- <bean id="componentSynchronizerHandler" class="org.apache.stratos.rest.endpoint.handlers.ComponentSynchronizerHandler"/>
+ <bean id="throwableExceptionHandler"
+ class="org.apache.stratos.rest.endpoint.handlers.CustomThrowableExceptionMapper"/>
+ <bean id="componentSynchronizerHandler"
+ class="org.apache.stratos.rest.endpoint.handlers.ComponentSynchronizerHandler"/>
<!--The below config enables OAuth based authentication/authorization for REST API-->
<bean id="OAuthFilter" class="org.apache.stratos.rest.endpoint.handlers.OAuthHandler">
<property name="password" value="admin"/>
@@ -105,7 +109,7 @@
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="supportUnwrapped" value="true"/>
<property name="serializeAsArray" value="true"/>
- <property name="dropRootElement" value="true" />
+ <property name="dropRootElement" value="true"/>
<property name="dropCollectionWrapperElement" value="true"/>
<property name="arrayKeys">
<list>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
index e650c68..275a0ef 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
@@ -56,9 +56,12 @@
<xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false">
<xs:complexType>
<xs:all>
- <xs:element name="requestsInFlight" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="memoryConsumption" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="loadAverage" type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="requestsInFlight" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="memoryConsumption" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="loadAverage" type="thresholdValues" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -87,10 +90,14 @@
<xs:element name="partition" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
- <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1"
+ nillable="false"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"
+ nillable="true"/>
+ <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -111,7 +118,8 @@
<xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="defaultAutoscalingPolicy" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="defaultAutoscalingPolicy" type="xs:string" minOccurs="0" maxOccurs="1"
+ nillable="false"/>
<xs:element name="multiTenant" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deployerType" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="portMapping" minOccurs="1" maxOccurs="unbounded">
@@ -131,15 +139,18 @@
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
<xs:element name="networkInterfaces" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="networkUuid" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="networkUuid" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -150,15 +161,18 @@
<xs:complexType>
<xs:sequence>
<xs:element name="imageName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="dockerfileRepo" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="dockerfileRepo" type="xs:string" minOccurs="0" maxOccurs="1"
+ nillable="false"/>
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
- </xs:element>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -169,8 +183,10 @@
<xs:element name="property" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1"
+ nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -222,37 +238,38 @@
</xs:all>
</xs:complexType>
</xs:element>
-
+
<xs:element name="serviceGroup">
<xs:complexType>
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="subGroups" type="xs:string" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
- <xs:element name="cartridges" type="xs:string" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
- <xs:element name="dependencies" type="tdependencies" minOccurs="0" maxOccurs="1"/>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="subGroups" type="xs:string" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="cartridges" type="xs:string" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="dependencies" type="tdependencies" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
<xs:element name="compositeAppDefinition">
<xs:complexType>
- <xs:sequence>
- <xs:element name="applicationId" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="alias" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="components" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="groups" type="tgroups" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="subscribables" type="tsubscribables" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="dependencies" type="tdependencies" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="subscribableInfo" type="tsubscribableInfo" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
+ <xs:sequence>
+ <xs:element name="applicationId" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="alias" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="components" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="groups" type="tgroups" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="subscribables" type="tsubscribables" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="dependencies" type="tdependencies" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="subscribableInfo" type="tsubscribableInfo" minOccurs="0" maxOccurs="unbounded"
+ nillable="false"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
<xs:complexType name="tsubscribableInfo">
<xs:all>
<xs:element name="alias" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
@@ -266,14 +283,14 @@
<xs:element name="removeOnTermination" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
</xs:all>
</xs:complexType>
-
+
<xs:complexType name="tdependencies">
- <xs:sequence>
- <xs:element name="terminationBehaviour" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="startupOrders" type="xs:string" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
- </xs:sequence>
+ <xs:sequence>
+ <xs:element name="terminationBehaviour" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="startupOrders" type="xs:string" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
+ </xs:sequence>
</xs:complexType>
-
+
<xs:complexType name="tgroups">
<xs:sequence>
<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
@@ -284,26 +301,27 @@
<xs:element name="subGroups" type="tgroups" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
-
+
<xs:complexType name="tsubscribables">
- <xs:all>
- <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="alias" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- </xs:all>
- </xs:complexType>
+ <xs:all>
+ <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="alias" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ </xs:all>
+ </xs:complexType>
<xs:element name="subscriptionDomainRequest">
<xs:complexType>
<xs:sequence>
- <xs:element name="domains" type="subscriptionDomain" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="domains" type="subscriptionDomain" minOccurs="1" maxOccurs="unbounded"
+ nillable="false"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:complexType name="subscriptionDomain">
<xs:all>
- <xs:element name="domainName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="applicationContext" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="domainName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="applicationContext" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
</xs:all>
</xs:complexType>
[3/6] stratos git commit: Formatting rest endpoint component code
Posted by la...@apache.org.
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/BadRequestExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
index 5ee8ebd..c10aae6 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
@@ -35,12 +35,12 @@ public class BadRequestExceptionMapper implements ExceptionMapper<BadRequestExce
private static Log log = LogFactory.getLog(BadRequestExceptionMapper.class);
public Response toResponse(BadRequestException badRequestException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Error in input format", badRequestException);
}
String errorMsg = badRequestException.getMessage() != null ? badRequestException.getMessage() : "please check" +
"your input format";
return Response.status(Response.Status.BAD_REQUEST).type(MediaType.APPLICATION_JSON).
- entity(new ErrorResponseBean(Response.Status.BAD_REQUEST.getStatusCode(),errorMsg)).build();
+ entity(new ErrorResponseBean(Response.Status.BAD_REQUEST.getStatusCode(), errorMsg)).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/handlers/ComponentSynchronizerHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
index b7456e4..807ff8a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
@@ -37,7 +37,7 @@ public class ComponentSynchronizerHandler implements RequestHandler {
public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
ComponentStartUpSynchronizer componentStartUpSynchronizer =
ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer();
- if(!componentStartUpSynchronizer.isComponentActive(Component.StratosManager)) {
+ if (!componentStartUpSynchronizer.isComponentActive(Component.StratosManager)) {
ApiResponseBean responseBean = new ApiResponseBean();
responseBean.setMessage("Stratos manager component is not active");
return Response.status(Response.Status.NOT_ACCEPTABLE).entity(responseBean).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/handlers/CookieBasedAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
index 9588f7b..40e7e1b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+
/*
* authenticate an incoming request using the session availability. Session is first established using the
* basic auth authentication. This handler will be the last to get executed in the current handler chain. Hence failure
@@ -41,45 +42,45 @@ public class CookieBasedAuthenticationHandler implements RequestHandler {
private Log log = LogFactory.getLog(CookieBasedAuthenticationHandler.class);
public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
- if(AuthenticationContext.isAthenticated()){
- return null;
- }
+ if (AuthenticationContext.isAthenticated()) {
+ return null;
+ }
- HttpServletRequest httpServletRequest = (HttpServletRequest)message.get("HTTP.REQUEST");
- HttpSession httpSession = httpServletRequest.getSession(false);
- if(httpSession != null && isUserLoggedIn(httpSession)){ // if sesion is avaialble
- String userName = (String)httpSession.getAttribute("userName");
- String tenantDomain = (String)httpSession.getAttribute("tenantDomain");
- int tenantId = (Integer)httpSession.getAttribute("tenantId");
- // the following will get used by the authorization handler..
- PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- carbonContext.setUsername(userName);
- carbonContext.setTenantDomain(tenantDomain);
- carbonContext.setTenantId(tenantId);
+ HttpServletRequest httpServletRequest = (HttpServletRequest) message.get("HTTP.REQUEST");
+ HttpSession httpSession = httpServletRequest.getSession(false);
+ if (httpSession != null && isUserLoggedIn(httpSession)) { // if sesion is avaialble
+ String userName = (String) httpSession.getAttribute("userName");
+ String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
+ int tenantId = (Integer) httpSession.getAttribute("tenantId");
+ // the following will get used by the authorization handler..
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ carbonContext.setUsername(userName);
+ carbonContext.setTenantDomain(tenantDomain);
+ carbonContext.setTenantId(tenantId);
- AuthenticationContext.setAuthenticated(true);
- if (log.isDebugEnabled()) {
- log.debug("authenticated using the " + CookieBasedAuthenticationHandler.class.getName() + "for username :" +
- userName + "tenantDomain : " + tenantDomain + " tenantId : " + tenantId);
- }
- return null;
+ AuthenticationContext.setAuthenticated(true);
+ if (log.isDebugEnabled()) {
+ log.debug("authenticated using the " + CookieBasedAuthenticationHandler.class.getName() + "for username :" +
+ userName + "tenantDomain : " + tenantDomain + " tenantId : " + tenantId);
+ }
+ return null;
- }
+ }
return Response.status(Response.Status.FORBIDDEN).
type(MediaType.APPLICATION_JSON).entity(
- new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(),
- "The endpoint requires authentication")).build();
+ new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(),
+ "The endpoint requires authentication")).build();
}
/*
* if the userName and tenantDomain is present in the session, we conclude this as an authenticated session.
* Thos params get set by the AuthenticationAdmin endpoint.
* */
- private boolean isUserLoggedIn(HttpSession httpSession){
- String userName = (String)httpSession.getAttribute("userName");
- String tenantDomain = (String)httpSession.getAttribute("tenantDomain");
- Integer tenantId = (Integer)httpSession.getAttribute("tenantId");
- if(userName != null && tenantDomain!=null && tenantId!=null) {
+ private boolean isUserLoggedIn(HttpSession httpSession) {
+ String userName = (String) httpSession.getAttribute("userName");
+ String tenantDomain = (String) httpSession.getAttribute("tenantDomain");
+ Integer tenantId = (Integer) httpSession.getAttribute("tenantId");
+ if (userName != null && tenantDomain != null && tenantId != null) {
return true;
}
return false;
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/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
index 2863c25..f54f4fc 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.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,18 +36,18 @@ public class CustomExceptionMapper implements ExceptionMapper<RestAPIException>
private static Log log = LogFactory.getLog(CustomExceptionMapper.class);
public Response toResponse(RestAPIException restAPIException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Error while invoking the admin rest api", restAPIException);
}
// if no specific error message specified, spitting out a generaic error message
- String errorMessage = (restAPIException.getMessage() != null)?
- restAPIException.getMessage():"Error while fulfilling the request";
+ String errorMessage = (restAPIException.getMessage() != null) ?
+ restAPIException.getMessage() : "Error while fulfilling the request";
// if no specific error specified we are throwing the bad request http status code by default
- Response.Status httpStatus= (restAPIException.getHTTPStatusCode() != null)?
- restAPIException.getHTTPStatusCode():Response.Status.BAD_REQUEST;
-
+ Response.Status httpStatus = (restAPIException.getHTTPStatusCode() != null) ?
+ restAPIException.getHTTPStatusCode() : Response.Status.BAD_REQUEST;
+
log.error(errorMessage, restAPIException);
return Response.status(httpStatus.getStatusCode()).type(MediaType.APPLICATION_JSON).
- entity(new ErrorResponseBean(httpStatus.getStatusCode(),errorMessage)).build();
+ entity(new ErrorResponseBean(httpStatus.getStatusCode(), errorMessage)).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/handlers/CustomThrowableExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
index d264cf1..73071b6 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
@@ -30,7 +30,7 @@ public class CustomThrowableExceptionMapper implements ExceptionMapper<Throwable
private static Log log = LogFactory.getLog(CustomThrowableExceptionMapper.class);
public Response toResponse(Throwable throwable) {
- if(log.isErrorEnabled()){
+ if (log.isErrorEnabled()) {
log.error("Internal server error", throwable);
}
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/GenericExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
index 3e4dc17..1ba9a06 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
@@ -35,12 +35,12 @@ public class GenericExceptionMapper implements ExceptionMapper<WebApplicationExc
private static Log log = LogFactory.getLog(GenericExceptionMapper.class);
public Response toResponse(WebApplicationException webApplicationException) {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("Internal server error", webApplicationException);
}
// if no specific error message specified, spitting out a generaic error message
- String errorMessage = (webApplicationException.getMessage() != null)?
- webApplicationException.getMessage():"Internal server error";
+ String errorMessage = (webApplicationException.getMessage() != null) ?
+ webApplicationException.getMessage() : "Internal server error";
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), errorMessage)).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/handlers/StratosAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
index 0a32c9d..fd95868 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
@@ -58,26 +58,27 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
private static Log log = LogFactory.getLog(StratosAuthenticationHandler.class);
private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
- public boolean canHandle(String authHeaderPrefix){
+ public boolean canHandle(String authHeaderPrefix) {
return SUPPORTED_AUTHENTICATION_TYPE.equals(authHeaderPrefix);
}
/**
* Authenticate the user against the user store. Once authenticate, populate the {@link org.wso2.carbon.context.CarbonContext}
* to be used by the downstream code.
+ *
* @param message
* @param classResourceInfo
* @return
*/
public Response handle(Message message, ClassResourceInfo classResourceInfo) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Authenticating request: [message-id] %s", message.getId()));
}
- // If Mutual SSL is enabled
+ // If Mutual SSL is enabled
HttpServletRequest request = (HttpServletRequest) message.get("HTTP.REQUEST");
Object certObject = request.getAttribute("javax.servlet.request.X509Certificate");
-
+
AuthorizationPolicy policy = message.get(AuthorizationPolicy.class);
String username = policy.getUserName().trim();
String password = policy.getPassword().trim();
@@ -86,28 +87,28 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
if (StringUtils.isEmpty(username)) {
log.error("username is seen as null/empty values");
return Response.status(Response.Status.UNAUTHORIZED)
- .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
- .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
- "Username cannot be null")).build();
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+ "Username cannot be null")).build();
} else if (certObject == null && (StringUtils.isEmpty(password))) {
log.error("password is seen as null/empty values");
return Response.status(Response.Status.UNAUTHORIZED)
- .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
- .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
- "password cannot be null")).build();
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+ "password cannot be null")).build();
}
-
+
try {
RealmService realmService = ServiceHolder.getRealmService();
RegistryService registryService = ServiceHolder.getRegistryService();
String tenantDomain = MultitenantUtils.getTenantDomain(username);
int tenantId = realmService.getTenantManager().getTenantId(tenantDomain);
-
+
UserRealm userRealm = null;
if (certObject == null) {
userRealm = AnonymousSessionUtil.getRealmByTenantDomain(registryService, realmService, tenantDomain);
if (userRealm == null) {
- log .error("Invalid domain or unactivated tenant login");
+ log.error("Invalid domain or unactivated tenant login");
// is this the correct HTTP code for this scenario ? (401)
return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
type(MediaType.APPLICATION_JSON).entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), "Tenant not found")).build();
@@ -136,15 +137,15 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz
log.warn(String.format("Unable to authenticate the request: [message-id] %s", message.getId()));
// authentication failed, request the authetication, add the realm name if needed to the value of WWW-Authenticate
return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
- type(MediaType.APPLICATION_JSON).entity(new ErrorResponseBean ( Response.Status.UNAUTHORIZED.getStatusCode(),
- "Authentication failed. Please check your username/password")).build();
+ type(MediaType.APPLICATION_JSON).entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+ "Authentication failed. Please check your username/password")).build();
}
} catch (Exception exception) {
- log.error(String.format("Authentication failed: [message-id] %s", message.getId()),exception);
+ log.error(String.format("Authentication failed: [message-id] %s", message.getId()), exception);
// server error in the eyes of the client. Hence 5xx HTTP code.
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
- "Unexpected error. Please contact the system admin")).build();
+ "Unexpected error. Please contact the system admin")).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/handlers/StratosAuthorizingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
index 1ec94d4..1e839fc 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
@@ -69,51 +69,50 @@ public class StratosAuthorizingHandler implements RequestHandler {
}
-
public Response handleRequest(Message message, ClassResourceInfo resourceClass) {
try {
AuthenticationContext.setAuthenticated(false); // TODO : fix this properly
String userName = CarbonContext.getThreadLocalCarbonContext().getUsername();
String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug("authorizing the action using" + StratosAuthorizingHandler.class.getName());
- log.debug("username :"+ userName);
+ log.debug("username :" + userName);
log.debug("tenantDomain" + tenantDomain);
- log.debug("tenantId :"+ tenantId);
+ log.debug("tenantId :" + tenantId);
}
Method targetMethod = getTargetMethod(message);
- if (!authorize(userName,tenantDomain,tenantId,targetMethod)) {
- log.warn("User :"+ userName + "trying to perform unauthrorized action" +
- " against the resource :"+ targetMethod);
- return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON).
- entity(new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(), "The user does not have required permissions to " +
- "perform this operation")).build();
+ if (!authorize(userName, tenantDomain, tenantId, targetMethod)) {
+ log.warn("User :" + userName + "trying to perform unauthrorized action" +
+ " against the resource :" + targetMethod);
+ return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON).
+ entity(new ErrorResponseBean(Response.Status.FORBIDDEN.getStatusCode(), "The user does not have required permissions to " +
+ "perform this operation")).build();
}
return null;
} catch (Exception exception) {
- log.error("Unexpected error occured while REST api, authorization process",exception);
+ log.error("Unexpected error occured while REST api, authorization process", exception);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
- "Unexpected error. Please contact the system admin")).build();
+ "Unexpected error. Please contact the system admin")).build();
}
}
- private boolean authorize(String userName, String tenantDomain,int tenantId, Method targetMethod) throws Exception{
- // first we try to see whether this is a super.tenant only operation
- if (superTenantServiceSet.contains(targetMethod.getName()) && !isCurrentUserSuperTenant(tenantDomain, tenantId)) {
- return false;
- }
- // authorize using permissionString given as annotation in the service class
- String permissionString = authorizationActionMap.get(targetMethod.getName());
+ private boolean authorize(String userName, String tenantDomain, int tenantId, Method targetMethod) throws Exception {
+ // first we try to see whether this is a super.tenant only operation
+ if (superTenantServiceSet.contains(targetMethod.getName()) && !isCurrentUserSuperTenant(tenantDomain, tenantId)) {
+ return false;
+ }
+ // authorize using permissionString given as annotation in the service class
+ String permissionString = authorizationActionMap.get(targetMethod.getName());
- // get the authorization manager for this tenant..
- UserRealm userRealm = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm();
- AuthorizationManager authorizationManager = userRealm.getAuthorizationManager();
+ // get the authorization manager for this tenant..
+ UserRealm userRealm = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm();
+ AuthorizationManager authorizationManager = userRealm.getAuthorizationManager();
- boolean isAuthorized = isAuthorized(authorizationManager, userName, permissionString, ACTION_ON_RESOURCE);
- return isAuthorized;
+ boolean isAuthorized = isAuthorized(authorizationManager, userName, permissionString, ACTION_ON_RESOURCE);
+ return isAuthorized;
}
@@ -140,7 +139,8 @@ public class StratosAuthorizingHandler implements RequestHandler {
/**
* Here we are getting the target invocation method. The method get set as a property in the
* message by the {@link org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor}
- * @param message incoming message
+ *
+ * @param message incoming message
* @return
*/
protected Method getTargetMethod(Message message) {
@@ -160,6 +160,7 @@ public class StratosAuthorizingHandler implements RequestHandler {
/**
* The instance of the secured bean get injected by the IOC framework
+ *
* @param securedObject
*/
public void setSecuredObject(Object securedObject) {
@@ -184,8 +185,9 @@ public class StratosAuthorizingHandler implements RequestHandler {
/**
* Goes through the class hierarchy and find the authorization annotations attached to a certain
* method.
- * @param clazz class to be scanned
- * @param authorizationActionMap the map to be populated
+ *
+ * @param clazz class to be scanned
+ * @param authorizationActionMap the map to be populated
*/
private void findAuthorizationActions(Class<?> clazz, Map<String, String> authorizationActionMap) {
if (clazz == null || clazz == Object.class) {
@@ -219,6 +221,7 @@ public class StratosAuthorizingHandler implements RequestHandler {
/**
* Goes through the class hierarchy and figure out the supertenant annotations coupled with operations/methods.
+ *
* @param clazz
* @param superTenantServiceSet
*/
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/StratosMockHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
index 12e0261..ebf2d3a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
@@ -57,22 +57,23 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl
private static Log log = LogFactory.getLog(StratosAuthenticationHandler.class);
private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
- public boolean canHandle(String authHeaderPrefix){
+ public boolean canHandle(String authHeaderPrefix) {
return SUPPORTED_AUTHENTICATION_TYPE.equals(authHeaderPrefix);
}
/**
* Authenticate the user against the user store. Once authenticate, populate the {@link org.wso2.carbon.context.CarbonContext}
* to be used by the downstream code.
+ *
* @param message
* @param classResourceInfo
* @return
*/
public Response handle(Message message, ClassResourceInfo classResourceInfo) {
- // If Mutual SSL is enabled
+ // If Mutual SSL is enabled
HttpServletRequest request = (HttpServletRequest) message.get("HTTP.REQUEST");
Object certObject = request.getAttribute("javax.servlet.request.X509Certificate");
-
+
AuthorizationPolicy policy = (AuthorizationPolicy) message.get(AuthorizationPolicy.class);
String username = policy.getUserName().trim();
String password = policy.getPassword().trim();
@@ -81,29 +82,29 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl
if ((username == null) || username.equals("")) {
log.error("username is seen as null/empty values.");
return Response.status(Response.Status.UNAUTHORIZED)
- .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
- .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
- "Username cannot be null")).build();
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+ "Username cannot be null")).build();
} else if (certObject == null && ((password == null) || password.equals(""))) {
log.error("password is seen as null/empty values.");
return Response.status(Response.Status.UNAUTHORIZED)
- .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
- .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
- "password cannot be null")).build();
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(new ErrorResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(),
+ "password cannot be null")).build();
}
-
+
try {
- // setting the correct tenant info for downstream code..
+ // setting the correct tenant info for downstream code..
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
carbonContext.setUsername(username);
-
+
return null;
} catch (Exception exception) {
- log.error("Authentication failed",exception);
+ log.error("Authentication failed", exception);
// server error in the eyes of the client. Hence 5xx HTTP code.
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
- entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
- "Unexpected error. Please contact the system admin")).build();
+ entity(new ErrorResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
+ "Unexpected error. Please contact the system admin")).build();
}
}
[4/6] stratos git commit: Formatting rest endpoint component code
Posted by la...@apache.org.
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);
}
[5/6] stratos git commit: Formatting rest endpoint component code
Posted by la...@apache.org.
Formatting rest endpoint component code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d61e7132
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d61e7132
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d61e7132
Branch: refs/heads/master
Commit: d61e71329dc5d03e16aa7196799156c61e9a9eaa
Parents: 367f91a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:48:56 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:48:56 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.rest.endpoint/pom.xml | 5 +-
.../apache/stratos/rest/endpoint/Constants.java | 2 +-
.../stratos/rest/endpoint/ServiceHolder.java | 8 +-
.../org/apache/stratos/rest/endpoint/Utils.java | 32 +-
.../stratos/rest/endpoint/api/AbstractApi.java | 8 +-
.../rest/endpoint/api/AuthenticationApi.java | 14 +-
.../rest/endpoint/api/StratosApiV40.java | 59 +-
.../rest/endpoint/api/StratosApiV40Utils.java | 42 +-
.../rest/endpoint/api/StratosApiV41.java | 18 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 1195 +++++++++---------
.../endpoint/context/AuthenticationContext.java | 6 +-
.../endpoint/exception/RestAPIException.java | 2 +-
...tractAuthenticationAuthorizationHandler.java | 42 +-
.../handlers/BadRequestExceptionMapper.java | 4 +-
.../handlers/ComponentSynchronizerHandler.java | 2 +-
.../CookieBasedAuthenticationHandler.java | 57 +-
.../handlers/CustomExceptionMapper.java | 46 +-
.../CustomThrowableExceptionMapper.java | 2 +-
.../handlers/GenericExceptionMapper.java | 6 +-
.../handlers/StratosAuthenticationHandler.java | 35 +-
.../handlers/StratosAuthorizingHandler.java | 57 +-
.../endpoint/handlers/StratosMockHandler.java | 31 +-
.../stratos/rest/endpoint/mock/MockContext.java | 1031 ++++++++-------
.../rest/endpoint/mock/StratosApiV40Mock.java | 131 +-
.../oauth2/ValidationServiceClient.java | 6 +-
.../endpoint/security/StratosPrincipal.java | 2 +-
.../util/converter/ObjectConverter.java | 242 ++--
.../rest/endpoint/util/type/list/ListType.java | 2 +-
.../rest/endpoint/util/type/map/MapAdapter.java | 6 +-
.../endpoint/util/type/map/MapEntryType.java | 2 +-
.../webapp/api-test/WEB-INF/cxf-servlet.xml | 10 +-
.../webapp/api-test/WEB-INF/schemas/schema.xsd | 48 +-
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 14 +-
.../main/webapp/api/WEB-INF/schemas/schema.xsd | 124 +-
34 files changed, 1651 insertions(+), 1640 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d61e7132/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index 2427df0..e661dfd 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -16,7 +16,8 @@
# specific language governing permissions and limitations
# under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
@@ -54,7 +55,7 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
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/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
index b4a42c5..3574e17 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
@@ -24,5 +24,5 @@ package org.apache.stratos.rest.endpoint;
public class Constants {
public static final String SUPER_TENANT_SERVICE = "super.tenant.service";
-
+
}
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/ServiceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
index 450ec4a..4112ed1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
@@ -38,19 +38,19 @@ public class ServiceHolder {
public static TenantManager getTenantManager() {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- RealmService realmService = (RealmService)carbonContext.getOSGiService(RealmService.class);
+ RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
return realmService.getTenantManager();
}
public static TenantBillingService getBillingService() {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- TenantBillingService tenantBillingService = (TenantBillingService)carbonContext.getOSGiService(TenantBillingService.class);
+ TenantBillingService tenantBillingService = (TenantBillingService) carbonContext.getOSGiService(TenantBillingService.class);
return tenantBillingService;
}
- public static RealmService getRealmService(){
+ public static RealmService getRealmService() {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- RealmService realmService = (RealmService)carbonContext.getOSGiService(RealmService.class);
+ RealmService realmService = (RealmService) carbonContext.getOSGiService(RealmService.class);
return realmService;
}
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/Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
index 37bcf8c..1731a01 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Utils.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;
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/AbstractApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AbstractApi.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AbstractApi.java
index 6bf943a..4aaee4c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AbstractApi.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AbstractApi.java
@@ -54,15 +54,15 @@ public class AbstractApi {
}
}
- protected String getTenantDomain(){
+ protected String getTenantDomain() {
return CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
}
- protected String getUsername(){
+ protected String getUsername() {
return CarbonContext.getThreadLocalCarbonContext().getUsername();
}
-
- protected int getTenantId(){
+
+ protected int getTenantId() {
return CarbonContext.getThreadLocalCarbonContext().getTenantId();
}
}
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/AuthenticationApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
index 4cb4aeb..1d61fd7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
@@ -50,14 +50,14 @@ public class AuthenticationApi extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getCookie(){
- HttpSession httpSession = httpServletRequest.getSession(true);//create session if not found
- PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- httpSession.setAttribute("userName",carbonContext.getUsername());
- httpSession.setAttribute("tenantDomain",carbonContext.getTenantDomain());
- httpSession.setAttribute("tenantId",carbonContext.getTenantId());
+ public Response getCookie() {
+ HttpSession httpSession = httpServletRequest.getSession(true);//create session if not found
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ httpSession.setAttribute("userName", carbonContext.getUsername());
+ httpSession.setAttribute("tenantDomain", carbonContext.getTenantDomain());
+ httpSession.setAttribute("tenantId", carbonContext.getTenantId());
- String sessionId = httpSession.getId();
+ String sessionId = httpSession.getId();
return Response.ok().header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON).
entity(Utils.buildAuthenticationSuccessMessage(sessionId)).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/api/StratosApiV40.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java
index 3e0f1ff..cc81ebc 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java
@@ -71,13 +71,14 @@ public class StratosApiV40 extends AbstractApi {
@POST
@Path("/init")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public ApiResponseBean initialize ()
+ public ApiResponseBean initialize()
throws RestAPIException {
ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully logged in");
return stratosApiResponse;
}
+
/*
This method gets called by the client who are interested in using session mechanism to authenticate themselves in
subsequent calls. This method call get authenticated by the basic authenticator.
@@ -88,13 +89,13 @@ public class StratosApiV40 extends AbstractApi {
@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
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- httpSession.setAttribute("userName",carbonContext.getUsername());
- httpSession.setAttribute("tenantDomain",carbonContext.getTenantDomain());
- httpSession.setAttribute("tenantId",carbonContext.getTenantId());
+ httpSession.setAttribute("userName", carbonContext.getUsername());
+ httpSession.setAttribute("tenantDomain", carbonContext.getTenantDomain());
+ httpSession.setAttribute("tenantId", carbonContext.getTenantId());
String sessionId = httpSession.getId();
return Response.ok().header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON).
@@ -121,7 +122,7 @@ public class StratosApiV40 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean unDeployCartridgeBeanDefinition (@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
+ public ApiResponseBean unDeployCartridgeBeanDefinition(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
return StratosApiV40Utils.undeployCartridge(cartridgeType);
}
@@ -132,7 +133,7 @@ public class StratosApiV40 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public Response deployPartition (PartitionBean partition)
+ public Response deployPartition(PartitionBean partition)
throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).build();
@@ -144,7 +145,7 @@ public class StratosApiV40 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public ApiResponseBean deployAutoscalingPolicyDefintion (AutoscalePolicyBean autoscalePolicy)
+ public ApiResponseBean deployAutoscalingPolicyDefintion(AutoscalePolicyBean autoscalePolicy)
throws RestAPIException {
return StratosApiV40Utils.deployAutoscalingPolicy(autoscalePolicy);
@@ -177,7 +178,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public PartitionBean getPartition (@PathParam("partitionId") String partitionId) throws RestAPIException {
+ public PartitionBean getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException {
return StratosApiV40Utils.getPartition(partitionId);
}
@@ -187,7 +188,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId)
+ public Response getPartitionGroups(@PathParam("deploymentPolicyId") String deploymentPolicyId)
throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).build();
@@ -198,8 +199,8 @@ public class StratosApiV40 extends AbstractApi {
@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 {
+ public PartitionBean[] getPartitions(@PathParam("deploymentPolicyId") String deploymentPolicyId,
+ @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException {
return StratosApiV40Utils.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId);
}
@@ -209,7 +210,7 @@ public class StratosApiV40 extends AbstractApi {
@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 StratosApiV40Utils.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
@@ -220,7 +221,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public AutoscalePolicyBean[] getAutoscalePolicies () throws RestAPIException {
+ public AutoscalePolicyBean[] getAutoscalePolicies() throws RestAPIException {
return StratosApiV40Utils.getAutoScalePolicies();
}
@@ -230,7 +231,7 @@ public class StratosApiV40 extends AbstractApi {
@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 StratosApiV40Utils.getAutoScalePolicy(autoscalePolicyId);
@@ -471,7 +472,7 @@ public class StratosApiV40 extends AbstractApi {
int tenantId = 0; //TODO verify whether this is the correct approach (isSkeleton)
try {
tenantId = persistor.persistTenant(tenant, false, tenantInfoBean.getSuccessKey(),
- tenantInfoBean.getOriginatedService(),false);
+ tenantInfoBean.getOriginatedService(), false);
} catch (Exception e) {
String msg = "Error in persisting tenant " + tenantDomain;
log.error(msg, e);
@@ -675,7 +676,7 @@ public class StratosApiV40 extends AbstractApi {
}
}
- private TenantInfoBean getTenantForDomain (String tenantDomain) throws Exception {
+ private TenantInfoBean getTenantForDomain(String tenantDomain) throws Exception {
TenantManager tenantManager = ServiceHolder.getTenantManager();
@@ -709,9 +710,9 @@ public class StratosApiV40 extends AbstractApi {
String activePlan = "";
//TODO: usage plan using billing service
- if(activePlan != null && activePlan.trim().length() > 0){
+ if (activePlan != null && activePlan.trim().length() > 0) {
bean.setUsagePlan(activePlan);
- }else{
+ } else {
bean.setUsagePlan("");
}
@@ -776,7 +777,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public TenantInfoBean[] retrievePartialSearchTenants(@PathParam("domain")String domain) throws RestAPIException {
+ public TenantInfoBean[] retrievePartialSearchTenants(@PathParam("domain") String domain) throws RestAPIException {
List<TenantInfoBean> tenantList = null;
try {
tenantList = searchPartialTenantsDomains(domain);
@@ -806,7 +807,7 @@ public class StratosApiV40 extends AbstractApi {
throw new RestAPIException(msg, e);
} catch (org.wso2.carbon.user.api.UserStoreException e) {
- throw new RestAPIException( e);
+ throw new RestAPIException(e);
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
@@ -815,7 +816,7 @@ public class StratosApiV40 extends AbstractApi {
TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId);
} catch (Exception e) {
- throw new RestAPIException( e);
+ throw new RestAPIException(e);
}
//Notify tenant activation all listeners
@@ -867,7 +868,7 @@ public class StratosApiV40 extends AbstractApi {
throw new RestAPIException(msg, e);
} catch (org.wso2.carbon.user.api.UserStoreException e) {
- throw new RestAPIException( e);
+ throw new RestAPIException(e);
}
ApiResponseBean stratosApiResponse = new ApiResponseBean();
@@ -875,7 +876,7 @@ public class StratosApiV40 extends AbstractApi {
try {
TenantMgtUtil.deactivateTenant(tenantDomain, tenantManager, tenantId);
} catch (Exception e) {
- throw new RestAPIException( e);
+ throw new RestAPIException(e);
}
//Notify tenant deactivation all listeners
@@ -918,7 +919,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getService(@PathParam("serviceType") String serviceType)throws RestAPIException {
+ public Response getService(@PathParam("serviceType") String serviceType) throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).build();
}
@@ -928,7 +929,7 @@ public class StratosApiV40 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getActiveService()throws RestAPIException {
+ public Response getActiveService() throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).build();
}
@@ -939,7 +940,7 @@ public class StratosApiV40 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public Response unDeployService (@PathParam("serviceType") String serviceType)
+ public Response unDeployService(@PathParam("serviceType") String serviceType)
throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).build();
@@ -1040,8 +1041,8 @@ public class StratosApiV40 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response removeSubscriptionDomain(@PathParam("cartridgeType") String cartridgeType,
- @PathParam("subscriptionAlias") String subscriptionAlias,
- @PathParam("domainName") String domainName) throws RestAPIException {
+ @PathParam("subscriptionAlias") String subscriptionAlias,
+ @PathParam("domainName") String domainName) throws RestAPIException {
// Not supported in 4.1.0
return Response.status(Response.Status.GONE).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/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index c3af4e8..a067d78 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -60,10 +60,10 @@ public class StratosApiV40Utils {
private static Log log = LogFactory.getLog(StratosApiV40Utils.class);
- static ApiResponseBean deployCartridge (CartridgeBean cartridgeDefinitionBean, ConfigurationContext ctxt,
- String userName, String tenantDomain) throws RestAPIException {
+ static ApiResponseBean deployCartridge(CartridgeBean cartridgeDefinitionBean, ConfigurationContext ctxt,
+ String userName, String tenantDomain) throws RestAPIException {
- log.info("Starting to deploy a Cartridge [type] "+ cartridgeDefinitionBean.getType());
+ log.info("Starting to deploy a Cartridge [type] " + cartridgeDefinitionBean.getType());
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
@@ -71,7 +71,7 @@ public class StratosApiV40Utils {
Cartridge cartridgeConfig = ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinitionBean);
- if(cartridgeConfig == null) {
+ if (cartridgeConfig == null) {
throw new RestAPIException("Populated CartridgeConfig instance is null, cartridge deployment aborted");
}
@@ -100,7 +100,7 @@ public class StratosApiV40Utils {
ApiResponseBean stratosApiResponse = new ApiResponseBean();
String message = "Successfully added cartridge definition: [cartridge-type] " + cartridgeDefinitionBean.getType();
stratosApiResponse.setMessage(message);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(message);
}
return stratosApiResponse;
@@ -178,22 +178,22 @@ public class StratosApiV40Utils {
return stratosApiResponse;
}
- private static CloudControllerServiceClient getCloudControllerServiceClient () throws RestAPIException {
+ private static CloudControllerServiceClient getCloudControllerServiceClient() throws RestAPIException {
try {
return CloudControllerServiceClient.getInstance();
} catch (AxisFault axisFault) {
String errorMsg = "Error while getting CloudControllerServiceClient instance to connect to the "
- + "Cloud Controller. Cause: "+axisFault.getMessage();
+ + "Cloud Controller. Cause: " + axisFault.getMessage();
log.error(errorMsg, axisFault);
throw new RestAPIException(errorMsg, axisFault);
}
}
- public static PartitionBean[] getAvailablePartitions () throws RestAPIException {
+ public static PartitionBean[] getAvailablePartitions() throws RestAPIException {
- org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = null;
+ org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
// try {
@@ -250,7 +250,7 @@ public class StratosApiV40Utils {
return ObjectConverter.populatePartitionPojos(partitions);
}
- public static PartitionBean getPartition (String partitionId) throws RestAPIException {
+ public static PartitionBean getPartition(String partitionId) throws RestAPIException {
org.apache.stratos.cloud.controller.stub.domain.Partition partition = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -268,7 +268,7 @@ public class StratosApiV40Utils {
return ObjectConverter.populatePartitionPojo(partition);
}
- private static AutoscalerServiceClient getAutoscalerServiceClient () throws RestAPIException {
+ private static AutoscalerServiceClient getAutoscalerServiceClient() throws RestAPIException {
try {
return AutoscalerServiceClient.getInstance();
@@ -280,7 +280,7 @@ public class StratosApiV40Utils {
}
}
- public static AutoscalePolicyBean[] getAutoScalePolicies () throws RestAPIException {
+ public static AutoscalePolicyBean[] getAutoScalePolicies() throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] autoscalePolicies = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -297,7 +297,7 @@ public class StratosApiV40Utils {
return ObjectConverter.convertStubAutoscalePoliciesToAutoscalePolicies(autoscalePolicies);
}
- public static AutoscalePolicyBean getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException {
+ public static AutoscalePolicyBean getAutoScalePolicy(String autoscalePolicyId) throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -307,7 +307,7 @@ public class StratosApiV40Utils {
} catch (RemoteException e) {
String errorMsg = "Error while getting information for autoscaling policy with id " +
- autoscalePolicyId+". Cause: "+e.getMessage();
+ autoscalePolicyId + ". Cause: " + e.getMessage();
log.error(errorMsg, e);
throw new RestAPIException(errorMsg, e);
}
@@ -326,18 +326,18 @@ public class StratosApiV40Utils {
static CartridgeBean getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
- for(CartridgeBean cartridge : cartridges) {
- if(cartridge.getType().equals(cartridgeType)) {
+ for (CartridgeBean cartridge : cartridges) {
+ if (cartridge.getType().equals(cartridgeType)) {
return cartridge;
}
}
String msg = "Unavailable cartridge type: " + cartridgeType;
log.error(msg);
- throw new RestAPIException(msg) ;
+ throw new RestAPIException(msg);
}
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>();
@@ -348,7 +348,7 @@ public class StratosApiV40Utils {
}
/*if(lbCartridges == null || lbCartridges.isEmpty()) {
- String msg = "Load balancer Cartridges are not available.";
+ String msg = "Load balancer Cartridges are not available.";
log.error(msg);
throw new RestAPIException(msg) ;
}*/
@@ -430,7 +430,7 @@ public class StratosApiV40Utils {
}
}
} catch (Exception e) {
- String msg = "Error while getting available cartridges. Cause: "+e.getMessage();
+ String msg = "Error while getting available cartridges. Cause: " + e.getMessage();
log.error(msg, e);
throw new RestAPIException(msg, e);
}
@@ -905,7 +905,7 @@ public class StratosApiV40Utils {
}
public static ApiResponseBean removeSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType,
- String subscriptionAlias, String domain) throws RestAPIException {
+ String subscriptionAlias, String domain) throws RestAPIException {
throw new RestAPIException("Not implemented");
}
}
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/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 0e31605..1ac626e 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -200,7 +200,7 @@ public class StratosApiV41 extends AbstractApi {
public Response getDeploymentPolicy(
@PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException {
DeploymentPolicyBean deploymentPolicyBean = StratosApiV41Utils.getDeployementPolicy(deploymentPolicyId);
- if(deploymentPolicyBean == null) {
+ if (deploymentPolicyBean == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
return Response.ok(deploymentPolicyBean).build();
@@ -539,7 +539,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/getNetworkPartitions")
public Response getNetworkPartitions()
throws RestAPIException {
- NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions();
+ NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions();
return Response.ok(networkPartitions).build();
}
@@ -895,11 +895,11 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("applicationId") String applicationId, @QueryParam("force") @DefaultValue("false") boolean force) throws RestAPIException {
ApplicationBean applicationDefinition = StratosApiV41Utils.getApplication(applicationId);
- if(applicationDefinition == null){
+ if (applicationDefinition == null) {
log.info(String.format("Application does not exist [application-id] ", applicationId));
return Response.status(Response.Status.NOT_FOUND).build();
}
- if(!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_DEPLOYED)){
+ if (!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_DEPLOYED)) {
String message = String.format("Could not undeploy since application is not in DEPLOYED status [application-id] %s [current status] %S", applicationId, applicationDefinition.getStatus());
log.info(message);
return Response.status(Response.Status.CONFLICT).entity(message).build();
@@ -952,7 +952,7 @@ public class StratosApiV41 extends AbstractApi {
return Response.status(Response.Status.NOT_FOUND).build();
}
- if(!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED)){
+ if (!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED)) {
return Response.status(Response.Status.CONFLICT).entity(new SuccessResponseBean(Response.Status.CONFLICT.getStatusCode(),
String.format("Could not delete since application is not in CREATED state : [application] %s [current-status] %S", applicationId, applicationDefinition.getStatus()))).build();
}
@@ -1096,9 +1096,9 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("clusterId") String clusterId) throws RestAPIException {
ClusterBean clusterBean = StratosApiV41Utils.getClusterInfo(clusterId);
- if(clusterBean == null){
+ if (clusterBean == null) {
return Response.status(Response.Status.NOT_FOUND).build();
- }else{
+ } else {
return Response.ok().entity(clusterBean).build();
}
}
@@ -1204,8 +1204,8 @@ public class StratosApiV41 extends AbstractApi {
URI url = uriInfo.getAbsolutePathBuilder().path(tenant.getDomain()).build();
return Response.created(url).entity(
- new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
- String.format("Tenant added successfully: [tenant] %s", tenantDomain))).build();
+ new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
+ String.format("Tenant added successfully: [tenant] %s", tenantDomain))).build();
}
/**
[6/6] stratos git commit: Organize imports of rest endpoint component
Posted by la...@apache.org.
Organize imports of rest endpoint component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/169909a5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/169909a5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/169909a5
Branch: refs/heads/master
Commit: 169909a575ae12a1fc45497a1798e72fd7768794
Parents: d61e713
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:49:44 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:49:44 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/ServiceHolder.java | 2 +-
.../rest/endpoint/api/AuthenticationApi.java | 5 ++++-
.../handlers/BadRequestExceptionMapper.java | 1 -
.../CookieBasedAuthenticationHandler.java | 1 -
.../endpoint/handlers/CustomExceptionMapper.java | 1 -
.../handlers/CustomThrowableExceptionMapper.java | 1 -
.../handlers/GenericExceptionMapper.java | 1 -
.../rest/endpoint/handlers/OAuthHandler.java | 1 -
.../handlers/StratosAuthenticationHandler.java | 10 +---------
.../handlers/StratosAuthorizingHandler.java | 2 --
.../endpoint/handlers/StratosMockHandler.java | 19 +------------------
.../stratos/rest/endpoint/mock/MockContext.java | 1 -
.../security/StratosSecurityContext.java | 1 -
.../endpoint/util/converter/ObjectConverter.java | 10 ++++------
14 files changed, 11 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
index 4112ed1..fc59b6f 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
@@ -23,10 +23,10 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.TenantBillingService;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.ConfigurationContextService;
-import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
/**
* Some of the admin services needs objects with states inside the runtime. There are
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
index 1d61fd7..93b668d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/AuthenticationApi.java
@@ -26,7 +26,10 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
index c10aae6..e4df93d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java
@@ -20,7 +20,6 @@ package org.apache.stratos.rest.endpoint.handlers;/*
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.MediaType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
index 40e7e1b..cd7228e 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
@@ -24,7 +24,6 @@ import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
index f54f4fc..759cc20 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java
@@ -21,7 +21,6 @@ package org.apache.stratos.rest.endpoint.handlers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import javax.ws.rs.core.MediaType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
index 73071b6..3558c55 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java
@@ -20,7 +20,6 @@ package org.apache.stratos.rest.endpoint.handlers;/*
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
index 1ba9a06..69c4e3d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java
@@ -21,7 +21,6 @@ package org.apache.stratos.rest.endpoint.handlers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/OAuthHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/OAuthHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/OAuthHandler.java
index 74c0bc8..4507c89 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/OAuthHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/OAuthHandler.java
@@ -20,7 +20,6 @@ package org.apache.stratos.rest.endpoint.handlers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
index fd95868..09b24fd 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java
@@ -18,10 +18,6 @@
*/
package org.apache.stratos.rest.endpoint.handlers;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -32,23 +28,19 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.security.SecurityContext;
import org.apache.stratos.common.beans.ErrorResponseBean;
import org.apache.stratos.rest.endpoint.ServiceHolder;
-import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
-import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.apache.stratos.rest.endpoint.security.StratosSecurityContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.core.common.AuthenticationException;
import org.wso2.carbon.core.util.AnonymousSessionUtil;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.user.api.UserRealm;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.util.List;
-
/**
* Here we are doing the request authentication within a {@link RequestHandler}. The request handlers
* are get invoked just before the actual method invocation. This authentication handler make use
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
index 1e839fc..f55ec6b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java
@@ -29,7 +29,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -40,7 +39,6 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
index ebf2d3a..6c9f6fe 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
@@ -18,36 +18,19 @@
*/
package org.apache.stratos.rest.endpoint.handlers;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
-import org.apache.cxf.security.SecurityContext;
import org.apache.stratos.common.beans.ErrorResponseBean;
-import org.apache.stratos.rest.endpoint.ServiceHolder;
-import org.apache.stratos.rest.endpoint.Utils;
-import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
-import org.apache.stratos.rest.endpoint.exception.RestAPIException;
-import org.apache.stratos.rest.endpoint.security.StratosSecurityContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.core.common.AuthenticationException;
-import org.wso2.carbon.core.util.AnonymousSessionUtil;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.api.UserRealm;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.util.List;
-
/**
* Here we are doing the request authentication within a {@link RequestHandler}. The request handlers
* are get invoked just before the actual method invocation. This authentication handler make use
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/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 c317b4c..b153745 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
@@ -24,7 +24,6 @@ import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
import org.apache.stratos.common.beans.partition.PartitionBean;
-import org.apache.stratos.common.beans.partition.PartitionBean;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
import org.apache.stratos.common.beans.topology.ClusterBean;
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosSecurityContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosSecurityContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosSecurityContext.java
index 7d958aa..2b5422f 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosSecurityContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosSecurityContext.java
@@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.cxf.security.SecurityContext;
import java.security.Principal;
-import java.util.Set;
/**
* {@link StratosSecurityContext} is what get passed between authentication handlers
http://git-wip-us.apache.org/repos/asf/stratos/blob/169909a5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index f12d270..85de306 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -33,12 +33,10 @@ import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingB
import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
import org.apache.stratos.common.beans.artifact.repository.ArtifactRepositoryBean;
import org.apache.stratos.common.beans.cartridge.*;
-import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
-import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
-import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean;
-import org.apache.stratos.common.beans.kubernetes.KubernetesServiceBean;
-import org.apache.stratos.common.beans.kubernetes.PortRangeBean;
-import org.apache.stratos.common.beans.partition.*;
+import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.kubernetes.*;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.partition.PartitionBean;
import org.apache.stratos.common.beans.policy.autoscale.*;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
[2/6] stratos git commit: Formatting rest endpoint component code
Posted by la...@apache.org.
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() {