public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[automation] Use Java 17 features (#15484)

Browse Source 
* [automation] Code optimization for Java17: instanceof matching and multiline strings

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* [automation] Make use of Java17 features

Use Map/Set/List.of instead of Collections.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* review comment

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

---------

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2023-08-23 17:27:40 +02:00
committed by GitHub
parent 626c6bde4a
commit 7b90fbe162
10 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/handler/PIDControllerTriggerHandler.java
View File

@@ -206,8 +206,8 @@ public class PIDControllerTriggerHandler extends BaseTriggerModuleHandler implem
private TriggerHandlerCallback getCallback() {
ModuleHandlerCallback localCallback = callback;
if (localCallback != null && localCallback instanceof TriggerHandlerCallback) {
return (TriggerHandlerCallback) localCallback;
if (localCallback != null && localCallback instanceof TriggerHandlerCallback handlerCallback) {
return handlerCallback;
}
throw new IllegalStateException("The module callback is not set");
@@ -236,8 +236,8 @@ public class PIDControllerTriggerHandler extends BaseTriggerModuleHandler implem
private double getItemValueAsNumber(Item item) throws PIDException {
State setpointState = item.getState();
if (setpointState instanceof Number) {
double doubleValue = ((Number) setpointState).doubleValue();
if (setpointState instanceof Number number) {
double doubleValue = number.doubleValue();
if (Double.isFinite(doubleValue) && !Double.isNaN(doubleValue)) {
return doubleValue;
@@ -254,9 +254,8 @@ public class PIDControllerTriggerHandler extends BaseTriggerModuleHandler implem
@Override
public void receive(Event event) {
if (event instanceof ItemStateChangedEvent) {
if (event instanceof ItemStateChangedEvent changedEvent) {
if (commandTopic.isPresent() && event.getTopic().equals(commandTopic.get())) {
ItemStateChangedEvent changedEvent = (ItemStateChangedEvent) event;
if ("RESET".equals(changedEvent.getItemState().toString())) {
controller.setIntegralResult(0);
controller.setDerivativeResult(0);