removing IDE warnings of cloud-controller component.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/40f1c027 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/40f1c027 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/40f1c027 Branch: refs/heads/4.0.0-grouping Commit: 40f1c0278b04be06bc830ab3d4ce29a614c92f46 Parents: d43e6be Author: Nirmal Fernando <[email protected]> Authored: Mon Aug 18 21:14:07 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Aug 18 21:14:07 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 1 - .../cloud/controller/iaases/OpenstackNovaIaas.java | 9 +-------- .../internal/CloudControllerDSComponent.java | 6 ------ .../publisher/CartridgeInstanceDataPublisher.java | 17 ++++++++--------- .../status/InstanceStatusEventMessageListener.java | 1 - .../status/InstanceStatusEventMessageQueue.java | 3 ++- .../cloud/controller/topology/TopologyBuilder.java | 2 -- .../cloud/controller/util/CloudControllerUtil.java | 1 - .../validate/VCloudPartitionValidator.java | 6 ++++-- 9 files changed, 15 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java index e4d5477..a637edc 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java @@ -59,7 +59,6 @@ import org.jclouds.ec2.options.DetachVolumeOptions; import java.util.*; -@SuppressWarnings("deprecation") public class AWSEC2Iaas extends Iaas { public AWSEC2Iaas(IaasProvider iaasProvider) { http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java index b4b31d5..2c0b27c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java @@ -44,7 +44,6 @@ import org.jclouds.compute.domain.NodeMetadataBuilder; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.options.TemplateOptions; -import org.jclouds.ec2.options.CreateSnapshotOptions; import org.jclouds.openstack.nova.v2_0.NovaApi; import org.jclouds.openstack.nova.v2_0.NovaApiMetadata; import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; @@ -55,7 +54,6 @@ import org.jclouds.openstack.nova.v2_0.domain.KeyPair; import org.jclouds.openstack.nova.v2_0.domain.Network; import org.jclouds.openstack.nova.v2_0.domain.Volume; import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment; -import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot; import org.jclouds.openstack.nova.v2_0.domain.zonescoped.AvailabilityZone; import org.jclouds.openstack.nova.v2_0.extensions.AvailabilityZoneAPI; import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi; @@ -64,7 +62,6 @@ import org.jclouds.openstack.nova.v2_0.extensions.KeyPairApi; import org.jclouds.openstack.nova.v2_0.extensions.VolumeApi; import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi; import org.jclouds.openstack.nova.v2_0.options.CreateVolumeOptions; -import org.jclouds.openstack.nova.v2_0.options.CreateVolumeSnapshotOptions; import org.jclouds.rest.RestContext; import java.util.ArrayList; @@ -314,8 +311,7 @@ public class OpenstackNovaIaas extends Iaas { ComputeServiceContext context = iaasInfo.getComputeService() .getContext(); - @SuppressWarnings("deprecation") - NovaApi novaClient = context.unwrap(NovaApiMetadata.CONTEXT_TOKEN).getApi(); + NovaApi novaClient = context.unwrap(NovaApiMetadata.CONTEXT_TOKEN).getApi(); String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); FloatingIPApi floatingIp = novaClient.getFloatingIPExtensionForZone( @@ -407,9 +403,7 @@ public class OpenstackNovaIaas extends Iaas { String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); - @SuppressWarnings("deprecation") RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap(); - @SuppressWarnings("deprecation") FloatingIPApi floatingIPApi = nova.getApi() .getFloatingIPExtensionForZone(region).get(); @@ -586,7 +580,6 @@ public class OpenstackNovaIaas extends Iaas { ComputeServiceContext context = iaasInfo.getComputeService().getContext();; RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap(); VolumeApi volumeApi = nova.getApi().getVolumeExtensionForZone(region).get(); - VolumeAttachmentApi volumeAttachmentApi = nova.getApi().getVolumeAttachmentExtensionForZone(region).get(); Volume.Status volumeStatus = this.getVolumeStatus(volumeApi, volumeId); while(volumeStatus != expectedStatus){ http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java index 0c9f5c2..b1d6c6d 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java @@ -27,7 +27,6 @@ import org.apache.stratos.cloud.controller.exception.CloudControllerException; import org.apache.stratos.cloud.controller.impl.CloudControllerServiceImpl; import org.apache.stratos.cloud.controller.interfaces.CloudControllerService; import org.apache.stratos.cloud.controller.publisher.TopologySynchronizerTaskScheduler; -import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; import org.apache.stratos.cloud.controller.topic.instance.status.InstanceStatusEventMessageDelegator; import org.apache.stratos.cloud.controller.topic.instance.status.InstanceStatusEventMessageListener; import org.apache.stratos.cloud.controller.util.CloudControllerConstants; @@ -61,14 +60,9 @@ import org.wso2.carbon.utils.ConfigurationContextService; * bind="setConfigurationContextService" * unbind="unsetConfigurationContextService" */ -//* @scr.reference name="org.apache.stratos.cloud.controller.deployers" -//* interface="org.apache.stratos.cloud.controller.interfaces.CloudControllerDeployerService" -//* cardinality="1..1" policy="dynamic" bind="setCloudControllerDeployerService" -//* unbind="unsetCloudControllerDeployerService" public class CloudControllerDSComponent { private static final Log log = LogFactory.getLog(CloudControllerDSComponent.class); - private static final FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance(); protected void activate(ComponentContext context) { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java index ecec703..bbc277e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java @@ -21,8 +21,6 @@ package org.apache.stratos.cloud.controller.publisher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.exception.CloudControllerException; -import org.apache.stratos.cloud.controller.exception.UnregisteredCartridgeException; -import org.apache.stratos.cloud.controller.impl.CloudControllerServiceImpl; import org.apache.stratos.cloud.controller.pojo.Cartridge; import org.apache.stratos.cloud.controller.pojo.MemberContext; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; @@ -51,7 +49,6 @@ public class CartridgeInstanceDataPublisher { private static StreamDefinition streamDefinition; private static final String cloudControllerEventStreamVersion = "1.0.0"; - @SuppressWarnings("deprecation") public static void publish(String memberId, String partitionId, String networkId, @@ -76,9 +73,11 @@ public class CartridgeInstanceDataPublisher { } } - Cartridge cartridge = null; MemberContext memberContext = FasterLookUpDataHolder.getInstance().getMemberContextOfMemberId(memberId); + String cartridgeType = memberContext.getCartridgeType(); + Cartridge cartridge = FasterLookUpDataHolder.getInstance().getCartridge(cartridgeType); + //Construct the data to be published List<Object> payload = new ArrayList<Object>(); // Payload values @@ -88,11 +87,11 @@ public class CartridgeInstanceDataPublisher { payload.add(memberContext.getLbClusterId()); payload.add(partitionId); payload.add(networkId); - if(cartridge != null) { - payload.add(String.valueOf(cartridge.isMultiTenant())); - } else { - payload.add(""); - } + if (cartridge != null) { + payload.add(String.valueOf(cartridge.isMultiTenant())); + } else { + payload.add(""); + } payload.add(memberContext.getPartition().getProvider()); payload.add(status); http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java index 891b92d..8e5ef9a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java @@ -20,7 +20,6 @@ package org.apache.stratos.cloud.controller.topic.instance.status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.topology.TopologyManager; import javax.jms.JMSException; import javax.jms.Message; http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageQueue.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageQueue.java index 86bfe0d..4e69c16 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageQueue.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageQueue.java @@ -26,7 +26,8 @@ import java.util.concurrent.LinkedBlockingQueue; * Implements a blocking queue for managing instance status event messages. */ public class InstanceStatusEventMessageQueue extends LinkedBlockingQueue<TextMessage>{ - private static volatile InstanceStatusEventMessageQueue instance; + private static final long serialVersionUID = 828304342209475302L; + private static volatile InstanceStatusEventMessageQueue instance; private InstanceStatusEventMessageQueue(){ } http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index c531b53..a8ed8de 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -356,7 +356,6 @@ public class TopologyBuilder { public static void handleMemberReadyToShutdown(InstanceReadyToShutdownEvent instanceReadyToShutdownEvent) throws InvalidMemberException, InvalidCartridgeTypeException { - String memberId = instanceReadyToShutdownEvent.getMemberId(); Topology topology = TopologyManager.getTopology(); Service service = topology.getService(instanceReadyToShutdownEvent.getServiceName()); //update the status of the member @@ -407,7 +406,6 @@ public class TopologyBuilder { public static void handleMemberMaintenance(InstanceMaintenanceModeEvent instanceMaintenanceModeEvent) throws InvalidMemberException, InvalidCartridgeTypeException { - String memberId = instanceMaintenanceModeEvent.getMemberId(); Topology topology = TopologyManager.getTopology(); Service service = topology.getService(instanceMaintenanceModeEvent.getServiceName()); //update the status of the member http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/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 d2b2e05..e9a57be 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 @@ -45,7 +45,6 @@ import java.util.Properties; public class CloudControllerUtil { private static final Log log = LogFactory.getLog(CloudControllerUtil.class); - @SuppressWarnings("unchecked") public static Cartridge toCartridge(CartridgeConfig config) { if (config == null) { return null; http://git-wip-us.apache.org/repos/asf/stratos/blob/40f1c027/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/VCloudPartitionValidator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/VCloudPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/VCloudPartitionValidator.java index 411b7ea..bcaaa41 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/VCloudPartitionValidator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/VCloudPartitionValidator.java @@ -34,9 +34,11 @@ import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidato */ public class VCloudPartitionValidator implements PartitionValidator { - private static final Log log = LogFactory.getLog(VCloudPartitionValidator.class); + @SuppressWarnings("unused") + private static final Log log = LogFactory.getLog(VCloudPartitionValidator.class); private IaasProvider iaasProvider; - private Iaas iaas; + @SuppressWarnings("unused") + private Iaas iaas; @Override public IaasProvider validate(String partitionId, Properties properties) throws InvalidPartitionException {
