Bump upstreams

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/DefaultDiagStatusProvider.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/DefaultDiagStatusProvider.java
index f92ffef558356dee35bb10024cbdaa22b58734bc..a84fed96c9d0eae342f949810b3f31c8dcfba2d8 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/DefaultDiagStatusProvider.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/DefaultDiagStatusProvider.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.openflowplugin.impl;
 
-import static java.util.Objects.requireNonNull;
-
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -29,14 +27,11 @@ public final class DefaultDiagStatusProvider implements DiagStatusProvider {
     private static final Logger LOG = LoggerFactory.getLogger(DefaultDiagStatusProvider.class);
     private static final String OPENFLOW_SERVICE_NAME = "OPENFLOW";
 
-    private final DiagStatusService diagStatusService;
-
     private ServiceRegistration reg;
 
     @Inject
     @Activate
     public DefaultDiagStatusProvider(@Reference final DiagStatusService diagStatusService) {
-        this.diagStatusService = requireNonNull(diagStatusService);
         reg = diagStatusService.register(OPENFLOW_SERVICE_NAME);
     }
 
@@ -44,26 +39,26 @@ public final class DefaultDiagStatusProvider implements DiagStatusProvider {
     @Deactivate
     public void close() {
         if (reg != null) {
-            reg.unregister();
+            reg.close();
             reg = null;
         }
     }
 
     @Override
-    public void reportStatus(ServiceState serviceState) {
+    public void reportStatus(final ServiceState serviceState) {
         LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
-        diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState));
+        reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState));
     }
 
     @Override
-    public void reportStatus(ServiceState serviceState, Throwable throwable) {
+    public void reportStatus(final ServiceState serviceState, final Throwable throwable) {
         LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
-        diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, throwable));
+        reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, throwable));
     }
 
     @Override
-    public void reportStatus(ServiceState serviceState, String description) {
+    public void reportStatus(final ServiceState serviceState, final String description) {
         LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
-        diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description));
+        reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description));
     }
 }