From: Robert Varga Date: Sat, 29 Jun 2019 09:43:53 +0000 (+0200) Subject: Eliminate jsr305 dependencies X-Git-Tag: release/sodium~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d6634716a6cd3d5b91b50f2c496b97d8e05a94ad;p=lispflowmapping.git Eliminate jsr305 dependencies Most of the annotations are not needed, as they are already specified as JDT annotations in implemented interfaces. This eliminates most annotations (where implied) and migrates them in fresh uses. Change-Id: I39af973b710d2c8aa6eac11d53e0ebc23a807533 Signed-off-by: Robert Varga --- diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml index c0851e868..f4baa1082 100644 --- a/mappingservice/neutron/pom.xml +++ b/mappingservice/neutron/pom.xml @@ -79,11 +79,6 @@ mdsal-singleton-common-api 4.0.2 - - com.google.code.findbugs - jsr305 - true - diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/DelegatingDataTreeListener.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/DelegatingDataTreeListener.java index 1b31c35a2..b5a328d7b 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/DelegatingDataTreeListener.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/DelegatingDataTreeListener.java @@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.neutron; import com.google.common.base.Preconditions; import java.util.Collection; -import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; @@ -52,7 +51,7 @@ public class DelegatingDataTreeListener implements Cluster } @Override - public void onDataTreeChanged(@Nonnull Collection> changes) { + public void onDataTreeChanged(Collection> changes) { for (DataTreeModification change : changes) { DataObjectModification mod = change.getRootNode(); diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java index ce9c89eac..f6a819b1b 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java @@ -11,7 +11,6 @@ import com.google.common.base.Preconditions; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nonnull; import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -44,7 +43,7 @@ public class VbridgeTopologyListener implements ClusteredDataTreeChangeListener< } @Override - public synchronized void onDataTreeChanged(@Nonnull Collection> changes) { + public synchronized void onDataTreeChanged(Collection> changes) { for (DataTreeModification topologyData : changes) { final KeyedInstanceIdentifier topologyInstanceIdentifier = (KeyedInstanceIdentifier) topologyData diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java index aa259826e..0c99a36d4 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java @@ -7,7 +7,6 @@ */ package org.opendaylight.lispflowmapping.neutron.intenthandler.listener; -import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.FutureCallback; @@ -20,8 +19,6 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.neutron.intenthandler.IntentHandlerAsyncExecutorProvider; import org.opendaylight.lispflowmapping.neutron.intenthandler.util.VppNetconfConnectionProbe; @@ -85,7 +82,7 @@ public class VppEndpointListener implements AutoCloseable, ClusteredDataTreeChan } @Override - public void onDataTreeChanged(@Nonnull Collection> changes) { + public void onDataTreeChanged(Collection> changes) { for (DataTreeModification change : changes) { final DataObjectModification modification = change.getRootNode(); ListenableFuture modificationTaskHandler; @@ -106,7 +103,7 @@ public class VppEndpointListener implements AutoCloseable, ClusteredDataTreeChan } Futures.addCallback(modificationTaskHandler, new FutureCallback() { @Override - public void onSuccess(@Nullable Void vd) { + public void onSuccess(Void vd) { LOG.debug("VppEndpoint modification handled successfully!"); } @@ -126,7 +123,7 @@ public class VppEndpointListener implements AutoCloseable, ClusteredDataTreeChan ListenableFuture> processingTask = processNode(newOrModifiedNode); Futures.addCallback(processingTask, new FutureCallback>() { @Override - public void onSuccess(@Nullable KeyedInstanceIdentifier kiiToNode) { + public void onSuccess(KeyedInstanceIdentifier kiiToNode) { hostInformationManager.addHostRelatedInfo(newOrModifiedNode.getNodeId().getValue(), LispAddressUtil.toRloc(vppNodeReader.rlocIpOfNode(kiiToNode))); } @@ -149,13 +146,8 @@ public class VppEndpointListener implements AutoCloseable, ClusteredDataTreeChan }); return Futures.transform(probeVppNodeForConnection, - new Function>() { - @Nullable - @Override - public KeyedInstanceIdentifier apply(@Nullable Void vd) { - return nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(); - } - }, MoreExecutors.directExecutor()); + vd -> nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(), + MoreExecutors.directExecutor()); } private void processNodeOnConnection(final Node newOrModifiedNode) { diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/service/VbridgeTopologyListenerService.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/service/VbridgeTopologyListenerService.java index 13ae40a18..d695ac428 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/service/VbridgeTopologyListenerService.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/service/VbridgeTopologyListenerService.java @@ -7,7 +7,7 @@ */ package org.opendaylight.lispflowmapping.neutron.intenthandler.listener.service; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.lispflowmapping.neutron.intenthandler.listener.VbridgeTopologyListener; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; @@ -47,8 +47,8 @@ public class VbridgeTopologyListenerService implements AutoCloseable { this.closed = false; } - public static VbridgeTopologyListenerService initialize(@Nonnull final DataBroker dataBroker, - @Nonnull final MountPointService mountPointService) { + public static VbridgeTopologyListenerService initialize(final @NonNull DataBroker dataBroker, + final @NonNull MountPointService mountPointService) { final ListenerRegistration reg = dataBroker.registerDataTreeChangeListener(TREE_LISTENER_IDENTIFIER, new VbridgeTopologyListener(dataBroker, mountPointService)); diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/util/VppNetconfConnectionProbe.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/util/VppNetconfConnectionProbe.java index 08bb09ea9..a16eb7c68 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/util/VppNetconfConnectionProbe.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/util/VppNetconfConnectionProbe.java @@ -19,7 +19,6 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; @@ -78,7 +77,7 @@ public class VppNetconfConnectionProbe implements ClusteredDataTreeChangeListene } @Override - public void onDataTreeChanged(@Nonnull Collection> changes) { + public void onDataTreeChanged(Collection> changes) { changes.forEach(modification -> { final DataObjectModification rootNode = modification.getRootNode(); final Node node = rootNode.getDataAfter();