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/05/15 07:54:36 UTC
stratos git commit: Fix formatting in CC, Rest api, and common
Repository: stratos
Updated Branches:
refs/heads/master 63a7c8b03 -> 93b2f9654
Fix formatting in CC, Rest api, and common
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/93b2f965
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/93b2f965
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/93b2f965
Branch: refs/heads/master
Commit: 93b2f9654ca8de7a2121e9781655ae388147c1d5
Parents: 63a7c8b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 11:13:27 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 11:13:35 2015 +0530
----------------------------------------------------------------------
.../CloudControllerServiceComponent.java | 2 +-
.../services/CloudControllerService.java | 4 +-
.../application/ScalingDependentsBean.java | 4 +-
.../beans/application/StartupOrderBean.java | 2 +-
.../ComponentStartUpSynchronizerImpl.java | 13 +-
.../apache/stratos/rest/endpoint/Constants.java | 8 +-
.../rest/endpoint/api/StratosApiV40Utils.java | 4 +-
.../rest/endpoint/api/StratosApiV41.java | 12 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 132 ++++++++++---------
.../exception/InvalidDomainException.java | 2 +-
.../handlers/StratosAuthorizingHandler.java | 2 +-
.../util/converter/ObjectConverter.java | 10 +-
12 files changed, 105 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
index e174104..21eb37a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -170,7 +170,7 @@ public class CloudControllerServiceComponent {
ComponentStartUpSynchronizer componentStartUpSynchronizer =
ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer();
- if(componentStartUpSynchronizer.isEnabled()) {
+ if (componentStartUpSynchronizer.isEnabled()) {
componentStartUpSynchronizer.addEventListener(new ComponentActivationEventListener() {
@Override
public void activated(Component component) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index b8f166f..00a067a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -252,8 +252,8 @@ public interface CloudControllerService {
* @throws ClusterInstanceCreationException if an y error occurs in cluster instance creation
*/
public boolean createClusterInstance(String serviceType, String clusterId, String alias,
- String instanceId, String partitionId,
- String networkPartitionId) throws
+ String instanceId, String partitionId,
+ String networkPartitionId) throws
ClusterInstanceCreationException;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ScalingDependentsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ScalingDependentsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ScalingDependentsBean.java
index 4f67212..f9ac6d1 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ScalingDependentsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ScalingDependentsBean.java
@@ -26,7 +26,7 @@ import java.util.List;
/**
* Scaling dependents bean.
*/
-@XmlRootElement(name="scalingDependents")
+@XmlRootElement(name = "scalingDependents")
public class ScalingDependentsBean implements Serializable {
private static final long serialVersionUID = -3495705783732405914L;
@@ -50,7 +50,7 @@ public class ScalingDependentsBean implements Serializable {
}
public void removeAlias(String alias) {
- if(aliases.contains(alias)) {
+ if (aliases.contains(alias)) {
aliases.remove(alias);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/StartupOrderBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/StartupOrderBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/StartupOrderBean.java
index ce3d49a..2540226 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/StartupOrderBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/StartupOrderBean.java
@@ -50,7 +50,7 @@ public class StartupOrderBean implements Serializable {
}
public void removeAlias(String alias) {
- if(aliases.contains(alias)) {
+ if (aliases.contains(alias)) {
aliases.remove(alias);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
index 7d88ac4..cb4bb1d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java
@@ -74,6 +74,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Returns true if component startup synchronizer is enabled.
+ *
* @return
*/
@Override
@@ -83,6 +84,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Set the status of a component.
+ *
* @param component
* @param active
*/
@@ -100,6 +102,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Notify component activation event listeners.
+ *
* @param component
*/
private void notifyComponentActivationEventListeners(Component component) {
@@ -118,6 +121,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Returns true if a given component is active.
+ *
* @param component
* @return
*/
@@ -131,13 +135,14 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Wait for a component to be activated
- * @param owner owner component
+ *
+ * @param owner owner component
* @param component component to be activated
*/
@Override
public void waitForComponentActivation(Component owner, Component component) {
- if(!componentStartUpSynchronizerEnabled) {
+ if (!componentStartUpSynchronizerEnabled) {
log.debug(String.format("Component activation check is disabled, %s did not wait for %s to be activated",
owner, component));
return;
@@ -169,13 +174,14 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Wait for a web service to be activated.
+ *
* @param serviceName
* @throws AxisFault
*/
@Override
public void waitForWebServiceActivation(String serviceName) throws AxisFault {
- if(!componentStartUpSynchronizerEnabled) {
+ if (!componentStartUpSynchronizerEnabled) {
log.debug(String.format("Component activation check is disabled, did not wait for %s to be activated",
serviceName));
return;
@@ -199,6 +205,7 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro
/**
* Add component startup event listener.
+ *
* @param eventListener
*/
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/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 6966d32..c6bf115 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
@@ -26,9 +26,9 @@ public class Constants {
public static final String SUPER_TENANT_SERVICE = "super.tenant.service";
// Values used to Filter Cartridges
- public static final String FILTER_TENANT_TYPE_SINGLE_TENANT="singleTenant";
- public static final String FILTER_TENANT_TYPE_MULTI_TENANT="multiTenant";
- public static final String FILTER_LOAD_BALANCER="loadBalancer";
- public static final String FILTER_PROVIDER="provider";
+ public static final String FILTER_TENANT_TYPE_SINGLE_TENANT = "singleTenant";
+ public static final String FILTER_TENANT_TYPE_MULTI_TENANT = "multiTenant";
+ public static final String FILTER_LOAD_BALANCER = "loadBalancer";
+ public static final String FILTER_PROVIDER = "provider";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/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 241a1c7..24374d2 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
@@ -62,7 +62,7 @@ public class StratosApiV40Utils {
private static Log log = LogFactory.getLog(StratosApiV40Utils.class);
static ResponseMessageBean deployCartridge(CartridgeBean cartridgeDefinitionBean, ConfigurationContext ctxt,
- String userName, String tenantDomain) throws RestAPIException {
+ String userName, String tenantDomain) throws RestAPIException {
log.info("Starting to deploy a Cartridge [type] " + cartridgeDefinitionBean.getType());
@@ -903,7 +903,7 @@ public class StratosApiV40Utils {
}
public static ResponseMessageBean 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/93b2f965/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 d7b2841..18068f8 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
@@ -842,7 +842,7 @@ public class StratosApiV41 extends AbstractApi {
if (applicationPolicyBean == null) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Application policy not found: [application-policy] " +
- applicationPolicyId)).build();
+ applicationPolicyId)).build();
}
return Response.ok(applicationPolicyBean).build();
} catch (ApplicationPolicyIdIsEmptyException e) {
@@ -1000,7 +1000,7 @@ public class StratosApiV41 extends AbstractApi {
if (applicationSignUpBean == null) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "No application signups found for application: [application]" +
- applicationId)).build();
+ applicationId)).build();
}
return Response.ok(applicationSignUpBean).build();
} catch (ApplicationSignUpRestAPIException e) {
@@ -1065,8 +1065,8 @@ public class StratosApiV41 extends AbstractApi {
/**
* Removes a domain mapping for an application.
*
- * @param applicationId the application id
- * @param domainName the domain name
+ * @param applicationId the application id
+ * @param domainName the domain name
* @return 200
* @throws RestAPIException the rest api exception
*/
@@ -1109,7 +1109,7 @@ public class StratosApiV41 extends AbstractApi {
if (domainMappingsBeanList == null || domainMappingsBeanList.isEmpty()) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "No domain mappings found for the application: [application-id] " +
- applicationId)).build();
+ applicationId)).build();
}
} catch (StratosManagerServiceDomainMappingExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
@@ -1208,7 +1208,7 @@ public class StratosApiV41 extends AbstractApi {
if (!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED)) {
return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
String.format("Could not delete since application is not in CREATED state :" +
- " [application] %s [current-status] %S", applicationId, applicationDefinition.getStatus()))).build();
+ " [application] %s [current-status] %S", applicationId, applicationDefinition.getStatus()))).build();
}
StratosApiV41Utils.removeApplication(applicationId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/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 5fbd050..0b60095 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
@@ -100,7 +100,7 @@ public class StratosApiV41Utils {
public static final String APPLICATION_STATUS_DEPLOYED = "Deployed";
public static final String APPLICATION_STATUS_CREATED = "Created";
- private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
+ private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
/**
* Add New Cartridge
@@ -125,7 +125,7 @@ public class StratosApiV41Utils {
"Successfully added cartridge: [cartridge-type] %s ",
cartridgeDefinition.getType()));
}
- }catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) {
+ } catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) {
String msg = "Could not add cartridge";
log.error(msg, e);
throw new RestAPIException(msg);
@@ -247,8 +247,8 @@ public class StratosApiV41Utils {
/**
* Get List of Cartridges by filter
*
- * @param filter filter
- * @param criteria criteria
+ * @param filter filter
+ * @param criteria criteria
* @param configurationContext Configuration Contex
* @return List of cartridges matches filter
* @throws RestAPIException
@@ -274,8 +274,8 @@ public class StratosApiV41Utils {
/**
* Get a Cartridge by filter
*
- * @param filter filter
- * @param cartridgeType cartride Type
+ * @param filter filter
+ * @param cartridgeType cartride Type
* @param configurationContext Configuration Context
* @return Cartridge matching filter
* @throws RestAPIException
@@ -295,7 +295,7 @@ public class StratosApiV41Utils {
/**
* Get the available Load balancer cartridges
*
- * @param multiTenant Multi tenant true of false
+ * @param multiTenant Multi tenant true of false
* @param configurationContext Configuration Context
* @return List of available Load balancer cartridges
* @throws RestAPIException
@@ -420,7 +420,7 @@ public class StratosApiV41Utils {
if (multiTenant != null && !multiTenant && cartridgeInfo.getMultiTenant()) {
// Need only Single-Tenant cartridges
continue;
- } else if ( multiTenant != null && multiTenant && !cartridgeInfo.getMultiTenant()) {
+ } else if (multiTenant != null && multiTenant && !cartridgeInfo.getMultiTenant()) {
// Need only Multi-Tenant cartridges
continue;
}
@@ -589,7 +589,7 @@ public class StratosApiV41Utils {
* Search cartridge Display name/Description for pattern
*
* @param cartridgeInfo cartridgeInfo
- * @param pattern Pattern
+ * @param pattern Pattern
* @return Pattern match status
*/
private static boolean cartridgeMatches(Cartridge cartridgeInfo, Pattern pattern) {
@@ -846,6 +846,7 @@ public class StratosApiV41Utils {
/**
* Updates an Autoscaling Policy
+ *
* @param autoscalePolicyBean autoscalePolicyBean
* @throws RestAPIException
*/
@@ -894,6 +895,7 @@ public class StratosApiV41Utils {
/**
* Get list of Autoscaling Policies
+ *
* @return Array of AutoscalingPolicies
* @throws RestAPIException
*/
@@ -1225,6 +1227,7 @@ public class StratosApiV41Utils {
/**
* Get a list of GroupBeans
+ *
* @return array of Group Beans
* @throws RestAPIException
*/
@@ -1263,21 +1266,21 @@ public class StratosApiV41Utils {
*/
public static void removeServiceGroup(String name) throws RestAPIException, AutoscalerServiceCartridgeGroupNotFoundExceptionException {
- if (log.isDebugEnabled()) {
- log.debug("Removing cartridge group: [name] " + name);
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Removing cartridge group: [name] " + name);
+ }
- AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
- StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
+ AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
+ StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
- // Check whether cartridge group exists
+ // Check whether cartridge group exists
try {
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
+ // 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";
@@ -1307,8 +1310,9 @@ public class StratosApiV41Utils {
/**
* Find Cartridges In ServiceGroup
+ *
* @param serviceGroup serviceGroup
- * @param cartridges List of cartridges
+ * @param cartridges List of cartridges
*/
private static void findCartridgesInServiceGroup(ServiceGroup serviceGroup, List<String> cartridges) {
@@ -1318,7 +1322,7 @@ public class StratosApiV41Utils {
if (serviceGroup.getCartridges() != null) {
for (String cartridge : serviceGroup.getCartridges()) {
- if (cartridge !=null && cartridges.contains(cartridge)) {
+ if (cartridge != null && cartridges.contains(cartridge)) {
cartridges.add(cartridge);
}
}
@@ -1334,7 +1338,7 @@ public class StratosApiV41Utils {
/**
* Find Cartrides in GroupBean
*
- * @param groupBean groupBean
+ * @param groupBean groupBean
* @param cartridges List of cartridges
*/
private static void findCartridgesInGroupBean(CartridgeGroupBean groupBean, List<String> cartridges) {
@@ -1482,8 +1486,9 @@ public class StratosApiV41Utils {
/**
* Find Cartridges And Groups In Application
+ *
* @param applicationBean ApplicationBean
- * @param cartridges List<String> cartridges
+ * @param cartridges List<String> cartridges
* @param cartridgeGroups List <String> cartridgeGroups
*/
private static void findCartridgesAndGroupsInApplication(
@@ -1508,9 +1513,10 @@ public class StratosApiV41Utils {
/**
* Find Cartridges And Groups In CartridgeGroup
+ *
* @param groupReferenceBean GroupReferenceBean
- * @param cartridges List <String>
- * @param cartridgeGroups List <String>
+ * @param cartridges List <String>
+ * @param cartridgeGroups List <String>
*/
private static void findCartridgesAndGroupsInCartridgeGroup(
CartridgeGroupReferenceBean groupReferenceBean, List<String> cartridges, List<String> cartridgeGroups) {
@@ -1535,8 +1541,9 @@ public class StratosApiV41Utils {
/**
* Find Cartridge Names In Cartridges
+ *
* @param cartridgeReferenceBeans List of CartridgeReferenceBean
- * @param cartridges List <String>
+ * @param cartridges List <String>
*/
private static void findCartridgeNamesInCartridges(
List<CartridgeReferenceBean> cartridgeReferenceBeans, List<String> cartridges) {
@@ -1818,7 +1825,7 @@ public class StratosApiV41Utils {
* Undeploy an Application
*
* @param applicationId applicationId
- * @param force parameter to set force undeployment
+ * @param force parameter to set force undeployment
* @throws RestAPIException
*/
public static void undeployApplication(String applicationId, boolean force) throws RestAPIException {
@@ -1876,7 +1883,7 @@ public class StratosApiV41Utils {
* Add GroupsInstances To ApplicationInstanceBean
*
* @param applicationInstanceBean ApplicationInstanceBean
- * @param application Application
+ * @param application Application
*/
private static void addGroupsInstancesToApplicationInstanceBean(ApplicationInstanceBean applicationInstanceBean,
Application application) {
@@ -1898,7 +1905,7 @@ public class StratosApiV41Utils {
* Add ClustersInstances To ApplicationInstanceBean
*
* @param applicationInstanceBean ApplicationInstanceBean
- * @param application Application
+ * @param application Application
*/
private static void addClustersInstancesToApplicationInstanceBean(
ApplicationInstanceBean applicationInstanceBean, Application application) {
@@ -1925,8 +1932,9 @@ public class StratosApiV41Utils {
/**
* Add ClustersInstances To GroupInstanceBean
+ *
* @param groupInstanceBean GroupInstanceBean
- * @param group Group
+ * @param group Group
*/
private static void addClustersInstancesToGroupInstanceBean(
GroupInstanceBean groupInstanceBean,
@@ -1954,7 +1962,7 @@ public class StratosApiV41Utils {
/**
* Set Sub Group Instances
*
- * @param group Group
+ * @param group Group
* @param groupInstanceBean GroupInstanceBean
*/
private static void setSubGroupInstances(Group group, GroupInstanceBean groupInstanceBean) {
@@ -2102,6 +2110,7 @@ public class StratosApiV41Utils {
/**
* Get a Kubernetes Cluster
+ *
* @param kubernetesClusterId Cluster ID
* @return KubernetesClusterBean
* @throws RestAPIException
@@ -2181,7 +2190,7 @@ public class StratosApiV41Utils {
/**
* Get Kubernetes Hosts
*
- * @param kubernetesClusterId kubernetesClusterId
+ * @param kubernetesClusterId kubernetesClusterId
* @return List of KubernetesHostBeans
* @throws RestAPIException
*/
@@ -2271,7 +2280,7 @@ public class StratosApiV41Utils {
/**
* Add Application Signup
*
- * @param applicationId applicationId
+ * @param applicationId applicationId
* @param applicationSignUpBean ApplicationSignUpBean
* @throws RestAPIException
*/
@@ -2461,7 +2470,7 @@ public class StratosApiV41Utils {
/**
* Add Application Domain Mappings
*
- * @param applicationId application Id
+ * @param applicationId application Id
* @param domainMappingsBean ApplicationDomainMappingsBean
* @throws RestAPIException
*/
@@ -2504,7 +2513,7 @@ public class StratosApiV41Utils {
/**
* Find Cluster Data Holder
*
- * @param applicationId applicationId
+ * @param applicationId applicationId
* @param cartridgeAlias cartridge Alias
* @return ClusterDataHolder
*/
@@ -2526,7 +2535,7 @@ public class StratosApiV41Utils {
* Remove Application Domain Mappings
*
* @param applicationId applicationId
- * @param domainName the domain name
+ * @param domainName the domain name
* @throws RestAPIException
*/
public static void removeApplicationDomainMapping(String applicationId, String domainName)
@@ -2857,14 +2866,14 @@ public class StratosApiV41Utils {
UserRegistry userRegistry = (UserRegistry) PrivilegedCarbonContext.getThreadLocalCarbonContext().
getRegistry(RegistryType.USER_GOVERNANCE);
if (userRegistry == null) {
- String msg="Security alert! User registry is null. A user is trying create a tenant "
+ String msg = "Security alert! User registry is null. A user is trying create a tenant "
+ " without an authenticated session.";
log.error(msg);
throw new RestAPIException("Could not add tenant: Session is not authenticated");
}
if (userRegistry.getTenantId() != MultitenantConstants.SUPER_TENANT_ID) {
- String msg="Security alert! None super tenant trying to create a tenant.";
+ String msg = "Security alert! None super tenant trying to create a tenant.";
log.error(msg);
throw new RestAPIException(msg);
}
@@ -2921,14 +2930,13 @@ public class StratosApiV41Utils {
}
/**
- *
* @param tenantInfoBean TenantInfoBean
* @throws RestAPIException
* @throws InvalidEmailException
* @throws RegistryException
*/
public static void updateExistingTenant(org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) throws
- RestAPIException, RegistryException,InvalidEmailException {
+ RestAPIException, RegistryException, InvalidEmailException {
TenantManager tenantManager = ServiceHolder.getTenantManager();
UserStoreManager userStoreManager;
@@ -3005,7 +3013,7 @@ public class StratosApiV41Utils {
userStoreManager = userRealm.getUserStoreManager();
} catch (UserStoreException e) {
String msg = "Error in getting the user store manager for tenant, tenant domain: " +
- tenantDomain + "."+e.getLocalizedMessage();
+ tenantDomain + "." + e.getLocalizedMessage();
log.error(msg, e);
throw new RestAPIException(msg, e);
}
@@ -3032,7 +3040,7 @@ public class StratosApiV41Utils {
tenantInfoBean.setAdminPassword("");
}
} catch (UserStoreException e) {
- String msg = "Error in getting the user store manager is read only " +e.getLocalizedMessage();
+ String msg = "Error in getting the user store manager is read only " + e.getLocalizedMessage();
log.error(msg, e);
throw new RestAPIException(msg, e);
}
@@ -3073,7 +3081,7 @@ public class StratosApiV41Utils {
} catch (UserStoreException e) {
String msg = "Error in retrieving the tenant id for the tenant domain: " +
tenantDomain + ".";
- log.error(msg,e);
+ log.error(msg, e);
throw new Exception(msg, e);
}
Tenant tenant;
@@ -3081,7 +3089,7 @@ public class StratosApiV41Utils {
tenant = (Tenant) tenantManager.getTenant(tenantId);
} catch (UserStoreException e) {
String msg = "Error in retrieving the tenant from the tenant manager.";
- log.error(msg,e);
+ log.error(msg, e);
throw new Exception(msg, e);
}
@@ -3090,7 +3098,7 @@ public class StratosApiV41Utils {
bean = ObjectConverter
.convertCarbonTenantInfoBeanToTenantInfoBean(TenantMgtUtil.initializeTenantInfoBean(tenantId, tenant));
} catch (Exception e) {
- log.error(String.format("Couldn't find tenant for provided tenant domain. [Tenant Domain] %s", tenantDomain),e);
+ log.error(String.format("Couldn't find tenant for provided tenant domain. [Tenant Domain] %s", tenantDomain), e);
return null;
}
@@ -3170,7 +3178,7 @@ public class StratosApiV41Utils {
int tenantId;
try {
tenantId = tenantManager.getTenantId(tenantDomain);
- if(tenantId != -1) {
+ if (tenantId != -1) {
try {
TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId);
@@ -3222,9 +3230,9 @@ public class StratosApiV41Utils {
try {
TenantMgtUtil.deactivateTenant(tenantDomain, tenantManager, tenantId);
} catch (Exception e) {
- String msg="Error in deactivating Tenant :"+tenantDomain;
- log.error(msg,e);
- throw new RestAPIException(msg,e);
+ String msg = "Error in deactivating Tenant :" + tenantDomain;
+ log.error(msg, e);
+ throw new RestAPIException(msg, e);
}
//Notify tenant deactivation all listeners
@@ -3247,12 +3255,12 @@ public class StratosApiV41Utils {
* @throws RestAPIException
*/
public static void addUser(UserInfoBean userInfoBean) throws RestAPIException {
- try {
+ try {
StratosUserManagerUtils.addUser(getTenantUserStoreManager(), userInfoBean);
} catch (UserManagerException e) {
- String msg = "Error in adding User";
- log.error(msg, e);
- throw new RestAPIException(msg, e);
+ String msg = "Error in adding User";
+ log.error(msg, e);
+ throw new RestAPIException(msg, e);
}
}
@@ -3293,7 +3301,7 @@ public class StratosApiV41Utils {
try {
StratosUserManagerUtils.removeUser(getTenantUserStoreManager(), userName);
} catch (UserManagerException e) {
- String msg = "Error in removing user :"+userName;
+ String msg = "Error in removing user :" + userName;
log.error(msg, e);
throw new RestAPIException(msg, e);
}
@@ -3312,7 +3320,7 @@ public class StratosApiV41Utils {
} catch (UserManagerException e) {
String msg = "Error in updating user";
log.error(msg, e);
- throw new RestAPIException(msg,e);
+ throw new RestAPIException(msg, e);
}
}
@@ -3320,7 +3328,7 @@ public class StratosApiV41Utils {
/**
* Get List of Users
*
- * @return List of Users
+ * @return List of Users
* @throws RestAPIException
*/
public static List<UserInfoBean> getUsers() throws RestAPIException {
@@ -3330,7 +3338,7 @@ public class StratosApiV41Utils {
} catch (UserManagerException e) {
String msg = "Error in retrieving users";
log.error(msg, e);
- throw new RestAPIException(msg,e);
+ throw new RestAPIException(msg, e);
}
return userList;
}
@@ -3387,7 +3395,7 @@ public class StratosApiV41Utils {
/**
* This is a wrapper method to invoke validateGroupDuplicationInGroupDefinition with a new arraylist of string
*
- * @param groupBean - cartridge group definition
+ * @param groupBean - cartridge group definition
* @throws InvalidCartridgeGroupDefinitionException
*/
private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean)
@@ -3395,13 +3403,13 @@ public class StratosApiV41Utils {
validateGroupDuplicationInGroupDefinition(groupBean, new ArrayList<String>());
}
- /**
- * This is to validate the group duplication in the group definition recursively for group within groups
- *
- * @param groupBean - cartridge group definition
- * @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy)
- * @throws InvalidCartridgeGroupDefinitionException - throws when the group definition is invalid
- */
+ /**
+ * This is to validate the group duplication in the group definition recursively for group within groups
+ *
+ * @param groupBean - cartridge group definition
+ * @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy)
+ * @throws InvalidCartridgeGroupDefinitionException - throws when the group definition is invalid
+ */
private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean, List<String> parentGroups)
throws InvalidCartridgeGroupDefinitionException {
if (groupBean == null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/InvalidDomainException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/InvalidDomainException.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/InvalidDomainException.java
index 5ea2cde..f46d786 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/InvalidDomainException.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/exception/InvalidDomainException.java
@@ -19,7 +19,7 @@
package org.apache.stratos.rest.endpoint.exception;
-public class InvalidDomainException extends RestAPIException{
+public class InvalidDomainException extends RestAPIException {
public InvalidDomainException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/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 e7f6da4..562f6b5 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
@@ -86,7 +86,7 @@ public class StratosAuthorizingHandler implements RequestHandler {
return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON).
entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
"The user does not have required permissions to " +
- "perform this operation")).build();
+ "perform this operation")).build();
}
return null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/93b2f965/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 dbb83e5..064d7b7 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
@@ -475,7 +475,7 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.domain.NetworkPartition
- convertNetworkPartitionToCCStubNetworkPartition(NetworkPartitionBean networkPartitionBean) {
+ convertNetworkPartitionToCCStubNetworkPartition(NetworkPartitionBean networkPartitionBean) {
org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition
= new org.apache.stratos.cloud.controller.stub.domain.NetworkPartition();
@@ -1099,7 +1099,7 @@ public class ObjectConverter {
private static List<StartupOrderBean> convertStringArrayToStartupOrderBeans(String[] startupOrders) {
List<StartupOrderBean> startupOrderBeans = new ArrayList<StartupOrderBean>();
- if(startupOrders != null) {
+ if (startupOrders != null) {
for (String aliasArrayList : startupOrders) {
if (StringUtils.isNotBlank(aliasArrayList)) {
String[] aliasArray = aliasArrayList.split(",");
@@ -1118,7 +1118,7 @@ public class ObjectConverter {
private static List<ScalingDependentsBean> convertStringArrayToDependentScalingBeans(String[] scalingDependents) {
List<ScalingDependentsBean> scalingDependentBeans = new ArrayList<ScalingDependentsBean>();
- if(scalingDependents != null) {
+ if (scalingDependents != null) {
for (String aliasArrayList : scalingDependents) {
if (StringUtils.isNotBlank(aliasArrayList)) {
String[] aliasArray = aliasArrayList.split(",");
@@ -1353,7 +1353,7 @@ public class ObjectConverter {
private static List<String> convertScalingDependentsBeansToStringList(List<ScalingDependentsBean> scalingDependentsBeans) {
List<String> scalingDependents = new ArrayList<String>();
- if(scalingDependentsBeans != null) {
+ if (scalingDependentsBeans != null) {
for (ScalingDependentsBean scalingDependentsBean : scalingDependentsBeans) {
StringBuilder stringBuilder = new StringBuilder();
for (String alias : scalingDependentsBean.getAliases()) {
@@ -1590,7 +1590,7 @@ public class ObjectConverter {
private static List<String> convertStartupOrdersBeansToStringList(List<StartupOrderBean> startupOrderBeans) {
List<String> startupOrders = new ArrayList<String>();
- if(startupOrderBeans != null) {
+ if (startupOrderBeans != null) {
for (StartupOrderBean startupOrderBean : startupOrderBeans) {
StringBuilder stringBuilder = new StringBuilder();
for (String alias : startupOrderBean.getAliases()) {