Simplify DeviceContextImpl flow counting

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / initialization / OF13DeviceInitializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
index 514f2f43bdaae23df96cace9299cfa9a76a23974..c954e0580ed7e068722cab041e326dfc44add778 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.device.initialization;
 
 import com.google.common.base.Function;
@@ -16,7 +15,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
@@ -84,9 +82,8 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                 return Futures.transform(
                     switchFeaturesMandatory ? Futures.allAsList(futures) : Futures.successfulAsList(futures),
                     new Function<List<RpcResult<List<OfHeader>>>, Void>() {
-                        @Nullable
                         @Override
-                        public Void apply(@Nullable final List<RpcResult<List<OfHeader>>> input) {
+                        public Void apply(final List<RpcResult<List<OfHeader>>> input) {
                             LOG.info("Static node {} successfully finished collecting",
                                     deviceContext.getDeviceInfo());
                             return null;
@@ -137,8 +134,8 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                                        @Nullable final ConvertorExecutor convertorExecutor) {
         Futures.addCallback(future, new FutureCallback<RpcResult<List<OfHeader>>>() {
             @Override
-            public void onSuccess(@Nonnull final RpcResult<List<OfHeader>> result) {
-                if (Objects.nonNull(result.getResult())) {
+            public void onSuccess(final RpcResult<List<OfHeader>> result) {
+                if (result.getResult() != null) {
                     LOG.info("Static node {} info: {} collected", deviceContext.getDeviceInfo(), type);
                     translateAndWriteResult(
                         type,
@@ -150,7 +147,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                     result.getErrors().forEach(rpcError -> {
                         LOG.warn("Failed to retrieve static node {} info: {}", type, rpcError.getMessage());
 
-                        if (LOG.isTraceEnabled() && Objects.nonNull(rpcError.getCause())) {
+                        if (LOG.isTraceEnabled() && rpcError.getCause() != null) {
                             LOG.trace("Detailed error:", rpcError.getCause());
                         }
                     });
@@ -166,7 +163,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
             }
 
             @Override
-            public void onFailure(@Nonnull final Throwable throwable) {
+            public void onFailure(final Throwable throwable) {
                 LOG.warn("Request of type {} for static info of node {} failed.",
                         type, deviceContext.getDeviceInfo());
             }
@@ -188,7 +185,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                                                 final DeviceContext deviceContext,
                                                 @Nullable final MultipartWriterProvider multipartWriterProvider,
                                                 @Nullable final ConvertorExecutor convertorExecutor) {
-        if (Objects.nonNull(result)) {
+        if (result != null) {
             try {
                 result.forEach(reply -> {
                     // First, translate collected data to proper openflowplugin representation
@@ -240,7 +237,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
 
             return Futures.transform(service.handleServiceCall(multipartType),
                 input -> {
-                    if (Objects.isNull(input.getResult()) && input.isSuccessful()) {
+                    if (input.getResult() == null && input.isSuccessful()) {
                         return RpcResultBuilder.<List<OfHeader>>success(null).build();
                     }
 
@@ -261,7 +258,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
             new MultiLayerMultipartCollectorService(deviceContext, deviceContext);
 
         return Futures.transform(service.handleServiceCall(multipartType), input -> {
-            if (Objects.isNull(input.getResult()) && input.isSuccessful()) {
+            if (input.getResult() == null && input.isSuccessful()) {
                 return RpcResultBuilder.<List<OfHeader>>success(null).build();
             }
 
@@ -270,5 +267,4 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                     : RpcResultBuilder.<List<OfHeader>>failed().withRpcErrors(input.getErrors()).build();
         }, MoreExecutors.directExecutor());
     }
-
 }