mirror of
https://github.com/danieldemus/openhab-addons
synced 2026-07-29 12:34:21 +02:00
Signed-off-by: Ravi Nadahar <nadahar@rediffmail.com>
This commit is contained in:
+4
-6
@@ -17,10 +17,9 @@ import java.nio.file.Path;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||||
import org.eclipse.jdt.annotation.Nullable;
|
import org.eclipse.jdt.annotation.Nullable;
|
||||||
@@ -114,8 +113,7 @@ public class RRD4jCommandExtension extends AbstractConsoleCommandExtension imple
|
|||||||
|
|
||||||
PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry
|
PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry
|
||||||
.get(RRD4jPersistenceService.SERVICE_ID);
|
.get(RRD4jPersistenceService.SERVICE_ID);
|
||||||
Stream<Entry<String, String>> aliases = config != null ? config.getAliases().entrySet().stream()
|
Map<String, String> aliases = config == null ? Map.of() : Map.copyOf(config.getAliases());
|
||||||
: Stream.empty();
|
|
||||||
|
|
||||||
console.println((checkOnly ? "Checking" : "Cleaning") + " RRD files...");
|
console.println((checkOnly ? "Checking" : "Cleaning") + " RRD files...");
|
||||||
int nb = 0;
|
int nb = 0;
|
||||||
@@ -128,8 +126,8 @@ public class RRD4jCommandExtension extends AbstractConsoleCommandExtension imple
|
|||||||
boolean itemFound;
|
boolean itemFound;
|
||||||
try {
|
try {
|
||||||
// Map alias back to item
|
// Map alias back to item
|
||||||
String item = Objects.requireNonNull(
|
String item = Objects.requireNonNull(aliases.entrySet().stream()
|
||||||
aliases.filter(e -> name.equals(e.getValue())).findAny().map(e -> e.getKey()).orElse(name));
|
.filter(e -> name.equals(e.getValue())).findAny().map(e -> e.getKey()).orElse(name));
|
||||||
itemRegistry.getItem(item);
|
itemRegistry.getItem(item);
|
||||||
itemFound = true;
|
itemFound = true;
|
||||||
} catch (ItemNotFoundException e) {
|
} catch (ItemNotFoundException e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user