[ecowatt] Change in handleRemoval (#14978)

Follow-up #14934

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/handler/EcowattHandler.java b/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/handler/EcowattHandler.java
index c6fd16e6b06cd2307d3e3aa597f793da0c94628d..e29d69ea34a1c7a5f03c5c82b2b2dfe71e9c9296 100644 (file)
--- a/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/handler/EcowattHandler.java
+++ b/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/handler/EcowattHandler.java
@@ -118,10 +118,7 @@ public class EcowattHandler extends BaseThingHandler {
 
     @Override
     public void handleRemoval() {
-        EcowattRestApi localApi = api;
-        if (localApi != null) {
-            localApi.deleteServiceAndAccessToken();
-        }
+        oAuthFactory.deleteServiceAndAccessToken(thing.getUID().getAsString());
         super.handleRemoval();
     }
 

diff --git a/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/restapi/EcowattRestApi.java b/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/restapi/EcowattRestApi.java
index c7f8d01fe4f2dbfdc8b186a734fee06d16d19174..7da333721b3cf712b599237e7cfd15d0238e6ba8 100644 (file)
--- a/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/restapi/EcowattRestApi.java
+++ b/bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/restapi/EcowattRestApi.java
@@ -140,8 +140,4 @@ public class EcowattRestApi {
     public void dispose() {
         oAuthFactory.ungetOAuthService(authServiceHandle);
     }
-
-    public void deleteServiceAndAccessToken() {
-        oAuthFactory.deleteServiceAndAccessToken(authServiceHandle);
-    }
 }