From: Robert Varga Date: Sun, 9 Mar 2014 13:44:46 +0000 (+0100) Subject: Remove unused import and raw type references X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~345 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f5ea38e63e89fd1a804e21a5c538d99522900837 Remove unused import and raw type references Fixes a couple of warnings just by removing imports and adding to Iterator. Change-Id: I71f9a1e0176a1a72fb402e972b1e39ac6c1bba0f Signed-off-by: Robert Varga --- diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java index 02cc5ea1e4..90131fee98 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java @@ -34,7 +34,7 @@ public class ConfigManagerActivator implements BundleActivator { private ExtensibleBundleTracker>> bundleTracker; private ConfigRegistryImpl configRegistry; private ConfigRegistryJMXRegistrator configRegistryJMXRegistrator; - private ServiceRegistration configRegistryServiceRegistration; + private ServiceRegistration configRegistryServiceRegistration; private final MBeanServer configMBeanServer = ManagementFactory.getPlatformMBeanServer(); diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java index d7b4bd9d9e..1640035420 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java @@ -1,16 +1,15 @@ package org.opendaylight.controller.sal.streams.websockets; -import org.opendaylight.controller.sal.streams.listeners.Notificator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; -import io.netty.channel.ChannelPipeline; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; +import org.opendaylight.controller.sal.streams.listeners.Notificator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * {@link WebSocketServer} is responsible to start and stop web socket server at * {@link #PORT}. diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java index 18b5ce490f..0492b3efd4 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java @@ -124,7 +124,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch if (nextEvent.isStartElement()) { StartElement startElement = (StartElement) nextEvent; if (startElement.getName().getLocalPart().equals("lf111")) { - Iterator prefixes = startElement.getNamespaceContext().getPrefixes("augment:augment:module"); + Iterator prefixes = startElement.getNamespaceContext().getPrefixes("augment:augment:module"); while (prefixes.hasNext() && aaModulePrefix == null) { String prefix = (String) prefixes.next(); @@ -164,7 +164,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch if (nextEvent.isStartElement()) { StartElement startElement = (StartElement) nextEvent; if (startElement.getName().getLocalPart().equals("lf111")) { - Iterator prefixes = startElement.getNamespaceContext().getPrefixes("augment:module:leaf:list"); + Iterator prefixes = startElement.getNamespaceContext().getPrefixes("augment:module:leaf:list"); while (prefixes.hasNext() && aModuleLfLstPrefix == null) { String prefix = (String) prefixes.next(); @@ -198,14 +198,14 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch MutableSimpleNode lf111 = NodeFactory.createMutableSimpleNode(TestUtils.buildQName("lf111", "augment:augment:module", "2014-01-17"), lst11, instanceIdentifier,null,null); - - + + lst11.getChildren().add(lf111); lst11.init(); cont1.getChildren().add(lst11); cont1.init(); - + cont.getChildren().add(cont1); cont.init(); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java index 5a2c964b8b..2037fd4862 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java @@ -23,7 +23,6 @@ import java.io.UnsupportedEncodingException; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; @@ -38,11 +37,11 @@ import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; import org.opendaylight.yangtools.yang.data.api.CompositeNode; public class MediaTypesTest extends JerseyTest { - + private static RestconfService restconfService; private static String jsonData; private static String xmlData; - + @BeforeClass public static void init() throws IOException { restconfService = mock(RestconfService.class); @@ -51,7 +50,7 @@ public class MediaTypesTest extends JerseyTest { InputStream xmlStream = RestconfImplTest.class.getResourceAsStream("/parts/ietf-interfaces_interfaces.xml"); xmlData = TestUtils.getDocumentInPrintableForm(TestUtils.loadDocumentFrom(xmlStream)); } - + @Override protected Application configure() { /* enable/disable Jersey logs to console */ @@ -65,7 +64,7 @@ public class MediaTypesTest extends JerseyTest { JsonToCompositeNodeProvider.INSTANCE); return resourceConfig; } - + @Test public void testPostOperationsWithInputDataMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/operations/"; @@ -84,14 +83,14 @@ public class MediaTypesTest extends JerseyTest { verify(restconfService, times(5)).invokeRpc(eq(uriPath), any(CompositeNode.class)); post(uri, null, MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - + // negative tests post(uri, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); post(uri, MediaType.TEXT_XML, MediaType.TEXT_PLAIN, xmlData); verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); } - + @Test public void testGetConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -108,12 +107,12 @@ public class MediaTypesTest extends JerseyTest { verify(restconfService, times(4)).readConfigurationData(uriPath); get(uri, MediaType.TEXT_XML); verify(restconfService, times(5)).readConfigurationData(uriPath); - + // negative tests get(uri, MediaType.TEXT_PLAIN); verify(restconfService, times(5)).readConfigurationData(uriPath); } - + @Test public void testGetOperationalMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/operational/"; @@ -130,12 +129,12 @@ public class MediaTypesTest extends JerseyTest { verify(restconfService, times(4)).readOperationalData(uriPath); get(uri, MediaType.TEXT_XML); verify(restconfService, times(5)).readOperationalData(uriPath); - + // negative tests get(uri, MediaType.TEXT_PLAIN); verify(restconfService, times(5)).readOperationalData(uriPath); } - + @Test public void testPutConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -155,7 +154,7 @@ public class MediaTypesTest extends JerseyTest { put(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); } - + @Test public void testPostConfigWithPathMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -175,7 +174,7 @@ public class MediaTypesTest extends JerseyTest { post(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); } - + @Test public void testPostConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -194,7 +193,7 @@ public class MediaTypesTest extends JerseyTest { post(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).createConfigurationData(any(CompositeNode.class)); } - + @Test public void testDeleteConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -204,18 +203,18 @@ public class MediaTypesTest extends JerseyTest { target(uri).request("fooMediaType").delete(); verify(restconfService, times(1)).deleteConfigurationData(uriPath); } - + private int get(String uri, String acceptMediaType) { return target(uri).request(acceptMediaType).get().getStatus(); } - + private int put(String uri, String acceptMediaType, String contentTypeMediaType, String data) { if (acceptMediaType == null) { return target(uri).request().put(Entity.entity(data, contentTypeMediaType)).getStatus(); } return target(uri).request(acceptMediaType).put(Entity.entity(data, contentTypeMediaType)).getStatus(); } - + private int post(String uri, String acceptMediaType, String contentTypeMediaType, String data) { if (acceptMediaType == null) { if (contentTypeMediaType == null || data == null) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index 11264e7f86..c6e2f14343 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -20,7 +20,6 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URLEncoder; import java.text.ParseException; import java.util.Set; import java.util.concurrent.Future; @@ -53,8 +52,6 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import com.google.common.base.Charsets; - public class RestPostOperationTest extends JerseyTest { private static String xmlDataAbsolutePath; diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java index 47bb3ffd7c..4393b79f64 100644 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java @@ -12,14 +12,13 @@ import java.util.Dictionary; import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.ws.rs.core.Application; import javax.ws.rs.ext.ContextResolver; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlRootElement; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.opendaylight.controller.northbound.bundlescanner.IBundleScanService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -30,12 +29,14 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + /** * Instance of javax.ws.rs.core.Application used to return the classes * that will be instantiated for JAXRS processing. This hooks onto the * bundle scanner service to provide JAXB classes to JAX-RS for prorcessing. */ -@SuppressWarnings("unchecked") public class NorthboundApplication extends Application { public static final String JAXRS_RESOURCES_MANIFEST_NAME = "Jaxrs-Resources"; public static final String JAXRS_EXCLUDES_MANIFEST_NAME = "Jaxrs-Exclude-Types"; @@ -97,7 +98,7 @@ public class NorthboundApplication extends Application { } private static final IBundleScanService lookupBundleScanner(BundleContext ctx) { - ServiceReference svcRef = ctx.getServiceReference(IBundleScanService.class); + ServiceReference svcRef = ctx.getServiceReference(IBundleScanService.class); if (svcRef == null) { throw new ServiceException("Unable to lookup IBundleScanService"); }