Removed more unused imports and leftover annotation code from various classes.

Author: cristofolini

engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java

@@ -24,7 +24,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;

engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java

@@ -24,7 +24,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.log4j.Logger;

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java

@@ -48,7 +48,6 @@
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.guru.DirectPodBasedNetworkGuru;
-import com.cloud.network.guru.NetworkGuru;
 import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallbackNoReturn;

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java

@@ -43,7 +43,6 @@
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.element.DhcpServiceProvider;
-import com.cloud.network.element.NetworkElement;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.db.DB;

plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java

@@ -125,8 +125,6 @@
  * removes them when the VM is destroyed.
  */
 @Component
-        SourceNatServiceProvider.class, StaticNatServiceProvider.class,
-        NetworkACLServiceProvider.class, FirewallServiceProvider.class})
 public class BigSwitchBcfElement extends AdapterBase implements BigSwitchBcfElementService,
 ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider,
 NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {

plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java

@@ -58,7 +58,6 @@
 import com.cloud.network.dao.VirtualRouterProviderDao;
 import com.cloud.network.element.IpDeployer;
 import com.cloud.network.element.LoadBalancingServiceProvider;
-import com.cloud.network.element.NetworkElement;
 import com.cloud.network.element.VirtualRouterElement;
 import com.cloud.network.element.VirtualRouterProviderVO;
 import com.cloud.network.lb.LoadBalancingRule;

plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java

@@ -86,7 +86,6 @@
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 @Component
-    StaticNatServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class})
 public class MidoNetElement extends AdapterBase implements ConnectivityProvider, DhcpServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, IpDeployer,
         PortForwardingServiceProvider, FirewallServiceProvider, PluggableService {
 

plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java

@@ -128,7 +128,6 @@
 import com.cloud.vm.dao.NicDao;
 
 @Component
-        IpDeployer.class})
 public class NiciraNvpElement extends AdapterBase implements ConnectivityProvider, SourceNatServiceProvider, PortForwardingServiceProvider, StaticNatServiceProvider,
 NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
 

plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java

@@ -45,7 +45,6 @@
 import com.cloud.network.Network.Service;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.element.ConnectivityProvider;
-import com.cloud.network.element.NetworkElement;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceStateAdapter;

plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java

@@ -79,8 +79,6 @@
 import com.cloud.vm.dao.UserVmDao;
 import com.google.gson.Gson;
 
-        SourceNatServiceProvider.class, StaticNatServiceProvider.class,
-        PortForwardingServiceProvider.class, IpDeployer.class, NetworkMigrationResponder.class})
 public class OvsElement extends AdapterBase implements NetworkElement,
 OvsElementService, ConnectivityProvider, ResourceStateAdapter,
 PortForwardingServiceProvider, LoadBalancingServiceProvider, NetworkMigrationResponder,