Another set of warning fixes

Change-Id: Ic2bd07eb6490174e7f6a8808652dabeec122866c
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
index d563b29de11383ba3200703d2b26a88d7edcc9d5..3396f4e3f8c41857e8a8a9e4f75658cf1ca2e431 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
@@ -7,34 +7,33 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl
 
+import com.google.common.collect.ImmutableList
+import java.util.ArrayList
+import java.util.Collections
+import java.util.HashMap
+import java.util.List
+import java.util.Map
+import java.util.WeakHashMap
+import java.util.concurrent.ConcurrentHashMap
+import org.opendaylight.yangtools.yang.binding.Augmentation
+import org.opendaylight.yangtools.yang.binding.DataObject
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier
-import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem
-import org.opendaylight.yangtools.yang.common.QName
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item
-import java.util.Map
-import java.util.WeakHashMap
+import org.opendaylight.yangtools.yang.binding.util.BindingReflections
+import org.opendaylight.yangtools.yang.common.QName
+import org.opendaylight.yangtools.yang.data.api.CompositeNode
 import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifier
 import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates
-import java.util.ArrayList
+import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument
+import org.opendaylight.yangtools.yang.data.api.Node
+import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl
+import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl
+import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry
+import org.opendaylight.yangtools.yang.data.impl.codec.IdentifierCodec
 import org.opendaylight.yangtools.yang.data.impl.codec.InstanceIdentifierCodec
 import org.opendaylight.yangtools.yang.data.impl.codec.ValueWithQName
-import java.util.HashMap
 import org.slf4j.LoggerFactory
-import java.util.List
-import org.opendaylight.yangtools.yang.binding.DataObject
-import org.opendaylight.yangtools.yang.data.impl.codec.IdentifierCodec
-import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl
-import org.opendaylight.yangtools.yang.data.api.Node
-import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl
-import org.opendaylight.yangtools.yang.data.api.CompositeNode
-import org.opendaylight.yangtools.yang.binding.Augmentable
-import com.google.common.collect.ImmutableList
-import org.opendaylight.yangtools.yang.binding.Augmentation
-import java.util.concurrent.ConcurrentHashMap
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections
-import java.util.Collections
 
 class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
 
@@ -52,7 +51,7 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         var Class<?> baType = null
         val biArgs = input.path
         val scannedPath = new ArrayList<QName>(biArgs.size);
-        val baArgs = new ArrayList<org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument>(biArgs.size)
+        val baArgs = new ArrayList<InstanceIdentifier.PathArgument>(biArgs.size)
         for(biArg : biArgs) {
             scannedPath.add(biArg.nodeType);
             val baArg = deserializePathArgument(biArg,scannedPath)
@@ -71,13 +70,13 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         return ret;
     }
 
-    private def dispatch org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument deserializePathArgument(NodeIdentifier argument,List<QName> processedPath) {
+    private def dispatch InstanceIdentifier.PathArgument deserializePathArgument(NodeIdentifier argument,List<QName> processedPath) {
         val Class cls = codecRegistry.getClassForPath(processedPath);
         return new Item(cls);
     }
 
 
-    private def dispatch org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument deserializePathArgument(NodeIdentifierWithPredicates argument,List<QName> processedPath) {
+    private def dispatch InstanceIdentifier.PathArgument deserializePathArgument(NodeIdentifierWithPredicates argument,List<QName> processedPath) {
         val Class type = codecRegistry.getClassForPath(processedPath);
         val IdentifierCodec codec = codecRegistry.getIdentifierCodecForIdentifiable(type);
         val value = codec.deserialize(argument.toCompositeNode())?.value;
@@ -93,9 +92,9 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         return new CompositeNodeTOImpl(predicates.nodeType,null,values);
     }
 
-    override serialize(InstanceIdentifier input) {
+    override serialize(InstanceIdentifier<?> input) {
         var Class<?> previousAugmentation = null
-        val pathArgs = input.path as List<org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument>
+        val pathArgs = input.path as List<InstanceIdentifier.PathArgument>
         var QName previousQName = null;
         val components = new ArrayList<PathArgument>(pathArgs.size);
         val qnamePath = new ArrayList<QName>(pathArgs.size);
@@ -114,7 +113,7 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
 
                 previousAugmentation = null;
             } else {
-                previousQName = codecRegistry.getQNameForAugmentation(baArg.type as Class);
+                previousQName = codecRegistry.getQNameForAugmentation(baArg.type as Class<?>);
                 previousAugmentation = baArg.type;
             }
         }
@@ -130,7 +129,7 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         classToPreviousAugment.get(class1).put(list,augmentation);
     }
 
-    private def dispatch PathArgument serializePathArgument(Item argument, QName previousQname) {
+    private def dispatch PathArgument serializePathArgument(Item<?> argument, QName previousQname) {
         val type = argument.type;
         val qname = BindingReflections.findQName(type);
         if(previousQname == null || (BindingReflections.isAugmentationChild(argument.type))) {

diff --git a/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/BindingToRestRpc.java b/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/BindingToRestRpc.java
index 6e695359daf0f2e02b8d6e9e8388fd2c0e88aa88..fe4eb76695e25b08007f27215ce3cd26bc1d7e7a 100644 (file)
--- a/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/BindingToRestRpc.java
+++ b/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/BindingToRestRpc.java
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.yangtools.restconf.client;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.sun.jersey.api.client.ClientResponse;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.opendaylight.yangtools.restconf.client.to.RestRpcError;
 import org.opendaylight.yangtools.restconf.client.to.RestRpcResult;
 import org.opendaylight.yangtools.restconf.common.ResourceUri;
@@ -38,6 +36,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSSerializer;
 
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.sun.jersey.api.client.ClientResponse;
+
 public class BindingToRestRpc implements InvocationHandler {
 
     private final RestconfClientImpl client;
@@ -46,7 +48,7 @@ public class BindingToRestRpc implements InvocationHandler {
     private final SchemaContext schcemaContext;
     private final Module module;
 
-    public BindingToRestRpc(Class proxiedInterface,BindingIndependentMappingService mappingService,RestconfClientImpl client,SchemaContext schemaContext) throws Exception {
+    public BindingToRestRpc(Class<?> proxiedInterface,BindingIndependentMappingService mappingService,RestconfClientImpl client,SchemaContext schemaContext) throws Exception {
         this.mappingService = mappingService;
         this.client  = client;
         this.schcemaContext = schemaContext;

diff --git a/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/RestListenableEventStreamContext.java b/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/RestListenableEventStreamContext.java
index e08f5b65d882fb4d6b7629393ba22de64c0e2b49..796959fe627af02eb619199567f9630605a2525b 100644 (file)
--- a/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/RestListenableEventStreamContext.java
+++ b/restconf/restconf-client-impl/src/main/java/org/opendaylight/yangtools/restconf/client/RestListenableEventStreamContext.java
@@ -7,14 +7,8 @@
  */
 package org.opendaylight.yangtools.restconf.client;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.sun.jersey.api.client.ClientResponse;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -24,7 +18,9 @@ import java.util.Date;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
+
 import javax.ws.rs.core.MediaType;
+
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.restconf.client.api.event.EventStreamInfo;
@@ -40,6 +36,14 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Charsets;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.sun.jersey.api.client.ClientResponse;
+
 
 
 

diff --git a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/InstanceIdentifierTest.java b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/InstanceIdentifierTest.java
index 074624b1e53ea4bc9a5d6259a12fe09cb124232f..792ccd0ccf2018ede2d1dac58043a92a376a98c3 100644 (file)
--- a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/InstanceIdentifierTest.java
+++ b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/InstanceIdentifierTest.java
@@ -7,7 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.binding.test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -23,18 +26,18 @@ public class InstanceIdentifierTest {
 
     @Test
     public void constructWithPredicates() {
-        
+
         InstanceIdentifier<Nodes> nodes = InstanceIdentifier.builder(Nodes.class).toInstance();
-        
+
         assertNotNull(nodes);
         assertEquals(Nodes.class, nodes.getTargetType());
-        
-        
-        InstanceIdentifier<Node> node = InstanceIdentifier.builder(nodes).node(Node.class).toInstance();
-        
+
+
+        InstanceIdentifier<Node> node = InstanceIdentifier.builder(nodes).child(Node.class).toInstance();
+
         assertNotNull(node);
         assertEquals(Node.class, node.getTargetType());
-        
+
         assertTrue(nodes.contains(node));
     }
 
@@ -49,25 +52,25 @@ public class InstanceIdentifierTest {
 
         assertTrue(nodes.contains(node));
     }
-   
-    
+
+
     @Test
     public void negativeContains() {
         InstanceIdentifier<FooChild> fooChild = InstanceIdentifier.builder(Nodes.class).child(InstantiatedFoo.class).child(FooChild.class).build();
-        
+
         InstanceIdentifier<Node> nodeTen = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(10)).toInstance();
         InstanceIdentifier<Node> nodeOne = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(1)).toInstance();
         InstanceIdentifier<Nodes> nodes = InstanceIdentifier.builder(Nodes.class).toInstance();
-    
+
         assertFalse(fooChild.contains(nodeTen));
         assertFalse(nodeTen.contains(nodes));
-        
+
         assertFalse(nodeOne.contains(nodes));
         assertTrue(nodes.contains(nodeOne));
     }
-    
+
     @Test
     public void containsWildcarded() {
         InstanceIdentifier<Nodes> nodes = InstanceIdentifier.builder(Nodes.class).toInstance();
@@ -75,40 +78,40 @@ public class InstanceIdentifierTest {
         InstanceIdentifier<NodeChild> wildcardedChildren = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class) //
                 .child(NodeChild.class).build();
-        
+
         assertTrue(wildcarded.isWildcarded());
         assertTrue(wildcardedChildren.isWildcarded());
-        
-        
+
+
         InstanceIdentifier<Node> nodeTen = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(10)).toInstance();
         InstanceIdentifier<Node> nodeOne = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(1)).toInstance();
-        
+
         assertFalse(nodeTen.isWildcarded());
         assertFalse(nodeOne.isWildcarded());
         assertTrue(nodes.containsWildcarded(nodeOne));
         assertTrue(wildcarded.containsWildcarded(nodeOne));
         assertTrue(wildcarded.containsWildcarded(nodeTen));
-        
-        
+
+
         InstanceIdentifier<NodeChild> nodeTenChildWildcarded = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(10)).child(NodeChild.class).toInstance();
-        
+
         assertTrue(nodeTenChildWildcarded.isWildcarded());
-        
+
         InstanceIdentifier<NodeChild> nodeTenChild = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(10)).child(NodeChild.class, new NodeChildKey(10)).toInstance();
         InstanceIdentifier<NodeChild> nodeOneChild = InstanceIdentifier.builder(Nodes.class) //
                 .child(Node.class,new NodeKey(1)).child(NodeChild.class, new NodeChildKey(1)).toInstance();
 
-        
+
         assertFalse(nodeTenChildWildcarded.containsWildcarded(nodeOneChild));
         assertTrue(nodeTenChildWildcarded.containsWildcarded(nodeTenChild));
-        
+
     }
-    
-    
+
+
     void childOfTest() {
         InstanceIdentifier.builder(Nodes.class).child(InstantiatedFoo.class).child(FooChild.class);
     }

diff --git a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeChildKey.java b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeChildKey.java
index f78427840ca1bd81fd231a3d144a5703fa7c7cdc..4c915fb8474209a24a86b4538fc4ea3466a7a34e 100644 (file)
--- a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeChildKey.java
+++ b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeChildKey.java
@@ -11,8 +11,8 @@ import org.opendaylight.yangtools.yang.binding.Identifier;
 
 public class NodeChildKey implements //
         Identifier<NodeChild> {
-
-    private final int id;
+       private static final long serialVersionUID = 1L;
+       private final int id;
 
     public NodeChildKey(int id) {
         super();

diff --git a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeKey.java b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeKey.java
index 295b6e5765628047e899ae528d881ce445ab23b3..7b83790c7537fca4937673db8b958c9a7144631b 100644 (file)
--- a/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeKey.java
+++ b/yang/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/test/mock/NodeKey.java
@@ -11,8 +11,8 @@ import org.opendaylight.yangtools.yang.binding.Identifier;
 
 public class NodeKey implements //
         Identifier<Node> {
-
-    private final int id;
+       private static final long serialVersionUID = 1L;
+       private final int id;
 
     public NodeKey(int id) {
         super();