Format CC component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/af29d05e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/af29d05e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/af29d05e Branch: refs/heads/master Commit: af29d05eacd5d73f39da48b78dedfaec9731d50d Parents: 8a77ea5 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Jun 14 15:03:48 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Jun 14 15:03:48 2015 +0530 ---------------------------------------------------------------------- .../controller/iaases/kubernetes/KubernetesIaas.java | 2 +- .../messaging/publisher/TopologyEventPublisher.java | 2 +- .../controller/messaging/topology/TopologyBuilder.java | 7 +++++-- .../services/impl/CloudControllerServiceImpl.java | 13 ------------- .../cloud/controller/util/CloudControllerUtil.java | 2 +- 5 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/af29d05e/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 6fe2a8a..71c38a3 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 @@ -466,7 +466,7 @@ public class KubernetesIaas extends Iaas { String sessionAffinity = null; Property sessionAffinityProperty = cartridge.getProperties().getProperty(KUBERNETES_SERVICE_SESSION_AFFINITY); - if(sessionAffinityProperty != null) { + if (sessionAffinityProperty != null) { sessionAffinity = sessionAffinityProperty.getValue(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/af29d05e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java index 6cbbbc3..7225a61 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java @@ -57,7 +57,7 @@ public class TopologyEventPublisher { : ServiceType.SingleTenant)); // Add ports to the event - if(cartridge.getPortMappings() != null) { + if (cartridge.getPortMappings() != null) { Port port; List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); for (PortMapping portMapping : portMappings) { http://git-wip-us.apache.org/repos/asf/stratos/blob/af29d05e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 282624e..4a78a6e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -21,7 +21,10 @@ package org.apache.stratos.cloud.controller.messaging.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.context.CloudControllerContext; -import org.apache.stratos.cloud.controller.domain.*; +import org.apache.stratos.cloud.controller.domain.Cartridge; +import org.apache.stratos.cloud.controller.domain.ClusterContext; +import org.apache.stratos.cloud.controller.domain.MemberContext; +import org.apache.stratos.cloud.controller.domain.PortMapping; import org.apache.stratos.cloud.controller.exception.InvalidCartridgeTypeException; import org.apache.stratos.cloud.controller.exception.InvalidMemberException; import org.apache.stratos.cloud.controller.messaging.publisher.TopologyEventPublisher; @@ -91,7 +94,7 @@ public class TopologyBuilder { } service.setProperties(properties); - if(cartridge.getPortMappings() != null) { + if (cartridge.getPortMappings() != null) { List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); Port port; //adding ports to the event http://git-wip-us.apache.org/repos/asf/stratos/blob/af29d05e/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 9179e6d..279280f 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 @@ -25,18 +25,6 @@ import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable import org.apache.stratos.cloud.controller.config.CloudControllerConfig; import org.apache.stratos.cloud.controller.context.CloudControllerContext; import org.apache.stratos.cloud.controller.domain.*; -import org.apache.stratos.cloud.controller.domain.ApplicationClusterContext; -import org.apache.stratos.cloud.controller.domain.Cartridge; -import org.apache.stratos.cloud.controller.domain.ClusterContext; -import org.apache.stratos.cloud.controller.domain.Dependencies; -import org.apache.stratos.cloud.controller.domain.InstanceContext; -import org.apache.stratos.cloud.controller.domain.MemberContext; -import org.apache.stratos.cloud.controller.domain.NetworkPartition; -import org.apache.stratos.cloud.controller.domain.Partition; -import org.apache.stratos.cloud.controller.domain.PortMapping; -import org.apache.stratos.cloud.controller.domain.Registrant; -import org.apache.stratos.cloud.controller.domain.ServiceGroup; -import org.apache.stratos.cloud.controller.domain.Volume; import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster; import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesHost; import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesMaster; @@ -45,7 +33,6 @@ import org.apache.stratos.cloud.controller.iaases.Iaas; import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder; import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager; import org.apache.stratos.cloud.controller.services.CloudControllerService; -import org.apache.stratos.cloud.controller.stub.domain.*; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.Property; import org.apache.stratos.common.domain.LoadBalancingIPType; http://git-wip-us.apache.org/repos/asf/stratos/blob/af29d05e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index ddd55587..f9b585e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -297,7 +297,7 @@ public class CloudControllerUtil { try { validateKubernetesMaster(kubernetesCluster.getKubernetesMaster()); validateKubernetesHosts(kubernetesCluster.getKubernetesHosts()); - + // Check for duplicate hostIds if (kubernetesCluster.getKubernetesHosts() != null) { List<String> hostIds = new ArrayList<String>();
