Switch to JDT annotations for Nullable and NonNull

This reduces our dependency on JSR-305 which causes a number of issues
(e.g. with javax.annotation resolution in OSGi bundles).

Annotations on local variables are removed because they trigger a
Javac bug which crashes ASM and then FindBugs, SpotBugs and JaCoCo.

Change-Id: I8c7736fe57e1e953dfa8e7dcf46d89d2166c892e
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java
index db833891c8908e257cf72b3470904566277960aa..c6aea69bfd8fa255dbd5cb9e7bf7516132e8213b 100644 (file)
--- a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java
+++ b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java
@@ -11,8 +11,8 @@ import java.util.Collection;
 import java.util.Map.Entry;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.Map.Entry;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 
 /**
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 
 /**


@@ -32,9 +32,9 @@ public interface AclInterfaceCache {
      *                       the Builder is initially populated from the existing instance.
      * @return the new or updated AclInterface
      */
      *                       the Builder is initially populated from the existing instance.
      * @return the new or updated AclInterface
      */

-    @Nonnull
-    AclInterface addOrUpdate(@Nonnull String interfaceId,
-            @Nonnull BiConsumer<AclInterface, AclInterface.Builder> updateFunction);
+    @NonNull
+    AclInterface addOrUpdate(@NonNull String interfaceId,
+            @NonNull BiConsumer<AclInterface, AclInterface.Builder> updateFunction);

 
     /**
      * Updates an existing AclInterface instance in the cache. The given updateFunction is used to build a new instance.
 
     /**
      * Updates an existing AclInterface instance in the cache. The given updateFunction is used to build a new instance.


@@ -47,8 +47,8 @@ public interface AclInterfaceCache {
      * @return the updated AclInterface or null if no instance was present or no updates were made
      */
     @Nullable
      * @return the updated AclInterface or null if no instance was present or no updates were made
      */
     @Nullable

-    AclInterface updateIfPresent(@Nonnull String interfaceId,
-            @Nonnull BiFunction<AclInterface, AclInterface.Builder, Boolean> updateFunction);
+    AclInterface updateIfPresent(@NonNull String interfaceId,
+            @NonNull BiFunction<AclInterface, AclInterface.Builder, Boolean> updateFunction);

 
     /**
      * Removes an AclInterface instance from the cache.
 
     /**
      * Removes an AclInterface instance from the cache.


@@ -56,7 +56,7 @@ public interface AclInterfaceCache {
      * @param interfaceId the interface Id
      * @return the AclInterface if present, null oherwise
      */
      * @param interfaceId the interface Id
      * @return the AclInterface if present, null oherwise
      */

-    AclInterface remove(@Nonnull String interfaceId);
+    AclInterface remove(@NonNull String interfaceId);

 
     /**
      * Gets an AclInterface instance from the cache if present.
 
     /**
      * Gets an AclInterface instance from the cache if present.


@@ -65,8 +65,8 @@ public interface AclInterfaceCache {
      * @return the AclInterface instance if found, null otherwise
      */
     @Nullable
      * @return the AclInterface instance if found, null otherwise
      */
     @Nullable

-    AclInterface get(@Nonnull String interfaceId);
+    AclInterface get(@NonNull String interfaceId);

 
 

-    @Nonnull
+    @NonNull

     Collection<Entry<String, AclInterface>> entries();
 }
     Collection<Entry<String, AclInterface>> entries();
 }

diff --git a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java
index e4b064537f62d4e76e9fbd1cf36164318775e4d4..9bc153f1b7aa0a01e2129b4c0b32f86d4d62d57f 100644 (file)
--- a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java
+++ b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.aclservice.api;
 
 import java.util.Collection;
 package org.opendaylight.netvirt.aclservice.api;
 
 import java.util.Collection;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.access.list.entries.Ace;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.access.list.entries.Ace;

diff --git a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java
index 16b9536fba1baac2652181b40a3e22ed0f659d36..0d1a79a67f7919988f0f604756fc560a3236b095 100644 (file)
--- a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java
+++ b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java
@@ -10,8 +10,8 @@ package org.opendaylight.netvirt.aclservice.api.utils;
 
 import java.util.Collection;
 import java.util.Map;
 
 import java.util.Collection;
 import java.util.Map;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.DirectionBase;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.DirectionBase;


@@ -30,19 +30,19 @@ public interface AclDataCache {
     @Nullable
     Integer getAclTag(String aclId);
 
     @Nullable
     Integer getAclTag(String aclId);
 

-    @Nonnull
+    @NonNull

     Map<Uuid, Collection<AclInterface>> getAclInterfaceMap();
 
     Map<Uuid, Collection<AclInterface>> getAclInterfaceMap();
 

-    @Nonnull
+    @NonNull

     Map<Uuid, Collection<Uuid>> getEgressRemoteAclIdMap();
 
     Map<Uuid, Collection<Uuid>> getEgressRemoteAclIdMap();
 

-    @Nonnull
+    @NonNull

     Map<Uuid, Collection<Uuid>> getIngressRemoteAclIdMap();
 
     Map<Uuid, Collection<Uuid>> getIngressRemoteAclIdMap();
 

-    @Nonnull
+    @NonNull

     Map<String, Integer> getAclTagMap();
 
     Map<String, Integer> getAclTagMap();
 

-    @Nonnull
+    @NonNull

     Map<String, Acl> getAclMap();
 
 }
     Map<String, Acl> getAclMap();
 
 }

diff --git a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java
index 1699bf00e512badaf2278e42dcfbafb868dd313d..2a3ebe2269a5c270d9192afd35efd29a6b70a6ab 100644 (file)
--- a/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java
+++ b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java
@@ -12,7 +12,7 @@ import com.google.common.collect.ImmutableSortedSet;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.SortedSet;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.SortedSet;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.interfaces._interface.AllowedAddressPairs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.interfaces._interface.SubnetInfo;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.interfaces._interface.AllowedAddressPairs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.interfaces._interface.SubnetInfo;

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
index b92f27b1ca5aad1589695044de64b535a10e1930..cbf4d4b9958706208380945ca1bba8c88b5c0001 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java
index 4be2c34401cec45a749b8a59e55bef87731a20b5..cd1e2d19ef423b753e2940c38e45dc6bfb21c288 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java
@@ -15,9 +15,9 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Singleton;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.aclservice.api.AclInterfaceCache;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface.Builder;
 import org.opendaylight.netvirt.aclservice.api.AclInterfaceCache;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface.Builder;


@@ -36,7 +36,7 @@ public class AclInterfaceCacheImpl implements AclInterfaceCache {
     private final ConcurrentMap<String, AclInterface> cache = new ConcurrentHashMap<>();
 
     @Override
     private final ConcurrentMap<String, AclInterface> cache = new ConcurrentHashMap<>();
 
     @Override

-    public AclInterface addOrUpdate(@Nonnull String interfaceId,
+    public AclInterface addOrUpdate(@NonNull String interfaceId,

             BiConsumer<AclInterface, AclInterface.Builder> updateFunction) {
         while (true) {
             // First try to update the existing instance in the cache if one exists.
             BiConsumer<AclInterface, AclInterface.Builder> updateFunction) {
         while (true) {
             // First try to update the existing instance in the cache if one exists.

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
index 3f0a85ed3749b7d6e7e7099ed97bc96a997a7690..75985301db4968bdb32e8a26b09ee4b37c1bc232 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
@@ -17,11 +17,11 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -265,7 +265,7 @@ public class AclEventListener extends AsyncDataTreeChangeListenerBase<Acl, AclEv
         return this;
     }
 
         return this;
     }
 

-    @Nonnull
+    @NonNull

     private List<Ace> getChangedAceList(Acl updatedAcl, Acl currentAcl) {
         if (updatedAcl == null) {
             return Collections.emptyList();
     private List<Ace> getChangedAceList(Acl updatedAcl, Acl currentAcl) {
         if (updatedAcl == null) {
             return Collections.emptyList();

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
index e076fdbbd980bcf0c354394ec4145418e613c063..fd4fe04e4683946b4d06e234e2cc035e40553ad3 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
@@ -9,10 +9,10 @@ package org.opendaylight.netvirt.aclservice.listeners;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -201,8 +201,8 @@ public class AclInterfaceListener extends AsyncDataTreeChangeListenerBase<Interf
     }
 
     private AclInterface addOrUpdateAclInterfaceCache(String interfaceId, InterfaceAcl aclInPort, boolean isSgChanged,
     }
 
     private AclInterface addOrUpdateAclInterfaceCache(String interfaceId, InterfaceAcl aclInPort, boolean isSgChanged,

-            @Nullable org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
-                .state.Interface interfaceState) {
+            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+                .@Nullable Interface interfaceState) {

         AclInterface aclInterface = aclInterfaceCache.addOrUpdate(interfaceId, (prevAclInterface, builder) -> {
             List<Uuid> sgs = new ArrayList<>();
             if (aclInPort != null) {
         AclInterface aclInterface = aclInterfaceCache.addOrUpdate(interfaceId, (prevAclInterface, builder) -> {
             List<Uuid> sgs = new ArrayList<>();
             if (aclInPort != null) {

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
index 64c425299d6d6fc31122da9536c3c2494887f202..cf02d2d241678ef945c457f2d0203e399be7766b 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
@@ -12,10 +12,10 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.math.BigInteger;
 import java.util.Collections;
 
 import java.math.BigInteger;
 import java.util.Collections;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java
index 955e59b20cb838973d949d3ea38a204c9d7b1efb..43706a11665ceb90a95eda80bb7ccc928e02e88c 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java
@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.MetaDataUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.MetaDataUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;


@@ -71,7 +71,7 @@ public final class AclLiveStatisticsHelper {
      * @param dataBroker the data broker
      * @return the acl port stats
      */
      * @param dataBroker the data broker
      * @return the acl port stats
      */

-    public static List<AclPortStats> getAclPortStats(Direction direction, @Nonnull List<String> interfaceNames,
+    public static List<AclPortStats> getAclPortStats(Direction direction, @NonNull List<String> interfaceNames,

             OpendaylightDirectStatisticsService odlDirectStatsService, DataBroker dataBroker) {
         LOG.trace("Get ACL port stats for direction {} and interfaces {}", direction, interfaceNames);
         List<AclPortStats> lstAclPortStats = new ArrayList<>();
             OpendaylightDirectStatisticsService odlDirectStatsService, DataBroker dataBroker) {
         LOG.trace("Get ACL port stats for direction {} and interfaces {}", direction, interfaceNames);
         List<AclPortStats> lstAclPortStats = new ArrayList<>();

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java
index 1cfa4ef9691b0225da8577026bd602fcf58fcd74..dda987e04c928bb4660f943126738a2e9039ee68 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java
@@ -21,9 +21,9 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Singleton;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.aclservice.api.utils.AclDataCache;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.netvirt.aclservice.api.utils.AclDataCache;
 import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;


@@ -101,7 +101,7 @@ public class AclDataUtil implements AclDataCache {
     }
 
     @Override
     }
 
     @Override

-    @Nonnull
+    @NonNull

     public Collection<AclInterface> getInterfaceList(Uuid acl) {
         final ConcurrentMap<String, AclInterface> interfaceMap = aclInterfaceMap.get(acl);
         return interfaceMap != null ? interfaceMap.values() : Collections.emptySet();
     public Collection<AclInterface> getInterfaceList(Uuid acl) {
         final ConcurrentMap<String, AclInterface> interfaceMap = aclInterfaceMap.get(acl);
         return interfaceMap != null ? interfaceMap.values() : Collections.emptySet();

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
index 02d8df61433717b39c404975beeb66a5732c0633..4eccbc73d2120306ef32b6c3b5cdc95462099783 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
@@ -13,7 +13,7 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.genius.mdsalutil.ActionInfo;

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java
index cd48ac37d0df3e6902ea40fc09e2051fb531d5e4..7d35bef4660508e1f64104e83e05bbacca97e3fe 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.BiFunction;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.BiFunction;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.InstructionInfo;
 import org.opendaylight.genius.mdsalutil.MatchInfoBase;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.InstructionInfo;
 import org.opendaylight.genius.mdsalutil.MatchInfoBase;

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
index 49cc0cfb7a4532eae4716b01405bf323cea57c44..a5d3e7756d5e8a99c195f55443acaf9416c44ee4 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
@@ -31,9 +31,9 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -215,9 +215,8 @@ public final class AclServiceUtils {
      * @param interfaceName the interface name.
      * @return the interface state.
      */
      * @param interfaceName the interface name.
      * @return the interface state.
      */

-    @Nullable

     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state

-        .Interface getInterfaceStateFromOperDS(DataBroker dataBroker, String interfaceName) {
+        .@Nullable Interface getInterfaceStateFromOperDS(DataBroker dataBroker, String interfaceName) {

         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508
             .interfaces.state.Interface> ifStateId = buildStateInterfaceId(interfaceName);
         return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, ifStateId, dataBroker).orNull();
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508
             .interfaces.state.Interface> ifStateId = buildStateInterfaceId(interfaceName);
         return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, ifStateId, dataBroker).orNull();

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
index d872a6d7b7c4e9c14bd8218b76e6340492c8aafe..ab413b9ee8e4d3c82e1c6a1fde175bcd11f164c5 100755 (executable)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
@@ -43,13 +43,13 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;

-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransport;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
index af537993708ffc47053e60aedbb36945d6dcee1f..663ad2ae2c26d85e145e221c841e71b32666c0af 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
@@ -15,12 +15,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.thrift.TException;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.thrift.TException;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
index 95a62995501c4ba705fd326087fc5a998926dd86..36fde58d44e46139c3f94f728f82f151c8ddc23b 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
@@ -9,7 +9,6 @@
 package org.opendaylight.netvirt.bgpmanager.oam;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 package org.opendaylight.netvirt.bgpmanager.oam;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

-

 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;


@@ -29,10 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.ConcurrentHashMap;

-
-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Inject;

-
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.infrautils.metrics.Counter;
 import org.opendaylight.infrautils.metrics.Labeled;
 import org.opendaylight.infrautils.metrics.MetricDescriptor;
 import org.opendaylight.infrautils.metrics.Counter;
 import org.opendaylight.infrautils.metrics.Labeled;
 import org.opendaylight.infrautils.metrics.MetricDescriptor;


@@ -176,7 +173,7 @@ public class BgpCounters implements Runnable, AutoCloseable {
         }
     }
 
         }
     }
 

-    private static boolean validate(@Nonnull final String ip, af_afi afi) {
+    private static boolean validate(@NonNull final String ip, af_afi afi) {

         if (ip.equals("")) {
             return false;
         }
         if (ip.equals("")) {
             return false;
         }

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java
index ab9433ab1b705250dffa1cea1f3fd7ab1e4492e4..143af53ea7c42ade4617733f86a632cf54f0fdf0 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java
@@ -17,12 +17,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 import java.util.List;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;

-import javax.annotation.Nullable;

 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager;
 import org.opendaylight.netvirt.bgpmanager.RetryOnException;
 import org.opendaylight.netvirt.bgpmanager.thrift.gen.BfdConfigData;
 import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager;
 import org.opendaylight.netvirt.bgpmanager.RetryOnException;
 import org.opendaylight.netvirt.bgpmanager.thrift.gen.BfdConfigData;

diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
index be8208e84698f3a8c53f20b92841621197de8ed3..1960556c739e021e1fb241af1a0b6cb0e7a33017 100755 (executable)
--- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
+++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java
@@ -10,11 +10,11 @@ package org.opendaylight.netvirt.cloudservicechain.utils;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.cloud.servicechain.state.rev160711.vpn.to.pseudo.port.list.VpnToPseudoPortData;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.cloud.servicechain.state.rev160711.vpn.to.pseudo.port.list.VpnToPseudoPortData;


@@ -49,18 +49,18 @@ public class VpnPseudoPortCache {
         }
     }
 
         }
     }
 

-    public void add(@Nonnull String vrfId, long vpnPseudoLportTag) {
+    public void add(@NonNull String vrfId, long vpnPseudoLportTag) {

         LOG.debug("Adding vpn {} and vpnPseudoLportTag {} to VpnPseudoPortCache", vrfId, vpnPseudoLportTag);
         cache.put(vrfId, Long.valueOf(vpnPseudoLportTag));
     }
 
     @Nullable
         LOG.debug("Adding vpn {} and vpnPseudoLportTag {} to VpnPseudoPortCache", vrfId, vpnPseudoLportTag);
         cache.put(vrfId, Long.valueOf(vpnPseudoLportTag));
     }
 
     @Nullable

-    public Long get(@Nonnull String vrfId) {
+    public Long get(@NonNull String vrfId) {

         return cache.get(vrfId);
     }
 
     @Nullable
         return cache.get(vrfId);
     }
 
     @Nullable

-    public Long remove(@Nonnull String vrfId) {
+    public Long remove(@NonNull String vrfId) {

         LOG.debug("Removing vpn {} from VpnPseudoPortCache", vrfId);
         return cache.remove(vrfId);
     }
         LOG.debug("Removing vpn {} from VpnPseudoPortCache", vrfId);
         return cache.remove(vrfId);
     }

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ClusterListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ClusterListener.java
index 1712c38ff7f8b6b1317b0ec76cda07ed8cc0ffb9..12fb41c69f796f13e7e17532322398c464a2d109 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ClusterListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ClusterListener.java
@@ -14,9 +14,9 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;


@@ -52,7 +52,7 @@ public class ClusterListener extends AbstractSyncDataTreeChangeListener<K8sClust
     }
 
     @Override
     }
 
     @Override

-    public void remove(@Nonnull InstanceIdentifier<K8sClusters> instanceIdentifier, @Nonnull K8sClusters clusters) {
+    public void remove(@NonNull InstanceIdentifier<K8sClusters> instanceIdentifier, @NonNull K8sClusters clusters) {

         LOG.trace("K8 Cluster deleted {}", clusters);
         if (clusters.getClusterId() == null) {
             LOG.error("K8 cluster {} deleted with null cluster-id");
         LOG.trace("K8 Cluster deleted {}", clusters);
         if (clusters.getClusterId() == null) {
             LOG.error("K8 cluster {} deleted with null cluster-id");


@@ -64,14 +64,14 @@ public class ClusterListener extends AbstractSyncDataTreeChangeListener<K8sClust
     }
 
     @Override
     }
 
     @Override

-    public void update(@Nonnull InstanceIdentifier<K8sClusters> instanceIdentifier,
-                       @Nonnull K8sClusters originalClusters,
-                       @Nonnull final K8sClusters updatedClusters) {
+    public void update(@NonNull InstanceIdentifier<K8sClusters> instanceIdentifier,
+                       @NonNull K8sClusters originalClusters,
+                       @NonNull final K8sClusters updatedClusters) {

         LOG.trace("K8 Cluster updated {} to {} . doing nothing", originalClusters, updatedClusters);
     }
 
     @Override
         LOG.trace("K8 Cluster updated {} to {} . doing nothing", originalClusters, updatedClusters);
     }
 
     @Override

-    public void add(@Nonnull InstanceIdentifier<K8sClusters> instanceIdentifier, @Nonnull K8sClusters clusters) {
+    public void add(@NonNull InstanceIdentifier<K8sClusters> instanceIdentifier, @NonNull K8sClusters clusters) {

         LOG.trace("K8 Cluster added {}", clusters);
         if (clusters.getClusterId() == null) {
             LOG.error("K8 cluster {} added with null cluster-id");
         LOG.trace("K8 Cluster added {}", clusters);
         if (clusters.getClusterId() == null) {
             LOG.error("K8 cluster {} added with null cluster-id");

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/InventoryNodeListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/InventoryNodeListener.java
index 0904c25cc72f19bae81767301f782b7052fe66a8..73d0db35ac9e1c7e19c44f18f80af0bea3b17be4 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/InventoryNodeListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/InventoryNodeListener.java
@@ -10,11 +10,10 @@ package org.opendaylight.netvirt.coe.listeners;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

-

 import org.apache.aries.blueprint.annotation.service.Reference;
 import org.apache.aries.blueprint.annotation.service.Reference;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;


@@ -55,18 +54,18 @@ public class InventoryNodeListener extends AbstractSyncDataTreeChangeListener<No
     }
 
     @Override
     }
 
     @Override

-    public void remove(@Nonnull InstanceIdentifier<Node> instanceIdentifier, @Nonnull Node node) {
+    public void remove(@NonNull InstanceIdentifier<Node> instanceIdentifier, @NonNull Node node) {

         // Do nothing
     }
 
     @Override
         // Do nothing
     }
 
     @Override

-    public void update(@Nonnull InstanceIdentifier<Node> instanceIdentifier, @Nonnull Node originalNode,
-                       @Nonnull final Node updatedNode) {
+    public void update(@NonNull InstanceIdentifier<Node> instanceIdentifier, @NonNull Node originalNode,
+                       @NonNull final Node updatedNode) {

         // Nothing to do
     }
 
     @Override
         // Nothing to do
     }
 
     @Override

-    public void add(@Nonnull InstanceIdentifier<Node> instanceIdentifier, @Nonnull Node node) {
+    public void add(@NonNull InstanceIdentifier<Node> instanceIdentifier, @NonNull Node node) {

         NodeId nodeId = node.getId();
         String[] nodeIdVal =  nodeId.getValue().split(":");
         if (nodeIdVal.length < 2) {
         NodeId nodeId = node.getId();
         String[] nodeIdVal =  nodeId.getValue().split(":");
         if (nodeIdVal.length < 2) {

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/NetworkPolicyListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/NetworkPolicyListener.java
index 6e5a7cfd5a019d686ea78f19a0855da7da9ad7c1..4755888875d9d42a415089b93fa037c9e515a6d9 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/NetworkPolicyListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/NetworkPolicyListener.java
@@ -12,10 +12,10 @@ import static org.opendaylight.netvirt.coe.utils.AceNetworkPolicyUtils.buildAcl;
 import static org.opendaylight.netvirt.coe.utils.AceNetworkPolicyUtils.getAclNameFromPolicy;
 import static org.opendaylight.netvirt.coe.utils.AclUtils.getAclIid;
 
 import static org.opendaylight.netvirt.coe.utils.AceNetworkPolicyUtils.getAclNameFromPolicy;
 import static org.opendaylight.netvirt.coe.utils.AclUtils.getAclIid;
 

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.RetryingManagedNewTransactionRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.RetryingManagedNewTransactionRunner;


@@ -42,25 +42,25 @@ public class NetworkPolicyListener extends AbstractSyncDataTreeChangeListener<Ne
     }
 
     @Override
     }
 
     @Override

-    public void add(@Nonnull InstanceIdentifier<NetworkPolicy> instanceIdentifier, @Nonnull NetworkPolicy policy) {
+    public void add(@NonNull InstanceIdentifier<NetworkPolicy> instanceIdentifier, @NonNull NetworkPolicy policy) {

         LOG.info("add: id: {}\npolicy: {}", instanceIdentifier, policy);
         updateAcl(policy, false);
     }
 
     @Override
         LOG.info("add: id: {}\npolicy: {}", instanceIdentifier, policy);
         updateAcl(policy, false);
     }
 
     @Override

-    public void remove(@Nonnull InstanceIdentifier<NetworkPolicy> instanceIdentifier, @Nonnull NetworkPolicy policy) {
+    public void remove(@NonNull InstanceIdentifier<NetworkPolicy> instanceIdentifier, @NonNull NetworkPolicy policy) {

         LOG.info("remove: id: {}\npolicy: {}", instanceIdentifier, policy);
         updateAcl(policy, true);
     }
 
     @Override
         LOG.info("remove: id: {}\npolicy: {}", instanceIdentifier, policy);
         updateAcl(policy, true);
     }
 
     @Override

-    public void update(@Nonnull InstanceIdentifier<NetworkPolicy> instanceIdentifier,
-                       @Nonnull NetworkPolicy oldPolicy, @Nonnull NetworkPolicy policy) {
+    public void update(@NonNull InstanceIdentifier<NetworkPolicy> instanceIdentifier,
+                       @NonNull NetworkPolicy oldPolicy, @NonNull NetworkPolicy policy) {

         LOG.info("update: id: {}\nold policy: {}\nnew policy: {}", instanceIdentifier, oldPolicy, policy);
         updateAcl(policy, false);
     }
 
         LOG.info("update: id: {}\nold policy: {}\nnew policy: {}", instanceIdentifier, oldPolicy, policy);
         updateAcl(policy, false);
     }
 

-    private void updateAcl(@Nonnull NetworkPolicy policy, boolean isDeleted) {
+    private void updateAcl(@NonNull NetworkPolicy policy, boolean isDeleted) {

         LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
             String aclName = getAclNameFromPolicy(policy);
             Acl acl = buildAcl(policy, isDeleted);
         LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
             String aclName = getAclNameFromPolicy(policy);
             Acl acl = buildAcl(policy, isDeleted);

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
index 13e0a8714161e50a357fd440e986d0444bbb0cba..ecdcf485f8ea4007a6f6a3f638ffa19e9ea6211f 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
@@ -17,11 +17,11 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Callable;

-import javax.annotation.Nonnull;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;


@@ -80,7 +80,7 @@ public class PodListener implements DataTreeChangeListener<Pods> {
     }
 
     @Override
     }
 
     @Override

-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Pods>> collection) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Pods>> collection) {

         collection.forEach(
             podsDataTreeModification -> podsDataTreeModification.getRootNode().getModifiedChildren().stream()
                     .filter(
         collection.forEach(
             podsDataTreeModification -> podsDataTreeModification.getRootNode().getModifiedChildren().stream()
                     .filter(

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
index e9c34d6f87378b8a00b059c1249f59a602a26794..caef4774abdfe4d4dfe71f19c45e9f14474aad32 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
@@ -11,11 +11,11 @@ package org.opendaylight.netvirt.coe.listeners;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.Collection;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.Collection;

-import javax.annotation.Nonnull;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;


@@ -70,7 +70,7 @@ public class ServiceListener implements DataTreeChangeListener<Services> {
     }
 
     @Override
     }
 
     @Override

-    public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Services>> changes) {
+    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Services>> changes) {

         for (DataTreeModification<Services> change : changes) {
             final DataObjectModification<Services> mod = change.getRootNode();
 
         for (DataTreeModification<Services> change : changes) {
             final DataObjectModification<Services> mod = change.getRootNode();
 

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
index f48629d95b9dc606830362031a507940d0471f7d..3288a23cfb810fd16de62345dfe95c89c880164f 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
@@ -14,10 +14,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AceNetworkPolicyUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AceNetworkPolicyUtils.java
index 477d3609d2a6129bcc7cc0cbaaca6f848dfa7d86..031ae5f052d0ce55eb5b0d0a8fff46bec5a79f7e 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AceNetworkPolicyUtils.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AceNetworkPolicyUtils.java
@@ -12,7 +12,7 @@ import static org.opendaylight.netvirt.coe.utils.AclUtils.buildName;
 import static org.opendaylight.netvirt.coe.utils.NetworkPolicyUtils.PROTOCOL_MAP;
 
 import java.util.ArrayList;
 import static org.opendaylight.netvirt.coe.utils.NetworkPolicyUtils.PROTOCOL_MAP;
 
 import java.util.ArrayList;

-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclBuilder;


@@ -50,8 +50,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev16060
 public final class AceNetworkPolicyUtils {
     private AceNetworkPolicyUtils() {}
 
 public final class AceNetworkPolicyUtils {
     private AceNetworkPolicyUtils() {}
 

-    @Nonnull
-    public static String getAclNameFromPolicy(@Nonnull NetworkPolicy policy) {
+    @NonNull
+    public static String getAclNameFromPolicy(@NonNull NetworkPolicy policy) {

         String aclName = "";
         if (policy.getUuid() != null) {
             aclName = policy.getUuid().getValue();
         String aclName = "";
         if (policy.getUuid() != null) {
             aclName = policy.getUuid().getValue();


@@ -62,8 +62,8 @@ public final class AceNetworkPolicyUtils {
     // TODO map empty rules:
     // ingress:empty - no incoming allowed
     // egress:empty - no outgoing allowed
     // TODO map empty rules:
     // ingress:empty - no incoming allowed
     // egress:empty - no outgoing allowed

-    @Nonnull
-    public static Acl buildAcl(@Nonnull NetworkPolicy policy, boolean isDeleted) {
+    @NonNull
+    public static Acl buildAcl(@NonNull NetworkPolicy policy, boolean isDeleted) {

         String aclName = getAclNameFromPolicy(policy);
         ArrayList<Ace> aceList = new ArrayList<>();
 
         String aclName = getAclNameFromPolicy(policy);
         ArrayList<Ace> aceList = new ArrayList<>();
 


@@ -129,10 +129,10 @@ public final class AceNetworkPolicyUtils {
         return aclBuilder.build();
     }
 
         return aclBuilder.build();
     }
 

-    @Nonnull
+    @NonNull

     public static AceBuilder getAceBuilder(boolean isDeleted, String ruleName,
     public static AceBuilder getAceBuilder(boolean isDeleted, String ruleName,

-                                           @Nonnull Class<? extends DirectionBase> direction,
-                                           @Nonnull AceIpBuilder aceIpBuilder) {
+                                           @NonNull Class<? extends DirectionBase> direction,
+                                           @NonNull AceIpBuilder aceIpBuilder) {

         MatchesBuilder matchesBuilder = new MatchesBuilder();
         matchesBuilder.setAceType(aceIpBuilder.build());
         ActionsBuilder actionsBuilder = new ActionsBuilder();
         MatchesBuilder matchesBuilder = new MatchesBuilder();
         matchesBuilder.setAceType(aceIpBuilder.build());
         ActionsBuilder actionsBuilder = new ActionsBuilder();


@@ -151,10 +151,10 @@ public final class AceNetworkPolicyUtils {
         return aceBuilder;
     }
 
         return aceBuilder;
     }
 

-    @Nonnull
-    public static Ace buildPortAce(boolean isDeleted, @Nonnull String aclName,
-                                   @Nonnull Class<? extends DirectionBase> direction,
-                                   @Nonnull NetworkPolicyPort port) {
+    @NonNull
+    public static Ace buildPortAce(boolean isDeleted, @NonNull String aclName,
+                                   @NonNull Class<? extends DirectionBase> direction,
+                                   @NonNull NetworkPolicyPort port) {

         AceIpBuilder aceIpBuilder = new AceIpBuilder();
         String ruleName = AclUtils.buildName(aclName, DIRECTION_MAP.get(direction), "port");
         if (port.getProtocol() != null) {
         AceIpBuilder aceIpBuilder = new AceIpBuilder();
         String ruleName = AclUtils.buildName(aclName, DIRECTION_MAP.get(direction), "port");
         if (port.getProtocol() != null) {


@@ -177,10 +177,10 @@ public final class AceNetworkPolicyUtils {
         return aceBuilder.build();
     }
 
         return aceBuilder.build();
     }
 

-    @Nonnull
-    public static Ace buildPolicyAce(boolean isDeleted, @Nonnull String aclName,
-                                     @Nonnull Class<? extends DirectionBase> direction,
-                                     @Nonnull NetworkPolicyPeer peer) {
+    @NonNull
+    public static Ace buildPolicyAce(boolean isDeleted, @NonNull String aclName,
+                                     @NonNull Class<? extends DirectionBase> direction,
+                                     @NonNull NetworkPolicyPeer peer) {

         AceIpBuilder aceIpBuilder = new AceIpBuilder();
         String ruleName = AclUtils.buildName(aclName, DIRECTION_MAP.get(direction), "peer");
 
         AceIpBuilder aceIpBuilder = new AceIpBuilder();
         String ruleName = AclUtils.buildName(aclName, DIRECTION_MAP.get(direction), "peer");
 

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AclUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AclUtils.java
index 1a6e6737c7edd5c3d0ec32abeb580806a0587261..4cbbcf73da1f5acd8066177dee338ef76d03be5c 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AclUtils.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/AclUtils.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.coe.utils;
 
 import com.google.common.collect.ImmutableBiMap;
 package org.opendaylight.netvirt.coe.utils;
 
 import com.google.common.collect.ImmutableBiMap;

-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.AccessLists;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.AccessLists;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;


@@ -31,23 +31,23 @@ public final class AclUtils {
 
     private AclUtils() {}
 
 
     private AclUtils() {}
 

-    @Nonnull
-    public static InstanceIdentifier<Acl> getAclIid(@Nonnull String aclName) {
+    @NonNull
+    public static InstanceIdentifier<Acl> getAclIid(@NonNull String aclName) {

         return InstanceIdentifier
             .builder(AccessLists.class)
             .child(Acl.class, new AclKey(aclName, Ipv4Acl.class))
             .build();
     }
 
         return InstanceIdentifier
             .builder(AccessLists.class)
             .child(Acl.class, new AclKey(aclName, Ipv4Acl.class))
             .build();
     }
 

-    @Nonnull
-    public static InstanceIdentifier<Ace> getAceIid(@Nonnull String aclName, @Nonnull String ruleName) {
+    @NonNull
+    public static InstanceIdentifier<Ace> getAceIid(@NonNull String aclName, @NonNull String ruleName) {

         return getAclIid(aclName).builder()
             .child(AccessListEntries.class)
             .child(Ace.class, new AceKey(ruleName))
             .build();
     }
 
         return getAclIid(aclName).builder()
             .child(AccessListEntries.class)
             .child(Ace.class, new AceKey(ruleName))
             .build();
     }
 

-    @Nonnull
+    @NonNull

     public static String buildName(String... args) {
         return String.join("_", args);
     }
     public static String buildName(String... args) {
         return String.join("_", args);
     }

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/NetworkPolicyUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/NetworkPolicyUtils.java
index eb1ba99c1ed15f91a2e54052d4d81fc95f130656..5f7e5995a27e118fdd217739e7c1d78e09961327 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/NetworkPolicyUtils.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/NetworkPolicyUtils.java
@@ -9,8 +9,8 @@ package org.opendaylight.netvirt.coe.utils;
 
 import com.google.common.collect.ImmutableBiMap;
 import java.util.List;
 
 import com.google.common.collect.ImmutableBiMap;
 import java.util.List;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.k8s.core.rev181205.Protocol;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.k8s.meta.v1.rev181205.label.selector.MatchLabels;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.k8s.core.rev181205.Protocol;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.k8s.meta.v1.rev181205.label.selector.MatchLabels;


@@ -58,24 +58,24 @@ public final class NetworkPolicyUtils {
 
     private NetworkPolicyUtils() {}
 
 
     private NetworkPolicyUtils() {}
 

-    @Nonnull
-    public static MatchLabels buildMatchLabels(@Nonnull String key, @Nonnull String value) {
+    @NonNull
+    public static MatchLabels buildMatchLabels(@NonNull String key, @NonNull String value) {

         return new MatchLabelsBuilder().setKey(key).setValue(value).build();
     }
 
         return new MatchLabelsBuilder().setKey(key).setValue(value).build();
     }
 

-    @Nonnull
-    public static PodSelector buildPodSelector(@Nonnull List<MatchLabels> matchLabels) {
+    @NonNull
+    public static PodSelector buildPodSelector(@NonNull List<MatchLabels> matchLabels) {

         return new PodSelectorBuilder().setMatchLabels(matchLabels).build();
     }
 
         return new PodSelectorBuilder().setMatchLabels(matchLabels).build();
     }
 

-    @Nonnull
-    public static InstanceIdentifier<NetworkPolicy> getNetworkPolicyIid(@Nonnull String uuid) {
+    @NonNull
+    public static InstanceIdentifier<NetworkPolicy> getNetworkPolicyIid(@NonNull String uuid) {

         return InstanceIdentifier.create(K8s.class).child(NetworkPolicies.class)
             .child(NetworkPolicy.class, new NetworkPolicyKey(new Uuid(uuid)));
     }
 
         return InstanceIdentifier.create(K8s.class).child(NetworkPolicies.class)
             .child(NetworkPolicy.class, new NetworkPolicyKey(new Uuid(uuid)));
     }
 

-    @Nonnull
-    public static IpBlock buildIpBlock(@Nonnull String cidr, @Nullable List<String> except) {
+    @NonNull
+    public static IpBlock buildIpBlock(@NonNull String cidr, @Nullable List<String> except) {

         IpBlockBuilder ipBlockBuilder = new IpBlockBuilder().setCidr(cidr);
 
         if (except != null && !except.isEmpty()) {
         IpBlockBuilder ipBlockBuilder = new IpBlockBuilder().setCidr(cidr);
 
         if (except != null && !except.isEmpty()) {


@@ -86,37 +86,37 @@ public final class NetworkPolicyUtils {
     }
 
     // TODO add pod and namespace selector handling
     }
 
     // TODO add pod and namespace selector handling

-    @Nonnull
-    public static NetworkPolicyPeer buildNetworkPolicyPeer(@Nonnull IpBlock ipBlock) {
+    @NonNull
+    public static NetworkPolicyPeer buildNetworkPolicyPeer(@NonNull IpBlock ipBlock) {

         return new NetworkPolicyPeerBuilder().setIpBlock(ipBlock).build();
     }
 
         return new NetworkPolicyPeerBuilder().setIpBlock(ipBlock).build();
     }
 

-    @Nonnull
-    public static NetworkPolicyPort buildNetworkPolicyPort(@Nonnull String port, @Nonnull Protocol protocol) {
+    @NonNull
+    public static NetworkPolicyPort buildNetworkPolicyPort(@NonNull String port, @NonNull Protocol protocol) {

         return new NetworkPolicyPortBuilder().setPort(port).setProtocol(protocol).build();
     }
 
         return new NetworkPolicyPortBuilder().setPort(port).setProtocol(protocol).build();
     }
 

-    @Nonnull
-    public static IngressPorts buildIngressPorts(@Nonnull NetworkPolicyPort port) {
+    @NonNull
+    public static IngressPorts buildIngressPorts(@NonNull NetworkPolicyPort port) {

         return new IngressPortsBuilder().setNetworkPolicyPort(port).build();
     }
 
         return new IngressPortsBuilder().setNetworkPolicyPort(port).build();
     }
 

-    @Nonnull
-    public static From buildFrom(@Nonnull NetworkPolicyPeer peer) {
+    @NonNull
+    public static From buildFrom(@NonNull NetworkPolicyPeer peer) {

         return new FromBuilder().setNetworkPolicyPeer(peer).build();
     }
 
         return new FromBuilder().setNetworkPolicyPeer(peer).build();
     }
 

-    @Nonnull
-    public static EgressPorts buildEgressPorts(@Nonnull NetworkPolicyPort port) {
+    @NonNull
+    public static EgressPorts buildEgressPorts(@NonNull NetworkPolicyPort port) {

         return new EgressPortsBuilder().setNetworkPolicyPort(port).build();
     }
 
         return new EgressPortsBuilder().setNetworkPolicyPort(port).build();
     }
 

-    @Nonnull
-    public static To buildTo(@Nonnull NetworkPolicyPeer peer) {
+    @NonNull
+    public static To buildTo(@NonNull NetworkPolicyPeer peer) {

         return new ToBuilder().setNetworkPolicyPeer(peer).build();
     }
 
         return new ToBuilder().setNetworkPolicyPeer(peer).build();
     }
 

-    @Nonnull
+    @NonNull

     public static NetworkPolicyIngressRule buildNetworkPolicyIngressRule(@Nullable List<IngressPorts> ports,
                                                                          @Nullable List<From> fromList) {
 
     public static NetworkPolicyIngressRule buildNetworkPolicyIngressRule(@Nullable List<IngressPorts> ports,
                                                                          @Nullable List<From> fromList) {
 


@@ -132,7 +132,7 @@ public final class NetworkPolicyUtils {
         return networkPolicyIngressRuleBuilder.build();
     }
 
         return networkPolicyIngressRuleBuilder.build();
     }
 

-    @Nonnull
+    @NonNull

     public static NetworkPolicyEgressRule buildNetworkPolicyEgressRule(@Nullable List<EgressPorts> ports,
                                                                        @Nullable List<To> toList) {
 
     public static NetworkPolicyEgressRule buildNetworkPolicyEgressRule(@Nullable List<EgressPorts> ports,
                                                                        @Nullable List<To> toList) {
 


@@ -148,18 +148,18 @@ public final class NetworkPolicyUtils {
         return networkPolicyEgressRuleBuilder.build();
     }
 
         return networkPolicyEgressRuleBuilder.build();
     }
 

-    @Nonnull
-    public static Ingress buildIngress(@Nonnull NetworkPolicyIngressRule rule) {
+    @NonNull
+    public static Ingress buildIngress(@NonNull NetworkPolicyIngressRule rule) {

         return new IngressBuilder().setNetworkPolicyIngressRule(rule).build();
     }
 
         return new IngressBuilder().setNetworkPolicyIngressRule(rule).build();
     }
 

-    @Nonnull
-    public static Egress buildEgress(@Nonnull NetworkPolicyEgressRule rule) {
+    @NonNull
+    public static Egress buildEgress(@NonNull NetworkPolicyEgressRule rule) {

         return new EgressBuilder().setNetworkPolicyEgressRule(rule).build();
     }
 
         return new EgressBuilder().setNetworkPolicyEgressRule(rule).build();
     }
 

-    @Nonnull
-    public static NetworkPolicySpec buildNetworkPolicySpec(@Nonnull PodSelector podSelector,
+    @NonNull
+    public static NetworkPolicySpec buildNetworkPolicySpec(@NonNull PodSelector podSelector,

                                                            @Nullable List<Ingress> ingress,
                                                            @Nullable List<Egress> egress,
                                                            @Nullable List<PolicyType> policyTypes) {
                                                            @Nullable List<Ingress> ingress,
                                                            @Nullable List<Egress> egress,
                                                            @Nullable List<PolicyType> policyTypes) {


@@ -178,8 +178,8 @@ public final class NetworkPolicyUtils {
         return networkPolicySpecBuilder.build();
     }
 
         return networkPolicySpecBuilder.build();
     }
 

-    @Nonnull
-    public static NetworkPolicy buildNetworkPolicy(@Nonnull String uuid, @Nullable String name,
+    @NonNull
+    public static NetworkPolicy buildNetworkPolicy(@NonNull String uuid, @Nullable String name,

                                                    @Nullable NetworkPolicySpec spec) {
         NetworkPolicyBuilder networkPolicyBuilder = new NetworkPolicyBuilder().setUuid(new Uuid(uuid));
         if (name != null) {
                                                    @Nullable NetworkPolicySpec spec) {
         NetworkPolicyBuilder networkPolicyBuilder = new NetworkPolicyBuilder().setUuid(new Uuid(uuid));
         if (name != null) {

diff --git a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java
index 5fa7146a6005bb25bab96ea9be7370e42cb8c698..5c6c554fba758dbf8cfb5d6824177b85361c058b 100644 (file)
--- a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java
+++ b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java
@@ -17,8 +17,8 @@ import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ArrayUtils;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
 import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 
 import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
 import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 

diff --git a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java
index b24fe90584071fb2a0216642930993ea7930f058..603b76ac5bb8cf46c8735743b49ecd7e42727c9f 100644 (file)
--- a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java
+++ b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java
@@ -13,7 +13,7 @@ import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 
 public abstract class DHCPUtils {
 
 
 public abstract class DHCPUtils {
 

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java
index 750c038d9228deea04f6fcfb575a19c1a6aa7757..29c205bc8fce82c5ce8c909a082ee7dc49d00cdb 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java
@@ -16,12 +16,12 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -132,7 +132,7 @@ public class DhcpAllocationPoolManager implements AutoCloseable, EventListener {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public Map<BigInteger, List<String>> getElanDpnInterfacesByName(DataBroker broker, String elanInstanceName) {
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnIfacesIid = InstanceIdentifier.builder(ElanDpnInterfaces.class)
                 .child(ElanDpnInterfacesList.class, new ElanDpnInterfacesListKey(elanInstanceName)).build();
     public Map<BigInteger, List<String>> getElanDpnInterfacesByName(DataBroker broker, String elanInstanceName) {
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnIfacesIid = InstanceIdentifier.builder(ElanDpnInterfaces.class)
                 .child(ElanDpnInterfacesList.class, new ElanDpnInterfacesListKey(elanInstanceName)).build();

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java
index a2cb5d304c6d2534186eabf764ee74a9dfe29b5d..3267c0de6867f2cde05dd6d26cd78ea01b310d42 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.netvirt.dhcpservice;
 
  */
 package org.opendaylight.netvirt.dhcpservice;
 

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java
index 5adef7fcfc215716dbd45127978ca408facff1a4..504a64291662ff3679b5383bbb40da52f61c5555 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java
@@ -27,13 +27,13 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java
index 13a41a14eae6040601daa20d1b11e74ead0e4cad..5e806ab1941d51ab197785a9450ef88140c57943 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java
@@ -10,9 +10,9 @@ package org.opendaylight.netvirt.dhcpservice;
 import com.google.common.base.Optional;
 import java.util.List;
 import java.util.function.Predicate;
 import com.google.common.base.Optional;
 import java.util.List;
 import java.util.function.Predicate;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
index 0d9606fb450a99da9c06466c180e8d7b30b787d7..71963ed772f00148b195bad689e204822613073e 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
@@ -12,12 +12,12 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java
index 47bb1e90b048ff64db6cd07a5fe273e314386414..1738a53621ca808bb1849e5cf726e47708d51d76 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java
@@ -11,10 +11,10 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.Nonnull;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 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.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;


@@ -63,13 +63,13 @@ public class DhcpMcastMacListener
     }
 
     @Override
     }
 
     @Override

-    public void update(@Nonnull InstanceIdentifier<RemoteMcastMacs> identifier, @Nonnull RemoteMcastMacs original,
-                       @Nonnull RemoteMcastMacs update) {
+    public void update(@NonNull InstanceIdentifier<RemoteMcastMacs> identifier, @NonNull RemoteMcastMacs original,
+                       @NonNull RemoteMcastMacs update) {

         // NOOP
     }
 
     @Override
         // NOOP
     }
 
     @Override

-    public void add(@Nonnull InstanceIdentifier<RemoteMcastMacs> identifier, @Nonnull RemoteMcastMacs remoteMcastMacs) {
+    public void add(@NonNull InstanceIdentifier<RemoteMcastMacs> identifier, @NonNull RemoteMcastMacs remoteMcastMacs) {

         String elanInstanceName = getElanName(remoteMcastMacs);
         IpAddress tunnelIp = dhcpL2GwUtil.getHwvtepNodeTunnelIp(identifier.firstIdentifierOf(Node.class));
         if (tunnelIp == null) {
         String elanInstanceName = getElanName(remoteMcastMacs);
         IpAddress tunnelIp = dhcpL2GwUtil.getHwvtepNodeTunnelIp(identifier.firstIdentifierOf(Node.class));
         if (tunnelIp == null) {


@@ -84,8 +84,8 @@ public class DhcpMcastMacListener
     }
 
     @Override
     }
 
     @Override

-    public void remove(@Nonnull InstanceIdentifier<RemoteMcastMacs> identifier,
-                       @Nonnull RemoteMcastMacs remoteMcastMacs) {
+    public void remove(@NonNull InstanceIdentifier<RemoteMcastMacs> identifier,
+                       @NonNull RemoteMcastMacs remoteMcastMacs) {

         String elanInstanceName = getElanName(remoteMcastMacs);
         IpAddress tunnelIp = dhcpL2GwUtil.getHwvtepNodeTunnelIp(identifier.firstIdentifierOf(Node.class));
         if (tunnelIp == null) {
         String elanInstanceName = getElanName(remoteMcastMacs);
         IpAddress tunnelIp = dhcpL2GwUtil.getHwvtepNodeTunnelIp(identifier.firstIdentifierOf(Node.class));
         if (tunnelIp == null) {

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
index 47cbdac5d7f4e984d2cbe0b100b4185e7a5053a3..4de582223aba41c39ea4dc6fc612532e63b2ec8e 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
@@ -19,12 +19,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;


@@ -363,7 +363,7 @@ public class DhcpPktHandler implements PacketProcessingListener {
         return dhcpInfo;
     }
 
         return dhcpInfo;
     }
 

-    @Nonnull
+    @NonNull

     private static DhcpInfo getApDhcpInfo(AllocationPool ap, IpAddress allocatedIp) {
         String clientIp = allocatedIp.stringValue();
         String serverIp = ap.getGateway().stringValue();
     private static DhcpInfo getApDhcpInfo(AllocationPool ap, IpAddress allocatedIp) {
         String clientIp = allocatedIp.stringValue();
         String serverIp = ap.getGateway().stringValue();


@@ -746,7 +746,7 @@ public class DhcpPktHandler implements PacketProcessingListener {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     protected byte[] convertToClasslessRouteOption(String dest, String router) {
         ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
         if (dest == null || router == null) {
     protected byte[] convertToClasslessRouteOption(String dest, String router) {
         ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
         if (dest == null || router == null) {

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
index 66b1f95fc924ed04817671b284b252fd57b14887..d7b6c28670d6f6a51f5f25edf26b2fd56ee34e50 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java
@@ -8,11 +8,10 @@
 package org.opendaylight.netvirt.dhcpservice;
 
 import java.util.concurrent.ConcurrentHashMap;
 package org.opendaylight.netvirt.dhcpservice;
 
 import java.util.concurrent.ConcurrentHashMap;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;

-
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -28,17 +27,17 @@ public class DhcpPortCache {
         LOG.trace("Initialize DhcpPortCache. ");
     }
 
         LOG.trace("Initialize DhcpPortCache. ");
     }
 

-    public  void put(@Nonnull  String interfaceName, Port port) {
+    public  void put(@NonNull  String interfaceName, Port port) {

         portMap.put(interfaceName, port);
         LOG.trace("Added the interface {} to DhcpPortCache",interfaceName);
     }
 
     @Nullable
         portMap.put(interfaceName, port);
         LOG.trace("Added the interface {} to DhcpPortCache",interfaceName);
     }
 
     @Nullable

-    public Port get(@Nonnull String interfaceName) {
+    public Port get(@NonNull String interfaceName) {

         return portMap.get(interfaceName);
     }
 
         return portMap.get(interfaceName);
     }
 

-    public void remove(@Nonnull String interfaceName) {
+    public void remove(@NonNull String interfaceName) {

         portMap.remove(interfaceName);
     }
 }
         portMap.remove(interfaceName);
     }
 }

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
index e9035dd33b1972cbd7aae2a80b50101059d7bdd7..9d52d641bc603c42c2b8ef32931a348c7efa9386 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
@@ -26,8 +26,8 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -260,7 +260,7 @@ public final class DhcpServiceUtils {
                 InstanceIdentifier.builder(Nodes.class).build()));
     }
 
                 InstanceIdentifier.builder(Nodes.class).build()));
     }
 

-    @Nonnull
+    @NonNull

     private static List<BigInteger> extractDpnsFromNodes(Optional<Nodes> optionalNodes) {
         return optionalNodes.toJavaUtil().map(
             nodes -> nodes.nonnullNode().stream().map(Node::getId).filter(Objects::nonNull).map(
     private static List<BigInteger> extractDpnsFromNodes(Optional<Nodes> optionalNodes) {
         return optionalNodes.toJavaUtil().map(
             nodes -> nodes.nonnullNode().stream().map(Node::getId).filter(Objects::nonNull).map(


@@ -268,7 +268,7 @@ public final class DhcpServiceUtils {
                     Collectors.toList())).orElse(Collections.emptyList());
     }
 
                     Collectors.toList())).orElse(Collections.emptyList());
     }
 

-    @Nonnull
+    @NonNull

     public static List<BigInteger> getDpnsForElan(String elanInstanceName, DataBroker broker) {
         List<BigInteger> elanDpns = new LinkedList<>();
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnInstanceIdentifier =
     public static List<BigInteger> getDpnsForElan(String elanInstanceName, DataBroker broker) {
         List<BigInteger> elanDpns = new LinkedList<>();
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnInstanceIdentifier =


@@ -285,9 +285,8 @@ public final class DhcpServiceUtils {
         return elanDpns;
     }
 
         return elanDpns;
     }
 

-    @Nullable
-    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
-            .state.Interface getInterfaceFromOperationalDS(String interfaceName, DataBroker dataBroker) {
+    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+            .@Nullable Interface getInterfaceFromOperationalDS(String interfaceName, DataBroker dataBroker) {

         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
                 .state.InterfaceKey interfaceKey =
                 new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
                 .state.InterfaceKey interfaceKey =
                 new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces


@@ -486,7 +485,7 @@ public final class DhcpServiceUtils {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     public static List<Uuid> getSubnetIdsFromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier id = buildNetworkMapIdentifier(networkId);
         Optional<NetworkMap> optionalNetworkMap = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id);
     public static List<Uuid> getSubnetIdsFromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier id = buildNetworkMapIdentifier(networkId);
         Optional<NetworkMap> optionalNetworkMap = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id);

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java
index 77f1e39a8ad65367b8413cc6483df054c5206a57..332c844c918429c24d78004ec96ce81580a2f8b6 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java
@@ -9,13 +9,13 @@ package org.opendaylight.netvirt.dhcpservice;
 
 import com.google.common.base.Optional;
 import java.math.BigInteger;
 
 import com.google.common.base.Optional;
 import java.math.BigInteger;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java
index 7d94e248f5a985f1f02152e5341f37c8faace4ee..fe2e92dc2c2be779b3fc8669f99059f21a34ad3a 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java
@@ -17,7 +17,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;

diff --git a/dhcpservice/shell/src/main/java/org/opendaylight/netvirt/dhcpservice/shell/DhcpCacheCli.java b/dhcpservice/shell/src/main/java/org/opendaylight/netvirt/dhcpservice/shell/DhcpCacheCli.java
index 05838d2b641e5a5ce0af77838a4f19a9d825518f..9dd21630f8c01909c582d27a84cba141e97af837 100644 (file)
--- a/dhcpservice/shell/src/main/java/org/opendaylight/netvirt/dhcpservice/shell/DhcpCacheCli.java
+++ b/dhcpservice/shell/src/main/java/org/opendaylight/netvirt/dhcpservice/shell/DhcpCacheCli.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.netvirt.dhcpservice.shell;
 
  */
 package org.opendaylight.netvirt.dhcpservice.shell;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.dhcpservice.api.IDhcpExternalTunnelManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.dhcpservice.api.IDhcpExternalTunnelManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java
index f6eb2d6f3a1a4ac00e55e0bcd6d3216b0cfc3429..86c847d11ae3c94bc1dcbbfcfc66e71b80aa13c7 100644 (file)
--- a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java
+++ b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java
@@ -11,7 +11,7 @@ package org.opendaylight.netvirt.elanmanager.api;
 import java.util.List;
 import java.util.Set;
 
 import java.util.List;
 import java.util.Set;
 

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;

diff --git a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java
index 953774572f57f473dffc97499be5291aff5b8338..c28b7945090b51c0763ced4d6ecab661823fa48a 100644 (file)
--- a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java
+++ b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java
@@ -13,8 +13,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.utils.cache.CacheUtil;
 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
 
 import org.opendaylight.genius.utils.cache.CacheUtil;
 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
 


@@ -87,7 +87,7 @@ public final class ElanL2GwCacheUtils {
         return result;
     }
 
         return result;
     }
 

-    @Nonnull
+    @NonNull

     public static List<L2GatewayDevice> getAllElanDevicesFromCache() {
         ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
                 (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
     public static List<L2GatewayDevice> getAllElanDevicesFromCache() {
         ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
                 (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceDpnsCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceDpnsCache.java
index e751323a869e8d41750709a2ef0e84d398f78783..9a537e979925d0136c093add75fb1743e810b127 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceDpnsCache.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceDpnsCache.java
@@ -12,8 +12,8 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nonnull;

 import javax.inject.Singleton;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfaces;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfaces;
 
 /**


@@ -25,20 +25,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan
 public class ElanInstanceDpnsCache {
     private final ConcurrentMap<String, Set<DpnInterfaces>> elanInstanceToDpnsCache = new ConcurrentHashMap<>();
 
 public class ElanInstanceDpnsCache {
     private final ConcurrentMap<String, Set<DpnInterfaces>> elanInstanceToDpnsCache = new ConcurrentHashMap<>();
 

-    public void add(@Nonnull String elanInstanceName, @Nonnull DpnInterfaces dpnInterfaces) {
+    public void add(@NonNull String elanInstanceName, @NonNull DpnInterfaces dpnInterfaces) {

         elanInstanceToDpnsCache.computeIfAbsent(elanInstanceName, key -> ConcurrentHashMap.newKeySet())
                 .add(dpnInterfaces);
     }
 
         elanInstanceToDpnsCache.computeIfAbsent(elanInstanceName, key -> ConcurrentHashMap.newKeySet())
                 .add(dpnInterfaces);
     }
 

-    public void remove(@Nonnull String elanInstanceName, @Nonnull DpnInterfaces dpnInterfaces) {
+    public void remove(@NonNull String elanInstanceName, @NonNull DpnInterfaces dpnInterfaces) {

         elanInstanceToDpnsCache.computeIfPresent(elanInstanceName, (key, prevInterfacesSet) -> {
             prevInterfacesSet.remove(dpnInterfaces);
             return !prevInterfacesSet.isEmpty() ? prevInterfacesSet : null;
         });
     }
 
         elanInstanceToDpnsCache.computeIfPresent(elanInstanceName, (key, prevInterfacesSet) -> {
             prevInterfacesSet.remove(dpnInterfaces);
             return !prevInterfacesSet.isEmpty() ? prevInterfacesSet : null;
         });
     }
 

-    @Nonnull
-    public Collection<DpnInterfaces> get(@Nonnull String elanInstanceName) {
+    @NonNull
+    public Collection<DpnInterfaces> get(@NonNull String elanInstanceName) {

         Set<DpnInterfaces> dpns = elanInstanceToDpnsCache.get(elanInstanceName);
         return dpns != null ? Collections.unmodifiableCollection(dpns) : Collections.emptyList();
     }
         Set<DpnInterfaces> dpns = elanInstanceToDpnsCache.get(elanInstanceName);
         return dpns != null ? Collections.unmodifiableCollection(dpns) : Collections.emptyList();
     }

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java
index 2755a1e52a04e32ecc1070c6918c5c877ad7eaf6..20dc778c4094d4c42c7b455fb7d8f2aa8800042f 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java
@@ -13,9 +13,9 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -47,8 +47,8 @@ public class ElanInterfaceCache extends InstanceIdDataObjectCache<ElanInterface>
                 InstanceIdentifier.create(ElanInterfaces.class).child(ElanInterface.class), cacheProvider);
     }
 
                 InstanceIdentifier.create(ElanInterfaces.class).child(ElanInterface.class), cacheProvider);
     }
 

-    @Nonnull
-    public Optional<ElanInterface> get(@Nonnull String interfaceName) {
+    @NonNull
+    public Optional<ElanInterface> get(@NonNull String interfaceName) {

         try {
             return get(ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName));
         } catch (ReadFailedException e) {
         try {
             return get(ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName));
         } catch (ReadFailedException e) {


@@ -57,15 +57,15 @@ public class ElanInterfaceCache extends InstanceIdDataObjectCache<ElanInterface>
         }
     }
 
         }
     }
 

-    @Nonnull
-    public Optional<EtreeInterface> getEtreeInterface(@Nonnull String interfaceName) {
+    @NonNull
+    public Optional<EtreeInterface> getEtreeInterface(@NonNull String interfaceName) {

         Optional<ElanInterface> elanInterface = get(interfaceName);
         return elanInterface.isPresent() ? Optional.fromNullable(
                 elanInterface.get().augmentation(EtreeInterface.class)) : Optional.absent();
     }
 
         Optional<ElanInterface> elanInterface = get(interfaceName);
         return elanInterface.isPresent() ? Optional.fromNullable(
                 elanInterface.get().augmentation(EtreeInterface.class)) : Optional.absent();
     }
 

-    @Nonnull
-    public Collection<String> getInterfaceNames(@Nonnull String elanInstanceName) {
+    @NonNull
+    public Collection<String> getInterfaceNames(@NonNull String elanInstanceName) {

         Set<String> removed = elanInstanceToInterfacesCache.remove(elanInstanceName);
         return removed != null ? Collections.unmodifiableCollection(removed) : Collections.emptySet();
     }
         Set<String> removed = elanInstanceToInterfacesCache.remove(elanInstanceName);
         return removed != null ? Collections.unmodifiableCollection(removed) : Collections.emptySet();
     }

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java
index 26b0d5896be951f34f2d7dfe110e139f5afe081c..9e6aea1cf99dfc0be463689ef7a8e64ca0429304 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java
index 8ea21c3f21baf6e4f76e012f3ebf1c65f62402cb..50cd0ba9471579b007b4eb805f6e7890aa76c551 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java
index 608659c03f0c4d5e6c2279f2ea2cdec825864ca9..c560813668a3203f8bb190aeee2ccd0c0beb59a2 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java
index 9e6fd8e6cf160598521c0b55738fd071998d99f1..3078ea488dac6eda359c4ef3aa1e95521686e5b0 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java
index 8d00ee71e94fb2d804cdb754e361167a1198f561..1c7bad99ab2e3cba6494fba823981b9b300895ca 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java
index 46ea6c79d7f0e6b1ec096805df0e2980d9e4a638..dd54ec21a08101a3a841c003051f694c2ad63c33 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java
index 714665450b1bb603854a17334c2ed1e8440b5c0d..7c233081c2c546cc975314c20aa5df5b4bf8c2d6 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java
index 3cf3ecbef333181da967bd304c07d0cc90aa953b..ec5b8498913f684330335e10f579da5646bb76d3 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java
index 326860c50e7f78d308c8b476ef222ba4b71dc910..80014c88aab46aa7938b5517fcdf5f3fa235a0e6 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java
@@ -10,10 +10,10 @@ package org.opendaylight.netvirt.elan.cli;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java
index 8aca18544fe086c623409c6c8b2a6da3cebfa44d..3edf42190a5d8aa530ceb6a44425a09bec110241 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java
index 1938999f551a4f079186e474f64862ac78d01a48..0c1abb0a4c69d952d7b2353183496ce1f003d5b7 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java
index 03b4991681c77d5b1089f279a4987b4590cfee00..26b4a7f09d7c6c69584ccc88300ae33f88033f37 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli;
 
  */
 package org.opendaylight.netvirt.elan.cli;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java
index e8d5dc712e5d7c0ac7bc7391b3d73ae8df92bf8f..76e9c8bb52e9367f95a4d607ae0cc2842d4eea89 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java
index a1a11d3f66182ccaef93fe7bdbde34ce647f4ad6..8db917e1b06e9358559aaa7aec87d7c89b540596 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java
index 9b2737f213376a3be74983997acd888360182ff9..01caadabc7ba199d53f592168b783fa5cecf9838 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java
index 44c9b6bbb9e0b249de7e35bf687d126e5d7afe54..7209fc2cfed15d76f1e8840227656b70b9b4c6ad 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface.EtreeInterfaceType;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface.EtreeInterfaceType;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java
index 2484a555dd8f6c39ac12f6c362740be230cca36c..6a06e828252ee75ce2e8943184674c7aeea47b8a 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 
  */
 package org.opendaylight.netvirt.elan.cli.etree;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
index 41666e313270365e83022072c44bb01b3b0531f6..783f3637f0a08d156524745d8f43bd66b9685b24 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.cli.etree;
 
 import java.util.List;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java
index 6b035924dff9c9c831221ad82d56caea13424f90..933c1cad921028a9e2f8184558e2714666708a81 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java
@@ -17,10 +17,10 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.utils.cache.CacheUtil;
 import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
 import org.opendaylight.netvirt.elanmanager.utils.ElanL2GwCacheUtils;
 import org.opendaylight.genius.utils.cache.CacheUtil;
 import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
 import org.opendaylight.netvirt.elanmanager.utils.ElanL2GwCacheUtils;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java
index 189a4b7ae938d295eea4f104cfde368ec2cd61e7..127d7698196cba15366a3b4c42d875867d70ed9b 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java
@@ -23,9 +23,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java
index 23f898936075a203be4db6f739cae37be13c1bf2..b8e6f2b1d8c15177e7e511848eb6e2257fcfb151 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java
@@ -15,10 +15,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
index e3916b03e6c2fc327e59c7795cc541eac9603c3b..15c5b322136de0808a732ca85eabc7d4ca361415 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
@@ -13,9 +13,9 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java
index 5f5652ae28c226e1c125872c7c3812c3f6c359e3..417fc14279d266ce9c83822faaa6b8add1fdd83e 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java
@@ -23,9 +23,9 @@ import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
index 81e545bc9febd731e70771448059b23a4f060895..e064cba32f8330e233e56a506d1a7de5bdabb844 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
@@ -18,9 +18,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
index 1175c78a7c009fa47e6c87f93e9e0da50ce0b659..da3670bb132d43a1bcf82b0d233f0738dd19bf42 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantLock;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;


@@ -268,7 +267,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase<ElanIn
                 return;
             }
             futures.add(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, flowTx -> {
                 return;
             }
             futures.add(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, flowTx -> {

-                @Nullable List<String> elanInterfaces = elanState.getElanInterfaces();
+                List<String> elanInterfaces = elanState.getElanInterfaces();

                 if (elanInterfaces == null || elanInterfaces.isEmpty()) {
                     holder.isLastElanInterface = true;
                 }
                 if (elanInterfaces == null || elanInterfaces.isEmpty()) {
                     holder.isLastElanInterface = true;
                 }


@@ -728,7 +727,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase<ElanIn
                             holder.dpnInterfaces =
                                 createElanInterfacesList(elanInstanceName, interfaceName, holder.dpId, operTx);
                         } else {
                             holder.dpnInterfaces =
                                 createElanInterfacesList(elanInstanceName, interfaceName, holder.dpId, operTx);
                         } else {

-                            @Nullable List<String> existingInterfaces = existingElanDpnInterfaces.get().getInterfaces();
+                            List<String> existingInterfaces = existingElanDpnInterfaces.get().getInterfaces();

                             List<String> elanInterfaces =
                                 existingInterfaces != null ? new ArrayList<>(existingInterfaces) : new ArrayList<>();
                             elanInterfaces.add(interfaceName);
                             List<String> elanInterfaces =
                                 existingInterfaces != null ? new ArrayList<>(existingInterfaces) : new ArrayList<>();
                             elanInterfaces.add(interfaceName);


@@ -744,7 +743,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase<ElanIn
                         elanL2GatewayUtils.installElanL2gwDevicesLocalMacsInDpn(holder.dpId, elanInstance,
                             interfaceName);
                     } else {
                         elanL2GatewayUtils.installElanL2gwDevicesLocalMacsInDpn(holder.dpId, elanInstance,
                             interfaceName);
                     } else {

-                        @Nullable List<String> existingInterfaces = existingElanDpnInterfaces.get().getInterfaces();
+                        List<String> existingInterfaces = existingElanDpnInterfaces.get().getInterfaces();

                         List<String> elanInterfaces =
                             existingInterfaces != null ? new ArrayList<>(existingInterfaces) : new ArrayList<>();
                         elanInterfaces.add(interfaceName);
                         List<String> elanInterfaces =
                             existingInterfaces != null ? new ArrayList<>(existingInterfaces) : new ArrayList<>();
                         elanInterfaces.add(interfaceName);

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
index 9c161ab0fcb369a123ff7cd1eb24b764bccbdfea..cbde09c7ea563112b931928125a0d4e2405fe9f9 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
@@ -23,10 +23,10 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.function.BiFunction;
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.function.BiFunction;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;


@@ -435,7 +435,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi
     }
 
     @Override
     }
 
     @Override

-    @Nonnull
+    @NonNull

     public List<String> getElanInterfaces(String elanInstanceName) {
         List<String> elanInterfaces = new ArrayList<>();
         InstanceIdentifier<ElanInterfaces> elanInterfacesIdentifier = InstanceIdentifier.builder(ElanInterfaces.class)
     public List<String> getElanInterfaces(String elanInstanceName) {
         List<String> elanInterfaces = new ArrayList<>();
         InstanceIdentifier<ElanInterfaces> elanInterfacesIdentifier = InstanceIdentifier.builder(ElanInterfaces.class)

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java
index ab86ae74fe690c0db02c612c473c5324b50aa004..bc70c7e3924273ffc5244ffa7070d1af41718d49 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.genius.infra.Datastore.Configuration;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java
index 74cee2f4eec8143ee10454679919bc511e6b18e4..63b13a43ca7eb98690d4319f8cb080978aa0c08f 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java
@@ -10,8 +10,8 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 
 public abstract class BaseCommand<T> {
 
 
 public abstract class BaseCommand<T> {
 


@@ -54,7 +54,7 @@ public abstract class BaseCommand<T> {
      * @param original Origina list to be compared with
      * @return List of diff based
      */
      * @param original Origina list to be compared with
      * @return List of diff based
      */

-    @Nonnull
+    @NonNull

     public List<T> diffOf(List<T> updated, final List<T> original) {
         if (updated == null) {
             return new ArrayList<>();
     public List<T> diffOf(List<T> updated, final List<T> original) {
         if (updated == null) {
             return new ArrayList<>();

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
index 0ffecc6b138ca46defab2ec9e151573f059e3d8c..23a7600881c3e2bb2ce26556805adcb0dfedf8db 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
@@ -10,7 +10,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java
index 4aefc90907d976e9caff2e75385a190d848bfd01..d58ba26d15f4d71e5bc4243cb1a40b2dd2ab44ac 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java
index f97783026498d43434f161331033a8d7a7db50a2..4bc536e19fc34eb29503a2b6472e04b146d4f93d 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java
index ddc2bfcad035d5ef1528bbf83722eeccd6bbc221..a15b431ac6dc490d0301d93295c50c0190fb00fe 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java
@@ -16,8 +16,8 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -56,7 +56,7 @@ public abstract class MergeCommand<T extends DataObject, Y extends Builder, Z ex
         return transform(nodePath, updatedSrc);
     }
 
         return transform(nodePath, updatedSrc);
     }
 

-    @Nonnull
+    @NonNull

     public List<T> diffByKey(List<T> updated, final List<T> original) {
         if (updated == null) {
             return new ArrayList<>();
     public List<T> diffByKey(List<T> updated, final List<T> original) {
         if (updated == null) {
             return new ArrayList<>();

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
index e7234f8e08d7978aca812570d83185822f28535c..48adb503dcbfdf3802e9c18867a3601c35897660 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
@@ -9,7 +9,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 import java.util.Objects;
 
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java
index 02c16e2aa78c461d9e4c8b37520e32802fa022eb..cc5f5ce4b3b5db309ebda93b3719ebc8a935023c 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java
@@ -10,7 +10,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java
index d8abdfe01dd7f2f1a927b1949275df8f212b42f0..cee6dc469739464b2441e23f9170fc9ee0ccb217 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java
@@ -9,7 +9,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 import java.util.Objects;
 
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java
index 1b9670188f9ef2e9914ccf25a9dda86b05606cdc..61ad12cd4c48ff3ec4af40dd08c3dc531afbb941 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
index db1cf06eacb746f0e36c34adaee4de6ebd063246..f0c249683aae4f695c068e121b61ac10372590d4 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentationBuilder;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentationBuilder;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java
index 2d7cfc2e200bef94d35eb295607afa8d4162529a..9c701561e4579b4aa2e52e792356ea5b8ea1ad08 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java
index e64c5a55fb741029fc510c02f83615634d0980a4..c1ffa3be008daaebad7da53ec19bc71f0e95e1d4 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java
@@ -9,7 +9,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
 import java.util.List;
 import java.util.Objects;
 
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.TunnelIps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.TunnelIps;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
index cf6a4c7d062af76adbf7e934b1e2ed80c0c28a28..4f2b5fe1d5d955781f7ea8ff5a3b2500774647f7 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
@@ -11,7 +11,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
index 3a3e6b296853a84ca8f5d3027ce6ea79be034dff..b0e2b3d201d470d4fb4888038c231c015d5a4b2c 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
@@ -11,8 +11,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.annotation.PreDestroy;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;


@@ -205,8 +205,7 @@ public abstract class ChildListener<P extends DataObject, C extends DataObject,
         }
     }
 
         }
     }
 

-    @Nullable
-    protected DataObjectModification.ModificationType getModificationType(
+    protected DataObjectModification.@Nullable ModificationType getModificationType(

             final DataObjectModification<? extends DataObject> mod) {
         try {
             return mod.getModificationType();
             final DataObjectModification<? extends DataObject> mod) {
         try {
             return mod.getModificationType();

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
index f610b45ec798170a65e011dec66bc5a3db2f8066..7a98143a704ba8312e3a748802284a1f31f037d8 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
@@ -12,9 +12,9 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java
index 525031420de81f3c534bd790fd49491eddd0b066..802ee837f69fa891c741c48d04e89cdf0c6a0fe6 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java
@@ -18,10 +18,10 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java
index 00a77653c92e7227ef81fa26fbb5b0f9d7be54b1..e49a2f08ff574701094b996265a606c3adb1cab5 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java
@@ -17,10 +17,10 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 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;
 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;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java
index c258e8772ecc7b97ed2362b0c65359cd2c5107fd..c07ab0087a840a5c33950ed99ce11f6ae32c9e1e 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java
@@ -19,10 +19,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -314,7 +314,7 @@ public class ElanL2GatewayMulticastUtils {
         return listBucketInfo;
     }
 
         return listBucketInfo;
     }
 

-    @Nonnull
+    @NonNull

     public List<Bucket> getRemoteBCGroupBuckets(ElanInstance elanInfo, @Nullable DpnInterfaces dpnInterfaces,
                                                 BigInteger dpnId, int bucketId, long elanTag) {
         List<Bucket> listBucketInfo = new ArrayList<>();
     public List<Bucket> getRemoteBCGroupBuckets(ElanInstance elanInfo, @Nullable DpnInterfaces dpnInterfaces,
                                                 BigInteger dpnId, int bucketId, long elanTag) {
         List<Bucket> listBucketInfo = new ArrayList<>();

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java
index a6623cb37807274cbce4b9fa68c6381548c51699..3e4d17ad83b402ec9b5053176c56720d6a5f3f09 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java
@@ -31,13 +31,13 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -1091,7 +1091,7 @@ public class ElanL2GatewayUtils {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public Collection<DpnInterfaces> getElanDpns(String elanName) {
         Collection<DpnInterfaces> dpnInterfaces = elanInstanceDpnsCache.get(elanName);
         if (!dpnInterfaces.isEmpty()) {
     public Collection<DpnInterfaces> getElanDpns(String elanName) {
         Collection<DpnInterfaces> dpnInterfaces = elanInstanceDpnsCache.get(elanName);
         if (!dpnInterfaces.isEmpty()) {

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java
index cea2408db0a74d09f18e5f075979669a507351fc..a96358f6b711ec3e2edb93f1181a8901984cba3c 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java
@@ -21,11 +21,11 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;


@@ -118,14 +118,14 @@ public class L2GatewayConnectionUtils implements AutoCloseable {
         return MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, inst).orNull();
     }
 
         return MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, inst).orNull();
     }
 

-    @Nonnull
+    @NonNull

     public static List<L2gateway> getL2gatewayList(DataBroker broker) {
         InstanceIdentifier<L2gateways> inst = InstanceIdentifier.create(Neutron.class).child(L2gateways.class);
         return MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, inst).toJavaUtil().map(
                 L2gateways::getL2gateway).orElse(emptyList());
     }
 
     public static List<L2gateway> getL2gatewayList(DataBroker broker) {
         InstanceIdentifier<L2gateways> inst = InstanceIdentifier.create(Neutron.class).child(L2gateways.class);
         return MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, inst).toJavaUtil().map(
                 L2gateways::getL2gateway).orElse(emptyList());
     }
 

-    @Nonnull
+    @NonNull

     public static List<L2gatewayConnection> getAllL2gatewayConnections(DataBroker broker) {
         InstanceIdentifier<L2gatewayConnections> inst = InstanceIdentifier.create(Neutron.class)
                 .child(L2gatewayConnections.class);
     public static List<L2gatewayConnection> getAllL2gatewayConnections(DataBroker broker) {
         InstanceIdentifier<L2gatewayConnections> inst = InstanceIdentifier.create(Neutron.class)
                 .child(L2gatewayConnections.class);


@@ -142,7 +142,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable {
      *            the l2 gateway ids
      * @return the associated l2 gw connections
      */
      *            the l2 gateway ids
      * @return the associated l2 gw connections
      */

-    @Nonnull
+    @NonNull

     public static List<L2gatewayConnection> getAssociatedL2GwConnections(DataBroker broker, Set<Uuid> l2GatewayIds) {
         List<L2gatewayConnection> allL2GwConns = getAllL2gatewayConnections(broker);
         List<L2gatewayConnection> l2GwConnections = new ArrayList<>();
     public static List<L2gatewayConnection> getAssociatedL2GwConnections(DataBroker broker, Set<Uuid> l2GatewayIds) {
         List<L2gatewayConnection> allL2GwConns = getAllL2gatewayConnections(broker);
         List<L2gatewayConnection> l2GwConnections = new ArrayList<>();


@@ -165,7 +165,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable {
      *            the elan Name
      * @return the associated l2 gw connection with elan
      */
      *            the elan Name
      * @return the associated l2 gw connection with elan
      */

-    @Nonnull
+    @NonNull

     public static List<L2gatewayConnection> getL2GwConnectionsByElanName(DataBroker broker, String elanName) {
         List<L2gatewayConnection> allL2GwConns = getAllL2gatewayConnections(broker);
         List<L2gatewayConnection> elanL2GateWayConnections = new ArrayList<>();
     public static List<L2gatewayConnection> getL2GwConnectionsByElanName(DataBroker broker, String elanName) {
         List<L2gatewayConnection> allL2GwConns = getAllL2gatewayConnections(broker);
         List<L2gatewayConnection> elanL2GateWayConnections = new ArrayList<>();


@@ -365,7 +365,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable {
         return l2GwDevice != null && l2GwDevice.getHwvtepNodeId() != null;
     }
 
         return l2GwDevice != null && l2GwDevice.getHwvtepNodeId() != null;
     }
 

-    protected static boolean isLastL2GwConnBeingDeleted(@Nonnull L2GatewayDevice l2GwDevice) {
+    protected static boolean isLastL2GwConnBeingDeleted(@NonNull L2GatewayDevice l2GwDevice) {

         return l2GwDevice.getL2GatewayIds().size() == 1;
     }
 
         return l2GwDevice.getL2GatewayIds().size() == 1;
     }
 


@@ -377,7 +377,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable {
             Futures.addCallback(broker.newReadOnlyTransaction().read(LogicalDatastoreType.OPERATIONAL,
                     nodeIid), new SettableFutureCallback<Optional<Node>>(settableFuture) {
                         @Override
             Futures.addCallback(broker.newReadOnlyTransaction().read(LogicalDatastoreType.OPERATIONAL,
                     nodeIid), new SettableFutureCallback<Optional<Node>>(settableFuture) {
                         @Override

-                        public void onSuccess(@Nonnull Optional<Node> resultNode) {
+                        public void onSuccess(@NonNull Optional<Node> resultNode) {

                             LocalUcastMacListener localUcastMacListener =
                                     new LocalUcastMacListener(broker, haOpClusteredListener,
                                             elanL2GatewayUtils, jobCoordinator, elanInstanceCache, hwvtepNodeHACache);
                             LocalUcastMacListener localUcastMacListener =
                                     new LocalUcastMacListener(broker, haOpClusteredListener,
                                             elanL2GatewayUtils, jobCoordinator, elanInstanceCache, hwvtepNodeHACache);

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java
index d23c7c8696d008afd2658e666f9d38bacafbb0c5..2a5c17037712172888c4c7ab4516de3ef08f85fc 100755 (executable)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java
@@ -10,9 +10,9 @@ package org.opendaylight.netvirt.elan.statisitcs;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.cache.ElanInterfaceCache;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.cache.ElanInterfaceCache;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java
index 60c264b4772ccd7fbc5561723bced82deb00c368..cde7d86394c5bcfebd9f6d57678b6ee76054d5bf 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java
@@ -15,9 +15,9 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.MatchInfo;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.MatchInfo;
 import org.opendaylight.genius.mdsalutil.NwConstants;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java
index 33c6da02564f305a39856cd26306832092bf940d..46540b9237c4474f8df934ee44e09db88c2c5558 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java
@@ -8,9 +8,9 @@
 package org.opendaylight.netvirt.elan.utils;
 
 import com.google.common.base.Optional;
 package org.opendaylight.netvirt.elan.utils;
 
 import com.google.common.base.Optional;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeLeafTagName;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeLeafTagName;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
index defc7821d16732634c47ba2cb8699aa57a9490e8..bcca8a628b4dc241d71a88f5cb6978828acff53c 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
@@ -12,9 +12,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
index c3ca78d1935d6e110554337c9cd615d2f2a515af..7b58c2cde772592b2ca8016d005f324b411bfa6b 100755 (executable)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
@@ -30,11 +30,11 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import javax.annotation.CheckReturnValue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import javax.annotation.CheckReturnValue;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;


@@ -285,7 +285,7 @@ public class ElanUtils {
      */
     @Deprecated
     @SuppressWarnings("checkstyle:IllegalCatch")
      */
     @Deprecated
     @SuppressWarnings("checkstyle:IllegalCatch")

-    public static <T extends DataObject> Optional<T> read(@Nonnull DataBroker broker,
+    public static <T extends DataObject> Optional<T> read(@NonNull DataBroker broker,

             LogicalDatastoreType datastoreType, InstanceIdentifier<T> path) {
         try (ReadOnlyTransaction tx = broker.newReadOnlyTransaction()) {
             return tx.read(datastoreType, path).get();
             LogicalDatastoreType datastoreType, InstanceIdentifier<T> path) {
         try (ReadOnlyTransaction tx = broker.newReadOnlyTransaction()) {
             return tx.read(datastoreType, path).get();


@@ -488,7 +488,7 @@ public class ElanUtils {
      *            the elan instance name
      * @return list of dpIds
      */
      *            the elan instance name
      * @return list of dpIds
      */

-    @Nonnull
+    @NonNull

     public List<BigInteger> getParticipatingDpnsInElanInstance(String elanInstanceName) {
         List<BigInteger> dpIds = new ArrayList<>();
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnInterfaceId = getElanDpnOperationDataPath(elanInstanceName);
     public List<BigInteger> getParticipatingDpnsInElanInstance(String elanInstanceName) {
         List<BigInteger> dpIds = new ArrayList<>();
         InstanceIdentifier<ElanDpnInterfacesList> elanDpnInterfaceId = getElanDpnOperationDataPath(elanInstanceName);


@@ -730,7 +730,7 @@ public class ElanUtils {
      * @return the egress actions for interface
      */
     @SuppressWarnings("checkstyle:IllegalCatch")
      * @return the egress actions for interface
      */
     @SuppressWarnings("checkstyle:IllegalCatch")

-    @Nonnull
+    @NonNull

     public List<Action> getEgressActionsForInterface(String ifName, @Nullable Long tunnelKey) {
         List<Action> listAction = new ArrayList<>();
         try {
     public List<Action> getEgressActionsForInterface(String ifName, @Nullable Long tunnelKey) {
         List<Action> listAction = new ArrayList<>();
         try {


@@ -798,12 +798,12 @@ public class ElanUtils {
         // TODO: Make sure that the same is performed against the ElanDevices.
     }
 
         // TODO: Make sure that the same is performed against the ElanDevices.
     }
 

-    @Nonnull
+    @NonNull

     public List<DpnInterfaces> getInvolvedDpnsInElan(String elanName) {
         return getElanDPNByName(elanName);
     }
 
     public List<DpnInterfaces> getInvolvedDpnsInElan(String elanName) {
         return getElanDPNByName(elanName);
     }
 

-    @Nonnull
+    @NonNull

     public List<DpnInterfaces> getElanDPNByName(String elanInstanceName) {
         InstanceIdentifier<ElanDpnInterfacesList> elanIdentifier = getElanDpnOperationDataPath(elanInstanceName);
         return MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL, elanIdentifier).toJavaUtil().map(
     public List<DpnInterfaces> getElanDPNByName(String elanInstanceName) {
         InstanceIdentifier<ElanDpnInterfacesList> elanIdentifier = getElanDpnOperationDataPath(elanInstanceName);
         return MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL, elanIdentifier).toJavaUtil().map(


@@ -1302,14 +1302,10 @@ public class ElanUtils {
      *            the data broker
      * @return the interface state from oper ds
      */
      *            the data broker
      * @return the interface state from oper ds
      */

-    @Nullable
-    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
-        .ietf.interfaces.rev140508.interfaces.state.Interface getInterfaceStateFromOperDS(
-            String interfaceName, DataBroker dataBroker) {
-        InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
-            .ietf.interfaces.rev140508.interfaces.state.Interface> ifStateId = createInterfaceStateInstanceIdentifier(
-                interfaceName);
-        return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, ifStateId).orNull();
+    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+            .@Nullable Interface getInterfaceStateFromOperDS(String interfaceName, DataBroker dataBroker) {
+        return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL,
+            createInterfaceStateInstanceIdentifier(interfaceName)).orNull();

     }
 
     /**
     }
 
     /**

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
index 5a1931e51dc184d3e7bb252254eb3c5a4efd85eb..651b04fbcafc3b15954863ecf6c790212a6bda50 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
@@ -24,10 +24,10 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -138,7 +138,7 @@ public class TransportZoneNotificationUtil {
     }
 
     private void updateTransportZone(TransportZone zone, BigInteger dpnId,
     }
 
     private void updateTransportZone(TransportZone zone, BigInteger dpnId,

-            @Nonnull TypedWriteTransaction<Configuration> tx) {
+            @NonNull TypedWriteTransaction<Configuration> tx) {

         InstanceIdentifier<TransportZone> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zone.getZoneName())).build();
 
         InstanceIdentifier<TransportZone> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zone.getZoneName())).build();
 


@@ -166,7 +166,7 @@ public class TransportZoneNotificationUtil {
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void updateTransportZone(String zoneName, BigInteger dpnId, @Nullable String localIp,
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void updateTransportZone(String zoneName, BigInteger dpnId, @Nullable String localIp,

-            @Nonnull TypedReadWriteTransaction<Configuration> tx)
+            @NonNull TypedReadWriteTransaction<Configuration> tx)

             throws ExecutionException, InterruptedException {
         InstanceIdentifier<TransportZone> inst = InstanceIdentifier.create(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName));
             throws ExecutionException, InterruptedException {
         InstanceIdentifier<TransportZone> inst = InstanceIdentifier.create(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName));


@@ -188,7 +188,7 @@ public class TransportZoneNotificationUtil {
     }
 
     private void deleteTransportZone(TransportZone zone, BigInteger dpnId,
     }
 
     private void deleteTransportZone(TransportZone zone, BigInteger dpnId,

-            @Nonnull TypedWriteTransaction<Configuration> tx) {
+            @NonNull TypedWriteTransaction<Configuration> tx) {

         InstanceIdentifier<TransportZone> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zone.getZoneName())).build();
         tx.delete(path);
         InstanceIdentifier<TransportZone> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zone.getZoneName())).build();
         tx.delete(path);


@@ -213,7 +213,7 @@ public class TransportZoneNotificationUtil {
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void deleteTransportZone(String zoneName, BigInteger dpnId,
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void deleteTransportZone(String zoneName, BigInteger dpnId,

-            @Nonnull TypedReadWriteTransaction<Configuration> tx) throws ExecutionException, InterruptedException {
+            @NonNull TypedReadWriteTransaction<Configuration> tx) throws ExecutionException, InterruptedException {

         InstanceIdentifier<TransportZone> inst = InstanceIdentifier.create(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName));
 
         InstanceIdentifier<TransportZone> inst = InstanceIdentifier.create(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName));
 


@@ -311,7 +311,7 @@ public class TransportZoneNotificationUtil {
 
     private void handleChangedLocalIps(Map<String, ValueDifference<String>> changedEntries, BigInteger dpId,
             Set<String> zonePrefixes, Map<String, List<String>> tepTzMap,
 
     private void handleChangedLocalIps(Map<String, ValueDifference<String>> changedEntries, BigInteger dpId,
             Set<String> zonePrefixes, Map<String, List<String>> tepTzMap,

-            @Nonnull TypedReadWriteTransaction<Configuration> tx) throws ExecutionException, InterruptedException {
+            @NonNull TypedReadWriteTransaction<Configuration> tx) throws ExecutionException, InterruptedException {

         if (changedEntries == null || changedEntries.isEmpty()) {
             LOG.trace("No changed local_ips found for DPN {}", dpId);
             return;
         if (changedEntries == null || changedEntries.isEmpty()) {
             LOG.trace("No changed local_ips found for DPN {}", dpId);
             return;


@@ -340,7 +340,7 @@ public class TransportZoneNotificationUtil {
     }
 
     private void handleRemovedLocalIps(Map<String, String> removedEntries, BigInteger dpId, Set<String> zonePrefixes,
     }
 
     private void handleRemovedLocalIps(Map<String, String> removedEntries, BigInteger dpId, Set<String> zonePrefixes,

-            Map<String, List<String>> tepTzMap, @Nonnull TypedWriteTransaction<Configuration> tx) {
+            Map<String, List<String>> tepTzMap, @NonNull TypedWriteTransaction<Configuration> tx) {

         if (removedEntries == null || removedEntries.isEmpty()) {
             LOG.trace("No removed local_ips found on DPN {}", dpId);
             return;
         if (removedEntries == null || removedEntries.isEmpty()) {
             LOG.trace("No removed local_ips found on DPN {}", dpId);
             return;


@@ -412,7 +412,7 @@ public class TransportZoneNotificationUtil {
         return false;
     }
 
         return false;
     }
 

-    private void removeVtep(String zoneName, BigInteger dpId, @Nonnull TypedWriteTransaction<Configuration> tx) {
+    private void removeVtep(String zoneName, BigInteger dpId, @NonNull TypedWriteTransaction<Configuration> tx) {

         InstanceIdentifier<Vteps> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName))
                 .child(Subnets.class, new SubnetsKey(IpPrefixBuilder.getDefaultInstance(ALL_SUBNETS)))
         InstanceIdentifier<Vteps> path = InstanceIdentifier.builder(TransportZones.class)
                 .child(TransportZone.class, new TransportZoneKey(zoneName))
                 .child(Subnets.class, new SubnetsKey(IpPrefixBuilder.getDefaultInstance(ALL_SUBNETS)))


@@ -422,7 +422,7 @@ public class TransportZoneNotificationUtil {
 
     // search for relevant subnets for the given subnetIP, add one if it is
     // necessary
 
     // search for relevant subnets for the given subnetIP, add one if it is
     // necessary

-    private Subnets getOrAddSubnet(@Nonnull List<Subnets> subnets, @Nonnull String subnetIp) {
+    private Subnets getOrAddSubnet(@NonNull List<Subnets> subnets, @NonNull String subnetIp) {

         IpPrefix subnetPrefix = IpPrefixBuilder.getDefaultInstance(subnetIp);
 
         for (Subnets subnet : subnets) {
         IpPrefix subnetPrefix = IpPrefixBuilder.getDefaultInstance(subnetIp);
 
         for (Subnets subnet : subnets) {


@@ -462,7 +462,7 @@ public class TransportZoneNotificationUtil {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     private Map<String, String> getDpnLocalIps(BigInteger dpId) throws ReadFailedException {
         // Example of local IPs from other_config:
         // local_ips="10.0.43.159:MPLS,11.11.11.11:DSL,ip:underlay-network"
     private Map<String, String> getDpnLocalIps(BigInteger dpId) throws ReadFailedException {
         // Example of local IPs from other_config:
         // local_ips="10.0.43.159:MPLS,11.11.11.11:DSL,ip:underlay-network"

diff --git a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java
index 383c2e67982436113a6eb61f41a3d636a7cca9a4..7b85a6804d87adc824ed05f0fd68b584c69444db 100644 (file)
--- a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java
+++ b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java
@@ -19,7 +19,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java
index de3e372481f6eae61da617790b6de9caf23f858d..d2f720055968e6cec9fcd4b775c5d067d63b8786 100644 (file)
--- a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java
+++ b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java
@@ -13,7 +13,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import java.math.BigInteger;
 import java.util.List;
 
 import java.math.BigInteger;
 import java.util.List;
 

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java
index afe659fff58a775c93e7bd51383624315dfc3a09..af5beaf7153765db8a30257928d06e3bf4936947 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java
@@ -20,10 +20,10 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -155,7 +155,7 @@ public class BaseVrfEntryHandler implements AutoCloseable {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     protected List<AdjacencyResult> resolveAdjacency(final BigInteger remoteDpnId, final long vpnId,
                                                      final VrfEntry vrfEntry, String rd) {
         List<RoutePaths> routePaths = new ArrayList<>(vrfEntry.nonnullRoutePaths());
     protected List<AdjacencyResult> resolveAdjacency(final BigInteger remoteDpnId, final long vpnId,
                                                      final VrfEntry vrfEntry, String rd) {
         List<RoutePaths> routePaths = new ArrayList<>(vrfEntry.nonnullRoutePaths());

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
index f96e72803a1931753f374e0ea9f1c69148a7ff2c..26301a66d3a3645c704848aca072932fed12dfae 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
@@ -17,10 +17,10 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Consumer;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Consumer;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java
index e3ad6413a1c0f2f7be5b72b0347082ce84b3e438..35c16317270551016c7f312e6552b9aed6bb374d 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java
@@ -16,10 +16,10 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java
index c870d7592a4d742ef1dc4a9f7472df7aca1f24c2..04dde4558a77adc1102ab0a8a3b90fa237eb7e8b 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java
@@ -24,9 +24,9 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -571,9 +571,8 @@ public class FibUtil {
         return id;
     }
 
         return id;
     }
 

-    @Nullable
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
-        .state.Interface getInterfaceStateFromOperDS(String interfaceName) {
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+        .@Nullable Interface getInterfaceStateFromOperDS(String interfaceName) {

         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508
             .interfaces.state.Interface> ifStateId = buildStateInterfaceId(interfaceName);
         Optional<Interface> ifStateOptional = MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, ifStateId);
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508
             .interfaces.state.Interface> ifStateId = buildStateInterfaceId(interfaceName);
         Optional<Interface> ifStateOptional = MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, ifStateId);

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java
index 25a1ee398b5a02c6c78d75300d3691c48be7116c..e7da0697aac76d22bf320af4ba57256b4f54716a 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java
@@ -24,10 +24,10 @@ import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
index 540e06aaf55e551cd6bfc4fefd449829333c1181..2c25f72cf84432af9fe45462a273869c9224ec8a 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
@@ -33,11 +33,11 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantLock;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;

diff --git a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java
index 17c993e642a0112470a56edca8dfd3a25ac1a679..21a2b7f1d632bc40e53ae069a47a0df19280ca01 100644 (file)
--- a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java
+++ b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java
@@ -8,10 +8,10 @@
 package org.opendaylight.netvirt.fibmanager.shell;
 
 import java.util.Locale;
 package org.opendaylight.netvirt.fibmanager.shell;
 
 import java.util.Locale;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 import org.opendaylight.netvirt.fibmanager.api.L3VPNTransportTypes;
 
 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 import org.opendaylight.netvirt.fibmanager.api.L3VPNTransportTypes;
 

diff --git a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
index 87b02946af274cbb246b0bc689de43240264369e..a8ed8d0159e937bdcbb8c950a2ac2ff9b6e72191 100644 (file)
--- a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
+++ b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
@@ -15,11 +15,11 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.util.Locale;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.util.Locale;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java
index 52d0b28ed486fd2e0a74a3be7f518289bd57476c..8cbc1b072aa2afb43f42bcd378ff4900fa958969 100644 (file)
--- a/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java
+++ b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.netvirt.fibmanager.shell;
 
  */
 package org.opendaylight.netvirt.fibmanager.shell;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 
 @Command(scope = "vpnservice", name = "showTransportType", description = "Displays transport type in use for services")
 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 
 @Command(scope = "vpnservice", name = "showTransportType", description = "Displays transport type in use for services")

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java
index e8584cd78e247f1a67c0a75cc0308375f789b5f0..b4457aa8e293044a4a03b78120285a21698a4a0d 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java
@@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants.Ipv6RouterAdvertisementType;
 import org.opendaylight.genius.ipv6util.api.Ipv6Util;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants.Ipv6RouterAdvertisementType;
 import org.opendaylight.genius.ipv6util.api.Ipv6Util;


@@ -860,7 +860,6 @@ public class IfMgr implements ElementCache, AutoCloseable {
         return elanTag;
     }
 
         return elanTag;
     }
 

-    @Nullable

     public void updateNetworkMtuInfo(Uuid networkId, int mtu) {
         VirtualNetwork net = getNetwork(networkId);
         if (null != net) {
     public void updateNetworkMtuInfo(Uuid networkId, int mtu) {
         VirtualNetwork net = getNetwork(networkId);
         if (null != net) {

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java
index 6518d3eca6bcab741f281e6d780489025fc0435d..19cb514c293872e48f1d0ae2928b8da1d3e72dbf 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java
@@ -15,7 +15,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.ipv6util.api.Icmpv6Type;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants.Ipv6RouterAdvertisementType;
 import org.opendaylight.genius.ipv6util.api.Icmpv6Type;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants;
 import org.opendaylight.genius.ipv6util.api.Ipv6Constants.Ipv6RouterAdvertisementType;

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java
index 66a09afd1f8bd2b1c5764b0504286daa12476ffe..8f241eaae301ddf95a89e16257d0b717c9ff3561 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java
@@ -12,10 +12,10 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
index b75d1416a479b317b40f1496534f2625f18db3f9..cceff6b3bb2fbe856de363f32f25cd55d797355a 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.ipv6util.api.Ipv6Util;
 import org.opendaylight.netvirt.ipv6service.api.IVirtualNetwork;
 import org.opendaylight.netvirt.ipv6service.utils.Ipv6ServiceConstants;
 import org.opendaylight.genius.ipv6util.api.Ipv6Util;
 import org.opendaylight.netvirt.ipv6service.api.IVirtualNetwork;
 import org.opendaylight.netvirt.ipv6service.utils.Ipv6ServiceConstants;

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
index 504fb74d83c078802992f7d933f214ac69f1e760..17049240d7b61b7ffc8b37bd1840fb3cb0eac78c 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
@@ -16,10 +16,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -126,9 +126,8 @@ public class Ipv6ServiceUtils {
      * @param interfaceName the interface name
      * @return the interface.
      */
      * @param interfaceName the interface name
      * @return the interface.
      */

-    @Nullable

     public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
     public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces

-        .Interface getInterface(String interfaceName) {
+        .@Nullable Interface getInterface(String interfaceName) {

         return read(LogicalDatastoreType.CONFIGURATION, getInterfaceIdentifier(interfaceName)).orNull();
     }
 
         return read(LogicalDatastoreType.CONFIGURATION, getInterfaceIdentifier(interfaceName)).orNull();
     }
 


@@ -166,9 +165,8 @@ public class Ipv6ServiceUtils {
      * @param interfaceName the interface name.
      * @return the interface state.
      */
      * @param interfaceName the interface name.
      * @return the interface state.
      */

-    @Nullable

     public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
     public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state

-            .Interface getInterfaceStateFromOperDS(String interfaceName) {
+            .@Nullable Interface getInterfaceStateFromOperDS(String interfaceName) {

         return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, buildStateInterfaceId(interfaceName), broker).orNull();
     }
 
         return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, buildStateInterfaceId(interfaceName), broker).orNull();
     }
 

diff --git a/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java b/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java
index 27c5c6547d8a9b6039451a8c094c746cdeeaf44e..7955fc4411fc0ed52a6cd10f6d9a1ab9a31f3580 100644 (file)
--- a/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java
+++ b/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java
@@ -9,10 +9,10 @@ package org.opendaylight.netvirt.ipv6service.shell;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import java.util.List;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.infrautils.utils.TablePrinter;
 import org.opendaylight.netvirt.ipv6service.api.ElementCache;
 import org.opendaylight.netvirt.ipv6service.api.IVirtualNetwork;
 import org.opendaylight.infrautils.utils.TablePrinter;
 import org.opendaylight.netvirt.ipv6service.api.ElementCache;
 import org.opendaylight.netvirt.ipv6service.api.IVirtualNetwork;

diff --git a/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java b/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java
index e49b758b54ecee4f7f9a628cf81259f73121344c..9e1a2d5c475a65d1ec3425cd6c93a45a79c72ff1 100644 (file)
--- a/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java
+++ b/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java
@@ -10,7 +10,7 @@ package org.opendaylight.netvirt.natservice.api;
 import java.math.BigInteger;
 
 import java.util.concurrent.ExecutionException;
 import java.math.BigInteger;
 
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java
index 53734cbef04f314b8ebbd08fefdb677b7072c349..8f8fd389cdd0989cb07d72e058d75180eef798fc 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java
@@ -11,10 +11,10 @@ package org.opendaylight.netvirt.natservice.cli;
 import com.google.common.base.Optional;
 import java.io.PrintStream;
 import java.math.BigInteger;
 import com.google.common.base.Optional;
 import java.io.PrintStream;
 import java.math.BigInteger;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -101,7 +101,7 @@ public class DisplayNaptSwithcesCli extends OsgiCommandSupport {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     private Optional<Node> readOvsdbNode(Node bridgeNode) {
         OvsdbBridgeAugmentation bridgeAugmentation = extractBridgeAugmentation(bridgeNode);
         if (bridgeAugmentation != null) {
     private Optional<Node> readOvsdbNode(Node bridgeNode) {
         OvsdbBridgeAugmentation bridgeAugmentation = extractBridgeAugmentation(bridgeNode);
         if (bridgeAugmentation != null) {

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java
index d0db56e018327bfa13bda4e30fbdf714d2a1ef41..fdd3b15d9054b4275a1ff4be4be465f6da0e5688 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java
@@ -21,9 +21,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java
index fff75627529d99576395c3798abcc04ec98d285d..d20bb6c65f271defcd211b652478905847ef677a 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -176,13 +176,13 @@ public class EvpnDnatFlowProgrammer {
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("onAddFloatingIp : Error {} in custom fib routes install process for Floating "
                         + "IP Prefix {} on DPN {}", error, externalIp, dpnId);
             }
 
             @Override
                 LOG.error("onAddFloatingIp : Error {} in custom fib routes install process for Floating "
                         + "IP Prefix {} on DPN {}", error, externalIp, dpnId);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(
                         txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> {
                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(
                         txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> {


@@ -308,13 +308,13 @@ public class EvpnDnatFlowProgrammer {
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
 
             @Override
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
 
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("onRemoveFloatingIp : Error {} in custom fib routes remove process for Floating "
                         + "IP Prefix {} on DPN {}", error, externalIp, dpnId);
             }
 
             @Override
                 LOG.error("onRemoveFloatingIp : Error {} in custom fib routes remove process for Floating "
                         + "IP Prefix {} on DPN {}", error, externalIp, dpnId);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<RemoveFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<RemoveFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
                         innerConfTx -> {
                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
                         innerConfTx -> {

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java
index 6947547994487143c74775c3517376eb1bf5a361..946018f45e34f85c4fb1ddbd59a189602e88685b 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java
@@ -18,9 +18,9 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;


@@ -149,14 +149,14 @@ public class EvpnSnatFlowProgrammer {
         final long finalL3Vni = l3Vni;
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
             @Override
         final long finalL3Vni = l3Vni;
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("evpnAdvToBgpAndInstallFibAndTsFlows : Error in custom fib routes install process for "
                         + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",
                         externalIp, dpnId, finalL3Vni, vpnName, routerId, error);
             }
 
             @Override
                 LOG.error("evpnAdvToBgpAndInstallFibAndTsFlows : Error in custom fib routes install process for "
                         + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",
                         externalIp, dpnId, finalL3Vni, vpnName, routerId, error);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     LOG.info("evpnAdvToBgpAndInstallFibAndTsFlows : Successfully installed custom FIB routes for "
                             + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",
                 if (result.isSuccessful()) {
                     LOG.info("evpnAdvToBgpAndInstallFibAndTsFlows : Successfully installed custom FIB routes for "
                             + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",


@@ -234,14 +234,14 @@ public class EvpnSnatFlowProgrammer {
         final long finalL3Vni = l3Vni;
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
             @Override
         final long finalL3Vni = l3Vni;
         Futures.addCallback(futureVxlan, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("evpnDelFibTsAndReverseTraffic : Error in custom fib routes remove process for "
                         + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",
                         externalIp, dpnId, finalL3Vni, vpnName, routerId, error);
             }
 
             @Override
                 LOG.error("evpnDelFibTsAndReverseTraffic : Error in custom fib routes remove process for "
                         + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for RouterId {}",
                         externalIp, dpnId, finalL3Vni, vpnName, routerId, error);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<RemoveFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<RemoveFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
                         innerConfTx -> {
                 if (result.isSuccessful()) {
                     ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION,
                         innerConfTx -> {

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java
index f2f4521758ce2cfb2eee5dd0532a8cb864e490b5..935dac9fb06f38f25ba51657b18f90b61c0d85db 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java
@@ -9,16 +9,15 @@
 package org.opendaylight.netvirt.natservice.internal;
 
 import com.google.common.base.Strings;
 package org.opendaylight.netvirt.natservice.internal;
 
 import com.google.common.base.Strings;

-

 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.mdsalutil.ActionInfo;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
index 09e5c4a6853f77c489bb843ba00a873d6dbb2b3a..8b5e1d57700c8ca00237f9808cae3e0d8602fc86 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
@@ -31,11 +31,11 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -1164,12 +1164,12 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
         Futures.addCallback(future, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override
         Futures.addCallback(future, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("advToBgpAndInstallFibAndTsFlows : Error in generate label or fib install process", error);
             }
 
             @Override
                 LOG.error("advToBgpAndInstallFibAndTsFlows : Error in generate label or fib install process", error);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     LOG.info("advToBgpAndInstallFibAndTsFlows : Successfully installed custom FIB routes for prefix {}",
                             externalIp);
                 if (result.isSuccessful()) {
                     LOG.info("advToBgpAndInstallFibAndTsFlows : Successfully installed custom FIB routes for prefix {}",
                             externalIp);


@@ -1777,7 +1777,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
             })), NatConstants.NAT_DJC_MAX_RETRIES);
     }
 
             })), NatConstants.NAT_DJC_MAX_RETRIES);
     }
 

-    public void handleDisableSnat(Routers router, Uuid networkUuid, @Nonnull Collection<String> externalIps,
+    public void handleDisableSnat(Routers router, Uuid networkUuid, @NonNull Collection<String> externalIps,

                                   boolean routerFlag, @Nullable String vpnName, BigInteger naptSwitchDpnId,
                                   long routerId, TypedReadWriteTransaction<Configuration> removeFlowInvTx) {
         LOG.info("handleDisableSnat : Entry");
                                   boolean routerFlag, @Nullable String vpnName, BigInteger naptSwitchDpnId,
                                   long routerId, TypedReadWriteTransaction<Configuration> removeFlowInvTx) {
         LOG.info("handleDisableSnat : Entry");


@@ -1836,7 +1836,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")
     public void handleDisableSnatInternetVpn(String routerName, long routerId, Uuid networkUuid,
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")
     public void handleDisableSnatInternetVpn(String routerName, long routerId, Uuid networkUuid,

-                                             @Nonnull Collection<String> externalIps,
+                                             @NonNull Collection<String> externalIps,

                                              String vpnId, TypedReadWriteTransaction<Configuration> writeFlowInvTx) {
         LOG.debug("handleDisableSnatInternetVpn: Started to process handle disable snat for router {} "
                 + "with internet vpn {}", routerName, vpnId);
                                              String vpnId, TypedReadWriteTransaction<Configuration> writeFlowInvTx) {
         LOG.debug("handleDisableSnatInternetVpn: Started to process handle disable snat for router {} "
                 + "with internet vpn {}", routerName, vpnId);


@@ -1913,7 +1913,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
 
     public void removeNaptFlowsFromActiveSwitch(long routerId, String routerName,
                                                 BigInteger dpnId, Uuid networkId, String vpnName,
 
     public void removeNaptFlowsFromActiveSwitch(long routerId, String routerName,
                                                 BigInteger dpnId, Uuid networkId, String vpnName,

-                                                @Nonnull Collection<String> externalIps,
+                                                @NonNull Collection<String> externalIps,

                                                 Collection<Uuid> externalSubnetList,
                                                 TypedReadWriteTransaction<Configuration> confTx,
                                                 ProviderTypes extNwProvType)
                                                 Collection<Uuid> externalSubnetList,
                                                 TypedReadWriteTransaction<Configuration> confTx,
                                                 ProviderTypes extNwProvType)


@@ -2082,7 +2082,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
     }
 
     protected void removeNaptFibExternalOutputFlows(long routerId, BigInteger dpnId, Uuid networkId,
     }
 
     protected void removeNaptFibExternalOutputFlows(long routerId, BigInteger dpnId, Uuid networkId,

-                                                    @Nonnull Collection<String> externalIps,
+                                                    @NonNull Collection<String> externalIps,

                                                     TypedReadWriteTransaction<Configuration> writeFlowInvTx)
             throws ExecutionException, InterruptedException {
         long extVpnId = NatConstants.INVALID_ID;
                                                     TypedReadWriteTransaction<Configuration> writeFlowInvTx)
             throws ExecutionException, InterruptedException {
         long extVpnId = NatConstants.INVALID_ID;


@@ -2245,7 +2245,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
     }
 
     public void clrRtsFromBgpAndDelFibTs(final BigInteger dpnId, Long routerId, @Nullable Uuid networkUuid,
     }
 
     public void clrRtsFromBgpAndDelFibTs(final BigInteger dpnId, Long routerId, @Nullable Uuid networkUuid,

-                                         @Nonnull Collection<String> externalIps, @Nullable String vpnName,
+                                         @NonNull Collection<String> externalIps, @Nullable String vpnName,

                                          String extGwMacAddress, TypedReadWriteTransaction<Configuration> confTx)
             throws ExecutionException, InterruptedException {
         //Withdraw the corresponding routes from the BGP.
                                          String extGwMacAddress, TypedReadWriteTransaction<Configuration> confTx)
             throws ExecutionException, InterruptedException {
         //Withdraw the corresponding routes from the BGP.


@@ -2366,13 +2366,13 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
             Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
                 @Override
             Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
                 @Override

-                public void onFailure(@Nonnull Throwable error) {
+                public void onFailure(@NonNull Throwable error) {

                     LOG.error("delFibTsAndReverseTraffic : Error in removing the label:{} or custom fib entries"
                         + "got external ip {}", label, extIp, error);
                 }
 
                 @Override
                     LOG.error("delFibTsAndReverseTraffic : Error in removing the label:{} or custom fib entries"
                         + "got external ip {}", label, extIp, error);
                 }
 
                 @Override

-                public void onSuccess(@Nonnull RpcResult<RemoveVpnLabelOutput> result) {
+                public void onSuccess(@NonNull RpcResult<RemoveVpnLabelOutput> result) {

                     if (result.isSuccessful()) {
                         LOG.debug("delFibTsAndReverseTraffic : Successfully removed the label for the prefix {} "
                             + "from VPN {}", externalIp, externalVpn);
                     if (result.isSuccessful()) {
                         LOG.debug("delFibTsAndReverseTraffic : Successfully removed the label for the prefix {} "
                             + "from VPN {}", externalIp, externalVpn);


@@ -2471,12 +2471,12 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
             Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
                 @Override
             Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
                 @Override

-                public void onFailure(@Nonnull Throwable error) {
+                public void onFailure(@NonNull Throwable error) {

                     LOG.error("delFibTsAndReverseTraffic : Error in removing the label or custom fib entries", error);
                 }
 
                 @Override
                     LOG.error("delFibTsAndReverseTraffic : Error in removing the label or custom fib entries", error);
                 }
 
                 @Override

-                public void onSuccess(@Nonnull RpcResult<RemoveVpnLabelOutput> result) {
+                public void onSuccess(@NonNull RpcResult<RemoveVpnLabelOutput> result) {

                     if (result.isSuccessful()) {
                         LOG.debug("delFibTsAndReverseTraffic : Successfully removed the label for the prefix {} "
                             + "from VPN {}", externalIp, vpnName);
                     if (result.isSuccessful()) {
                         LOG.debug("delFibTsAndReverseTraffic : Successfully removed the label for the prefix {} "
                             + "from VPN {}", externalIp, vpnName);

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
index a5b1313a742bedef0a25a80281c49af19c354827..c6582ea37494076f62c05cb2561e160e41f6d3a5 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
@@ -17,10 +17,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java
index aec92363150b6ef6976f1e240a6a96cb74307c14..f7b6b16b93bbeafcd284a88f2ceb02ef88a4b67e 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.netvirt.natservice.internal;
 
 
 package org.opendaylight.netvirt.natservice.internal;
 

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.natservice.internal.NaptPacketInHandler.NatPacketProcessingState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
 
 import org.opendaylight.netvirt.natservice.internal.NaptPacketInHandler.NatPacketProcessingState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
 

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java
index f703b8e46786bb896fe19bd6fd583c79e30ac96c..13663d2839442a9b3c96054911ca5ef2631d9c74 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java
@@ -14,9 +14,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;


@@ -113,7 +113,7 @@ public class NAPTSwitchSelector {
             .child(RouterToNaptSwitch.class, new RouterToNaptSwitchKey(routerName)).build();
     }
 
             .child(RouterToNaptSwitch.class, new RouterToNaptSwitchKey(routerName)).build();
     }
 

-    @Nonnull
+    @NonNull

     public List<BigInteger> getDpnsForVpn(String routerName) {
         LOG.debug("getDpnsForVpn: called for RouterName {}", routerName);
         long bgpVpnId = NatUtil.getBgpVpnId(dataBroker, routerName);
     public List<BigInteger> getDpnsForVpn(String routerName) {
         LOG.debug("getDpnsForVpn: called for RouterName {}", routerName);
         long bgpVpnId = NatUtil.getBgpVpnId(dataBroker, routerName);


@@ -176,7 +176,7 @@ public class NAPTSwitchSelector {
         }
 
         @Override
         }
 
         @Override

-        public int compareTo(@Nonnull SwitchWeight switchWeight) {
+        public int compareTo(@NonNull SwitchWeight switchWeight) {

             return weight - switchWeight.getWeight();
         }
     }
             return weight - switchWeight.getWeight();
         }
     }

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
index df13e84e9d3a395a16fe2427568c890dab4d33bf..42215304316ad20481a2d372204fb17000fd783e 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
@@ -22,10 +22,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.common.util.Arguments;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.common.util.Arguments;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;


@@ -292,7 +292,7 @@ public class NaptEventHandler {
                                             }
 
                                             @Override
                                             }
 
                                             @Override

-                                            public void onFailure(@Nonnull Throwable throwable) {
+                                            public void onFailure(@NonNull Throwable throwable) {

                                                 LOG.error("handleEvent : Error configuring outbound "
                                                         + "SNAT flows using RPC for SNAT connection from {} to {}",
                                                                   internalAddress, externalAddress);
                                                 LOG.error("handleEvent : Error configuring outbound "
                                                         + "SNAT flows using RPC for SNAT connection from {} to {}",
                                                                   internalAddress, externalAddress);


@@ -301,7 +301,7 @@ public class NaptEventHandler {
                                 }
 
                                 @Override
                                 }
 
                                 @Override

-                                public void onFailure(@Nonnull Throwable throwable) {
+                                public void onFailure(@NonNull Throwable throwable) {

                                     LOG.error("handleEvent : Error configuring inbound SNAT flows "
                                             + "using RPC for SNAT connection from {} to {}",
                                             internalAddress, externalAddress);
                                     LOG.error("handleEvent : Error configuring inbound SNAT flows "
                                             + "using RPC for SNAT connection from {} to {}",
                                             internalAddress, externalAddress);


@@ -576,7 +576,7 @@ public class NaptEventHandler {
         return matchInfo;
     }
 
         return matchInfo;
     }
 

-    @Nonnull
+    @NonNull

     private static List<InstructionInfo> buildAndGetSetActionInstructionInfo(String ipAddress, int port,
                                                                              long segmentId, long vpnId,
                                                                              short tableId,
     private static List<InstructionInfo> buildAndGetSetActionInstructionInfo(String ipAddress, int port,
                                                                              long segmentId, long vpnId,
                                                                              short tableId,

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java
index 95b6fa6580373c21e4ec76c3e1164cbfcfaefe11..4c18c9a6fd5f82b0c125e0fbfd43be34764550d7 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java
@@ -21,12 +21,12 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -506,7 +506,7 @@ public class NaptManager {
             .child(ExternalIpCounter.class, new ExternalIpCounterKey(external)).build();
     }
 
             .child(ExternalIpCounter.class, new ExternalIpCounterKey(external)).build();
     }
 

-    @Nonnull
+    @NonNull

     public static List<IpMap> getIpMapList(DataBroker broker, Long routerId) {
         InstanceIdentifier<IpMapping> id = getIpMapList(routerId);
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,
     public static List<IpMap> getIpMapList(DataBroker broker, Long routerId) {
         InstanceIdentifier<IpMapping> id = getIpMapList(routerId);
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java
index 862df7d867cb160d26e9babf0f70b37252432eb9..4dce44ee4f1c6abcd7d5f561bb10e723b64a1724 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java
@@ -18,10 +18,10 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -360,7 +360,7 @@ public class NaptSwitchHA {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     private List<String> getRouterIdsForExtNetwork(Uuid extNetworkId) {
         List<String> routerUuidsAsString = new ArrayList<>();
         InstanceIdentifier<Networks> extNetwork = InstanceIdentifier.builder(ExternalNetworks.class)
     private List<String> getRouterIdsForExtNetwork(Uuid extNetworkId) {
         List<String> routerUuidsAsString = new ArrayList<>();
         InstanceIdentifier<Networks> extNetwork = InstanceIdentifier.builder(ExternalNetworks.class)


@@ -695,7 +695,7 @@ public class NaptSwitchHA {
         return listBucketInfo;
     }
 
         return listBucketInfo;
     }
 

-    @Nonnull
+    @NonNull

     public List<BucketInfo> handleGroupInNeighborSwitches(BigInteger dpnId, String routerName, long routerId,
             BigInteger naptSwitch) {
         List<BucketInfo> listBucketInfo = new ArrayList<>();
     public List<BucketInfo> handleGroupInNeighborSwitches(BigInteger dpnId, String routerName, long routerId,
             BigInteger naptSwitch) {
         List<BucketInfo> listBucketInfo = new ArrayList<>();

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java
index 40ba8fdca57550893b9928cee4dead257261cb29..c52aef63bbe241b5ae12d59793f55dd236760fdc 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java
@@ -14,7 +14,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatSouthboundEventHandlers.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatSouthboundEventHandlers.java
index 64cfe3f592739a1991435395e3d264ca092ace40..6bcc99185bc48f0df77d013e29139b1e85d7081a 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatSouthboundEventHandlers.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatSouthboundEventHandlers.java
@@ -24,10 +24,10 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -310,7 +310,7 @@ public class NatSouthboundEventHandlers {
         }, MoreExecutors.directExecutor());
     }
 
         }, MoreExecutors.directExecutor());
     }
 

-    @Nonnull
+    @NonNull

     private List<InternalToExternalPortMap> getIntExtPortMapListForPortName(String portName, String routerId) {
         InstanceIdentifier<Ports> portToIpMapIdentifier = NatUtil.buildPortToIpMapIdentifier(routerId, portName);
         Optional<Ports> port =
     private List<InternalToExternalPortMap> getIntExtPortMapListForPortName(String portName, String routerId) {
         InstanceIdentifier<Ports> portToIpMapIdentifier = NatUtil.buildPortToIpMapIdentifier(routerId, portName);
         Optional<Ports> port =

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java
index b01a0122b74740ee3fe366544039ddcb88a9e4d2..b16246c721386c6e133ba9881c231351ebdfbc7e 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java
@@ -22,10 +22,10 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;


@@ -787,13 +787,13 @@ public class NatTunnelInterfaceStateListener
             Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
                 @Override
             Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
                 @Override

-                public void onFailure(@Nonnull Throwable error) {
+                public void onFailure(@NonNull Throwable error) {

                     LOG.error("hndlTepAddOnNaptSwitch : SNAT->Error in generate label or fib install process",
                             error);
                 }
 
                 @Override
                     LOG.error("hndlTepAddOnNaptSwitch : SNAT->Error in generate label or fib install process",
                             error);
                 }
 
                 @Override

-                public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+                public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                     if (result.isSuccessful()) {
                         LOG.info("hndlTepAddOnNaptSwitch : SNAT -> Successfully installed custom FIB routes "
                                 + "for prefix {}", externalIp);
                     if (result.isSuccessful()) {
                         LOG.info("hndlTepAddOnNaptSwitch : SNAT -> Successfully installed custom FIB routes "
                                 + "for prefix {}", externalIp);


@@ -919,13 +919,13 @@ public class NatTunnelInterfaceStateListener
                 Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
                     @Override
                 Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
                     @Override

-                    public void onFailure(@Nonnull Throwable error) {
+                    public void onFailure(@NonNull Throwable error) {

                         LOG.error("hndlTepAddForDnatInEachRtr : DNAT -> Error in generate label or fib install process",
                                 error);
                     }
 
                     @Override
                         LOG.error("hndlTepAddForDnatInEachRtr : DNAT -> Error in generate label or fib install process",
                                 error);
                     }
 
                     @Override

-                    public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+                    public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                         if (result.isSuccessful()) {
                             LOG.info("hndlTepAddForDnatInEachRtr : DNAT -> Successfully installed custom FIB routes "
                                     + "for prefix {}", externalIp);
                         if (result.isSuccessful()) {
                             LOG.info("hndlTepAddForDnatInEachRtr : DNAT -> Successfully installed custom FIB routes "
                                     + "for prefix {}", externalIp);


@@ -1127,13 +1127,13 @@ public class NatTunnelInterfaceStateListener
                 Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
 
                     @Override
                 Futures.addCallback(listenableFuture, new FutureCallback<RpcResult<RemoveFibEntryOutput>>() {
 
                     @Override

-                    public void onFailure(@Nonnull Throwable error) {
+                    public void onFailure(@NonNull Throwable error) {

                         LOG.error("hndlTepDelForDnatInEachRtr : DNAT -> Error in removing the table 21 entry pushing "
                             + "the MPLS label to the tunnel since label is invalid ", error);
                     }
 
                     @Override
                         LOG.error("hndlTepDelForDnatInEachRtr : DNAT -> Error in removing the table 21 entry pushing "
                             + "the MPLS label to the tunnel since label is invalid ", error);
                     }
 
                     @Override

-                    public void onSuccess(@Nonnull RpcResult<RemoveFibEntryOutput> result) {
+                    public void onSuccess(@NonNull RpcResult<RemoveFibEntryOutput> result) {

                         if (result.isSuccessful()) {
                             LOG.info("hndlTepDelForDnatInEachRtr : DNAT -> Successfully removed the entry pushing the "
                                 + "MPLS label to the tunnel");
                         if (result.isSuccessful()) {
                             LOG.info("hndlTepDelForDnatInEachRtr : DNAT -> Successfully removed the entry pushing the "
                                 + "MPLS label to the tunnel");

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java
index 6c81d0197744994a69574139d75dd17b01fcef6a..03394c9a4fb1544a1d26750f8268674fa3dfa193 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java
@@ -33,9 +33,9 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -492,7 +492,7 @@ public final class NatUtil {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public static List<Uuid> getRouterIdsfromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier<Networks> id = buildNetworkIdentifier(networkId);
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,
     public static List<Uuid> getRouterIdsfromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier<Networks> id = buildNetworkIdentifier(networkId);
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,


@@ -863,7 +863,7 @@ public final class NatUtil {
         return routerInstanceIndentifier;
     }
 
         return routerInstanceIndentifier;
     }
 

-    @Nonnull
+    @NonNull

     public static List<Integer> getInternalIpPortListInfo(DataBroker dataBroker, Long routerId,
                                                           String internalIpAddress, ProtocolTypes protocolType) {
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker,
     public static List<Integer> getInternalIpPortListInfo(DataBroker dataBroker, Long routerId,
                                                           String internalIpAddress, ProtocolTypes protocolType) {
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker,


@@ -970,7 +970,7 @@ public final class NatUtil {
             .build();
     }
 
             .build();
     }
 

-    @Nonnull
+    @NonNull

     public static Collection<String> getExternalIpsForRouter(DataBroker dataBroker, Long routerId) {
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
             .ip.map.IpMapping> ipMappingOptional =
     public static Collection<String> getExternalIpsForRouter(DataBroker dataBroker, Long routerId) {
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
             .ip.map.IpMapping> ipMappingOptional =


@@ -986,7 +986,7 @@ public final class NatUtil {
         return externalIps;
     }
 
         return externalIps;
     }
 

-    @Nonnull
+    @NonNull

     public static List<String> getExternalIpsForRouter(DataBroker dataBroker, String routerName) {
         Routers routerData = NatUtil.getRoutersFromConfigDS(dataBroker, routerName);
         if (routerData != null) {
     public static List<String> getExternalIpsForRouter(DataBroker dataBroker, String routerName) {
         Routers routerData = NatUtil.getRoutersFromConfigDS(dataBroker, routerName);
         if (routerData != null) {


@@ -996,7 +996,7 @@ public final class NatUtil {
         return emptyList();
     }
 
         return emptyList();
     }
 

-    @Nonnull
+    @NonNull

     public static Map<String, Long> getExternalIpsLabelForRouter(DataBroker dataBroker, Long routerId) {
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
             .ip.map.IpMapping> ipMappingOptional =
     public static Map<String, Long> getExternalIpsLabelForRouter(DataBroker dataBroker, Long routerId) {
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
             .ip.map.IpMapping> ipMappingOptional =


@@ -1045,7 +1045,7 @@ public final class NatUtil {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     public static String[] getSubnetIpAndPrefix(String subnetString) {
         String[] subnetSplit = subnetString.split("/");
         String subnetIp = subnetSplit[0];
     public static String[] getSubnetIpAndPrefix(String subnetString) {
         String[] subnetSplit = subnetString.split("/");
         String subnetIp = subnetSplit[0];


@@ -1076,7 +1076,7 @@ public final class NatUtil {
         return new String[] {leastLoadedExtIp, leastLoadedExtIpPrefix};
     }
 
         return new String[] {leastLoadedExtIp, leastLoadedExtIpPrefix};
     }
 

-    @Nonnull
+    @NonNull

     public static List<BigInteger> getDpnsForRouter(DataBroker dataBroker, String routerUuid) {
         InstanceIdentifier id = InstanceIdentifier.builder(NeutronRouterDpns.class)
             .child(RouterDpnList.class, new RouterDpnListKey(routerUuid)).build();
     public static List<BigInteger> getDpnsForRouter(DataBroker dataBroker, String routerUuid) {
         InstanceIdentifier id = InstanceIdentifier.builder(NeutronRouterDpns.class)
             .child(RouterDpnList.class, new RouterDpnListKey(routerUuid)).build();


@@ -1101,9 +1101,8 @@ public final class NatUtil {
         return bgpVpnId;
     }
 
         return bgpVpnId;
     }
 

-    @Nullable

     static org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.router.interfaces
     static org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.router.interfaces

-        .RouterInterface getConfiguredRouterInterface(DataBroker broker, String interfaceName) {
+            .@Nullable RouterInterface getConfiguredRouterInterface(DataBroker broker, String interfaceName) {

         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,
                 LogicalDatastoreType.CONFIGURATION, NatUtil.getRouterInterfaceId(interfaceName)).orNull();
     }
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,
                 LogicalDatastoreType.CONFIGURATION, NatUtil.getRouterInterfaceId(interfaceName)).orNull();
     }


@@ -1217,7 +1216,7 @@ public final class NatUtil {
     }
 
     public static void removeFromNeutronRouterDpnsMap(String routerName, String vpnInterfaceName,
     }
 
     public static void removeFromNeutronRouterDpnsMap(String routerName, String vpnInterfaceName,

-         BigInteger dpId, @Nonnull TypedReadWriteTransaction<Operational> operTx) {
+         BigInteger dpId, @NonNull TypedReadWriteTransaction<Operational> operTx) {

         InstanceIdentifier<DpnVpninterfacesList> routerDpnListIdentifier = getRouterDpnId(routerName, dpId);
         Optional<DpnVpninterfacesList> optionalRouterDpnList;
         try {
         InstanceIdentifier<DpnVpninterfacesList> routerDpnListIdentifier = getRouterDpnId(routerName, dpId);
         Optional<DpnVpninterfacesList> optionalRouterDpnList;
         try {


@@ -1370,7 +1369,7 @@ public final class NatUtil {
         return nodeId;
     }
 
         return nodeId;
     }
 

-    @Nonnull
+    @NonNull

     public static List<ActionInfo> getEgressActionsForInterface(OdlInterfaceRpcService odlInterfaceRpcService,
                                                                 ItmRpcService itmRpcService,
                                                                 IInterfaceManager interfaceManager, String ifName,
     public static List<ActionInfo> getEgressActionsForInterface(OdlInterfaceRpcService odlInterfaceRpcService,
                                                                 ItmRpcService itmRpcService,
                                                                 IInterfaceManager interfaceManager, String ifName,


@@ -1379,7 +1378,7 @@ public final class NatUtil {
                 ifName, tunnelKey, 0, internalTunnelInterface);
     }
 
                 ifName, tunnelKey, 0, internalTunnelInterface);
     }
 

-    @Nonnull
+    @NonNull

     public static List<ActionInfo> getEgressActionsForInterface(OdlInterfaceRpcService odlInterfaceRpcService,
                                                                 ItmRpcService itmRpcService,
                                                                 IInterfaceManager interfaceManager,
     public static List<ActionInfo> getEgressActionsForInterface(OdlInterfaceRpcService odlInterfaceRpcService,
                                                                 ItmRpcService itmRpcService,
                                                                 IInterfaceManager interfaceManager,


@@ -1454,7 +1453,7 @@ public final class NatUtil {
         return getNeutronPortForIp(broker, targetIP, NeutronConstants.DEVICE_OWNER_GATEWAY_INF);
     }
 
         return getNeutronPortForIp(broker, targetIP, NeutronConstants.DEVICE_OWNER_GATEWAY_INF);
     }
 

-    @Nonnull
+    @NonNull

     public static List<Port> getNeutronPorts(DataBroker broker) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports>
             portsIdentifier = InstanceIdentifier.create(Neutron.class)
     public static List<Port> getNeutronPorts(DataBroker broker) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports>
             portsIdentifier = InstanceIdentifier.create(Neutron.class)


@@ -1513,7 +1512,7 @@ public final class NatUtil {
                 LogicalDatastoreType.CONFIGURATION, subnetmapId).orNull();
     }
 
                 LogicalDatastoreType.CONFIGURATION, subnetmapId).orNull();
     }
 

-    @Nonnull
+    @NonNull

     public static List<Uuid> getSubnetIdsFromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier<NetworkMap> id = InstanceIdentifier.builder(NetworkMaps.class)
             .child(NetworkMap.class, new NetworkMapKey(networkId)).build();
     public static List<Uuid> getSubnetIdsFromNetworkId(DataBroker broker, Uuid networkId) {
         InstanceIdentifier<NetworkMap> id = InstanceIdentifier.builder(NetworkMaps.class)
             .child(NetworkMap.class, new NetworkMapKey(networkId)).build();


@@ -1754,7 +1753,7 @@ public final class NatUtil {
                 null);
     }
 
                 null);
     }
 

-    @Nonnull
+    @NonNull

     public static List<Ports> getFloatingIpPortsForRouter(DataBroker broker, Uuid routerUuid) {
         InstanceIdentifier<RouterPorts> routerPortsIdentifier = getRouterPortsId(routerUuid.getValue());
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,
     public static List<Ports> getFloatingIpPortsForRouter(DataBroker broker, Uuid routerUuid) {
         InstanceIdentifier<RouterPorts> routerPortsIdentifier = getRouterPortsId(routerUuid.getValue());
         return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(broker,


@@ -1762,7 +1761,7 @@ public final class NatUtil {
                 routerPortsIdentifier).toJavaUtil().map(RouterPorts::getPorts).orElse(emptyList());
     }
 
                 routerPortsIdentifier).toJavaUtil().map(RouterPorts::getPorts).orElse(emptyList());
     }
 

-    @Nonnull
+    @NonNull

     public static List<Uuid> getRouterUuIdsForVpn(DataBroker broker, Uuid vpnUuid) {
         InstanceIdentifier<ExternalNetworks> externalNwIdentifier = InstanceIdentifier.create(ExternalNetworks.class);
         Optional<ExternalNetworks> externalNwData =
     public static List<Uuid> getRouterUuIdsForVpn(DataBroker broker, Uuid vpnUuid) {
         InstanceIdentifier<ExternalNetworks> externalNwIdentifier = InstanceIdentifier.create(ExternalNetworks.class);
         Optional<ExternalNetworks> externalNwData =


@@ -1792,7 +1791,7 @@ public final class NatUtil {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public static Collection<Uuid> getExternalSubnetIdsFromExternalIps(@Nullable List<ExternalIps> externalIps) {
         if (externalIps == null) {
             return Collections.emptySet();
     public static Collection<Uuid> getExternalSubnetIdsFromExternalIps(@Nullable List<ExternalIps> externalIps) {
         if (externalIps == null) {
             return Collections.emptySet();


@@ -1801,7 +1800,7 @@ public final class NatUtil {
         return externalIps.stream().map(ExternalIps::getSubnetId).collect(Collectors.toSet());
     }
 
         return externalIps.stream().map(ExternalIps::getSubnetId).collect(Collectors.toSet());
     }
 

-    @Nonnull
+    @NonNull

     public static Collection<Uuid> getExternalSubnetIdsForRouter(DataBroker dataBroker, @Nullable String routerName) {
         if (routerName == null) {
             LOG.error("getExternalSubnetIdsForRouter : empty routerName received");
     public static Collection<Uuid> getExternalSubnetIdsForRouter(DataBroker dataBroker, @Nullable String routerName) {
         if (routerName == null) {
             LOG.error("getExternalSubnetIdsForRouter : empty routerName received");


@@ -1820,7 +1819,7 @@ public final class NatUtil {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     protected static Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external
         .subnets.Subnets> getOptionalExternalSubnets(DataBroker dataBroker, Uuid subnetId) {
         if (subnetId == null) {
     protected static Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external
         .subnets.Subnets> getOptionalExternalSubnets(DataBroker dataBroker, Uuid subnetId) {
         if (subnetId == null) {


@@ -1837,7 +1836,7 @@ public final class NatUtil {
                 LogicalDatastoreType.CONFIGURATION, subnetsIdentifier);
     }
 
                 LogicalDatastoreType.CONFIGURATION, subnetsIdentifier);
     }
 

-    @Nonnull
+    @NonNull

     protected static Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external
         .subnets.Subnets> getOptionalExternalSubnets(TypedReadTransaction<Configuration> tx, Uuid subnetId) {
         if (subnetId == null) {
     protected static Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external
         .subnets.Subnets> getOptionalExternalSubnets(TypedReadTransaction<Configuration> tx, Uuid subnetId) {
         if (subnetId == null) {


@@ -1913,7 +1912,7 @@ public final class NatUtil {
         return result;
     }
 
         return result;
     }
 

-    @Nonnull
+    @NonNull

     static List<String> getIpsListFromExternalIps(@Nullable List<ExternalIps> externalIps) {
         if (externalIps == null) {
             return emptyList();
     static List<String> getIpsListFromExternalIps(@Nullable List<ExternalIps> externalIps) {
         if (externalIps == null) {
             return emptyList();


@@ -2067,7 +2066,7 @@ public final class NatUtil {
             .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build();
     }
 
             .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build();
     }
 

-    @Nonnull
+    @NonNull

     public static List<String> getListOfRdsFromVpnInstance(VpnInstance vpnInstance) {
         VpnAfConfig vpnConfig = vpnInstance.getIpv4Family();
         return vpnConfig.getRouteDistinguisher() != null ? new ArrayList<>(
     public static List<String> getListOfRdsFromVpnInstance(VpnInstance vpnInstance) {
         VpnAfConfig vpnConfig = vpnInstance.getIpv4Family();
         return vpnConfig.getRouteDistinguisher() != null ? new ArrayList<>(


@@ -2547,7 +2546,7 @@ public final class NatUtil {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     public static Optional<Node> readOvsdbNode(Node bridgeNode, DataBroker dataBroker) {
         OvsdbBridgeAugmentation bridgeAugmentation = extractBridgeAugmentation(bridgeNode);
         if (bridgeAugmentation != null) {
     public static Optional<Node> readOvsdbNode(Node bridgeNode, DataBroker dataBroker) {
         OvsdbBridgeAugmentation bridgeAugmentation = extractBridgeAugmentation(bridgeNode);
         if (bridgeAugmentation != null) {

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java
index 7efb852268d531ce212e1bbc0d347814b7af89a2..df1d875d8ab8820b40f4b72141fb3fd2a0294617 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java
@@ -15,10 +15,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

-
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java
index 4c647c2f74fbb017fdb5417fc119bbf66818c3b8..86659abc774cb540706a5608b8541d1763dbcb69 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.netvirt.natservice.internal;
 
  */
 package org.opendaylight.netvirt.natservice.internal;
 

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java
index 736316f83da8dd2e4af41c538f8da5ef5a84fafe..d32b435ac9d6c7fd911c0f9adabdfae8ab7bed4a 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java
@@ -15,9 +15,9 @@ import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -84,11 +84,11 @@ public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeLis
     }
 
     @Override
     }
 
     @Override

-    public void add(@Nonnull UpgradeConfig newDataObject) {
+    public void add(@NonNull UpgradeConfig newDataObject) {

     }
 
     @Override
     }
 
     @Override

-    public void remove(@Nonnull UpgradeConfig removedDataObject) {
+    public void remove(@NonNull UpgradeConfig removedDataObject) {

         if (natMode == NatserviceConfig.NatMode.Conntrack) {
             return;
         }
         if (natMode == NatserviceConfig.NatMode.Conntrack) {
             return;
         }


@@ -96,7 +96,7 @@ public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeLis
     }
 
     @Override
     }
 
     @Override

-    public void update(@Nonnull UpgradeConfig original, UpgradeConfig updated) {
+    public void update(@NonNull UpgradeConfig original, UpgradeConfig updated) {

         if (natMode == NatserviceConfig.NatMode.Controller) {
             if (original.isUpgradeInProgress() && !updated.isUpgradeInProgress()) {
                 Optional<NaptSwitches> npatSwitches = NatUtil.getAllPrimaryNaptSwitches(dataBroker);
         if (natMode == NatserviceConfig.NatMode.Controller) {
             if (original.isUpgradeInProgress() && !updated.isUpgradeInProgress()) {
                 Optional<NaptSwitches> npatSwitches = NatUtil.getAllPrimaryNaptSwitches(dataBroker);

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
index 68672608116e213754d3fa38412d3c942de5cb3f..9348678054621ef3fdd8dc6ec437733949968450 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
@@ -20,9 +20,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;


@@ -269,12 +269,12 @@ public class VpnFloatingIpHandler implements FloatingIPHandler {
         Futures.addCallback(future, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override
         Futures.addCallback(future, new FutureCallback<RpcResult<CreateFibEntryOutput>>() {
 
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("onAddFloatingIp : Error in generate label or fib install process", error);
             }
 
             @Override
                 LOG.error("onAddFloatingIp : Error in generate label or fib install process", error);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<CreateFibEntryOutput> result) {
+            public void onSuccess(@NonNull RpcResult<CreateFibEntryOutput> result) {

                 if (result.isSuccessful()) {
                     LOG.info("onAddFloatingIp : Successfully installed custom FIB routes for prefix {}", externalIp);
                 } else {
                 if (result.isSuccessful()) {
                     LOG.info("onAddFloatingIp : Successfully installed custom FIB routes for prefix {}", externalIp);
                 } else {


@@ -383,12 +383,12 @@ public class VpnFloatingIpHandler implements FloatingIPHandler {
         Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
             @Override
         Futures.addCallback(labelFuture, new FutureCallback<RpcResult<RemoveVpnLabelOutput>>() {
 
             @Override

-            public void onFailure(@Nonnull Throwable error) {
+            public void onFailure(@NonNull Throwable error) {

                 LOG.error("onRemoveFloatingIp : Error in removing the label or custom fib entries", error);
             }
 
             @Override
                 LOG.error("onRemoveFloatingIp : Error in removing the label or custom fib entries", error);
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<RemoveVpnLabelOutput> result) {
+            public void onSuccess(@NonNull RpcResult<RemoveVpnLabelOutput> result) {

                 if (result.isSuccessful()) {
                     LOG.debug("onRemoveFloatingIp : Successfully removed the label for the prefix {} from VPN {}",
                             externalIp, vpnName);
                 if (result.isSuccessful()) {
                     LOG.debug("onRemoveFloatingIp : Successfully removed the label for the prefix {} from VPN {}",
                             externalIp, vpnName);

diff --git a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java
index 71f35fc0fb2d24e47ad99a14829de109c71568dd..8f96fc70264ca376cadcf6b79ca955b32245734f 100644 (file)
--- a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java
+++ b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java
@@ -8,12 +8,12 @@
 package org.opendaylight.netvirt.neutronvpn.api.l2gw;
 
 import java.util.Collection;
 package org.opendaylight.netvirt.neutronvpn.api.l2gw;
 
 import java.util.Collection;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 
 public interface L2GatewayCache {
 
 public interface L2GatewayCache {

-    @Nonnull
-    L2GatewayDevice addOrGet(@Nonnull String deviceName);
+    @NonNull
+    L2GatewayDevice addOrGet(@NonNull String deviceName);

 
     @Nullable
     L2GatewayDevice remove(String deviceName);
 
     @Nullable
     L2GatewayDevice remove(String deviceName);


@@ -21,6 +21,6 @@ public interface L2GatewayCache {
     @Nullable
     L2GatewayDevice get(String deviceName);
 
     @Nullable
     L2GatewayDevice get(String deviceName);
 

-    @Nonnull
+    @NonNull

     Collection<L2GatewayDevice> getAll();
 }
     Collection<L2GatewayDevice> getAll();
 }

diff --git a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java
index 00c1f4115c35b53389beb0df4d0be9a34c465e4a..65a29b04cce6702a33f7856a91be1e0537e11971 100644 (file)
--- a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java
+++ b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java
@@ -18,8 +18,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.attributes.Devices;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.attributes.Devices;


@@ -75,7 +75,7 @@ public class L2GatewayDevice {
      *
      * @return the tunnel ips
      */
      *
      * @return the tunnel ips
      */

-    @Nonnull
+    @NonNull

     public Set<IpAddress> getTunnelIps() {
         return tunnelIps;
     }
     public Set<IpAddress> getTunnelIps() {
         return tunnelIps;
     }


@@ -84,7 +84,7 @@ public class L2GatewayDevice {
         l2gwConnectionIdToDevices.computeIfAbsent(connectionId, key -> Sets.newConcurrentHashSet()).add(device);
     }
 
         l2gwConnectionIdToDevices.computeIfAbsent(connectionId, key -> Sets.newConcurrentHashSet()).add(device);
     }
 

-    @Nonnull
+    @NonNull

     public Collection<Devices> getDevicesForL2gwConnectionId(Uuid connectionId) {
         final Set<Devices> devices = l2gwConnectionIdToDevices.get(connectionId);
         return devices != null ? devices : Collections.emptyList();
     public Collection<Devices> getDevicesForL2gwConnectionId(Uuid connectionId) {
         final Set<Devices> devices = l2gwConnectionIdToDevices.get(connectionId);
         return devices != null ? devices : Collections.emptyList();


@@ -118,7 +118,7 @@ public class L2GatewayDevice {
      *
      * @return the l2 gateway ids
      */
      *
      * @return the l2 gateway ids
      */

-    @Nonnull
+    @NonNull

     public Set<Uuid> getL2GatewayIds() {
         return l2GatewayIds;
     }
     public Set<Uuid> getL2GatewayIds() {
         return l2GatewayIds;
     }


@@ -167,7 +167,7 @@ public class L2GatewayDevice {
      *
      * @return the ucast local macs
      */
      *
      * @return the ucast local macs
      */

-    @Nonnull
+    @NonNull

     public Collection<LocalUcastMacs> getUcastLocalMacs() {
         return new ArrayList<>(ucastLocalMacs);
     }
     public Collection<LocalUcastMacs> getUcastLocalMacs() {
         return new ArrayList<>(ucastLocalMacs);
     }

diff --git a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java
index 1f0b93b40f3219b66db267d4cb4190f3f62f53dd..82170e1763df3b44103c36a006d92c789c2e861b 100644 (file)
--- a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java
+++ b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java
@@ -15,8 +15,8 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;


@@ -221,7 +221,7 @@ public final class NeutronUtils {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public static List<Uuid> getVpnMapRouterIdsListUuid(@Nullable List<RouterIds> routerIds) {
         if (routerIds == null) {
             return Collections.emptyList();
     public static List<Uuid> getVpnMapRouterIdsListUuid(@Nullable List<RouterIds> routerIds) {
         if (routerIds == null) {
             return Collections.emptyList();

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
index 999f13ddc9fb95741f180455d204f59c0580c425..5e6e824aafa1e96ff7518707061c10128d7d775a 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java
@@ -9,9 +9,9 @@
 package org.opendaylight.netvirt.neutronvpn;
 
 import com.google.common.base.Optional;
 package org.opendaylight.netvirt.neutronvpn;
 
 import com.google.common.base.Optional;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -32,7 +32,7 @@ public class HostConfigCache extends InstanceIdDataObjectCache<Hostconfig> {
               cacheProvider);
     }
 
               cacheProvider);
     }
 

-    public Optional<Hostconfig> get(@Nonnull String hostId) throws ReadFailedException {
+    public Optional<Hostconfig> get(@NonNull String hostId) throws ReadFailedException {

         InstanceIdentifier<Hostconfig> hostConfigPath = InstanceIdentifier.builder(Neutron.class)
                                                  .child(Hostconfigs.class)
                                                  .child(Hostconfig.class, new HostconfigKey(hostId, "ODL L2"))
         InstanceIdentifier<Hostconfig> hostConfigPath = InstanceIdentifier.builder(Neutron.class)
                                                  .child(Hostconfigs.class)
                                                  .child(Hostconfig.class, new HostconfigKey(hostId, "ODL L2"))

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java
index c3dc1dcfb537d40cfaf16d54ac931ea875d6fc8e..00b241cd03e76e09bb11a704e89c2e66a875a69d 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java
@@ -8,12 +8,10 @@
 package org.opendaylight.netvirt.neutronvpn;
 
 import java.util.List;
 package org.opendaylight.netvirt.neutronvpn;
 
 import java.util.List;

-
-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

-
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
 import org.slf4j.Logger;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
 import org.slf4j.Logger;

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
index 84814ad0f8578f4bbd85ed4dfb22931d23fa006e..77bc810854259ca20e50412e2861498326eee892 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
@@ -10,10 +10,10 @@ package org.opendaylight.netvirt.neutronvpn;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
index 97af8e286174ca8a493bda1ac51452046da8a22a..033bc62739b4e8fc205f978b6e315c3caf5013c3 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
@@ -12,11 +12,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;


@@ -189,7 +189,7 @@ public class NeutronNetworkChangeListener
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     private List<ElanSegments> buildSegments(Network input) {
         NetworkProviderExtension providerExtension = input.augmentation(NetworkProviderExtension.class);
         if (providerExtension == null || providerExtension.getSegments() == null) {
     private List<ElanSegments> buildSegments(Network input) {
         NetworkProviderExtension providerExtension = input.augmentation(NetworkProviderExtension.class);
         if (providerExtension == null || providerExtension.getSegments() == null) {

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index 85564d2bf7b27dd0ce8e1b2f2ec6f3ec39cedcb4..329198594831fb3787ca4bc5ea15c9711fdf59b1 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -25,10 +25,10 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.ObjectUtils;
 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.ObjectUtils;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java
index dab32fe9729fc9212d3dbc34136b2d169812725b..7d70bf78fa3535435c079cebb5cb8961e1a5d268 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java
@@ -19,11 +19,11 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.arputil.api.ArpConstants;
 import org.opendaylight.genius.mdsalutil.NWUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.arputil.api.ArpConstants;
 import org.opendaylight.genius.mdsalutil.NWUtil;

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
index 3b50c215ef03791b5234e00646ca91b3dced879b..629ca008e9e4c700f6f606de9822f6d7f0860797 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
@@ -37,11 +37,11 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -268,7 +268,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")
     protected void createSubnetmapNode(Uuid subnetId, String subnetIp, Uuid tenantId, Uuid networkId,
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")
     protected void createSubnetmapNode(Uuid subnetId, String subnetIp, Uuid tenantId, Uuid networkId,

-                                       @Nullable NetworkAttributes.NetworkType networkType, long segmentationId) {
+                                       NetworkAttributes.@Nullable NetworkType networkType, long segmentationId) {

         try {
             InstanceIdentifier<Subnetmap> subnetMapIdentifier = NeutronvpnUtils.buildSubnetMapIdentifier(subnetId);
             final ReentrantLock lock = lockForUuid(subnetId);
         try {
             InstanceIdentifier<Subnetmap> subnetMapIdentifier = NeutronvpnUtils.buildSubnetMapIdentifier(subnetId);
             final ReentrantLock lock = lockForUuid(subnetId);


@@ -2024,7 +2024,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
                         && interVpnLink.getFirstEndpoint().getIpAddress().getValue().equals(nexthop));
     }
 
                         && interVpnLink.getFirstEndpoint().getIpAddress().getValue().equals(nexthop));
     }
 

-    @Nonnull
+    @NonNull

     protected List<Adjacency> getAdjacencyforExtraRoute(List<Routes> routeList, String fixedIp) {
         List<Adjacency> adjList = new ArrayList<>();
         Map<String, List<String>> adjMap = new HashMap<>();
     protected List<Adjacency> getAdjacencyforExtraRoute(List<Routes> routeList, String fixedIp) {
         List<Adjacency> adjList = new ArrayList<>();
         Map<String, List<String>> adjMap = new HashMap<>();


@@ -2384,8 +2384,8 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
      * @param networkList List list of network Ids (Uuid), which will be associated.
      * @return list of formatted strings with detailed error messages.
      */
      * @param networkList List list of network Ids (Uuid), which will be associated.
      * @return list of formatted strings with detailed error messages.
      */

-    @Nonnull
-    protected List<String> associateNetworksToVpn(@Nonnull Uuid vpnId, @Nonnull List<Uuid> networkList) {
+    @NonNull
+    protected List<String> associateNetworksToVpn(@NonNull Uuid vpnId, @NonNull List<Uuid> networkList) {

         List<String> failedNwList = new ArrayList<>();
         HashSet<Uuid> passedNwList = new HashSet<>();
         boolean isExternalNetwork = false;
         List<String> failedNwList = new ArrayList<>();
         HashSet<Uuid> passedNwList = new HashSet<>();
         boolean isExternalNetwork = false;


@@ -2500,7 +2500,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
         return failedNwList;
     }
 
         return failedNwList;
     }
 

-    private boolean associateExtNetworkToVpn(@Nonnull Uuid vpnId, @Nonnull Network extNet) {
+    private boolean associateExtNetworkToVpn(@NonNull Uuid vpnId, @NonNull Network extNet) {

         if (!addExternalNetworkToVpn(extNet, vpnId)) {
             return false;
         }
         if (!addExternalNetworkToVpn(extNet, vpnId)) {
             return false;
         }


@@ -2549,8 +2549,8 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
      * @param networkList List list of network Ids (Uuid), which will be disassociated.
      * @return list of formatted strings with detailed error messages.
      */
      * @param networkList List list of network Ids (Uuid), which will be disassociated.
      * @return list of formatted strings with detailed error messages.
      */

-    @Nonnull
-    protected List<String> dissociateNetworksFromVpn(@Nonnull Uuid vpnId, @Nonnull List<Uuid> networkList) {
+    @NonNull
+    protected List<String> dissociateNetworksFromVpn(@NonNull Uuid vpnId, @NonNull List<Uuid> networkList) {

         List<String> failedNwList = new ArrayList<>();
         HashSet<Uuid> passedNwList = new HashSet<>();
         if (networkList.isEmpty()) {
         List<String> failedNwList = new ArrayList<>();
         HashSet<Uuid> passedNwList = new HashSet<>();
         if (networkList.isEmpty()) {


@@ -2627,7 +2627,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
         return failedNwList;
     }
 
         return failedNwList;
     }
 

-    private boolean disassociateExtNetworkFromVpn(@Nonnull Uuid vpnId, @Nonnull Network extNet) {
+    private boolean disassociateExtNetworkFromVpn(@NonNull Uuid vpnId, @NonNull Network extNet) {

         if (!removeExternalNetworkFromVpn(extNet)) {
             return false;
         }
         if (!removeExternalNetworkFromVpn(extNet)) {
             return false;
         }


@@ -3134,7 +3134,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
 
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")
 
     // TODO Clean up the exception handling
     @SuppressWarnings("checkstyle:IllegalCatch")

-    private void writeVpnInterfaceToDs(@Nonnull Collection<Uuid> vpnIdList, String infName,
+    private void writeVpnInterfaceToDs(@NonNull Collection<Uuid> vpnIdList, String infName,

             @Nullable Adjacencies adjacencies, Uuid networkUuid, Boolean isRouterInterface,
             TypedWriteTransaction<Configuration> wrtConfigTxn) {
         if (vpnIdList.isEmpty() || infName == null) {
             @Nullable Adjacencies adjacencies, Uuid networkUuid, Boolean isRouterInterface,
             TypedWriteTransaction<Configuration> wrtConfigTxn) {
         if (vpnIdList.isEmpty() || infName == null) {


@@ -3367,8 +3367,8 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
         return message;
     }
 
         return message;
     }
 

-    protected void addV6PrivateSubnetToExtNetwork(@Nonnull Uuid routerId, @Nonnull Uuid internetVpnId,
-                                                  @Nonnull Subnetmap subnetMap) {
+    protected void addV6PrivateSubnetToExtNetwork(@NonNull Uuid routerId, @NonNull Uuid internetVpnId,
+                                                  @NonNull Subnetmap subnetMap) {

         updateVpnInternetForSubnet(subnetMap, internetVpnId, true);
         neutronvpnUtils.updateVpnInstanceWithFallback(routerId, internetVpnId, true);
         if (neutronvpnUtils.shouldVpnHandleIpVersionChoiceChange(IpVersionChoice.IPV6, routerId, true)) {
         updateVpnInternetForSubnet(subnetMap, internetVpnId, true);
         neutronvpnUtils.updateVpnInstanceWithFallback(routerId, internetVpnId, true);
         if (neutronvpnUtils.shouldVpnHandleIpVersionChoiceChange(IpVersionChoice.IPV6, routerId, true)) {


@@ -3378,8 +3378,8 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even
         }
     }
 
         }
     }
 

-    protected void removeV6PrivateSubnetToExtNetwork(@Nonnull Uuid routerId, @Nonnull Uuid internetVpnId,
-                                                     @Nonnull Subnetmap subnetMap) {
+    protected void removeV6PrivateSubnetToExtNetwork(@NonNull Uuid routerId, @NonNull Uuid internetVpnId,
+                                                     @NonNull Subnetmap subnetMap) {

         updateVpnInternetForSubnet(subnetMap, internetVpnId, false);
         neutronvpnUtils.updateVpnInstanceWithFallback(routerId, internetVpnId, false);
     }
         updateVpnInternetForSubnet(subnetMap, internetVpnId, false);
         neutronvpnUtils.updateVpnInstanceWithFallback(routerId, internetVpnId, false);
     }

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
index 25128c536f408edba811f46b6fc23e89226cdbb8..f87b98ac0272dbed5417119e2f6773bf41af557d 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
@@ -15,10 +15,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;

-import javax.annotation.Nullable;

 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
index 58f98a6aec262c579e687350fef362fef2d8a5c1..6d91d2317468001d1c58841952ee8afa29944b29 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
@@ -38,11 +38,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -811,7 +811,7 @@ public class NeutronvpnUtils {
         return subnetMapList;
     }
 
         return subnetMapList;
     }
 

-    @Nonnull
+    @NonNull

     protected List<Uuid> getNeutronRouterSubnetIds(Uuid routerId) {
         LOG.debug("getNeutronRouterSubnetIds for {}", routerId.getValue());
         List<Uuid> subnetIdList = new ArrayList<>();
     protected List<Uuid> getNeutronRouterSubnetIds(Uuid routerId) {
         LOG.debug("getNeutronRouterSubnetIds for {}", routerId.getValue());
         List<Uuid> subnetIdList = new ArrayList<>();


@@ -1596,7 +1596,7 @@ public class NeutronvpnUtils {
      * @param routerId the Uuid of the router which you try to reach the external network
      * @return Uuid of externalNetwork or null if is not exist
      */
      * @param routerId the Uuid of the router which you try to reach the external network
      * @return Uuid of externalNetwork or null if is not exist
      */

-    protected Uuid getExternalNetworkUuidAttachedFromRouterUuid(@Nonnull Uuid routerId) {
+    protected Uuid getExternalNetworkUuidAttachedFromRouterUuid(@NonNull Uuid routerId) {

         LOG.debug("getExternalNetworkUuidAttachedFromRouterUuid for {}", routerId.getValue());
         Uuid externalNetworkUuid = null;
         Router router = getNeutronRouter(routerId);
         LOG.debug("getExternalNetworkUuidAttachedFromRouterUuid for {}", routerId.getValue());
         Uuid externalNetworkUuid = null;
         Router router = getNeutronRouter(routerId);


@@ -1606,7 +1606,7 @@ public class NeutronvpnUtils {
         return externalNetworkUuid;
     }
 
         return externalNetworkUuid;
     }
 

-    public Uuid getInternetvpnUuidBoundToRouterId(@Nonnull Uuid routerId) {
+    public Uuid getInternetvpnUuidBoundToRouterId(@NonNull Uuid routerId) {

         Uuid netId = getExternalNetworkUuidAttachedFromRouterUuid(routerId);
         if (netId == null) {
             return netId;
         Uuid netId = getExternalNetworkUuidAttachedFromRouterUuid(routerId);
         if (netId == null) {
             return netId;


@@ -1622,7 +1622,7 @@ public class NeutronvpnUtils {
      * @return Uuid of externalVpn or null if it is not found
      */
     @Nullable
      * @return Uuid of externalVpn or null if it is not found
      */
     @Nullable

-    public Uuid getInternetvpnUuidBoundToSubnetRouter(@Nonnull Uuid subnetUuid) {
+    public Uuid getInternetvpnUuidBoundToSubnetRouter(@NonNull Uuid subnetUuid) {

         Subnetmap subnetmap = getSubnetmap(subnetUuid);
         Uuid routerUuid = subnetmap.getRouterId();
         LOG.debug("getInternetvpnUuidBoundToSubnetRouter for subnetUuid {}", subnetUuid.getValue());
         Subnetmap subnetmap = getSubnetmap(subnetUuid);
         Uuid routerUuid = subnetmap.getRouterId();
         LOG.debug("getInternetvpnUuidBoundToSubnetRouter for subnetUuid {}", subnetUuid.getValue());


@@ -1638,7 +1638,7 @@ public class NeutronvpnUtils {
      * @param extNet Provider Network, which has a port attached as external network gateway to router
      * @return a list of Private Subnetmap Ids of the router with external network gateway
      */
      * @param extNet Provider Network, which has a port attached as external network gateway to router
      * @return a list of Private Subnetmap Ids of the router with external network gateway
      */

-    public @Nonnull List<Uuid> getPrivateSubnetsToExport(@Nonnull Network extNet, Uuid internetVpnId) {
+    public @NonNull List<Uuid> getPrivateSubnetsToExport(@NonNull Network extNet, Uuid internetVpnId) {

         List<Uuid> subList = new ArrayList<>();
         List<Uuid> rtrList = new ArrayList<>();
         if (internetVpnId != null) {
         List<Uuid> subList = new ArrayList<>();
         List<Uuid> rtrList = new ArrayList<>();
         if (internetVpnId != null) {


@@ -1723,7 +1723,7 @@ public class NeutronvpnUtils {
         }
     }
 
         }
     }
 

-    public void updateVpnInstanceOpWithType(VpnInstanceOpDataEntry.BgpvpnType choice, @Nonnull Uuid vpn) {
+    public void updateVpnInstanceOpWithType(VpnInstanceOpDataEntry.BgpvpnType choice, @NonNull Uuid vpn) {

         String primaryRd = getVpnRd(vpn.getValue());
         if (primaryRd == null) {
             LOG.debug("updateVpnInstanceOpWithType: Update BgpvpnType {} for {}."
         String primaryRd = getVpnRd(vpn.getValue());
         if (primaryRd == null) {
             LOG.debug("updateVpnInstanceOpWithType: Update BgpvpnType {} for {}."


@@ -1815,7 +1815,7 @@ public class NeutronvpnUtils {
         return listRouterIds;
     }
 
         return listRouterIds;
     }
 

-    @Nonnull
+    @NonNull

     public List<BigInteger> getDpnsForRouter(String routerUuid) {
         InstanceIdentifier id = InstanceIdentifier.builder(NeutronRouterDpns.class)
             .child(RouterDpnList.class, new RouterDpnListKey(routerUuid)).build();
     public List<BigInteger> getDpnsForRouter(String routerUuid) {
         InstanceIdentifier id = InstanceIdentifier.builder(NeutronRouterDpns.class)
             .child(RouterDpnList.class, new RouterDpnListKey(routerUuid)).build();

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
index d58930f92d19de77475c1f71169c2aff96a22922..f0aef8d0f6305eca94f54461a218cc02889427d3 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
@@ -7,10 +7,9 @@
  */
 package org.opendaylight.netvirt.neutronvpn;
 
  */
 package org.opendaylight.netvirt.neutronvpn;
 

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

-
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -36,15 +35,15 @@ public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeLis
     }
 
     @Override
     }
 
     @Override

-    public void add(@Nonnull UpgradeConfig newDataObject) {
+    public void add(@NonNull UpgradeConfig newDataObject) {

     }
 
     @Override
     }
 
     @Override

-    public void remove(@Nonnull UpgradeConfig removedDataObject) {
+    public void remove(@NonNull UpgradeConfig removedDataObject) {

     }
 
     @Override
     }
 
     @Override

-    public void update(@Nonnull UpgradeConfig original, UpgradeConfig updated) {
+    public void update(@NonNull UpgradeConfig original, UpgradeConfig updated) {

         LOG.info("UpgradeStateListener update from {} to {}", original, updated);
         neutronSubnetGwMacResolver.sendArpRequestsToExtGateways();
     }
         LOG.info("UpgradeStateListener update from {} to {}", original, updated);
         neutronSubnetGwMacResolver.sendArpRequestsToExtGateways();
     }

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java
index 2162185cc7c479cddcf2c02313311a6c39e4b2ba..c933e071ea88ebba12bed1cf50040aa45a791751 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java
@@ -11,7 +11,7 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import com.google.common.base.Optional;
 import java.util.Collections;
 
 import com.google.common.base.Optional;
 import java.util.Collections;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
index eb85fe3dcc311ac78d428b12f8085ca9ecf9dcfe..d4345af43dc8a2c9c170ec62181a377d01488242 100644 (file)
--- a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
+++ b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
@@ -18,9 +18,9 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -366,7 +366,7 @@ public class PolicyServiceUtil {
         return aclType != null && aclType.isAssignableFrom(PolicyAcl.class);
     }
 
         return aclType != null && aclType.isAssignableFrom(PolicyAcl.class);
     }
 

-    @Nonnull
+    @NonNull

     public List<DpnToInterface> getUnderlayNetworkDpnToInterfaces(String underlayNetwork) {
         InstanceIdentifier<UnderlayNetwork> identifier = InstanceIdentifier.create(UnderlayNetworks.class)
                 .child(UnderlayNetwork.class, new UnderlayNetworkKey(underlayNetwork));
     public List<DpnToInterface> getUnderlayNetworkDpnToInterfaces(String underlayNetwork) {
         InstanceIdentifier<UnderlayNetwork> identifier = InstanceIdentifier.create(UnderlayNetworks.class)
                 .child(UnderlayNetwork.class, new UnderlayNetworkKey(underlayNetwork));

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java
index 5ccf35583435305bc69754325fb0b1616846e328..cdd8fb77d933ec7fb2e3a0e54f6f2bb329f1b2f0 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.netvirt.qosservice;
 
 
 package org.opendaylight.netvirt.qosservice;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java
index 0de3fa07c392f8ce057f12507283ef02fdaa44b0..e8dea5ae471c8bd950a25f1b833e76b672f11f24 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.netvirt.qosservice;
 
 
 package org.opendaylight.netvirt.qosservice;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java
index dceed36b2d0587530f01eefa60167ae857eff1a7..31c3ba41c9ba268416a012289b58f1478452ea45 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.netvirt.qosservice;
 
 
 package org.opendaylight.netvirt.qosservice;
 

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
index 2ebf70f964bc3f1a7900fac98a60280e2d0cf49c..878b2c863dd5a6fdaba4e8b9899e7bc825cd9714 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
@@ -22,10 +22,10 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore;


@@ -175,13 +175,13 @@ public class QosNeutronUtils {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public Collection<Network> getQosNetworks(Uuid qosUuid) {
         final ConcurrentMap<Uuid, Network> networkMap = qosNetworksMap.get(qosUuid);
         return networkMap != null ? networkMap.values() : emptyList();
     }
 
     public Collection<Network> getQosNetworks(Uuid qosUuid) {
         final ConcurrentMap<Uuid, Network> networkMap = qosNetworksMap.get(qosUuid);
         return networkMap != null ? networkMap.values() : emptyList();
     }
 

-    @Nonnull
+    @NonNull

     public List<Uuid> getSubnetIdsFromNetworkId(Uuid networkId) {
         InstanceIdentifier<NetworkMap> networkMapId = InstanceIdentifier.builder(NetworkMaps.class)
                 .child(NetworkMap.class, new NetworkMapKey(networkId)).build();
     public List<Uuid> getSubnetIdsFromNetworkId(Uuid networkId) {
         InstanceIdentifier<NetworkMap> networkMapId = InstanceIdentifier.builder(NetworkMaps.class)
                 .child(NetworkMap.class, new NetworkMapKey(networkId)).build();


@@ -191,7 +191,7 @@ public class QosNeutronUtils {
             ? optionalNetworkMap.get().getSubnetIdList() : emptyList();
     }
 
             ? optionalNetworkMap.get().getSubnetIdList() : emptyList();
     }
 

-    @Nonnull
+    @NonNull

     protected List<Uuid> getPortIdsFromSubnetId(Uuid subnetId) {
         InstanceIdentifier<Subnetmap> subnetMapId = InstanceIdentifier
                 .builder(Subnetmaps.class)
     protected List<Uuid> getPortIdsFromSubnetId(Uuid subnetId) {
         InstanceIdentifier<Subnetmap> subnetMapId = InstanceIdentifier
                 .builder(Subnetmaps.class)


@@ -656,12 +656,12 @@ public class QosNeutronUtils {
         return bridgeRefEntry.getBridgeReference();
     }
 
         return bridgeRefEntry.getBridgeReference();
     }
 

-    @Nonnull
+    @NonNull

     private static InstanceIdentifier<BridgeRefEntry> getBridgeRefEntryIdentifier(BridgeRefEntryKey bridgeRefEntryKey) {
         return InstanceIdentifier.builder(BridgeRefInfo.class).child(BridgeRefEntry.class, bridgeRefEntryKey).build();
     }
 
     private static InstanceIdentifier<BridgeRefEntry> getBridgeRefEntryIdentifier(BridgeRefEntryKey bridgeRefEntryKey) {
         return InstanceIdentifier.builder(BridgeRefInfo.class).child(BridgeRefEntry.class, bridgeRefEntryKey).build();
     }
 

-    @Nonnull
+    @NonNull

     private static InstanceIdentifier<BridgeEntry> getBridgeEntryIdentifier(BridgeEntryKey bridgeEntryKey) {
         return InstanceIdentifier.builder(BridgeInterfaceInfo.class).child(BridgeEntry.class, bridgeEntryKey).build();
     }
     private static InstanceIdentifier<BridgeEntry> getBridgeEntryIdentifier(BridgeEntryKey bridgeEntryKey) {
         return InstanceIdentifier.builder(BridgeInterfaceInfo.class).child(BridgeEntry.class, bridgeEntryKey).build();
     }


@@ -714,15 +714,13 @@ public class QosNeutronUtils {
                 new FlowId(getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex, ethType)));
     }
 
                 new FlowId(getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex, ethType)));
     }
 

-    @Nullable
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
-            .ietf.interfaces.rev140508.interfaces.state.Interface getInterfaceStateFromOperDS(
-            String interfaceName) {
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+            .@Nullable Interface getInterfaceStateFromOperDS(String interfaceName) {

         return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL,
                 createInterfaceStateInstanceIdentifier(interfaceName)).orNull();
     }
 
         return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL,
                 createInterfaceStateInstanceIdentifier(interfaceName)).orNull();
     }
 

-    @Nonnull
+    @NonNull

     public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
             .ietf.interfaces.rev140508.interfaces.state.Interface> createInterfaceStateInstanceIdentifier(
             String interfaceName) {
     public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
             .ietf.interfaces.rev140508.interfaces.state.Interface> createInterfaceStateInstanceIdentifier(
             String interfaceName) {


@@ -771,7 +769,7 @@ public class QosNeutronUtils {
                 .addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
     }
 
                 .addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
     }
 

-    @Nonnull
+    @NonNull

     public static String getQosFlowId(short tableId, BigInteger dpId, int lportTag, int ethType) {
         return new StringBuilder().append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(dpId)
                 .append(NwConstants.FLOWID_SEPARATOR).append(lportTag)
     public static String getQosFlowId(short tableId, BigInteger dpId, int lportTag, int ethType) {
         return new StringBuilder().append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(dpId)
                 .append(NwConstants.FLOWID_SEPARATOR).append(lportTag)

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
index f6337bdf33c68c0670fdceb3ed49f5551a465276..89618b2413d984e28cc888dadbfdd1ac6d1eccec 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
@@ -11,10 +11,10 @@ package org.opendaylight.netvirt.qosservice;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.Collections;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.Collections;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;

diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java
index 5ef5f2228a89d596340096ee60f9b8964d6e239e..088e4d40f949d52c162f68218f26d7cbdeaf7313 100644 (file)
--- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java
+++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java
@@ -12,8 +12,8 @@ import com.google.common.net.InetAddresses;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Singleton;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.TypedWriteTransaction;

diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java
index 0cc4294c5d4fa5c2a719abf94bf1adcb3ab93f4f..ef21749f19997c95a7738d7d5d27c62e7e50d119 100644 (file)
--- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java
+++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java
@@ -10,7 +10,7 @@ package org.opendaylight.netvirt.sfc.classifier.service.domain;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.sfc.classifier.service.domain.api.ClassifierEntryRenderer;
 import org.opendaylight.netvirt.sfc.classifier.service.domain.api.ClassifierRenderableEntry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.access.list.entries.ace.Matches;
 import org.opendaylight.netvirt.sfc.classifier.service.domain.api.ClassifierEntryRenderer;
 import org.opendaylight.netvirt.sfc.classifier.service.domain.api.ClassifierRenderableEntry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.access.list.entries.ace.Matches;

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java
index 003605e1d00666d5b672a196979b5930a542e9f5..5d40e675b135d2bd9bbdb3775318b6b6883894a3 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java
@@ -14,8 +14,8 @@ import java.util.Collection;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;


@@ -87,7 +87,7 @@ public abstract class DelegatingDataTreeListener<T extends DataObject> implement
     }
 
     @Override
     }
 
     @Override

-    public void onDataTreeChanged(@Nonnull final Collection<DataTreeModification<T>> changes) {
+    public void onDataTreeChanged(@NonNull final Collection<DataTreeModification<T>> changes) {

         Preconditions.checkNotNull(changes, "Changes may not be null!");
         executorService.execute(() -> processChanges(changes));
     }
         Preconditions.checkNotNull(changes, "Changes may not be null!");
         executorService.execute(() -> processChanges(changes));
     }

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java
index f1c21cb5c0686f81a9fb2351c92fef36fb4465cc..870a7a2efc55999dbebd60db68bdf068a34537c0 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.netvirt.sfc.translator;
 
 
 package org.opendaylight.netvirt.sfc.translator;
 

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
index e68a2de06f91ee5e1661558e9b0314ab1099bb04..f3b1fd0c5897206f7005904ca6db49503a15a10b 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.netvirt.sfc.translator;
 
 
 package org.opendaylight.netvirt.sfc.translator;
 

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java
index 4816304fd09e2eb0be6ed2187dd0d62002cd4c01..5e3de3c3b4c389bc3b38969f6b89f1483a9749f6 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java
@@ -9,7 +9,7 @@
 package org.opendaylight.netvirt.sfc.translator.flowclassifier;
 
 import java.util.ArrayList;
 package org.opendaylight.netvirt.sfc.translator.flowclassifier;
 
 import java.util.ArrayList;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv6Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv4Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.Ipv6Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java
index ba5216765b951272c845e541dc6fbc86dd5a3fa0..03f6648e9e7bb15bea02049bb56541f73c2700dc 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java
@@ -13,8 +13,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -80,7 +80,7 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener<PortCha
     public void update(PortChain origPortChain, PortChain updatePortChain) {
         List<Uuid> oldFcList = origPortChain.getFlowClassifiers();
         oldFcList = oldFcList != null ? new ArrayList<>(oldFcList) : new ArrayList<>();
     public void update(PortChain origPortChain, PortChain updatePortChain) {
         List<Uuid> oldFcList = origPortChain.getFlowClassifiers();
         oldFcList = oldFcList != null ? new ArrayList<>(oldFcList) : new ArrayList<>();

-        @Nullable List<Uuid> newFcList = updatePortChain.getFlowClassifiers();
+        List<Uuid> newFcList = updatePortChain.getFlowClassifiers();

         if (oldFcList != null && newFcList != null) {
             oldFcList.removeAll(newFcList);
             if (!oldFcList.isEmpty()) {
         if (oldFcList != null && newFcList != null) {
             oldFcList.removeAll(newFcList);
             if (!oldFcList.isEmpty()) {


@@ -112,7 +112,7 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener<PortCha
         List<ServiceFunction> portChainServiceFunctionList = new ArrayList<>();
 
         //Read chain related port pair group from neutron data store
         List<ServiceFunction> portChainServiceFunctionList = new ArrayList<>();
 
         //Read chain related port pair group from neutron data store

-        @Nullable List<Uuid> newPortPairGroups = newPortChain.getPortPairGroups();
+        List<Uuid> newPortPairGroups = newPortChain.getPortPairGroups();

         if (newPortPairGroups != null) {
             for (Uuid ppgUuid : newPortPairGroups) {
                 PortPairGroup ppg = neutronMdsalHelper.getNeutronPortPairGroup(ppgUuid);
         if (newPortPairGroups != null) {
             for (Uuid ppgUuid : newPortPairGroups) {
                 PortPairGroup ppg = neutronMdsalHelper.getNeutronPortPairGroup(ppgUuid);


@@ -182,12 +182,12 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener<PortCha
         // The RSP will automatically be created from the SFP added above.
 
         // Add ACLs from flow classifiers
         // The RSP will automatically be created from the SFP added above.
 
         // Add ACLs from flow classifiers

-        @Nullable List<Uuid> newFlowClassifiers = newPortChain.getFlowClassifiers();
+        List<Uuid> newFlowClassifiers = newPortChain.getFlowClassifiers();

         processFlowClassifiers(newPortChain, newFlowClassifiers != null ? newFlowClassifiers : Collections.emptyList(),
             sfp.getName().getValue(), true);
     }
 
         processFlowClassifiers(newPortChain, newFlowClassifiers != null ? newFlowClassifiers : Collections.emptyList(),
             sfp.getName().getValue(), true);
     }
 

-    private void processFlowClassifiers(PortChain pc, @Nonnull List<Uuid> flowClassifiers, @Nullable String sfpName,
+    private void processFlowClassifiers(PortChain pc, @NonNull List<Uuid> flowClassifiers, @Nullable String sfpName,

             boolean added) {
         for (Uuid uuid : flowClassifiers) {
             SfcFlowClassifier fc = neutronMdsalHelper.getNeutronFlowClassifier(uuid);
             boolean added) {
         for (Uuid uuid : flowClassifiers) {
             SfcFlowClassifier fc = neutronMdsalHelper.getNeutronFlowClassifier(uuid);

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
index e45267ecbfbe6209472d86e4176332402f641b37..6fa9b10b9cc3df2c3ae339c9c825a01316ef96c8 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
@@ -12,7 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableBiMap;
 import java.util.ArrayList;
 import java.util.List;
 import com.google.common.collect.ImmutableBiMap;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.netvirt.sfc.translator.SfcMdsalHelper;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName;
 import org.opendaylight.netvirt.sfc.translator.SfcMdsalHelper;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName;


@@ -48,7 +48,7 @@ public final class PortPairTranslator {
 
     private PortPairTranslator() { }
 
 
     private PortPairTranslator() { }
 

-    @Nonnull
+    @NonNull

     public static ServiceFunction buildServiceFunction(
             PortPair portPair,
             PortPairGroup portPairGroup) {
     public static ServiceFunction buildServiceFunction(
             PortPair portPair,
             PortPairGroup portPairGroup) {

diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java
index bc31bb84976adeac603ad359a9240ad76dfbbca9..ba84220976fd18d601cd49117c9c669dcc874444 100644 (file)
--- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java
+++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;


@@ -964,7 +964,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan
             }
 
             @Override
             }
 
             @Override

-            public void onSuccess(@Nonnull RpcResult<CreateIdPoolOutput> rpcResult) {
+            public void onSuccess(@NonNull RpcResult<CreateIdPoolOutput> rpcResult) {

                 if (rpcResult.isSuccessful()) {
                     LOG.debug("Created IdPool for tap");
                 } else {
                 if (rpcResult.isSuccessful()) {
                     LOG.debug("Created IdPool for tap");
                 } else {

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java
index 5ab4cd1f0ce0c97d204a8bd5c75f59a2a4b14e4f..d791df6ef856fbb6ae7e015111297759d8e169ec 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java
@@ -9,7 +9,7 @@
 package org.opendaylight.netvirt.vpnmanager.api;
 
 import java.math.BigInteger;
 package org.opendaylight.netvirt.vpnmanager.api;
 
 import java.math.BigInteger;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 
 /**
  * ICentralizedSwitchProvider allows to create or interrogate centralized
 
 /**
  * ICentralizedSwitchProvider allows to create or interrogate centralized

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java
index d239bdf1d334997c0b6ff371ca43ae12d3462c2b..a1b1a43f22b40758f63c43c1bdf084fa3d148eda 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java
@@ -9,8 +9,8 @@
 package org.opendaylight.netvirt.vpnmanager.api;
 
 import java.math.BigInteger;
 package org.opendaylight.netvirt.vpnmanager.api;
 
 import java.math.BigInteger;

-import javax.annotation.Nullable;

 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutablePair;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.IpAddresses;
 
 public interface IVpnFootprintService {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.IpAddresses;
 
 public interface IVpnFootprintService {

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
index aea160974f4811ca43b03587852ee7dc4f218c62..575686d7283876ebcf31c1d50b599ca3c22cc646 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Set;
 
 import java.util.concurrent.ExecutionException;
 import java.util.Set;
 
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.Datastore.Operational;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.Datastore.Operational;


@@ -36,11 +36,11 @@ public interface IVpnManager {
     void addExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
         Long l3vni, RouteOrigin origin, @Nullable String intfName, @Nullable Adjacency operationalAdj,
         VrfEntry.EncapType encapType, Set<String> prefixListForRefreshFib,
     void addExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
         Long l3vni, RouteOrigin origin, @Nullable String intfName, @Nullable Adjacency operationalAdj,
         VrfEntry.EncapType encapType, Set<String> prefixListForRefreshFib,

-        @Nonnull TypedWriteTransaction<Configuration> confTx);
+        @NonNull TypedWriteTransaction<Configuration> confTx);

 
     void delExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
 
     void delExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,

-        @Nullable String intfName, @Nonnull TypedWriteTransaction<Configuration> confTx,
-        @Nonnull TypedWriteTransaction<Operational> operTx);
+        @Nullable String intfName, @NonNull TypedWriteTransaction<Configuration> confTx,
+        @NonNull TypedWriteTransaction<Operational> operTx);

 
     void removePrefixFromBGP(String vpnName, String primaryRd, String extraRouteRd, String vpnInterfaceName,
                                     String prefix, String nextHop, String nextHopTunnelIp, BigInteger dpnId,
 
     void removePrefixFromBGP(String vpnName, String primaryRd, String extraRouteRd, String vpnInterfaceName,
                                     String prefix, String nextHop, String nextHopTunnelIp, BigInteger dpnId,

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java
index ecdb4855c734c2cdc48ee063214310c59e04ce2e..58cc4402a7ac34c9add282e1f3eaccf592d5a4a6 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java
@@ -12,7 +12,7 @@ import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -125,9 +125,8 @@ public final class InterfaceUtils {
         return id;
     }
 
         return id;
     }
 

-    @Nullable

     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state

-        .Interface getInterfaceStateFromOperDS(
+        .@Nullable Interface getInterfaceStateFromOperDS(

         DataBroker dataBroker, String interfaceName) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces
             .rev140508.interfaces.state.Interface>
         DataBroker dataBroker, String interfaceName) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces
             .rev140508.interfaces.state.Interface>


@@ -141,9 +140,8 @@ public final class InterfaceUtils {
         return null;
     }
 
         return null;
     }
 

-    @Nullable

     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces

-        .Interface getInterface(
+        .@Nullable Interface getInterface(

         DataBroker broker, String interfaceName) {
         Optional<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
             .Interface>
         DataBroker broker, String interfaceName) {
         Optional<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces
             .Interface>

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
index 4a22f3566835cc451019ec09e250ad9387b9707f..1eb90611227efd3df9923dff902f5b4ebbcaa6ee 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
index da6b030423fa67a42321173c1b96b949fde2c669..885da7553c81cad6956556d772c8e0e18a4ac377 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
@@ -16,8 +16,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -129,7 +129,7 @@ public final class VpnHelper {
         }
     }
 
         }
     }
 

-    @Nonnull
+    @NonNull

     public static List<String> getVpnInterfaceVpnInstanceNamesString(@Nullable List<VpnInstanceNames> vpnInstanceList) {
         List<String> listVpn = new ArrayList<>();
         if (vpnInstanceList != null) {
     public static List<String> getVpnInterfaceVpnInstanceNamesString(@Nullable List<VpnInstanceNames> vpnInstanceList) {
         List<String> listVpn = new ArrayList<>();
         if (vpnInstanceList != null) {

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java
index 65af87179bab2e95f7d4b8b80b0fbfabf0702948..24adfd12e50ab6abfcd8cf26c0eb751873649c02 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java
@@ -9,7 +9,7 @@ package org.opendaylight.netvirt.vpnmanager.api.intervpnlink;
 
 import com.google.common.base.Optional;
 import java.util.List;
 
 import com.google.common.base.Optional;
 import java.util.List;

-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.links.InterVpnLink;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.links.InterVpnLink;
 


@@ -35,6 +35,6 @@ public interface InterVpnLinkCache {
 
     Optional<InterVpnLinkDataComposite> getInterVpnLinkByVpnId(String vpnId);
 
 
     Optional<InterVpnLinkDataComposite> getInterVpnLinkByVpnId(String vpnId);
 

-    @Nonnull
+    @NonNull

     List<InterVpnLinkDataComposite> getAllInterVpnLinks();
 }
     List<InterVpnLinkDataComposite> getAllInterVpnLinks();
 }

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
index 9c2972c219f10ae5669ee6e3175ac0579aea4b2a..0a1138f5f4aa89d206269be038a05e7b1835a074 100755 (executable)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
@@ -14,7 +14,7 @@ import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.links.InterVpnLink;
 import org.slf4j.Logger;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.links.InterVpnLink;
 import org.slf4j.Logger;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java
index eaa7f7a79a4b6bd45931d085e91206dd643eddf2..b5f88b0917b8cc1e25bf0562082df71309021839 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java
@@ -9,9 +9,9 @@
 package org.opendaylight.netvirt.vpnmanager;
 
 import java.math.BigInteger;
 package org.opendaylight.netvirt.vpnmanager;
 
 import java.math.BigInteger;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.netvirt.vpnmanager.api.ICentralizedSwitchProvider;
 
 @Singleton
 import org.opendaylight.netvirt.vpnmanager.api.ICentralizedSwitchProvider;
 
 @Singleton

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
index 531a226dc4a1caa5a0d718f3110cab1827b6e1ab..313cc8072948cf47c9ce2f171ae501f74970daa9 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
@@ -11,9 +11,9 @@ import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
index 1b87cf566999253c4c6b6af76336d5c595e3ef5c..8191fa26df0d40cacb80041e0e8718ac52f602de 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
@@ -12,10 +12,10 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nonnull;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;


@@ -274,7 +274,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange
         LOG.info("{} update: Processed Interface {} update event", LOGGING_PREFIX, update.getName());
     }
 
         LOG.info("{} update: Processed Interface {} update event", LOGGING_PREFIX, update.getName());
     }
 

-    @Nonnull
+    @NonNull

     protected List<Uuid> getSubnetId(Interface intrf) {
         List<Uuid> listSubnetIds = new ArrayList<>();
         if (!NeutronUtils.isUuid(intrf.getName())) {
     protected List<Uuid> getSubnetId(Interface intrf) {
         List<Uuid> listSubnetIds = new ArrayList<>();
         if (!NeutronUtils.isUuid(intrf.getName())) {

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
index d2999f300cb22b3d618286138a8c4c80cb530373..dd75b7e7452c87c1d2446c717b31409dbd3b4376 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
@@ -14,9 +14,9 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java
index 166f81762ed7036407a7146a622be61b0e58ded3..94ead97782dc9efa1792334e3064a3e21f0d0e91 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java
@@ -13,16 +13,15 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;

-

 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.tuple.ImmutablePair;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java
index 1133f3ed1f6ae4b65a2f8f8641d55554b3cfccee..498ea32f3d6d2aafcb30b84eb2d864a69ec155fa 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java
@@ -22,10 +22,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
index 4f3081358b2de17d9175923c4783d314f538ba7f..62e9f17ac3f55571518add1799e7d90079d85b25 100755 (executable)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
@@ -34,11 +34,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java
index 9c319a139fa2baab00f128d1047e92172ee1cae6..183ad000babe850ca328e0714e42a884344540cb 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java
@@ -19,11 +19,11 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -194,7 +194,7 @@ public class VpnManagerImpl implements IVpnManager {
     public void addExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
         Long l3vni, RouteOrigin origin, @Nullable String intfName, @Nullable Adjacency operationalAdj,
         VrfEntry.EncapType encapType, Set<String> prefixListForRefreshFib,
     public void addExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
         Long l3vni, RouteOrigin origin, @Nullable String intfName, @Nullable Adjacency operationalAdj,
         VrfEntry.EncapType encapType, Set<String> prefixListForRefreshFib,

-        @Nonnull TypedWriteTransaction<Configuration> confTx) {
+        @NonNull TypedWriteTransaction<Configuration> confTx) {

         //add extra route to vpn mapping; advertise with nexthop as tunnel ip
         vpnUtil.syncUpdate(LogicalDatastoreType.OPERATIONAL,
                 VpnExtraRouteHelper.getVpnToExtrarouteVrfIdIdentifier(vpnName, rd != null ? rd : routerID,
         //add extra route to vpn mapping; advertise with nexthop as tunnel ip
         vpnUtil.syncUpdate(LogicalDatastoreType.OPERATIONAL,
                 VpnExtraRouteHelper.getVpnToExtrarouteVrfIdIdentifier(vpnName, rd != null ? rd : routerID,


@@ -257,8 +257,8 @@ public class VpnManagerImpl implements IVpnManager {
 
     @Override
     public void delExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
 
     @Override
     public void delExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,

-                              @Nullable String intfName, @Nonnull TypedWriteTransaction<Configuration> confTx,
-                              @Nonnull TypedWriteTransaction<Operational> operTx) {
+                              @Nullable String intfName, @NonNull TypedWriteTransaction<Configuration> confTx,
+                              @NonNull TypedWriteTransaction<Operational> operTx) {

         BigInteger dpnId = null;
         String tunnelIp = nextHop;
         if (intfName != null && !intfName.isEmpty()) {
         BigInteger dpnId = null;
         String tunnelIp = nextHop;
         if (intfName != null && !intfName.isEmpty()) {

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java
index 59806511365a660b40840453193d0f88437df6aa..4fcfddd7e2da001f554825eeca9ee9500500f15a 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java
@@ -17,9 +17,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

-import javax.annotation.Nullable;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
index 925b14d7d1569e8fb5e40e922f66d95e0b29f561..7ca8c1e4440dfb28b268a8afb533681b12e2da77 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
@@ -38,9 +38,9 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.concurrent.Future;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import javax.inject.Singleton;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;


@@ -432,7 +432,7 @@ public final class VpnUtil {
         return vpnInstance.isPresent() ? vpnInstance.get() : null;
     }
 
         return vpnInstance.isPresent() ? vpnInstance.get() : null;
     }
 

-    @Nonnull
+    @NonNull

     List<VpnInstanceOpDataEntry> getAllVpnInstanceOpData() {
         InstanceIdentifier<VpnInstanceOpData> id = InstanceIdentifier.builder(VpnInstanceOpData.class).build();
         Optional<VpnInstanceOpData> vpnInstanceOpDataOptional = read(LogicalDatastoreType.OPERATIONAL, id);
     List<VpnInstanceOpDataEntry> getAllVpnInstanceOpData() {
         InstanceIdentifier<VpnInstanceOpData> id = InstanceIdentifier.builder(VpnInstanceOpData.class).build();
         Optional<VpnInstanceOpData> vpnInstanceOpDataOptional = read(LogicalDatastoreType.OPERATIONAL, id);


@@ -442,7 +442,7 @@ public final class VpnUtil {
                 : emptyList();
     }
 
                 : emptyList();
     }
 

-    @Nonnull
+    @NonNull

     List<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data
             .vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces> getDpnVpnInterfaces(VpnInstance vpnInstance,
                                                                                            BigInteger dpnId) {
     List<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data
             .vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces> getDpnVpnInterfaces(VpnInstance vpnInstance,
                                                                                            BigInteger dpnId) {


@@ -453,7 +453,7 @@ public final class VpnUtil {
             : emptyList();
     }
 
             : emptyList();
     }
 

-    @Nonnull
+    @NonNull

     static List<String> getListOfRdsFromVpnInstance(VpnInstance vpnInstance) {
         VpnAfConfig vpnConfig = vpnInstance.getIpv4Family();
         LOG.trace("vpnConfig {}", vpnConfig);
     static List<String> getListOfRdsFromVpnInstance(VpnInstance vpnInstance) {
         VpnAfConfig vpnConfig = vpnInstance.getIpv4Family();
         LOG.trace("vpnConfig {}", vpnConfig);


@@ -882,32 +882,32 @@ public final class VpnUtil {
             new ElanTagNameKey(elanTag)).build();
     }
 
             new ElanTagNameKey(elanTag)).build();
     }
 

-    static void removePrefixToInterfaceForVpnId(long vpnId, @Nonnull TypedWriteTransaction<Operational> operTx) {
+    static void removePrefixToInterfaceForVpnId(long vpnId, @NonNull TypedWriteTransaction<Operational> operTx) {

         // Clean up PrefixToInterface Operational DS
         operTx.delete(InstanceIdentifier.builder(
                     PrefixToInterface.class).child(VpnIds.class, new VpnIdsKey(vpnId)).build());
     }
 
         // Clean up PrefixToInterface Operational DS
         operTx.delete(InstanceIdentifier.builder(
                     PrefixToInterface.class).child(VpnIds.class, new VpnIdsKey(vpnId)).build());
     }
 

-    static void removeVpnExtraRouteForVpn(String vpnName, @Nonnull TypedWriteTransaction<Operational> operTx) {
+    static void removeVpnExtraRouteForVpn(String vpnName, @NonNull TypedWriteTransaction<Operational> operTx) {

         // Clean up VPNExtraRoutes Operational DS
         operTx.delete(InstanceIdentifier.builder(VpnToExtraroutes.class).child(Vpn.class, new VpnKey(vpnName)).build());
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
         // Clean up VPNExtraRoutes Operational DS
         operTx.delete(InstanceIdentifier.builder(VpnToExtraroutes.class).child(Vpn.class, new VpnKey(vpnName)).build());
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")

-    static void removeVpnOpInstance(String vpnName, @Nonnull TypedWriteTransaction<Operational> operTx) {
+    static void removeVpnOpInstance(String vpnName, @NonNull TypedWriteTransaction<Operational> operTx) {

         // Clean up VPNInstanceOpDataEntry
         operTx.delete(getVpnInstanceOpDataIdentifier(vpnName));
     }
 
         // Clean up VPNInstanceOpDataEntry
         operTx.delete(getVpnInstanceOpDataIdentifier(vpnName));
     }
 

-    static void removeVpnInstanceToVpnId(String vpnName, @Nonnull TypedWriteTransaction<Configuration> confTx) {
+    static void removeVpnInstanceToVpnId(String vpnName, @NonNull TypedWriteTransaction<Configuration> confTx) {

         confTx.delete(VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName));
     }
 
         confTx.delete(VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName));
     }
 

-    static void removeVpnIdToVpnInstance(long vpnId, @Nonnull TypedWriteTransaction<Configuration> confTx) {
+    static void removeVpnIdToVpnInstance(long vpnId, @NonNull TypedWriteTransaction<Configuration> confTx) {

         confTx.delete(getVpnIdToVpnInstanceIdentifier(vpnId));
     }
 
         confTx.delete(getVpnIdToVpnInstanceIdentifier(vpnId));
     }
 

-    static void removeL3nexthopForVpnId(long vpnId, @Nonnull TypedWriteTransaction<Operational> operTx) {
+    static void removeL3nexthopForVpnId(long vpnId, @NonNull TypedWriteTransaction<Operational> operTx) {

         // Clean up L3NextHop Operational DS
         operTx.delete(InstanceIdentifier.builder(L3nexthop.class).child(
                                     VpnNexthops.class, new VpnNexthopsKey(vpnId)).build());
         // Clean up L3NextHop Operational DS
         operTx.delete(InstanceIdentifier.builder(L3nexthop.class).child(
                                     VpnNexthops.class, new VpnNexthopsKey(vpnId)).build());


@@ -1108,7 +1108,7 @@ public final class VpnUtil {
         return null;
     }
 
         return null;
     }
 

-    @Nonnull
+    @NonNull

     List<BigInteger> getDpnsOnVpn(String vpnInstanceName) {
         List<BigInteger> result = new ArrayList<>();
         String rd = getVpnRd(vpnInstanceName);
     List<BigInteger> getDpnsOnVpn(String vpnInstanceName) {
         List<BigInteger> result = new ArrayList<>();
         String rd = getVpnRd(vpnInstanceName);


@@ -1229,7 +1229,7 @@ public final class VpnUtil {
         return extNetwork != null ? extNetwork.getVpnid() : null;
     }
 
         return extNetwork != null ? extNetwork.getVpnid() : null;
     }
 

-    @Nonnull
+    @NonNull

     public List<Uuid> getExternalNetworkRouterIds(Uuid networkId) {
         Networks extNetwork = getExternalNetwork(networkId);
         return extNetwork != null && extNetwork.getRouterIds() != null ? extNetwork.getRouterIds() : emptyList();
     public List<Uuid> getExternalNetworkRouterIds(Uuid networkId) {
         Networks extNetwork = getExternalNetwork(networkId);
         return extNetwork != null && extNetwork.getRouterIds() != null ? extNetwork.getRouterIds() : emptyList();


@@ -1639,8 +1639,7 @@ public final class VpnUtil {
         return isVxLan ? VrfEntryBase.EncapType.Vxlan : VrfEntryBase.EncapType.Mplsgre;
     }
 
         return isVxLan ? VrfEntryBase.EncapType.Vxlan : VrfEntryBase.EncapType.Mplsgre;
     }
 

-    @Nullable
-    org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets.Subnets
+    org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets.@Nullable Subnets

         getExternalSubnet(Uuid subnetId) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets
             .Subnets> subnetsIdentifier = InstanceIdentifier.builder(ExternalSubnets.class)
         getExternalSubnet(Uuid subnetId) {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets
             .Subnets> subnetsIdentifier = InstanceIdentifier.builder(ExternalSubnets.class)

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java
index ed744e551f72ce1b6774536e6ef95714d2dcaf1b..1bbcb0c6bf7930da5a21020f22ca4d0e60edc903 100755 (executable)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java
@@ -19,11 +19,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
index 2fbf2c10224f3ea65be345d038ee24d947d51c3b..c0a14260b2fddcfe55c6256821ed5bbe7556047c 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
@@ -13,10 +13,10 @@ import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
index 1c2f059c608701160b723a1e8960acdcceaa9152..3d452ff067cc32e0038b9f0053c456adb49c12ef 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
@@ -16,9 +16,9 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

-import javax.annotation.Nonnull;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.NWUtil;
 import org.opendaylight.netvirt.vpnmanager.VpnUtil;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.NWUtil;
 import org.opendaylight.netvirt.vpnmanager.VpnUtil;


@@ -135,7 +135,7 @@ public class InterVpnLinkLocator {
      * @return the list of dpnIds where the specified InterVpnLink should not
      *     be installed
      */
      * @return the list of dpnIds where the specified InterVpnLink should not
      *     be installed
      */

-    @Nonnull
+    @NonNull

     private List<BigInteger> findDpnsWithSimilarIVpnLinks(InterVpnLink interVpnLink,
                                                           List<InterVpnLinkDataComposite> allInterVpnLinks) {
         List<InterVpnLinkDataComposite> sameGroupInterVpnLinks = findInterVpnLinksSameGroup(interVpnLink,
     private List<BigInteger> findDpnsWithSimilarIVpnLinks(InterVpnLink interVpnLink,
                                                           List<InterVpnLinkDataComposite> allInterVpnLinks) {
         List<InterVpnLinkDataComposite> sameGroupInterVpnLinks = findInterVpnLinksSameGroup(interVpnLink,

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/LearntVpnVipToPortEventProcessor.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/LearntVpnVipToPortEventProcessor.java
index 1b9d08010109a516c2cd619c6373cc0fa8a816ee..e30bfdd565a9985a0ea7b00031eba969fe843ad7 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/LearntVpnVipToPortEventProcessor.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/LearntVpnVipToPortEventProcessor.java
@@ -14,11 +14,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;

-import javax.annotation.Nullable;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/ipv4/ArpUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/ipv4/ArpUtils.java
index 1d876dde338c74aaa03e810b121858cd8c8a996b..dd0cf296d0edc645884f78eec7e2ab4ec4ba281f 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/ipv4/ArpUtils.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/ipv4/ArpUtils.java
@@ -10,7 +10,7 @@ package org.opendaylight.netvirt.vpnmanager.iplearn.ipv4;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.NWUtil;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.NWUtil;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java
index b149fa6d8cb6bc29d87bfbd87cf90f52fee31b5d..fd47198f18baa5b1a68a6b8dc17f3406f93c6250 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java
@@ -16,7 +16,7 @@ import com.google.common.base.Preconditions;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.infra.Datastore.Configuration;

diff --git a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java
index 9f99ca6034027b84e4df16a9712afeb493314fc7..994919ed2e3b90e90ee195b6596a57413b6bf437 100644 (file)
--- a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java
+++ b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java
@@ -16,10 +16,10 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java
index a075b2c76482ce6c6b186965bc96298384da371a..3e1e4255cec4bb24326542444a43a0d4048bf28a 100644 (file)
--- a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java
+++ b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java
@@ -13,10 +13,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;

-import javax.annotation.Nullable;

 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;

+import org.eclipse.jdt.annotation.Nullable;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;