From: lolodomo <lg.hc@free.fr>
Date: Thu, 11 May 2023 20:00:23 +0000 (+0200)
Subject: [ecowatt] Change in handleRemoval (#14978)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=29edae9f21e4e5de8b04a8ebf1489e4c7bd2fa0b;p=openhab-addons.git

[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 c6fd16e6b0..e29d69ea34 100644
--- 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 c7f8d01fe4..7da333721b 100644
--- 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);
-    }
 }