diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/CurrencyServiceConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/CurrencyServiceConfigOptionProvider.java index 45cd7a2fcf7..8e3ed18064f 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/CurrencyServiceConfigOptionProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/CurrencyServiceConfigOptionProvider.java @@ -50,7 +50,7 @@ public void removeCurrencyProvider(CurrencyProvider currencyProvider) { @Override public @Nullable Collection getParameterOptions(URI uri, String param, @Nullable String context, @Nullable Locale locale) { - if ("system:units".equals(uri.toString()) && param.equals("currencyProvider")) { + if ("system:units".equals(uri.toString()) && "currencyProvider".equals(param)) { return currencyProviders.stream().map(this::mapProvider).toList(); } return null; diff --git a/bundles/org.openhab.core.config.discovery.addon.process/src/main/java/org/openhab/core/config/discovery/addon/process/ProcessAddonFinder.java b/bundles/org.openhab.core.config.discovery.addon.process/src/main/java/org/openhab/core/config/discovery/addon/process/ProcessAddonFinder.java index 316be24d9af..066b5c90e97 100644 --- a/bundles/org.openhab.core.config.discovery.addon.process/src/main/java/org/openhab/core/config/discovery/addon/process/ProcessAddonFinder.java +++ b/bundles/org.openhab.core.config.discovery.addon.process/src/main/java/org/openhab/core/config/discovery/addon/process/ProcessAddonFinder.java @@ -59,14 +59,17 @@ public ProcessAddonFinder() { // also tries to mitigate differences on different operating systems String getProcessCommandProcess(ProcessHandle h) { Optional command = h.info().command(); - if (command.isPresent()) + if (command.isPresent()) { return command.get(); + } Optional args = h.info().arguments(); - if (!args.isPresent()) + if (!args.isPresent()) { return ""; + } String[] argsArray = args.get(); - if (argsArray.length < 1) + if (argsArray.length < 1) { return ""; + } return argsArray[0]; } diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManager.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManager.java index b34282fcfa1..99004a89a2b 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManager.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManager.java @@ -498,7 +498,6 @@ public void addItem(Item item) { } if (getMatchingConfigurations(FORECAST).anyMatch(configuration -> appliesToItem(configuration, item))) { scheduleNextPersistedForecastForItem(item.getName()); - } } } diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java index 63d51dd1a6b..932c931c224 100644 --- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java +++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java @@ -90,7 +90,6 @@ public Set getSupportedLocales() { @Override public void createRules(@Nullable Locale locale) { - /****************************** ENGLISH ******************************/ if (locale == null || Objects.equals(locale.getLanguage(), Locale.ENGLISH.getLanguage())) { @@ -173,7 +172,6 @@ public void createRules(@Nullable Locale locale) { /****************************** GERMAN ******************************/ if (locale == null || Objects.equals(locale.getLanguage(), Locale.GERMAN.getLanguage())) { - Expression einAnAus = alt(cmd("ein", OnOffType.ON), cmd("an", OnOffType.ON), cmd("aus", OnOffType.OFF)); Expression denDieDas = opt(alt("den", "die", "das")); Expression schalte = alt("schalt", "schalte", "mach"); @@ -237,7 +235,6 @@ public void createRules(@Nullable Locale locale) { seq(schalte, denDieDas), /* item */ seq(opt("auf"), labeledCmd)// ), // Locale.GERMAN).toArray(Rule[]::new)); - } /****************************** FRENCH ******************************/ diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java index 9bc83c2f70f..9b1099f41c7 100644 --- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java +++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java @@ -1240,7 +1240,7 @@ private Expression parseItemRuleTokenText(Locale locale, String tokenText, Item if (tokenText.contains("?")) { throw new ParseException("The character '?' can only be used at the end of the expression", 0); } - if (tokenText.equals("|")) { + if ("|".equals(tokenText)) { throw new ParseException("The character '|' can not be used alone", 0); } Expression expression = seq(tokenText.contains("|") ? alt(Arrays.stream(tokenText.split("\\|"))// @@ -1542,7 +1542,7 @@ public List> getCommandClasses(@Nullable Item ignored) public record ItemFilter(Set itemNames, Set excludedItemNames, Set itemTags, Set itemSemantics) { - private static final ItemFilter allInstance = new ItemFilter(Set.of(), Set.of(), Set.of(), Set.of()); + private static final ItemFilter ALL_INSTANCE = new ItemFilter(Set.of(), Set.of(), Set.of(), Set.of()); public boolean filterItem(Item item, MetadataRegistry metadataRegistry) { if (!itemNames.isEmpty() && !itemNames.contains(item.getName())) { return false; @@ -1563,7 +1563,7 @@ public boolean filterItem(Item item, MetadataRegistry metadataRegistry) { } public static ItemFilter all() { - return allInstance; + return ALL_INSTANCE; } public static ItemFilter forItem(Item item) { diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/text/StandardInterpreterTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/text/StandardInterpreterTest.java index cda7ad4348d..e5ea7c76afd 100644 --- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/text/StandardInterpreterTest.java +++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/text/StandardInterpreterTest.java @@ -244,7 +244,7 @@ public void allowUseCustomCommandCommands() throws InterpretationException { @Test public void allowHandleQuestionWithCustomCommand() throws InterpretationException { - var trigger_item = new StringItem("trigger_item") { + var triggerItem = new StringItem("trigger_item") { @Override public @Nullable CommandDescription getCommandDescription() { return () -> List.of(new CommandOption("day", "day"), new CommandOption("time", "time")); @@ -255,20 +255,20 @@ public void allowHandleQuestionWithCustomCommand() throws InterpretationExceptio return getCommandDescription(); } }; - MetadataKey voiceMetadataKey = new MetadataKey(VOICE_SYSTEM_NAMESPACE, trigger_item.getName()); + MetadataKey voiceMetadataKey = new MetadataKey(VOICE_SYSTEM_NAMESPACE, triggerItem.getName()); when(metadataRegistryMock.get(voiceMetadataKey)) .thenReturn(new Metadata(voiceMetadataKey, "what $cmd$ is it", null)); - List items = List.of(trigger_item); + List items = List.of(triggerItem); when(itemRegistryMock.getItems()).thenReturn(items); assertEquals(OK_RESPONSE, standardInterpreter.interpret(Locale.ENGLISH, "what time is it?")); verify(eventPublisherMock, times(1)) - .post(ItemEventFactory.createCommandEvent(trigger_item.getName(), new StringType("time"))); + .post(ItemEventFactory.createCommandEvent(triggerItem.getName(), new StringType("time"))); reset(eventPublisherMock); } @Test public void allowForceCustomCommand() throws InterpretationException { - var trigger_item = new StringItem("trigger_item") { + var triggerItem = new StringItem("trigger_item") { @Override public @Nullable CommandDescription getCommandDescription() { return () -> List.of(new CommandOption("day", "day"), new CommandOption("time", "time")); @@ -286,14 +286,14 @@ public void allowForceCustomCommand() throws InterpretationException { }; HashMap configuration = new HashMap<>(); configuration.put(IS_FORCED_CONFIGURATION, true); - MetadataKey voiceMetadataKey = new MetadataKey(VOICE_SYSTEM_NAMESPACE, trigger_item.getName()); + MetadataKey voiceMetadataKey = new MetadataKey(VOICE_SYSTEM_NAMESPACE, triggerItem.getName()); when(metadataRegistryMock.get(voiceMetadataKey)) .thenReturn(new Metadata(voiceMetadataKey, "what $cmd$ is it", configuration)); - List items = List.of(trigger_item); + List items = List.of(triggerItem); when(itemRegistryMock.getItems()).thenReturn(items); assertEquals(OK_RESPONSE, standardInterpreter.interpret(Locale.ENGLISH, "what time is it?")); verify(eventPublisherMock, times(1)) - .post(ItemEventFactory.createCommandEvent(trigger_item.getName(), new StringType("time"))); + .post(ItemEventFactory.createCommandEvent(triggerItem.getName(), new StringType("time"))); reset(eventPublisherMock); } diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TimeSeries.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TimeSeries.java index aa71f00b9fe..8f53d53e586 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TimeSeries.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TimeSeries.java @@ -104,10 +104,12 @@ public record Entry(Instant timestamp, State state) { @Override public boolean equals(@Nullable Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } TimeSeries that = (TimeSeries) o; return Objects.equals(states, that.states) && policy == that.policy; }