Improve formatting of few Java classes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/626fe3f3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/626fe3f3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/626fe3f3 Branch: refs/heads/master Commit: 626fe3f37936462cdc4f3ccb20fbf1fd7883b664 Parents: ef8ed14 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu May 21 14:22:07 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu May 21 14:34:25 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 2 +- .../java/org/apache/stratos/cli/RestClient.java | 4 +-- .../stratos/cli/commands/ListTenants.java | 4 +-- .../iaases/kubernetes/KubernetesIaas.java | 4 +-- .../manager/utils/PermissionConstants.java | 2 +- .../stratos/manager/utils/UserRoleCreator.java | 2 +- .../rest/endpoint/api/StratosApiV41.java | 6 ++-- .../rest/endpoint/api/StratosApiV41Utils.java | 38 ++++++++++---------- 8 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 3fc870b..c48d053 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -407,7 +407,7 @@ public class DefaultApplicationParser implements ApplicationParser { if (StringUtils.isBlank(dependentCartridgeType)) { throw new CartridgeNotFoundException( String.format("Could not find dependent cartridge for " + - "application: %s cartridge-alias: %s", appId, cartridgeAlias)); + "application: %s cartridge-alias: %s", appId, cartridgeAlias)); } Cartridge dependencyCartridge = getCartridge(dependentCartridgeType); ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType); http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java index 53cc1d2..1480630 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java @@ -188,8 +188,8 @@ public class RestClient implements GenericRestClient { public void updateEntity(String serviceEndpoint, String entityBody, String entityName) { try { - String responseMessage = executePut(serviceEndpoint, entityBody); - System.out.println(responseMessage); + String responseMessage = executePut(serviceEndpoint, entityBody); + System.out.println(responseMessage); } catch (Exception e) { String message = String.format("Error in updating %s", entityName); System.out.println(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java index dc87f41..33308b6 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java @@ -55,11 +55,11 @@ public class ListTenants implements Command<StratosCommandContext> { log.debug("Executing {} command...", getName()); } - if(args == null || args.length == 0) { + if (args == null || args.length == 0) { RestCommandLineService.getInstance().listTenants(); return CliConstants.COMMAND_SUCCESSFULL; - } else if(args[0] != null) { + } else if (args[0] != null) { String partialDomainName = args[0]; RestCommandLineService.getInstance().listTenantsByPartialDomain(partialDomainName); http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index b218403..e06d2d1 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -383,11 +383,11 @@ public class KubernetesIaas extends Iaas { int cpu = Integer.getInteger(KUBERNETES_CONTAINER_CPU_DEFAULT, 0); int memory = Integer.getInteger(KUBERNETES_CONTAINER_MEMORY_DEFAULT, 0); Property cpuProperty = cartridge.getProperties().getProperty(KUBERNETES_CONTAINER_CPU); - if(cpuProperty != null) { + if (cpuProperty != null) { cpu = Integer.parseInt(cpuProperty.getValue()); } Property memoryProperty = cartridge.getProperties().getProperty(KUBERNETES_CONTAINER_MEMORY); - if(memoryProperty != null) { + if (memoryProperty != null) { memory = Integer.parseInt(memoryProperty.getValue()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java index 8bd453c..60d11a0 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.utils; public class PermissionConstants { - public static final String[] STRATOS_PERMISSIONS = new String[] { + public static final String[] STRATOS_PERMISSIONS = new String[]{ "/permission/stratos", "/permission/stratos/autoscalingPolicies", "/permission/stratos/autoscalingPolicies/manage", http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java index 2bdc82f..00e5b20 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java @@ -46,7 +46,7 @@ public class UserRoleCreator { //Set permissions to the Internal/user role List<Permission> permissions = new ArrayList<Permission>(); - for(String permissionResourceId : PermissionConstants.STRATOS_PERMISSIONS) { + for (String permissionResourceId : PermissionConstants.STRATOS_PERMISSIONS) { Permission permission = new Permission(permissionResourceId, UserMgtConstants.EXECUTE_ACTION); permissions.add(permission); } http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/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 0a10a59..0960549 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 @@ -737,7 +737,7 @@ public class StratosApiV41 extends AbstractApi { public Response addApplication(ApplicationBean applicationDefinition) throws RestAPIException { try { StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), - getUsername(), getTenantDomain()); + getUsername(), getTenantDomain()); URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build(); @@ -747,7 +747,7 @@ public class StratosApiV41 extends AbstractApi { } catch (ApplicationAlreadyExistException e) { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Application already exists")).build(); - } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) { + } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) { String backendErrorMessage = e.getFaultMessage().getCartridgeNotFoundException(). getMessage(); return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( @@ -783,7 +783,7 @@ public class StratosApiV41 extends AbstractApi { return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Application updated successfully: [application] %s", applicationDefinition.getApplicationId()))).build(); - } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) { + } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) { String backendErrorMessage = e.getFaultMessage().getCartridgeNotFoundException(). getMessage(); return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( http://git-wip-us.apache.org/repos/asf/stratos/blob/626fe3f3/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 1a87292..dbcf072 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 @@ -229,29 +229,29 @@ public class StratosApiV41Utils { CloudControllerServiceCartridgeNotFoundExceptionException, CloudControllerServiceInvalidCartridgeTypeExceptionException { - if (log.isDebugEnabled()) { - log.debug(String.format("Removing cartridge: [cartridge-type] %s ", cartridgeType)); - } + if (log.isDebugEnabled()) { + log.debug(String.format("Removing cartridge: [cartridge-type] %s ", cartridgeType)); + } - CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); - if (cloudControllerServiceClient.getCartridge(cartridgeType) == null) { - throw new RuntimeException("Cartridge not found: [cartridge-type] " + cartridgeType); - } + CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); + if (cloudControllerServiceClient.getCartridge(cartridgeType) == null) { + throw new RuntimeException("Cartridge not found: [cartridge-type] " + cartridgeType); + } - StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); + 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"; - log.error(message); - throw new RestAPIException(message); - } - cloudControllerServiceClient.removeCartridge(cartridgeType); + // 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"; + log.error(message); + throw new RestAPIException(message); + } + cloudControllerServiceClient.removeCartridge(cartridgeType); - if (log.isInfoEnabled()) { - log.info(String.format("Successfully removed cartridge: [cartridge-type] %s ", cartridgeType)); - } + if (log.isInfoEnabled()) { + log.info(String.format("Successfully removed cartridge: [cartridge-type] %s ", cartridgeType)); + } } /**
