Repository: stratos Updated Branches: refs/heads/master 29f569ad6 -> bb5454456
Fix formatting issues Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb545445 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb545445 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb545445 Branch: refs/heads/master Commit: bb5454456359769578b462c9ffd033dd307b965f Parents: 29f569a Author: Lahiru Sandaruwan <[email protected]> Authored: Tue May 19 20:29:39 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue May 19 20:39:15 2015 +0530 ---------------------------------------------------------------------- .../applications/ApplicationUtils.java | 4 +-- ...ApplicationPolicyAlreadyExistsException.java | 3 +-- .../monitor/component/ApplicationMonitor.java | 2 +- .../monitor/component/GroupMonitor.java | 14 +++++------ .../autoscaler/services/AutoscalerService.java | 2 +- .../cloud/controller/domain/Partition.java | 2 +- .../openstack/networking/NovaNetworkingApi.java | 2 +- .../impl/CloudControllerServiceImpl.java | 3 +-- .../NetworkPartitionReferenceBean.java | 2 -- .../publisher/wso2/cep/ThriftClientConfig.java | 2 +- .../balancer/conf/structure/NodeBuilder.java | 26 ++++++++++---------- .../util/converter/ObjectConverter.java | 14 +++++------ 12 files changed, 36 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java index 11971ea..a9861a6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java @@ -82,9 +82,9 @@ public class ApplicationUtils { StringBuilder portMapBuilder = new StringBuilder(); PortMapping[] portMappings = cartridge.getPortMappings(); - if(cartridge.getPortMappings()[0] == null){ + if (cartridge.getPortMappings()[0] == null) { // first element is null, which means no port mappings. - return null; + return null; } for (PortMapping portMapping : portMappings) { http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/policy/ApplicationPolicyAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/policy/ApplicationPolicyAlreadyExistsException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/policy/ApplicationPolicyAlreadyExistsException.java index eae5eb2..eb76bd7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/policy/ApplicationPolicyAlreadyExistsException.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/policy/ApplicationPolicyAlreadyExistsException.java @@ -23,8 +23,7 @@ package org.apache.stratos.autoscaler.exception.policy; */ public class ApplicationPolicyAlreadyExistsException extends Exception { - public ApplicationPolicyAlreadyExistsException(String message) - { + public ApplicationPolicyAlreadyExistsException(String message) { super(message); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java index f092aa6..fd93367 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java @@ -470,7 +470,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { startDependency(application, instanceIds); - } catch (Exception e){ + } catch (Exception e) { log.error(String.format("Application instance creation failed [applcaition-id] %s", appId), e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index ce23e45..aaf6268 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -298,7 +298,7 @@ public class GroupMonitor extends ParentComponentMonitor { private void createGroupInstanceOnScaling(final NetworkPartitionContext networkPartitionContext, final String parentInstanceId) { if (groupScalingEnabled) { - if (((ParentLevelNetworkPartitionContext)networkPartitionContext).getPendingInstancesCount() == 0) { + if (((ParentLevelNetworkPartitionContext) networkPartitionContext).getPendingInstancesCount() == 0) { //one of the child is loaded and max out. // Hence creating new group instance if (log.isDebugEnabled()) { @@ -639,8 +639,8 @@ public class GroupMonitor extends ParentComponentMonitor { * @return the group level network partition context */ private ParentLevelNetworkPartitionContext getGroupLevelNetworkPartitionContext(String groupAlias, - String appId, - Instance parentInstanceContext) { + String appId, + Instance parentInstanceContext) { ParentLevelNetworkPartitionContext parentLevelNetworkPartitionContext; String deploymentPolicyId = AutoscalerUtil.getDeploymentPolicyIdByAlias(appId, groupAlias); DeploymentPolicy deploymentPolicy = PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId); @@ -746,9 +746,9 @@ public class GroupMonitor extends ParentComponentMonitor { /** * Creates the group instance and adds the required context objects * - * @param group the group - * @param parentInstanceContext the parent instance context - * @param partitionContext partition-context used to create the group instance + * @param group the group + * @param parentInstanceContext the parent instance context + * @param partitionContext partition-context used to create the group instance * @param parentLevelNetworkPartitionContext the group level network partition context */ private String createGroupInstanceAndAddToMonitor(Group group, Instance parentInstanceContext, @@ -868,7 +868,7 @@ public class GroupMonitor extends ParentComponentMonitor { * then that will be returned instead of parsing the algorithm * * @param parentLevelNetworkPartitionContext the group-network-partition-context - * @param parentPartitionId parent-partition-id + * @param parentPartitionId parent-partition-id * @return the partition-context */ private PartitionContext getPartitionContext( http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java index 10fad76..cf53668 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java @@ -151,7 +151,7 @@ public interface AutoscalerService { * @throws ApplicationPolicyAlreadyExistsException */ public boolean addApplicationPolicy(ApplicationPolicy applicationPolicy) throws RemoteException, - InvalidApplicationPolicyException, InvalidPolicyException,ApplicationPolicyAlreadyExistsException; + InvalidApplicationPolicyException, InvalidPolicyException, ApplicationPolicyAlreadyExistsException; /** * Get application policy by application id http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java index 010453c..fc0e0af 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java @@ -115,7 +115,7 @@ public class Partition implements Serializable { } public String getKubernetesClusterId() { - if(properties != null) { + if (properties != null) { Property property = properties.getProperty(KUBERNETES_CLUSTER); if (property != null) { return property.getValue(); http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java index bef5cb5..b069b73 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java @@ -60,7 +60,7 @@ public class NovaNetworkingApi implements OpenstackNetworkingApi { ComputeServiceContext context = iaasProvider.getComputeService().getContext(); String region = ComputeServiceBuilderUtil.extractRegion(iaasProvider); - if(StringUtils.isEmpty(region)) { + if (StringUtils.isEmpty(region)) { throw new RuntimeException("Could not find region in iaas provider: " + iaasProvider.getName()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 7d9ab51..b9e0983 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -1192,8 +1192,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public boolean updateKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException - { + public boolean updateKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException { if (kubernetesCluster == null) { throw new InvalidKubernetesClusterException("Kubernetes cluster cannot be null"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java index 52b9e68..c593ee4 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java @@ -19,8 +19,6 @@ package org.apache.stratos.common.beans.partition; -import org.apache.stratos.common.beans.PropertyBean; - import javax.xml.bind.annotation.XmlRootElement; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java index 4879b02..178c5a6 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java @@ -44,7 +44,7 @@ public class ThriftClientConfig { synchronized (ThriftClientConfig.class) { if (instance == null) { String configFilePath = System.getProperty(THRIFT_CLIENT_CONFIG_FILE_PATH); - if(StringUtils.isBlank(configFilePath)) { + if (StringUtils.isBlank(configFilePath)) { throw new RuntimeException(String.format("Thrift client configuration file path system " + "property is not set: %s", THRIFT_CLIENT_CONFIG_FILE_PATH)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java index 297f5a5..cf80544 100755 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java @@ -32,19 +32,19 @@ public class NodeBuilder { /** * Construct a node structure for the given content. - * - * # comment - * property_1 value1; - * property_2 value2; - * - * node1 { # comment - * property_3 value3; - * property_4 value4; - * - * node2 { - * property_5 value5; - * } - * } + * <p/> + * # comment + * property_1 value1; + * property_2 value2; + * <p/> + * node1 { # comment + * property_3 value3; + * property_4 value4; + * <p/> + * node2 { + * property_5 value5; + * } + * } * * @return fully constructed root node */ http://git-wip-us.apache.org/repos/asf/stratos/blob/bb545445/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 9f3eb0c..c86dee1 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 @@ -79,7 +79,7 @@ public class ObjectConverter { cartridge.setDisplayName(cartridgeBean.getDisplayName()); cartridge.setDescription(cartridgeBean.getDescription()); cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); - if(cartridgeBean.getMetadataKeys() != null) { + if (cartridgeBean.getMetadataKeys() != null) { cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys(). toArray(new String[cartridgeBean.getMetadataKeys().size()])); } @@ -138,7 +138,7 @@ public class ObjectConverter { private static List<PortMappingBean> convertPortMappingsToStubPortMappingBeans( PortMapping[] portMappingps) { - if (portMappingps == null || portMappingps[0] == null ) { + if (portMappingps == null || portMappingps[0] == null) { return null; } List<PortMappingBean> portMappingBeans = new ArrayList<PortMappingBean>(); @@ -165,7 +165,7 @@ public class ObjectConverter { } List<IaasProviderBean> iaasProviderBeans = new ArrayList<IaasProviderBean>(); - for(IaasConfig iaasConfig : iaasConfigs) { + for (IaasConfig iaasConfig : iaasConfigs) { IaasProviderBean iaasProviderBean = new IaasProviderBean(); iaasProviderBean.setType(iaasConfig.getType()); iaasProviderBean.setImageId(iaasConfig.getImageId()); @@ -327,7 +327,7 @@ public class ObjectConverter { List<NetworkInterfaceBean> networkInterfaceBeans = new ArrayList<NetworkInterfaceBean>(); - for(NetworkInterface networkInterface : networkInterfaces.getNetworkInterfaces()) { + for (NetworkInterface networkInterface : networkInterfaces.getNetworkInterfaces()) { NetworkInterfaceBean networkInterfaceBean = new NetworkInterfaceBean(); networkInterfaceBean.setNetworkUuid(networkInterface.getNetworkUuid()); networkInterfaceBean.setFixedIp(networkInterface.getFixedIp()); @@ -367,7 +367,7 @@ public class ObjectConverter { return floatingNetworks; } - private static List<FloatingNetworkBean> convertFloatingNetworksToFloatingNetworkBeans( + private static List<FloatingNetworkBean> convertFloatingNetworksToFloatingNetworkBeans( FloatingNetworks floatingNetworks) { List<FloatingNetworkBean> floatingNetworkBeans = new ArrayList<FloatingNetworkBean>(); @@ -1521,7 +1521,7 @@ public class ObjectConverter { /** * Convert Persistence To PersistenceBean * - * @param baseDir base directory + * @param baseDir base directory * @param directories directories * @return DeploymentBean */ @@ -1592,7 +1592,7 @@ public class ObjectConverter { cartridge.setDescription(cartridgeInfo.getDescription()); cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); - if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { + if (cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { cartridge.setMetadataKeys(Arrays.asList(cartridgeInfo.getMetadataKeys())); }
