Fixup errors reported by null analysis

This fixes up nulls being used in illegal contexts.

Change-Id: Icba09ff95e0c8a41615b0925de8f12006ea92059
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
index 8a47507edd8fee4fc7e05572c76729ade185352e..923e40fb5c1dace432ef54c870f7a13257689dc0 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
@@ -14,8 +14,10 @@ import static org.junit.Assert.fail;
 
 import com.google.common.collect.UnmodifiableIterator;
 import java.net.URI;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -26,7 +28,17 @@ public class PathArgumentListTest {
     private static final class TestClass extends PathArgumentList {
         @Override
         public UnmodifiableIterator<PathArgument> iterator() {
-            return null;
+            return new UnmodifiableIterator<PathArgument>() {
+                @Override
+                public boolean hasNext() {
+                    return false;
+                }
+
+                @Override
+                public PathArgument next() {
+                    throw new NoSuchElementException();
+                }
+            };
         }
 
         @Override
@@ -57,21 +69,21 @@ public class PathArgumentListTest {
         }
 
         try {
-            l.addAll(null);
+            l.addAll(Collections.emptyList());
             fail();
         } catch (UnsupportedOperationException e) {
             // Expected
         }
 
         try {
-            l.removeAll(null);
+            l.removeAll(Collections.emptyList());
             fail();
         } catch (UnsupportedOperationException e) {
             // Expected
         }
 
         try {
-            l.retainAll(null);
+            l.retainAll(Collections.emptyList());
             fail();
         } catch (UnsupportedOperationException e) {
             // Expected

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java
index 3fd64d131b089ea112126fa70fa4cd3c8f2a8bbb..31e0c88e2544338b3a5441ad514cdc2ca692d737 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java
@@ -7,12 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.model.repo.util;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Arrays;
 import java.util.concurrent.Future;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -53,7 +56,7 @@ public class SchemaSourceTransformerTest {
         this.schema = new SchemaSourceTransformer<>(
                 this.provider, SchemaSourceTransformerTest.SRC_CLASS, this.consumer,
                 SchemaSourceTransformerTest.DST_CLASS, this.function);
-        Assert.assertNotNull(this.schema);
+        assertNotNull(this.schema);
     }
 
     @Test
@@ -68,9 +71,9 @@ public class SchemaSourceTransformerTest {
                 this.function);
         final SchemaSourceProvider<YinXmlSchemaSource> prov = this.schema;
         final Future<? extends YinXmlSchemaSource> source = prov.getSource(sourceIdentifier);
-        Assert.assertNotNull(source);
+        assertNotNull(source);
         source.cancel(true);
-        Assert.assertTrue(source.isDone());
+        assertTrue(source.isDone());
     }
 
     @Test
@@ -96,11 +99,11 @@ public class SchemaSourceTransformerTest {
         final Iterable<PotentialSchemaSource<?>> sources = Arrays.asList(potList);
         listener.schemaSourceRegistered(sources);
         final ListenableFuture<YinXmlSchemaSource> source = this.schema.getSource(sourceIdentifier);
-        Assert.assertNotNull(source);
+        assertNotNull(source);
 
         listener.schemaSourceUnregistered(foo.getPotentialSchemSource());
         final ListenableFuture<YinXmlSchemaSource> source2 = this.schema.getSource(sourceIdentifier);
-        Assert.assertNotNull(source2);
+        assertNotNull(source2);
     }
 
     private class Foo<T extends SchemaSourceRepresentation> {
@@ -142,26 +145,25 @@ public class SchemaSourceTransformerTest {
         @Deprecated
         @Override
         public SchemaContextFactory createSchemaContextFactory(final SchemaSourceFilter filter) {
-            return null;
+            return mock(SchemaContextFactory.class);
         }
 
         @Override
         public SchemaContextFactory createSchemaContextFactory(final SchemaContextFactoryConfiguration config) {
-            return null;
+            return mock(SchemaContextFactory.class);
         }
-
     }
 
     private class Consumer extends AbstractSchemaRepository {
         @Deprecated
         @Override
         public SchemaContextFactory createSchemaContextFactory(final SchemaSourceFilter filter) {
-            return null;
+            return mock(SchemaContextFactory.class);
         }
 
         @Override
         public SchemaContextFactory createSchemaContextFactory(final SchemaContextFactoryConfiguration config) {
-            return null;
+            return mock(SchemaContextFactory.class);
         }
     }
 }

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
index c35c0c3c44d62c20318a0b001073f551ded6e57c..f30a998b54715a98429776e1a2aeeb17d1c39a77 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
@@ -33,7 +33,7 @@ public final class OpenConfigVersionSupport extends AbstractStatementSupport<Sem
 
     @Override
     public SemVer parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return SemVer.valueOf(value) ;
+        return SemVer.valueOf(value);
     }
 
     @Override

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java
index f387062e294347da8d2a692f6ade44b51a6f95bf..45639b103acede4a6d8f4310f0fb120324f38c21 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/SchemaContextUtilTest.java
@@ -12,6 +12,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.net.URI;
@@ -19,9 +21,9 @@ import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.Optional;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
@@ -45,6 +47,7 @@ import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.stmt.TestUtils;
 
+@RunWith(MockitoJUnitRunner.class)
 public class SchemaContextUtilTest {
     @Mock
     private SchemaContext mockSchemaContext;
@@ -53,7 +56,6 @@ public class SchemaContextUtilTest {
 
     @Test
     public void testFindDummyData() {
-        MockitoAnnotations.initMocks(this);
         doReturn(Optional.empty()).when(mockSchemaContext).findModule(any(QNameModule.class));
         doReturn(Optional.empty()).when(mockSchemaContext).findDataTreeChild(any(Iterable.class));
         doReturn(URI.create("dummy")).when(mockModule).getNamespace();
@@ -383,7 +385,7 @@ public class SchemaContextUtilTest {
     @Test(expected = IllegalArgumentException.class)
     public void findParentModuleIllegalArgumentTest() {
 
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
         SchemaContextUtil.findParentModule(mockContext, null);
 
     }
@@ -391,35 +393,29 @@ public class SchemaContextUtilTest {
     @Test(expected = IllegalArgumentException.class)
     public void findParentModuleIllegalArgumentTest2() {
 
-        final SchemaNode mockSchemaNode = Mockito.mock(SchemaNode.class);
+        final SchemaNode mockSchemaNode = mock(SchemaNode.class);
         SchemaContextUtil.findParentModule(null, mockSchemaNode);
 
     }
 
     @Test(expected = IllegalStateException.class)
     public void findParentModuleIllegalStateTest() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
-        final SchemaNode mockSchemaNode = Mockito.mock(SchemaNode.class);
-        Mockito.when(mockSchemaNode.getPath()).thenReturn(null);
+        final SchemaContext mockContext = mock(SchemaContext.class);
+        final SchemaNode mockSchemaNode = mock(SchemaNode.class);
+        when(mockSchemaNode.getPath()).thenReturn(null);
         SchemaContextUtil.findParentModule(mockContext, mockSchemaNode);
-
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeIllegalArgumentTest() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
         SchemaContextUtil.findDataSchemaNode(mockContext, null);
-
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeIllegalArgumentTest2() {
-
-        final SchemaPath mockSchemaPath = Mockito.mock(SchemaPath.class);
+        final SchemaPath mockSchemaPath = mock(SchemaPath.class);
         SchemaContextUtil.findDataSchemaNode(null, mockSchemaPath);
-
     }
 
     @Test
@@ -469,73 +465,60 @@ public class SchemaContextUtilTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeFromXPathIllegalArgumentTest() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
-        final Module module = Mockito.mock(Module.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
+        final Module module = mock(Module.class);
 
         SchemaContextUtil.findDataSchemaNode(mockContext, module, null);
-
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeFromXPathIllegalArgumentTest2() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
         final RevisionAwareXPath xpath = new RevisionAwareXPathImpl("my:my-grouping/my:my-leaf-in-gouping2", true);
 
         SchemaContextUtil.findDataSchemaNode(mockContext, null, xpath);
-
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeFromXPathIllegalArgumentTest3() {
-
-        final Module module = Mockito.mock(Module.class);
+        final Module module = mock(Module.class);
         final RevisionAwareXPath xpath = new RevisionAwareXPathImpl("my:my-grouping/my:my-leaf-in-gouping2", true);
 
         SchemaContextUtil.findDataSchemaNode(null, module, xpath);
-
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void findDataSchemaNodeFromXPathIllegalArgumentTest4() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
-        final Module module = Mockito.mock(Module.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
+        final Module module = mock(Module.class);
         final RevisionAwareXPath xpath = new RevisionAwareXPathImpl(
                 "my:my-grouping[@con='NULL']/my:my-leaf-in-gouping2", true);
 
         SchemaContextUtil.findDataSchemaNode(mockContext, module, xpath);
-
     }
 
     @Test
     public void findDataSchemaNodeFromXPathNullTest() {
+        final SchemaContext mockContext = mock(SchemaContext.class);
+        final Module module = mock(Module.class);
+        final RevisionAwareXPath xpath = mock(RevisionAwareXPath.class);
 
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
-        final Module module = Mockito.mock(Module.class);
-        final RevisionAwareXPath xpath = Mockito.mock(RevisionAwareXPath.class);
-
-        Mockito.when(xpath.toString()).thenReturn(null);
+        when(xpath.toString()).thenReturn(null);
         assertNull(SchemaContextUtil.findDataSchemaNode(mockContext, module, xpath));
-
     }
 
     @Test
     public void findDataSchemaNodeFromXPathNullTest2() {
-
-        final SchemaContext mockContext = Mockito.mock(SchemaContext.class);
-        final Module module = Mockito.mock(Module.class);
+        final SchemaContext mockContext = mock(SchemaContext.class);
+        final Module module = mock(Module.class);
         final RevisionAwareXPath xpath = new RevisionAwareXPathImpl("my:my-grouping/my:my-leaf-in-gouping2", false);
 
         assertNull(SchemaContextUtil.findDataSchemaNode(mockContext, module, xpath));
-
     }
 
     @Test
     public void findNodeInSchemaContextGroupingsTest() throws URISyntaxException, IOException,
             YangSyntaxErrorException, ReactorException {
-
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
         final Module myModule = context.findModule(URI.create("uri:my-module"), Revision.of("2014-10-07")).get();
 
@@ -729,7 +712,6 @@ public class SchemaContextUtilTest {
         assertNotNull(testNode);
         assertNotNull(foundNode);
         assertEquals(testNode, foundNode);
-
     }
 
     @Test
@@ -737,7 +719,6 @@ public class SchemaContextUtilTest {
             YangSyntaxErrorException, ReactorException {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
-
         final Module myModule = context.findModule(new URI("uri:my-module"), Revision.of("2014-10-07")).get();
 
         // find grouping in container
@@ -842,7 +823,6 @@ public class SchemaContextUtilTest {
 
         assertNull(testNode);
         assertNull(foundNode);
-
     }
 
     private static GroupingDefinition getGroupingByName(final DataNodeContainer dataNodeContainer, final String name) {