Merge "Update docs header to Magnesium in the master"

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / AbstractRequestCallback.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractRequestCallback.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractRequestCallback.java
index 8992a7b5e1350d79155b1708331c930c9bb7be5a..1fdfa45edd3bd6a5dc54a8c6dd7c38850489dafe 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractRequestCallback.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractRequestCallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -15,7 +15,7 @@ import org.opendaylight.openflowjava.protocol.api.connection.DeviceRequestFailed
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.EventIdentifier;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
-import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy.STATISTIC_GROUP;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy.StatisticsGroup;
 import org.opendaylight.openflowplugin.impl.services.util.RequestContextUtil;
 import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.EventsTimeCounter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Error;
@@ -30,10 +30,10 @@ public abstract class AbstractRequestCallback<T> implements FutureCallback<OfHea
     private final MessageSpy spy;
     private EventIdentifier eventIdentifier;
 
-    protected AbstractRequestCallback(final RequestContext<T> context,
-                                      final Class<?> requestType,
-                                      final MessageSpy spy,
-                                      final EventIdentifier eventIdentifier) {
+    AbstractRequestCallback(final RequestContext<T> context,
+                            final Class<?> requestType,
+                            final MessageSpy spy,
+                            final EventIdentifier eventIdentifier) {
         this.context = Preconditions.checkNotNull(context);
         this.requestType = Preconditions.checkNotNull(requestType);
         this.spy = Preconditions.checkNotNull(spy);
@@ -45,7 +45,7 @@ public abstract class AbstractRequestCallback<T> implements FutureCallback<OfHea
         context.close();
     }
 
-    protected final void spyMessage(@Nonnull final STATISTIC_GROUP group) {
+    protected final void spyMessage(@Nonnull final StatisticsGroup group) {
         spy.spyMessage(requestType, Preconditions.checkNotNull(group));
     }
 
@@ -54,20 +54,23 @@ public abstract class AbstractRequestCallback<T> implements FutureCallback<OfHea
     }
 
     @Override
-    public final void onFailure(@Nonnull final Throwable t) {
+    public final void onFailure(@Nonnull final Throwable throwable) {
         final RpcResultBuilder<T> builder;
         if (null != eventIdentifier) {
             EventsTimeCounter.markEnd(eventIdentifier);
         }
-        if (t instanceof DeviceRequestFailedException) {
-            final Error err = ((DeviceRequestFailedException) t).getError();
-            final String errorString = String.format("Device reported error type %s code %s", err.getTypeString(), err.getCodeString());
+        if (throwable instanceof DeviceRequestFailedException) {
+            final Error err = ((DeviceRequestFailedException) throwable).getError();
+            final String errorString = String.format("Device reported error type %s code %s",
+                                                     err.getTypeString(),
+                                                     err.getCodeString());
 
-            builder = RpcResultBuilder.<T>failed().withError(RpcError.ErrorType.APPLICATION, errorString, t);
-            spyMessage(MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
+            builder = RpcResultBuilder.<T>failed().withError(RpcError.ErrorType.APPLICATION, errorString, throwable);
+            spyMessage(StatisticsGroup.TO_SWITCH_SUBMIT_FAILURE);
         } else {
-            builder = RpcResultBuilder.<T>failed().withError(RpcError.ErrorType.APPLICATION, t.getMessage(), t);
-            spyMessage(MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_ERROR);
+            builder = RpcResultBuilder.<T>failed()
+                    .withError(RpcError.ErrorType.APPLICATION, throwable.getMessage(), throwable);
+            spyMessage(StatisticsGroup.TO_SWITCH_SUBMIT_ERROR);
         }
 
         context.setResult(builder.build());