Decompose RPC implementation classes

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java
index 2324783238505bb98346f3be2bd092e465e5c3f0..ac9e580a58a6e5e1c3fbcd766602fa8d907b3f44 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java
@@ -55,9 +55,9 @@ public abstract class AbstractService<I, O> {
 
         this.requestContextStack = requestContextStack;
         this.deviceContext = deviceContext;
-        this.datapathId = deviceInfo.getDatapathId();
-        this.version = deviceInfo.getVersion();
-        this.messageSpy = deviceContext.getMessageSpy();
+        datapathId = deviceInfo.getDatapathId();
+        version = deviceInfo.getVersion();
+        messageSpy = deviceContext.getMessageSpy();
     }
 
     public boolean canUseSingleLayerSerialization() {
@@ -109,11 +109,11 @@ public abstract class AbstractService<I, O> {
 
     protected abstract FutureCallback<OfHeader> createCallback(RequestContext<O> context, Class<?> requestType);
 
-    public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input) {
+    public @NonNull ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input) {
         return handleServiceCall(input, null);
     }
 
-    public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input,
+    public @NonNull ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input,
             @Nullable final Function<OfHeader, Boolean> isComplete) {
         requireNonNull(input);