Switch to JDT annotations for NonNull

Change-Id: Id90bbd8717047f027ce9620c0f91d01033b9aa79
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java b/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
index e2f6a12269bf9a72b192ad313da36db9207ab2f4..cf3a81c6ba749abaf6cf26225559dead41ca6fec 100644 (file)
--- a/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
+++ b/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
@@ -13,11 +13,12 @@ import com.google.common.collect.Maps;
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
@@ -86,7 +87,7 @@ public class NeutronHostconfigOvsListener implements ClusteredDataTreeChangeList
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Node>> changes) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) {
         Preconditions.checkNotNull(changes, "Changes may not be null!");
         try {
             processChanges(changes);

diff --git a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
index 2e17d3e8b64b74b363a8fb2c4186811b1beab716..727245490f55a7cbb3b657ee7138434b07a85ac8 100644 (file)
--- a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
+++ b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
@@ -18,7 +18,8 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
+
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
@@ -79,7 +80,7 @@ public class NeutronHostconfigVppListener implements ClusteredDataTreeChangeList
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Node>> changes) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) {
         LOG.info("onDataTreeChanged: Received Data Tree Changes: {}", changes);
         executorService.execute(() -> {
             try {

diff --git a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
index 9a001e4150bca85b54a8b36573a988b9bfb9ce35..b8a2639789121aa4a746e97c96d606fafc8ca02e 100644 (file)
--- a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
+++ b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
@@ -16,8 +16,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -98,7 +97,7 @@ public class NeutronHostconfigVppListenerTest extends HostconfigsDataBrokerTest
         Assert.assertEquals(sf.get(), Integer.valueOf(2));
     }
 
-    private InstanceIdentifier<Hostconfig> hostConfigIid(@Nonnull NodeId nodeId) {
+    private InstanceIdentifier<Hostconfig> hostConfigIid(@NonNull NodeId nodeId) {
         return InstanceIdentifier.builder(Neutron.class)
             .child(Hostconfigs.class)
             .child(Hostconfig.class, new HostconfigKey(nodeId.getValue(), HostconfigUtil.L2_HOST_TYPE))

diff --git a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
index 355278d847ed0a498827e472ab55f7f3ebac54a2..a7b23f942d912ec9a7338ae77eccd7b95599a757 100644 (file)
--- a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
+++ b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
@@ -10,11 +10,12 @@ package org.opendaylight.neutron.logger;
 
 import com.google.common.base.Preconditions;
 import java.util.Collection;
-import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
@@ -39,13 +40,13 @@ public final class NeutronLogger {
     private ListenerRegistration<? extends ClusteredDataTreeChangeListener<Neutron>> operationalRegisteredListener;
 
     @Inject
-    public NeutronLogger(@Nonnull DataBroker db) {
+    public NeutronLogger(@NonNull DataBroker db) {
         LOG.info("Creating NeutronLogger {}", db);
         this.db = Preconditions.checkNotNull(db, "null db");
     }
 
-    private <T extends DataObject> void formatModification(@Nonnull final StringBuilder messageBuilder,
-            @Nonnull final DataObjectModification<T> objectModification) {
+    private <T extends DataObject> void formatModification(@NonNull final StringBuilder messageBuilder,
+            @NonNull final DataObjectModification<T> objectModification) {
         final String typeName = objectModification.getDataType().getSimpleName();
 
         switch (objectModification.getModificationType()) {
@@ -73,8 +74,8 @@ public final class NeutronLogger {
         }
     }
 
-    private <T extends DataObject> void formatChanges(@Nonnull final StringBuilder messageBuilder,
-            @Nonnull final Collection<DataTreeModification<T>> changes) {
+    private <T extends DataObject> void formatChanges(@NonNull final StringBuilder messageBuilder,
+            @NonNull final Collection<DataTreeModification<T>> changes) {
         for (DataTreeModification<T> modification : changes) {
             final DataTreeIdentifier<T> identifier = modification.getRootPath();
             final LogicalDatastoreType datastoreType = identifier.getDatastoreType();
@@ -89,7 +90,7 @@ public final class NeutronLogger {
         }
     }
 
-    private void logChanges(String prefix, @Nonnull Collection<DataTreeModification<Neutron>> changes) {
+    private void logChanges(String prefix, @NonNull Collection<DataTreeModification<Neutron>> changes) {
         if (LOG.isInfoEnabled()) {
             final StringBuilder messageBuilder = new StringBuilder(prefix);
             formatChanges(messageBuilder, changes);