From 7ccf9e0b14843fae4fb856f4d672460a641efcea Mon Sep 17 00:00:00 2001
From: Nick Waterton <n.waterton@outlook.com>
Date: Fri, 9 Jun 2023 15:10:04 +0000
Subject: [PATCH] [samsungtv: refactored for new WatchService]

Signed-off-by: Nick Waterton <n.waterton@outlook.com>
---
 .../internal/SamsungTvAppWatchService.java    | 29 ++++++-------------
 .../src/main/resources/OH-INF/addon/addon.xml | 11 +++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100755 bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/addon/addon.xml

diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/SamsungTvAppWatchService.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/SamsungTvAppWatchService.java
index 93eaaf8e442af..1e0cbe400a169 100755
--- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/SamsungTvAppWatchService.java
+++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/SamsungTvAppWatchService.java
@@ -12,23 +12,19 @@
  */
 package org.openhab.binding.samsungtv.internal;
 
-import static java.nio.file.StandardWatchEventKinds.*;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchEvent.Kind;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.samsungtv.internal.protocol.RemoteControllerWebSocket;
 import org.openhab.core.OpenHAB;
-import org.openhab.core.service.AbstractWatchService;
+import org.openhab.core.service.WatchService;
+import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,9 +33,11 @@
  * File should be in json format
  *
  * @author Nick Waterton - Initial contribution
+ * @author Nick Waterton - Refactored to new WatchService
  */
+@Component(service = SamsungTvAppWatchService.class)
 @NonNullByDefault
-public class SamsungTvAppWatchService extends AbstractWatchService {
+public class SamsungTvAppWatchService implements WatchService.WatchEventListener {
     private static final String APPS_PATH = OpenHAB.getConfigFolder() + File.separator + "services";
     private static final String APPS_FILE = "samsungtv.cfg";
 
@@ -50,7 +48,6 @@ public class SamsungTvAppWatchService extends AbstractWatchService {
     int count = 0;
 
     public SamsungTvAppWatchService(String host, RemoteControllerWebSocket remoteControllerWebSocket) {
-        super(APPS_PATH);
         this.host = host;
         this.remoteControllerWebSocket = remoteControllerWebSocket;
     }
@@ -61,7 +58,6 @@ public void start() {
             logger.info("{}: Starting Apps File monitoring service", host);
             started = true;
             readFileApps();
-            activate();
         } else if (count++ == 0) {
             logger.warn("{}: cannot start Apps File monitoring service, file {} does not exist", host, file.toString());
             remoteControllerWebSocket.addKnownAppIds();
@@ -82,23 +78,16 @@ public boolean checkFileDir() {
     }
 
     public void readFileApps() {
-        processWatchEvent(null, null, Paths.get(APPS_PATH, APPS_FILE));
+        processWatchEvent(WatchService.Kind.MODIFY, Paths.get(APPS_PATH, APPS_FILE));
     }
 
-    @Override
-    protected boolean watchSubDirectories() {
+    public boolean watchSubDirectories() {
         return false;
     }
 
     @Override
-    @NonNullByDefault({})
-    protected Kind<?>[] getWatchEventKinds(@Nullable Path directory) {
-        return new Kind<?>[] { ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY };
-    }
-
-    @Override
-    protected void processWatchEvent(@Nullable WatchEvent<?> event, @Nullable Kind<?> kind, @Nullable Path path) {
-        if (path != null && path.endsWith(APPS_FILE)) {
+    public void processWatchEvent(WatchService.Kind kind, Path path) {
+        if (path.endsWith(APPS_FILE) && kind != WatchService.Kind.DELETE) {
             logger.debug("{}: Updating Apps list from FILE {}", host, path);
             try {
                 @SuppressWarnings("null")
diff --git a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/addon/addon.xml
new file mode 100755
index 0000000000000..1bb7e7d959c97
--- /dev/null
+++ b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/addon/addon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon:addon id="samsungtv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
+
+	<type>binding</type>
+	<name>SamsungTV Binding</name>
+	<description>This is the binding for Samsung TV.</description>
+	<connection>local</connection>
+
+</addon:addon>