demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Use Java 21 language features (#5374)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2026-02-20 07:30:15 +01:00
committed by GitHub
parent 669b7918e2
commit 7f7741d1ef
9 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/parser/gson/RuleGSONParserTest.java
+11 -11
View File
@@ -101,7 +101,7 @@ public class RuleGSONParserTest {
triggers = rule.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("2"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -118,7 +118,7 @@ public class RuleGSONParserTest {
conditions = rule.getConditions();
assertThat(conditions, hasSize(2));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("3"));
assertThat(condition.getLabel(), is(emptyOrNullString()));
assertThat(condition.getDescription(), is(emptyOrNullString()));
@@ -137,7 +137,7 @@ public class RuleGSONParserTest {
actions = rule.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("1"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -183,7 +183,7 @@ public class RuleGSONParserTest {
List<ConfigDescriptionParameter> configDescriptions = rule.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(5));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("textParam"));
assertThat(parameter.getLabel(), is("Text parameter"));
assertThat(parameter.getDescription(), is("This is a text parameter."));
@@ -201,14 +201,14 @@ public class RuleGSONParserTest {
assertFalse(parameter.getLimitToOptions());
List<ParameterOption> options = parameter.getOptions();
assertThat(options, hasSize(2));
assertThat(options.get(0).getLabel(), is("First Option"));
assertThat(options.get(0).getValue(), is("1st"));
assertThat(options.getFirst().getLabel(), is("First Option"));
assertThat(options.getFirst().getValue(), is("1st"));
assertThat(options.get(1).getLabel(), is("Second Option"));
assertThat(options.get(1).getValue(), is("2nd"));
List<FilterCriteria> filterCriterias = parameter.getFilterCriteria();
assertThat(filterCriterias, hasSize(2));
assertThat(filterCriterias.get(0).getName(), is("filter1"));
assertThat(filterCriterias.get(0).getValue(), is(".*"));
assertThat(filterCriterias.getFirst().getName(), is("filter1"));
assertThat(filterCriterias.getFirst().getValue(), is(".*"));
assertThat(filterCriterias.get(1).getName(), is("filter2"));
assertThat(filterCriterias.get(1).getValue(), is("a.*"));
parameter = configDescriptions.get(1);
@@ -282,7 +282,7 @@ public class RuleGSONParserTest {
List<Trigger> triggers = rule.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("first"));
assertThat(trigger.getLabel(), is("First Trigger"));
assertThat(trigger.getDescription(), is("The first trigger."));
@@ -299,7 +299,7 @@ public class RuleGSONParserTest {
List<Condition> conditions = rule.getConditions();
assertThat(conditions, hasSize(4));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("holiday"));
assertThat(condition.getLabel(), is("Is Holiday"));
assertThat(condition.getDescription(), is("It must be a holiday."));
@@ -329,7 +329,7 @@ public class RuleGSONParserTest {
List<Action> actions = rule.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("greet"));
assertThat(action.getLabel(), is("Greet"));
assertThat(action.getDescription(), is("Greets the person."));
bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/parser/gson/TemplateGSONParserTest.java
+20 -20
View File
@@ -65,7 +65,7 @@ public class TemplateGSONParserTest {
List<ConfigDescriptionParameter> configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(1));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("startLevel"));
assertThat(parameter.getLabel(), is("Start Level"));
assertThat(parameter.getDescription(), is("The start level which will trigger the rule."));
@@ -86,7 +86,7 @@ public class TemplateGSONParserTest {
List<Trigger> triggers = template.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("3"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -103,7 +103,7 @@ public class TemplateGSONParserTest {
List<Condition> conditions = template.getConditions();
assertThat(conditions, hasSize(2));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("4"));
assertThat(condition.getLabel(), is(emptyOrNullString()));
assertThat(condition.getDescription(), is(emptyOrNullString()));
@@ -122,7 +122,7 @@ public class TemplateGSONParserTest {
List<Action> actions = template.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("1"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -160,7 +160,7 @@ public class TemplateGSONParserTest {
List<ConfigDescriptionParameter> configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(5));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("textParam"));
assertThat(parameter.getLabel(), is("Text parameter"));
assertThat(parameter.getDescription(), is("This is a text parameter."));
@@ -178,14 +178,14 @@ public class TemplateGSONParserTest {
assertFalse(parameter.getLimitToOptions());
List<ParameterOption> options = parameter.getOptions();
assertThat(options, hasSize(2));
assertThat(options.get(0).getLabel(), is("First Option"));
assertThat(options.get(0).getValue(), is("Welcome"));
assertThat(options.getFirst().getLabel(), is("First Option"));
assertThat(options.getFirst().getValue(), is("Welcome"));
assertThat(options.get(1).getLabel(), is("Second Option"));
assertThat(options.get(1).getValue(), is("Willkommen"));
List<FilterCriteria> filterCriterias = parameter.getFilterCriteria();
assertThat(filterCriterias, hasSize(2));
assertThat(filterCriterias.get(0).getName(), is("filter1"));
assertThat(filterCriterias.get(0).getValue(), is(".*"));
assertThat(filterCriterias.getFirst().getName(), is("filter1"));
assertThat(filterCriterias.getFirst().getValue(), is(".*"));
assertThat(filterCriterias.get(1).getName(), is("filter2"));
assertThat(filterCriterias.get(1).getValue(), is("a.*"));
parameter = configDescriptions.get(1);
@@ -259,7 +259,7 @@ public class TemplateGSONParserTest {
List<Trigger> triggers = template.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("first"));
assertThat(trigger.getLabel(), is("First Trigger"));
assertThat(trigger.getDescription(), is("The first trigger."));
@@ -276,7 +276,7 @@ public class TemplateGSONParserTest {
List<Condition> conditions = template.getConditions();
assertThat(conditions, hasSize(4));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("holiday"));
assertThat(condition.getLabel(), is("Is Holiday"));
assertThat(condition.getDescription(), is("It must be a holiday."));
@@ -306,7 +306,7 @@ public class TemplateGSONParserTest {
List<Action> actions = template.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("greet"));
assertThat(action.getLabel(), is("Greet"));
assertThat(action.getDescription(), is("Greets the person."));
@@ -347,7 +347,7 @@ public class TemplateGSONParserTest {
List<ConfigDescriptionParameter> configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(3));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("consumption"));
assertThat(parameter.getLabel(), is("Consumption Item"));
assertThat(parameter.getDescription(), is("Data source for current consumption"));
@@ -367,8 +367,8 @@ public class TemplateGSONParserTest {
assertThat(options, is(empty()));
List<FilterCriteria> filterCriterias = parameter.getFilterCriteria();
assertThat(filterCriterias, hasSize(1));
assertThat(filterCriterias.get(0).getName(), is("type"));
assertThat(filterCriterias.get(0).getValue(), is("Number"));
assertThat(filterCriterias.getFirst().getName(), is("type"));
assertThat(filterCriterias.getFirst().getValue(), is("Number"));
parameter = configDescriptions.get(1);
assertThat(parameter.getName(), is("light"));
assertThat(parameter.getLabel(), is("Color Item"));
@@ -407,7 +407,7 @@ public class TemplateGSONParserTest {
List<Trigger> triggers = template.getTriggers();
assertThat(triggers, hasSize(1));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("trigger"));
assertThat(trigger.getLabel(), is("Current consumption changes"));
assertThat(trigger.getDescription(), is("Triggers whenever the current consumption changes its value"));
@@ -420,7 +420,7 @@ public class TemplateGSONParserTest {
List<Action> actions = template.getActions();
assertThat(actions, hasSize(1));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("setcolor"));
assertThat(action.getLabel(), is("Change the light color"));
assertThat(action.getDescription(),
@@ -444,7 +444,7 @@ public class TemplateGSONParserTest {
configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(6));
parameter = configDescriptions.get(0);
parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("itemTargetTime"));
assertThat(parameter.getLabel(), is("Target Time (DateTime Item)"));
assertThat(parameter.getDescription(), is(
@@ -545,7 +545,7 @@ public class TemplateGSONParserTest {
triggers = template.getTriggers();
assertThat(triggers, hasSize(1));
trigger = triggers.get(0);
trigger = triggers.getFirst();
assertThat(trigger.getId(), is("1"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -558,7 +558,7 @@ public class TemplateGSONParserTest {
actions = template.getActions();
assertThat(actions, hasSize(1));
action = actions.get(0);
action = actions.getFirst();
assertThat(action.getId(), is("2"));
assertThat(action.getLabel(), is("Calculate & set the target brightness"));
assertThat(action.getDescription(),
bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowMessageHandler.java
+8 -12
View File
@@ -227,18 +227,14 @@ public class WindowMessageHandler implements Runnable, WindowProc {
@Nullable
private LRESULT onDeviceChange(WPARAM wParam, LPARAM lParam) {
switch (wParam.intValue()) {
case DBT.DBT_DEVICEARRIVAL:
return onDeviceAddedOrRemoved(lParam, true);
case DBT.DBT_DEVICEREMOVECOMPLETE:
return onDeviceAddedOrRemoved(lParam, false);
case DBT.DBT_DEVNODES_CHANGED:
// LRESULT(1) aka TRUE means that the message was processed. This message is non-specific
// (basically means "something changed"), so we don't want to take any action.
return new LRESULT(1);
default:
return null;
}
return switch (wParam.intValue()) {
case DBT.DBT_DEVICEARRIVAL -> onDeviceAddedOrRemoved(lParam, true);
case DBT.DBT_DEVICEREMOVECOMPLETE -> onDeviceAddedOrRemoved(lParam, false);
// LRESULT(1) aka TRUE means that the message was processed. This message is non-specific
// (basically means "something changed"), so we don't want to take any action.
case DBT.DBT_DEVNODES_CHANGED -> new LRESULT(1);
default -> null;
};
}
@Nullable
bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
+1 -1
View File
@@ -400,7 +400,7 @@ public class PersistenceResource implements RESTResource {
persistenceProblems.add(new PersistenceServiceProblem(
PersistenceServiceProblem.PERSISTENCE_NO_STRATEGY, serviceId, items, editable));
} else if (strategies.size() == 1
&& PersistenceStrategy.Globals.RESTORE.equals(strategies.get(0))) {
&& PersistenceStrategy.Globals.RESTORE.equals(strategies.getFirst())) {
persistenceProblems.add(new PersistenceServiceProblem(
PersistenceServiceProblem.PERSISTENCE_NO_STORE_STRATEGY, serviceId, items,
editable));
bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/items/YamlItemDTOTest.java
+1 -1
View File
@@ -609,6 +609,6 @@ public class YamlItemDTOTest {
assertEquals(1, warnings.size());
assertEquals(
"item \"item_name\": \"expire\" field is redundant with \"expire\" metadata; value \"5m\" will be considered",
warnings.get(0));
warnings.getFirst());
}
}
bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/items/fileconverter/YamlItemFileConverterTest.java
+2 -2
View File
@@ -116,8 +116,8 @@ public class YamlItemFileConverterTest {
List<YamlElement> elements = repository.getElements();
assertEquals(1, elements.size());
assertInstanceOf(YamlItemDTO.class, elements.get(0));
return (YamlItemDTO) elements.get(0);
assertInstanceOf(YamlItemDTO.class, elements.getFirst());
return (YamlItemDTO) elements.getFirst();
}
private static class CapturingYamlModelRepository implements YamlModelRepository {
bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/rules/YamlRuleProviderTest.java
+24 -24
View File
@@ -139,7 +139,7 @@ public class YamlRuleProviderTest {
List<Trigger> triggers = rule.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("2"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -156,7 +156,7 @@ public class YamlRuleProviderTest {
List<Condition> conditions = rule.getConditions();
assertThat(conditions, hasSize(2));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("3"));
assertThat(condition.getLabel(), is(emptyOrNullString()));
assertThat(condition.getDescription(), is(emptyOrNullString()));
@@ -175,7 +175,7 @@ public class YamlRuleProviderTest {
List<Action> actions = rule.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("1"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -218,7 +218,7 @@ public class YamlRuleProviderTest {
assertThat(config.getProperties(), hasEntry("sourceItem", "None"));
List<ConfigDescriptionParameter> configDescriptions = rule.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(1));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("sourceItem"));
assertThat(parameter.getType(), is(Type.TEXT));
assertThat(parameter.getContext(), is("item"));
@@ -228,7 +228,7 @@ public class YamlRuleProviderTest {
List<Trigger> triggers = rule.getTriggers();
assertThat(triggers, hasSize(1));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("1"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -242,7 +242,7 @@ public class YamlRuleProviderTest {
List<Action> actions = rule.getActions();
assertThat(actions, hasSize(1));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("script"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -280,7 +280,7 @@ public class YamlRuleProviderTest {
assertThat(config.getProperties(), hasEntry("timeOfDay", "Yes"));
configDescriptions = rule.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(3));
parameter = configDescriptions.get(0);
parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("timeOfDay"));
assertThat(parameter.getType(), is(Type.TEXT));
assertThat(parameter.getContext(), is("item"));
@@ -289,8 +289,8 @@ public class YamlRuleProviderTest {
assertTrue(parameter.isRequired());
List<FilterCriteria> filterCriteria = parameter.getFilterCriteria();
assertThat(filterCriteria, hasSize(1));
assertThat(filterCriteria.get(0).getName(), is("type"));
assertThat(filterCriteria.get(0).getValue(), is("String"));
assertThat(filterCriteria.getFirst().getName(), is("type"));
assertThat(filterCriteria.getFirst().getValue(), is("String"));
parameter = configDescriptions.get(1);
assertThat(parameter.getName(), is("timesOfDayGrp"));
assertThat(parameter.getType(), is(Type.TEXT));
@@ -301,8 +301,8 @@ public class YamlRuleProviderTest {
assertTrue(parameter.isRequired());
filterCriteria = parameter.getFilterCriteria();
assertThat(filterCriteria, hasSize(1));
assertThat(filterCriteria.get(0).getName(), is("type"));
assertThat(filterCriteria.get(0).getValue(), is("Group"));
assertThat(filterCriteria.getFirst().getName(), is("type"));
assertThat(filterCriteria.getFirst().getValue(), is("Group"));
parameter = configDescriptions.get(2);
assertThat(parameter.getName(), is("namespace"));
assertThat(parameter.getType(), is(Type.TEXT));
@@ -315,7 +315,7 @@ public class YamlRuleProviderTest {
triggers = rule.getTriggers();
assertThat(triggers, hasSize(3));
trigger = triggers.get(0);
trigger = triggers.getFirst();
assertThat(trigger.getId(), is("1"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -341,7 +341,7 @@ public class YamlRuleProviderTest {
actions = rule.getActions();
assertThat(actions, hasSize(1));
action = actions.get(0);
action = actions.getFirst();
assertThat(action.getId(), is("3"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -365,7 +365,7 @@ public class YamlRuleProviderTest {
assertThat(rule.getConfiguration().getProperties(), is(anEmptyMap()));
configDescriptions = rule.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(4));
parameter = configDescriptions.get(0);
parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("powerItem"));
assertThat(parameter.getType(), is(Type.TEXT));
assertThat(parameter.getContext(), is("item"));
@@ -404,7 +404,7 @@ public class YamlRuleProviderTest {
triggers = rule.getTriggers();
assertThat(triggers, hasSize(1));
trigger = triggers.get(0);
trigger = triggers.getFirst();
assertThat(trigger.getId(), is("1"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -417,7 +417,7 @@ public class YamlRuleProviderTest {
actions = rule.getActions();
assertThat(actions, hasSize(1));
action = actions.get(0);
action = actions.getFirst();
assertThat(action.getId(), is("2"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -456,7 +456,7 @@ public class YamlRuleProviderTest {
List<ConfigDescriptionParameter> configDescriptions = rule.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(5));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("textParam"));
assertThat(parameter.getLabel(), is("Text parameter"));
assertThat(parameter.getDescription(), is("This is a text parameter."));
@@ -474,14 +474,14 @@ public class YamlRuleProviderTest {
assertFalse(parameter.getLimitToOptions());
List<ParameterOption> options = parameter.getOptions();
assertThat(options, hasSize(2));
assertThat(options.get(0).getLabel(), is("First Option"));
assertThat(options.get(0).getValue(), is("1st"));
assertThat(options.getFirst().getLabel(), is("First Option"));
assertThat(options.getFirst().getValue(), is("1st"));
assertThat(options.get(1).getLabel(), is("Second Option"));
assertThat(options.get(1).getValue(), is("2nd"));
List<FilterCriteria> filterCriterias = parameter.getFilterCriteria();
assertThat(filterCriterias, hasSize(2));
assertThat(filterCriterias.get(0).getName(), is("filter1"));
assertThat(filterCriterias.get(0).getValue(), is(".*"));
assertThat(filterCriterias.getFirst().getName(), is("filter1"));
assertThat(filterCriterias.getFirst().getValue(), is(".*"));
assertThat(filterCriterias.get(1).getName(), is("filter2"));
assertThat(filterCriterias.get(1).getValue(), is("a.*"));
parameter = configDescriptions.get(1);
@@ -555,7 +555,7 @@ public class YamlRuleProviderTest {
List<Trigger> triggers = rule.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("first"));
assertThat(trigger.getLabel(), is("First Trigger"));
assertThat(trigger.getDescription(), is("The first trigger."));
@@ -572,7 +572,7 @@ public class YamlRuleProviderTest {
List<Condition> conditions = rule.getConditions();
assertThat(conditions, hasSize(4));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("holiday"));
assertThat(condition.getLabel(), is("Is Holiday"));
assertThat(condition.getDescription(), is("It must be a holiday."));
@@ -602,7 +602,7 @@ public class YamlRuleProviderTest {
List<Action> actions = rule.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("greet"));
assertThat(action.getLabel(), is("Greet"));
assertThat(action.getDescription(), is("Greets the person."));
bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/rules/YamlRuleTemplateProviderTest.java
+12 -12
View File
@@ -115,7 +115,7 @@ public class YamlRuleTemplateProviderTest {
List<ConfigDescriptionParameter> configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(1));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("startLevel"));
assertThat(parameter.getLabel(), is("Start Level"));
assertThat(parameter.getDescription(), is("The start level which will trigger the rule."));
@@ -139,7 +139,7 @@ public class YamlRuleTemplateProviderTest {
List<Trigger> triggers = template.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("3"));
assertThat(trigger.getLabel(), is(emptyOrNullString()));
assertThat(trigger.getDescription(), is(emptyOrNullString()));
@@ -156,7 +156,7 @@ public class YamlRuleTemplateProviderTest {
List<Condition> conditions = template.getConditions();
assertThat(conditions, hasSize(2));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("4"));
assertThat(condition.getLabel(), is(emptyOrNullString()));
assertThat(condition.getDescription(), is(emptyOrNullString()));
@@ -175,7 +175,7 @@ public class YamlRuleTemplateProviderTest {
List<Action> actions = template.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("1"));
assertThat(action.getLabel(), is(emptyOrNullString()));
assertThat(action.getDescription(), is(emptyOrNullString()));
@@ -214,7 +214,7 @@ public class YamlRuleTemplateProviderTest {
List<ConfigDescriptionParameter> configDescriptions = template.getConfigurationDescriptions();
assertThat(configDescriptions, hasSize(5));
ConfigDescriptionParameter parameter = configDescriptions.get(0);
ConfigDescriptionParameter parameter = configDescriptions.getFirst();
assertThat(parameter.getName(), is("textParam"));
assertThat(parameter.getLabel(), is("Text parameter"));
assertThat(parameter.getDescription(), is("This is a text parameter."));
@@ -232,14 +232,14 @@ public class YamlRuleTemplateProviderTest {
assertFalse(parameter.getLimitToOptions());
List<ParameterOption> options = parameter.getOptions();
assertThat(options, hasSize(2));
assertThat(options.get(0).getLabel(), is("First Option"));
assertThat(options.get(0).getValue(), is("Welcome"));
assertThat(options.getFirst().getLabel(), is("First Option"));
assertThat(options.getFirst().getValue(), is("Welcome"));
assertThat(options.get(1).getLabel(), is("Second Option"));
assertThat(options.get(1).getValue(), is("Willkommen"));
List<FilterCriteria> filterCriterias = parameter.getFilterCriteria();
assertThat(filterCriterias, hasSize(2));
assertThat(filterCriterias.get(0).getName(), is("filter1"));
assertThat(filterCriterias.get(0).getValue(), is(".*"));
assertThat(filterCriterias.getFirst().getName(), is("filter1"));
assertThat(filterCriterias.getFirst().getValue(), is(".*"));
assertThat(filterCriterias.get(1).getName(), is("filter2"));
assertThat(filterCriterias.get(1).getValue(), is("a.*"));
parameter = configDescriptions.get(1);
@@ -313,7 +313,7 @@ public class YamlRuleTemplateProviderTest {
List<Trigger> triggers = template.getTriggers();
assertThat(triggers, hasSize(2));
Trigger trigger = triggers.get(0);
Trigger trigger = triggers.getFirst();
assertThat(trigger.getId(), is("first"));
assertThat(trigger.getLabel(), is("First Trigger"));
assertThat(trigger.getDescription(), is("The first trigger."));
@@ -330,7 +330,7 @@ public class YamlRuleTemplateProviderTest {
List<Condition> conditions = template.getConditions();
assertThat(conditions, hasSize(4));
Condition condition = conditions.get(0);
Condition condition = conditions.getFirst();
assertThat(condition.getId(), is("holiday"));
assertThat(condition.getLabel(), is("Is Holiday"));
assertThat(condition.getDescription(), is("It must be a holiday."));
@@ -360,7 +360,7 @@ public class YamlRuleTemplateProviderTest {
List<Action> actions = template.getActions();
assertThat(actions, hasSize(2));
Action action = actions.get(0);
Action action = actions.getFirst();
assertThat(action.getId(), is("greet"));
assertThat(action.getLabel(), is("Greet"));
assertThat(action.getDescription(), is("Greets the person."));
bundles/org.openhab.core/src/main/java/org/openhab/core/io/dto/SerializationException.java
+2
View File
@@ -13,6 +13,7 @@
package org.openhab.core.io.dto;
import java.io.IOException;
import java.io.Serial;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -25,6 +26,7 @@ import org.eclipse.jdt.annotation.Nullable;
@NonNullByDefault
public class SerializationException extends IOException {
@Serial
private static final long serialVersionUID = 1L;
/**