address review comments

Signed-off-by: Jan N. Klug <[email protected]>
openhab · May 12, 2023 · f65f5b6 · f65f5b6
1 parent d9d9177
commit f65f5b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...e.influxdb/src/main/java/org/openhab/persistence/influxdb/InfluxDBPersistenceService.java b/...e.influxdb/src/main/java/org/openhab/persistence/influxdb/InfluxDBPersistenceService.java
@@ -219,11 +219,16 @@ public void store(Item item, ZonedDateTime date, State state, @Nullable String a
 
     @Override
     public boolean remove(FilterCriteria filter) throws IllegalArgumentException {
-        if (filter.getItemName() == null) {
-            logger.warn("Item name is missing in filter {} when trying to remove data.", filter);
+        if (serviceActivated && checkConnection()) {
+            if (filter.getItemName() == null) {
+                logger.warn("Item name is missing in filter {} when trying to remove data.", filter);
+                return false;
+            }
+            return influxDBRepository.remove(filter);
+        } else {
+            logger.debug("Remove query {} ignored, InfluxDB is not connected.", filter);
             return false;
         }
-        return influxDBRepository.remove(filter);
     }
 
     @Override

diff --git a/....influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBRepository.java b/....influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBRepository.java
@@ -80,7 +80,7 @@ public interface InfluxDBRepository {
      * Execute delete query
      *
      * @param filter the query filter
-     * @return
+     * @return <code>true</code> if query executed successfully, <code>false</code> otherwise
      */
     boolean remove(FilterCriteria filter);