diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
index e7b12b7c86..aae2bfef5d 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
@@ -24,6 +24,7 @@ import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
+import java.util.Map;
 import java.util.function.BiFunction;
 
 import org.junit.jupiter.api.AfterEach;
@@ -231,8 +232,7 @@ public class AudioManagerTest {
         audioManager.addAudioSource(audioSource);
 
         if (isSourceDefault) {
-            audioManager
-                    .modified(Collections.singletonMap(AudioManagerImpl.CONFIG_DEFAULT_SOURCE, audioSource.getId()));
+            audioManager.modified(Map.of(AudioManagerImpl.CONFIG_DEFAULT_SOURCE, audioSource.getId()));
         } else {
             // just to make sure there is no default source
             audioManager.modified(Collections.emptyMap());
@@ -250,10 +250,10 @@ public class AudioManagerTest {
         audioManager.addAudioSink(audioSink);
 
         if (isSinkDefault) {
-            audioManager.modified(Collections.singletonMap(AudioManagerImpl.CONFIG_DEFAULT_SINK, audioSink.getId()));
+            audioManager.modified(Map.of(AudioManagerImpl.CONFIG_DEFAULT_SINK, audioSink.getId()));
         } else {
             // just to make sure there is no default sink
-            audioManager.modified(Collections.emptyMap());
+            audioManager.modified(Map.of());
         }
 
         assertThat(String.format("The sink %s was not registered", audioSink.getId()), audioManager.getSink(),
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
index ee46b20784..7b52e2705d 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
@@ -13,11 +13,8 @@
 package org.openhab.core.audio.internal.fake;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -51,10 +48,9 @@ public class AudioSinkFake implements AudioSink {
     public boolean isUnsupportedAudioFormatExceptionExpected;
     public boolean isUnsupportedAudioStreamExceptionExpected;
 
-    private static final Set<AudioFormat> SUPPORTED_AUDIO_FORMATS = Collections
-            .unmodifiableSet(Stream.of(AudioFormat.MP3, AudioFormat.WAV).collect(Collectors.toSet()));
-    private static final Set<Class<? extends AudioStream>> SUPPORTED_AUDIO_STREAMS = Collections
-            .unmodifiableSet(Stream.of(FixedLengthAudioStream.class, URLAudioStream.class).collect(Collectors.toSet()));
+    private static final Set<AudioFormat> SUPPORTED_AUDIO_FORMATS = Set.of(AudioFormat.MP3, AudioFormat.WAV);
+    private static final Set<Class<? extends AudioStream>> SUPPORTED_AUDIO_STREAMS = Set
+            .of(FixedLengthAudioStream.class, URLAudioStream.class);
 
     @Override
     public String getId() {
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
index 7a10695965..eb863c09c8 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
@@ -12,10 +12,8 @@
  */
 package org.openhab.core.automation.module.media.internal;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
-
 import java.util.Collection;
+import java.util.List;
 
 import org.openhab.core.audio.AudioManager;
 import org.openhab.core.automation.Action;
@@ -35,8 +33,7 @@ import org.osgi.service.component.annotations.Reference;
 @Component(service = ModuleHandlerFactory.class)
 public class MediaModuleHandlerFactory extends BaseModuleHandlerFactory {
 
-    private static final Collection<String> TYPES = unmodifiableList(
-            asList(SayActionHandler.TYPE_ID, PlayActionHandler.TYPE_ID));
+    private static final Collection<String> TYPES = List.of(SayActionHandler.TYPE_ID, PlayActionHandler.TYPE_ID);
     private VoiceManager voiceManager;
     private AudioManager audioManager;
 
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
index 74b05baf72..78ac127c05 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
@@ -13,9 +13,9 @@
 package org.openhab.core.automation.module.media.internal;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -56,12 +56,12 @@ public class MediaScriptScopeProvider implements ScriptExtensionProvider {
 
     @Override
     public Collection<String> getDefaultPresets() {
-        return Collections.singleton("media");
+        return Set.of("media");
     }
 
     @Override
     public Collection<String> getPresets() {
-        return Collections.singleton("media");
+        return Set.of("media");
     }
 
     @Override
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
index efde9cc83d..0c465a1df0 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
@@ -20,6 +20,7 @@ import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -182,12 +183,12 @@ public class DefaultScriptScopeProvider implements ScriptExtensionProvider {
 
     @Override
     public Collection<String> getDefaultPresets() {
-        return Collections.singleton(PRESET_DEFAULT);
+        return Set.of(PRESET_DEFAULT);
     }
 
     @Override
     public Collection<String> getPresets() {
-        return Collections.singleton(PRESET_DEFAULT);
+        return Set.of(PRESET_DEFAULT);
     }
 
     @Override
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
index c604aeb37b..d906dae2f3 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.module.script.internal.defaultscope;
 
-import java.util.AbstractMap;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
@@ -115,7 +114,7 @@ public class ItemRegistryDelegate implements Map<String, State> {
     public Set<java.util.Map.Entry<String, State>> entrySet() {
         Set<Map.Entry<String, State>> entries = new HashSet<>();
         for (Item item : itemRegistry.getAll()) {
-            entries.add(new AbstractMap.SimpleEntry<>(item.getName(), item.getState()));
+            entries.add(Map.entry(item.getName(), item.getState()));
         }
         return entries;
     }
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/LifecycleScriptExtensionProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/LifecycleScriptExtensionProvider.java
index cb9b79e2b8..c9097e0ac6 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/LifecycleScriptExtensionProvider.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/LifecycleScriptExtensionProvider.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -40,17 +41,17 @@ public class LifecycleScriptExtensionProvider implements ScriptExtensionProvider
 
     @Override
     public Collection<String> getDefaultPresets() {
-        return Collections.singleton(LIFECYCLE_PRESET_NAME);
+        return Set.of(LIFECYCLE_PRESET_NAME);
     }
 
     @Override
     public Collection<String> getPresets() {
-        return Collections.singleton(LIFECYCLE_PRESET_NAME);
+        return Set.of(LIFECYCLE_PRESET_NAME);
     }
 
     @Override
     public Collection<String> getTypes() {
-        return Collections.singleton(LIFECYCLE_TRACKER_NAME);
+        return Set.of(LIFECYCLE_TRACKER_NAME);
     }
 
     @Override
@@ -67,7 +68,7 @@ public class LifecycleScriptExtensionProvider implements ScriptExtensionProvider
         if (LIFECYCLE_PRESET_NAME.equals(preset)) {
             final Object requestedType = get(scriptIdentifier, LIFECYCLE_TRACKER_NAME);
             if (requestedType != null) {
-                return Collections.singletonMap(LIFECYCLE_TRACKER_NAME, requestedType);
+                return Map.of(LIFECYCLE_TRACKER_NAME, requestedType);
             }
         }
 
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/factory/ScriptModuleHandlerFactory.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/factory/ScriptModuleHandlerFactory.java
index ba979a4771..8e219e805a 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/factory/ScriptModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/factory/ScriptModuleHandlerFactory.java
@@ -12,10 +12,8 @@
  */
 package org.openhab.core.automation.module.script.internal.factory;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
-
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -46,8 +44,8 @@ public class ScriptModuleHandlerFactory extends BaseModuleHandlerFactory {
 
     private final Logger logger = LoggerFactory.getLogger(ScriptModuleHandlerFactory.class);
 
-    private static final Collection<String> TYPES = unmodifiableList(
-            asList(ScriptActionHandler.TYPE_ID, ScriptConditionHandler.TYPE_ID));
+    private static final Collection<String> TYPES = List.of(ScriptActionHandler.TYPE_ID,
+            ScriptConditionHandler.TYPE_ID);
     private @NonNullByDefault({}) ScriptEngineManager scriptEngineManager;
 
     @Override
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
index 4bb37d90aa..8e3b26e1c3 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
@@ -14,7 +14,6 @@ package org.openhab.core.automation.internal;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -95,15 +94,11 @@ public class RuleImpl implements Rule {
         this.uid = uid == null ? UUID.randomUUID().toString() : uid;
         this.name = name;
         this.description = description;
-        this.tags = tags == null ? Collections.emptySet() : Collections.unmodifiableSet(new HashSet<>(tags));
-        this.triggers = triggers == null ? Collections.emptyList()
-                : Collections.unmodifiableList(new ArrayList<>(triggers));
-        this.conditions = conditions == null ? Collections.emptyList()
-                : Collections.unmodifiableList(new ArrayList<>(conditions));
-        this.actions = actions == null ? Collections.emptyList()
-                : Collections.unmodifiableList(new ArrayList<>(actions));
-        this.configDescriptions = configDescriptions == null ? Collections.emptyList()
-                : Collections.unmodifiableList(new ArrayList<>(configDescriptions));
+        this.tags = tags == null ? Set.of() : Set.copyOf(tags);
+        this.triggers = triggers == null ? List.of() : List.copyOf(triggers);
+        this.conditions = conditions == null ? List.of() : List.copyOf(conditions);
+        this.actions = actions == null ? List.of() : List.copyOf(actions);
+        this.configDescriptions = configDescriptions == null ? List.of() : List.copyOf(configDescriptions);
         this.configuration = configuration == null ? new Configuration()
                 : new Configuration(configuration.getProperties());
         this.templateUID = templateUID;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
index 4c1f20de2b..4bd3e2a9e1 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
@@ -13,9 +13,7 @@
 package org.openhab.core.automation.internal.module.factory;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -45,10 +43,9 @@ public class EphemerisModuleHandlerFactory extends BaseModuleHandlerFactory impl
 
     private final Logger logger = LoggerFactory.getLogger(EphemerisModuleHandlerFactory.class);
 
-    private static final Collection<String> TYPES = Collections.unmodifiableList(Stream
-            .of(EphemerisConditionHandler.HOLIDAY_MODULE_TYPE_ID, EphemerisConditionHandler.WEEKEND_MODULE_TYPE_ID,
-                    EphemerisConditionHandler.WEEKDAY_MODULE_TYPE_ID, EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID)
-            .collect(Collectors.toList()));
+    private static final Collection<String> TYPES = List.of(EphemerisConditionHandler.HOLIDAY_MODULE_TYPE_ID,
+            EphemerisConditionHandler.WEEKEND_MODULE_TYPE_ID, EphemerisConditionHandler.WEEKDAY_MODULE_TYPE_ID,
+            EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID);
 
     private final EphemerisManager ephemerisManager;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
index ba06cbfbfd..6ef80f6336 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
@@ -12,11 +12,8 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
@@ -66,10 +63,9 @@ public class GenericEventTriggerHandler extends BaseTriggerModuleHandler impleme
         this.source = (String) module.getConfiguration().get(CFG_EVENT_SOURCE);
         this.topic = (String) module.getConfiguration().get(CFG_EVENT_TOPIC);
         if (module.getConfiguration().get(CFG_EVENT_TYPES) != null) {
-            this.types = Collections.unmodifiableSet(
-                    new HashSet<>(Arrays.asList(((String) module.getConfiguration().get(CFG_EVENT_TYPES)).split(","))));
+            this.types = Set.of(((String) module.getConfiguration().get(CFG_EVENT_TYPES)).split(","));
         } else {
-            this.types = Collections.emptySet();
+            this.types = Set.of();
         }
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupCommandTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupCommandTriggerHandler.java
index 4afab1998a..b55d71646a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupCommandTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupCommandTriggerHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -67,7 +66,7 @@ public class GroupCommandTriggerHandler extends BaseTriggerModuleHandler impleme
         super(module);
         this.groupName = (String) module.getConfiguration().get(CFG_GROUPNAME);
         this.command = (String) module.getConfiguration().get(CFG_COMMAND);
-        this.types = Collections.singleton(ItemCommandEvent.TYPE);
+        this.types = Set.of(ItemCommandEvent.TYPE);
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
         this.topic = "openhab/items/";
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupStateTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupStateTriggerHandler.java
index 69b4bcd885..39fc32cfdd 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupStateTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupStateTriggerHandler.java
@@ -12,10 +12,8 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
@@ -73,12 +71,9 @@ public class GroupStateTriggerHandler extends BaseTriggerModuleHandler implement
         this.state = (String) module.getConfiguration().get(CFG_STATE);
         this.previousState = (String) module.getConfiguration().get(CFG_PREVIOUS_STATE);
         if (UPDATE_MODULE_TYPE_ID.equals(module.getTypeUID())) {
-            this.types = Collections.singleton(ItemStateEvent.TYPE);
+            this.types = Set.of(ItemStateEvent.TYPE);
         } else {
-            Set<String> set = new HashSet<>();
-            set.add(ItemStateChangedEvent.TYPE);
-            set.add(GroupItemStateChangedEvent.TYPE);
-            this.types = Collections.unmodifiableSet(set);
+            this.types = Set.of(ItemStateChangedEvent.TYPE, GroupItemStateChangedEvent.TYPE);
         }
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
index 718b121c45..bcd808706b 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -61,7 +60,7 @@ public class ItemCommandTriggerHandler extends BaseTriggerModuleHandler implemen
         super(module);
         this.itemName = (String) module.getConfiguration().get(CFG_ITEMNAME);
         this.command = (String) module.getConfiguration().get(CFG_COMMAND);
-        this.types = Collections.singleton(ItemCommandEvent.TYPE);
+        this.types = Set.of(ItemCommandEvent.TYPE);
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
         this.topic = "openhab/items/" + itemName + "/command";
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
index 9839cf0dd7..eb15e131da 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
@@ -12,10 +12,8 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
@@ -68,12 +66,9 @@ public class ItemStateTriggerHandler extends BaseTriggerModuleHandler implements
         this.state = (String) module.getConfiguration().get(CFG_STATE);
         this.previousState = (String) module.getConfiguration().get(CFG_PREVIOUS_STATE);
         if (UPDATE_MODULE_TYPE_ID.equals(module.getTypeUID())) {
-            this.types = Collections.singleton(ItemStateEvent.TYPE);
+            this.types = Set.of(ItemStateEvent.TYPE);
         } else {
-            Set<String> set = new HashSet<>();
-            set.add(ItemStateChangedEvent.TYPE);
-            set.add(GroupItemStateChangedEvent.TYPE);
-            this.types = Collections.unmodifiableSet(set);
+            this.types = Set.of(ItemStateChangedEvent.TYPE, GroupItemStateChangedEvent.TYPE);
         }
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java
index 6fbe7508b1..63e70c44be 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java
@@ -13,7 +13,6 @@
 package org.openhab.core.automation.internal.module.handler;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -59,7 +58,7 @@ public class SystemTriggerHandler extends BaseTriggerModuleHandler implements Ev
         super(module);
         this.startlevel = ((BigDecimal) module.getConfiguration().get(CFG_STARTLEVEL)).intValue();
         if (STARTLEVEL_MODULE_TYPE_ID.equals(module.getTypeUID())) {
-            this.types = Collections.singleton(StartlevelEvent.TYPE);
+            this.types = Set.of(StartlevelEvent.TYPE);
         } else {
             logger.warn("Module type '{}' is not (yet) handled by this class.", module.getTypeUID());
             throw new IllegalArgumentException(module.getTypeUID() + " is no valid module type.");
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
index 9c2072d778..fb050890af 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -73,9 +72,9 @@ public class ThingStatusTriggerHandler extends BaseTriggerModuleHandler implemen
         this.status = (String) module.getConfiguration().get(CFG_STATUS);
         this.previousStatus = (String) module.getConfiguration().get(CFG_PREVIOUS_STATUS);
         if (UPDATE_MODULE_TYPE_ID.equals(module.getTypeUID())) {
-            this.types = Collections.singleton(ThingStatusInfoEvent.TYPE);
+            this.types = Set.of(ThingStatusInfoEvent.TYPE);
         } else {
-            this.types = Collections.singleton(ThingStatusInfoChangedEvent.TYPE);
+            this.types = Set.of(ThingStatusInfoChangedEvent.TYPE);
         }
         this.bundleContext = bundleContext;
         Dictionary<String, Object> properties = new Hashtable<>();
diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java
index 35d8839e60..83cc6d4be8 100644
--- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java
+++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
-import java.util.Collections;
+import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.BeforeEach;
@@ -60,7 +60,7 @@ public class EphemerisModuleHandlerFactoryTest {
     public void testFactoryCreatesModuleHandlerForDaysetCondition() {
         when(moduleMock.getTypeUID()).thenReturn(EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID);
 
-        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Collections.singletonMap("dayset", "school")));
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Map.of("dayset", "school")));
         ModuleHandler handler = factory.internalCreate(moduleMock, "My second rule");
         assertThat(handler, is(notNullValue()));
         assertThat(handler, instanceOf(EphemerisConditionHandler.class));
@@ -75,7 +75,7 @@ public class EphemerisModuleHandlerFactoryTest {
         assertThat(handler, is(notNullValue()));
         assertThat(handler, instanceOf(EphemerisConditionHandler.class));
 
-        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Collections.singletonMap("offset", 5)));
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Map.of("offset", 5)));
         handler = factory.internalCreate(moduleMock, "My second rule");
         assertThat(handler, is(notNullValue()));
         assertThat(handler, instanceOf(EphemerisConditionHandler.class));
diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
index fc4787aecc..0c37699e34 100644
--- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
+++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
@@ -15,7 +15,6 @@ package org.openhab.core.automation.util;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -154,14 +153,14 @@ public class ReferenceResolverUtilTest {
     @Test
     public void testGetFromList() {
         String ken = "Ken";
-        List<String> names = Arrays.asList("John", ken, "Sue");
+        List<String> names = List.of("John", ken, "Sue");
         assertEquals(ken,
                 ReferenceResolver.resolveComplexDataReference(names, ReferenceResolver.splitReferenceToTokens("[1]")));
     }
 
     @Test
     public void testGetFromListInvalidIndexFormat() {
-        List<String> names = Arrays.asList("John", "Ken", "Sue");
+        List<String> names = List.of("John", "Ken", "Sue");
         assertThrows(NumberFormatException.class, () -> ReferenceResolver.resolveComplexDataReference(names,
                 ReferenceResolver.splitReferenceToTokens("[Ten]")));
     }
@@ -169,10 +168,7 @@ public class ReferenceResolverUtilTest {
     @Test
     public void getFromMap() {
         String phone = "0331 1387 121";
-        Map<String, String> phones = new HashMap<>();
-        phones.put("John", phone);
-        phones.put("Sue", "0222 2184 121");
-        phones.put("Mark", "0222 5641 121");
+        Map<String, String> phones = Map.of("John", phone, "Sue", "0222 2184 121", "Mark", "0222 5641 121");
         assertEquals(phone, ReferenceResolver.resolveComplexDataReference(phones,
                 ReferenceResolver.splitReferenceToTokens("[\"John\"]")));
     }
@@ -180,19 +176,14 @@ public class ReferenceResolverUtilTest {
     @Test
     public void getFromMapWithKeyThatContainsSpecialCharacters() {
         String phone = "0331 1387 121";
-        Map<String, String> phones = new HashMap<>();
-        phones.put("John[].Smi\"th].", phone);
-        phones.put("Sue", "0222 2184 121");
-        phones.put("Mark", "0222 5641 121");
+        Map<String, String> phones = Map.of("John[].Smi\"th].", phone, "Sue", "0222 2184 121", "Mark", "0222 5641 121");
         assertEquals(phone, ReferenceResolver.resolveComplexDataReference(phones,
                 ReferenceResolver.splitReferenceToTokens("[\"John[].Smi\"th].\"]")));
     }
 
     @Test
     public void getFromMapUnExistingKey() {
-        Map<String, String> phones = new HashMap<>();
-        phones.put("Sue", "0222 2184 121");
-        phones.put("Mark", "0222 5641 121");
+        Map<String, String> phones = Map.of("Sue", "0222 2184 121", "Mark", "0222 5641 121");
         assertNull(ReferenceResolver.resolveComplexDataReference(phones,
                 ReferenceResolver.splitReferenceToTokens("[\"John\"]")));
     }
@@ -200,21 +191,21 @@ public class ReferenceResolverUtilTest {
     @Test
     public void getFromList() {
         String ken = "Ken";
-        List<String> names = Arrays.asList(new String[] { "John", ken, "Sue" });
+        List<String> names = List.of("John", ken, "Sue");
         assertEquals(ken,
                 ReferenceResolver.resolveComplexDataReference(names, ReferenceResolver.splitReferenceToTokens("[1]")));
     }
 
     @Test
     public void testGetFromListInvalidIndex() {
-        List<String> names = Arrays.asList(new String[] { "John", "Ken", "Sue" });
+        List<String> names = List.of("John", "Ken", "Sue");
         assertThrows(ArrayIndexOutOfBoundsException.class, () -> ReferenceResolver.resolveComplexDataReference(names,
                 ReferenceResolver.splitReferenceToTokens("[10]")));
     }
 
     @Test
     public void testGetFromInvalidIndexFormat() {
-        List<String> names = Arrays.asList(new String[] { "John", "Ken", "Sue" });
+        List<String> names = List.of("John", "Ken", "Sue");
         assertThrows(NumberFormatException.class, () -> ReferenceResolver.resolveComplexDataReference(names,
                 ReferenceResolver.splitReferenceToTokens("[Ten]")));
     }
@@ -238,8 +229,7 @@ public class ReferenceResolverUtilTest {
     @Test
     public void testBeanFromBean() {
         String phone = "0331 1387 121";
-        Map<String, String> phones = new HashMap<>();
-        phones.put("John", phone);
+        Map<String, String> phones = Map.of("John", phone);
         B1<Map<String, String>> b3 = new B1<>(phones);
         B2<B1<Map<String, String>>> b4 = new B2<>(b3);
         assertEquals(phone, ReferenceResolver.resolveComplexDataReference(b4,
@@ -252,7 +242,7 @@ public class ReferenceResolverUtilTest {
         B1<String> b31 = new B1<>("Ken");
         B1<String> b32 = new B1<>("Sue");
         B1<String> b33 = new B1<>(name);
-        List<B1<String>> b = Arrays.asList(b31, b32, b33);
+        List<B1<String>> b = List.of(b31, b32, b33);
         assertEquals(name, ReferenceResolver.resolveComplexDataReference(b,
                 ReferenceResolver.splitReferenceToTokens("[2].value")));
     }
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
index e5b87f7591..89b2087b3b 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
@@ -14,9 +14,7 @@ package org.openhab.core.config.core;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -104,10 +102,9 @@ public class ConfigDescriptionParameter {
     private boolean advanced = false;
     private boolean verify = false;
 
-    private static final Set<String> UNITS = Collections
-            .unmodifiableSet(new HashSet<>(Arrays.asList("A", "cd", "K", "kg", "m", "mol", "s", "g", "rad", "sr", "Hz",
-                    "N", "Pa", "J", "W", "C", "V", "F", "Ω", "S", "Wb", "T", "H", "Cel", "lm", "lx", "Bq", "Gy", "Sv",
-                    "kat", "m/s2", "m2v", "m3", "kph", "%", "l", "ms", "min", "h", "d", "week", "y")));
+    private static final Set<String> UNITS = Set.of("A", "cd", "K", "kg", "m", "mol", "s", "g", "rad", "sr", "Hz", "N",
+            "Pa", "J", "W", "C", "V", "F", "Ω", "S", "Wb", "T", "H", "Cel", "lm", "lx", "Bq", "Gy", "Sv", "kat", "m/s2",
+            "m2v", "m3", "kph", "%", "l", "ms", "min", "h", "d", "week", "y");
 
     /**
      * Default constructor.
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
index 493e10f763..da2004b2b2 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
@@ -112,7 +112,7 @@ public class ConfigUtil {
                 if (defaultValue != null && configuration.get(parameter.getName()) == null) {
                     if (parameter.isMultiple()) {
                         if (defaultValue.contains(DEFAULT_LIST_DELIMITER)) {
-                            List<Object> values = Arrays.asList(defaultValue.split(DEFAULT_LIST_DELIMITER)).stream()
+                            List<Object> values = List.of(defaultValue.split(DEFAULT_LIST_DELIMITER)).stream()
                                     .map(v -> v.trim()).filter(v -> !v.isEmpty())
                                     .map(v -> ConfigUtil.getDefaultValueAsCorrectType(parameter.getName(),
                                             parameter.getType(), v))
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
index 89016c0faf..041ee5f370 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
@@ -20,7 +20,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -161,7 +160,7 @@ public class ConfigMapper {
                 final Enum<?> enumvalue = Enum.valueOf(enumType, value.toString());
                 result = enumvalue;
             } else if (Collection.class.isAssignableFrom(type)) {
-                result = Collections.singletonList(value);
+                result = List.of(value);
             }
         }
         return result;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
index aa88f2845f..e4c43722d6 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
@@ -12,12 +12,9 @@
  */
 package org.openhab.core.config.core.internal.normalization;
 
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Collections;
+import static java.util.Map.entry;
+
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
@@ -31,12 +28,9 @@ import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
  */
 public final class NormalizerFactory {
 
-    private static final Map<Type, Normalizer> NORMALIZERS = Collections.unmodifiableMap(Stream
-            .of(new SimpleEntry<>(Type.BOOLEAN, new BooleanNormalizer()),
-                    new SimpleEntry<>(Type.TEXT, new TextNormalizer()),
-                    new SimpleEntry<>(Type.INTEGER, new IntNormalizer()),
-                    new SimpleEntry<>(Type.DECIMAL, new DecimalNormalizer()))
-            .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+    private static final Map<Type, Normalizer> NORMALIZERS = Map.ofEntries(entry(Type.BOOLEAN, new BooleanNormalizer()),
+            entry(Type.TEXT, new TextNormalizer()), entry(Type.INTEGER, new IntNormalizer()),
+            entry(Type.DECIMAL, new DecimalNormalizer()));
 
     private NormalizerFactory() {
         // prevent instantiation
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
index d374bded11..a2ede1f06f 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
@@ -12,13 +12,10 @@
  */
 package org.openhab.core.config.core.internal.validation;
 
+import static java.util.Map.entry;
+
 import java.math.BigDecimal;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Collections;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 
@@ -30,12 +27,9 @@ import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
  */
 final class TypeIntrospections {
 
-    private static final Map<Type, TypeIntrospection> INTROSPECTIONS = Collections.unmodifiableMap(Stream
-            .of(new SimpleEntry<>(Type.BOOLEAN, new BooleanIntrospection()),
-                    new SimpleEntry<>(Type.TEXT, new StringIntrospection()),
-                    new SimpleEntry<>(Type.INTEGER, new IntegerIntrospection()),
-                    new SimpleEntry<>(Type.DECIMAL, new FloatIntrospection()))
-            .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+    private static final Map<Type, TypeIntrospection> INTROSPECTIONS = Map.ofEntries(
+            entry(Type.BOOLEAN, new BooleanIntrospection()), entry(Type.TEXT, new StringIntrospection()),
+            entry(Type.INTEGER, new IntegerIntrospection()), entry(Type.DECIMAL, new FloatIntrospection()));
 
     private TypeIntrospections() {
         super();
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
index 7f6e29825c..1d3f23997c 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.config.core.status.events;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.openhab.core.config.core.status.ConfigStatusInfo;
@@ -30,7 +29,7 @@ import org.osgi.service.component.annotations.Component;
 @Component(immediate = true, service = { EventFactory.class })
 public final class ConfigStatusEventFactory extends AbstractEventFactory {
 
-    private static final Set<String> SUPPORTED_EVENT_TYPES = Collections.singleton(ConfigStatusInfoEvent.TYPE);
+    private static final Set<String> SUPPORTED_EVENT_TYPES = Set.of(ConfigStatusInfoEvent.TYPE);
 
     /**
      * Creates a new {@link ConfigStatusEventFactory}.
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
index 91450d49ef..b9728d8a34 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -66,7 +65,7 @@ public class ConfigDescriptionBuilderTest {
 
     @Test
     public void testWithTwoParameters() {
-        final List<ConfigDescriptionParameter> params = Arrays.asList(PARAM1, PARAM2);
+        final List<ConfigDescriptionParameter> params = List.of(PARAM1, PARAM2);
 
         ConfigDescription configDescription = builder.withParameters(params).build();
         assertThat(configDescription.getUID(), is(CONFIG_URI));
@@ -86,7 +85,7 @@ public class ConfigDescriptionBuilderTest {
 
     @Test
     public void testWithTwoParameterGroups() {
-        final List<ConfigDescriptionParameterGroup> groups = Arrays.asList(GROUP1, GROUP2);
+        final List<ConfigDescriptionParameterGroup> groups = List.of(GROUP1, GROUP2);
 
         ConfigDescription configDescription = builder.withParameterGroups(groups).build();
         assertThat(configDescription.getUID(), is(CONFIG_URI));
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
index a78f537289..5f1d065083 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
@@ -67,8 +67,8 @@ public class ConfigDescriptionParameterBuilderTest {
                 .withDefault(defaultVal)
                 .withLabel(label)
                 .withDescription(description)
-                .withOptions(Arrays.asList(options))
-                .withFilterCriteria(Arrays.asList(criterias))
+                .withOptions(List.of(options))
+                .withFilterCriteria(List.of(criterias))
                 .withGroupName(groupName)
                 .withAdvanced(advanced)
                 .withLimitToOptions(limitToOptions)
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
index b60433dc71..f47565e36e 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
@@ -20,8 +20,8 @@ import static org.mockito.Mockito.when;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68,39 +68,36 @@ public class ConfigDescriptionRegistryTest extends JavaTest {
                 .create("param1", ConfigDescriptionParameter.Type.INTEGER).build();
 
         configDescription = ConfigDescriptionBuilder.create(uriDummy).withParameter(param1).build();
-        when(configDescriptionProviderMock.getConfigDescriptions(any()))
-                .thenReturn(Collections.singleton(configDescription));
+        when(configDescriptionProviderMock.getConfigDescriptions(any())).thenReturn(Set.of(configDescription));
         when(configDescriptionProviderMock.getConfigDescription(eq(uriDummy), any())).thenReturn(configDescription);
 
         configDescription1 = ConfigDescriptionBuilder.create(uriDummy1).build();
-        when(configDescriptionProviderMock1.getConfigDescriptions(any()))
-                .thenReturn(Collections.singleton(configDescription1));
+        when(configDescriptionProviderMock1.getConfigDescriptions(any())).thenReturn(Set.of(configDescription1));
         when(configDescriptionProviderMock1.getConfigDescription(eq(uriDummy1), any())).thenReturn(configDescription1);
 
         configDescriptionAliased = ConfigDescriptionBuilder.create(uriAliases).withParameter(
                 ConfigDescriptionParameterBuilder.create("instanceId", ConfigDescriptionParameter.Type.INTEGER).build())
                 .build();
         when(configDescriptionProviderAliased.getConfigDescriptions(any()))
-                .thenReturn(Collections.singleton(configDescriptionAliased));
+                .thenReturn(Set.of(configDescriptionAliased));
         when(configDescriptionProviderAliased.getConfigDescription(eq(uriAliases), any()))
                 .thenReturn(configDescriptionAliased);
 
         ConfigDescriptionParameter param2 = ConfigDescriptionParameterBuilder
                 .create("param2", ConfigDescriptionParameter.Type.INTEGER).build();
         configDescription2 = ConfigDescriptionBuilder.create(uriDummy).withParameter(param2).build();
-        when(configDescriptionProviderMock2.getConfigDescriptions(any()))
-                .thenReturn(Collections.singleton(configDescription2));
+        when(configDescriptionProviderMock2.getConfigDescriptions(any())).thenReturn(Set.of(configDescription2));
         when(configDescriptionProviderMock2.getConfigDescription(eq(uriDummy), any())).thenReturn(configDescription2);
 
         when(aliasProvider.getAlias(eq(uriAliases))).thenReturn(uriDummy);
 
         when(configOptionsProviderMockAliased.getParameterOptions(eq(uriAliases), anyString(), any(), any()))
-                .thenReturn(Collections.singletonList(new ParameterOption("Option", "Aliased")));
+                .thenReturn(List.of(new ParameterOption("Option", "Aliased")));
         when(configOptionsProviderMockAliased.getParameterOptions(eq(uriDummy), anyString(), any(), any()))
                 .thenReturn(null);
 
         when(configOptionsProviderMock.getParameterOptions(eq(uriDummy), anyString(), any(), any()))
-                .thenReturn(Collections.singletonList(new ParameterOption("Option", "Original")));
+                .thenReturn(List.of(new ParameterOption("Option", "Original")));
         when(configOptionsProviderMock.getParameterOptions(eq(uriAliases), anyString(), any(), any())).thenReturn(null);
     }
 
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
index ede0062e86..4a0396f0ae 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
@@ -19,9 +19,8 @@ import static org.openhab.core.config.core.ConfigDescriptionParameter.Type.*;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
@@ -124,7 +123,7 @@ public class ConfigUtilTest {
                 .withParameter(configDescriptionParameterBuilder1.build()).build();
 
         ConfigUtil.applyDefaultConfiguration(configuration, configDescription);
-        verifyValuesOfConfiguration(configuration.get("p1"), 1, Collections.singletonList(new BigDecimal("2.5")));
+        verifyValuesOfConfiguration(configuration.get("p1"), 1, List.of(new BigDecimal("2.5")));
     }
 
     @Test
@@ -137,7 +136,7 @@ public class ConfigUtilTest {
 
         ConfigUtil.applyDefaultConfiguration(configuration, configDescription);
         verifyValuesOfConfiguration(configuration.get("p1"), 3,
-                Arrays.asList(new BigDecimal("2.3"), new BigDecimal("2.4"), new BigDecimal("2.5")));
+                List.of(new BigDecimal("2.3"), new BigDecimal("2.4"), new BigDecimal("2.5")));
     }
 
     @Test
@@ -150,7 +149,7 @@ public class ConfigUtilTest {
 
         ConfigUtil.applyDefaultConfiguration(configuration, configDescription);
         verifyValuesOfConfiguration(configuration.get("p1"), 3,
-                Arrays.asList(new BigDecimal("2.3"), new BigDecimal("2.4"), new BigDecimal("2.5")));
+                List.of(new BigDecimal("2.3"), new BigDecimal("2.4"), new BigDecimal("2.5")));
     }
 
     @Test
@@ -162,8 +161,7 @@ public class ConfigUtilTest {
                 .withParameter(configDescriptionParameterBuilder2.build()).build();
 
         ConfigUtil.applyDefaultConfiguration(configuration, configDescription);
-        verifyValuesOfConfiguration(configuration.get("p2"), 3,
-                Arrays.asList("first value", "second value", "third value"));
+        verifyValuesOfConfiguration(configuration.get("p2"), 3, List.of("first value", "second value", "third value"));
     }
 
     private void verifyValuesOfConfiguration(Object subject, int expectedSize, List<?> expectedValues) {
@@ -181,21 +179,15 @@ public class ConfigUtilTest {
         ConfigDescription configDescriptionString = ConfigDescriptionBuilder.create(new URI("thingType:fooThing"))
                 .withParameter(ConfigDescriptionParameterBuilder.create("foo", TEXT).build()).build();
 
-        assertThat(
-                ConfigUtil.normalizeTypes(Collections.singletonMap("foo", "1"), Arrays.asList(configDescriptionInteger))
-                        .get("foo"),
+        assertThat(ConfigUtil.normalizeTypes(Map.of("foo", "1"), List.of(configDescriptionInteger)).get("foo"),
                 is(instanceOf(BigDecimal.class)));
-        assertThat(
-                ConfigUtil.normalizeTypes(Collections.singletonMap("foo", "1"), Arrays.asList(configDescriptionString))
-                        .get("foo"),
-                is(instanceOf(String.class)));
-        assertThat(
-                ConfigUtil.normalizeTypes(Collections.singletonMap("foo", "1"),
-                        Arrays.asList(configDescriptionInteger, configDescriptionString)).get("foo"),
-                is(instanceOf(BigDecimal.class)));
-        assertThat(
-                ConfigUtil.normalizeTypes(Collections.singletonMap("foo", "1"),
-                        Arrays.asList(configDescriptionString, configDescriptionInteger)).get("foo"),
+        assertThat(ConfigUtil.normalizeTypes(Map.of("foo", "1"), List.of(configDescriptionString)).get("foo"),
                 is(instanceOf(String.class)));
+        assertThat(ConfigUtil
+                .normalizeTypes(Map.of("foo", "1"), List.of(configDescriptionInteger, configDescriptionString))
+                .get("foo"), is(instanceOf(BigDecimal.class)));
+        assertThat(ConfigUtil
+                .normalizeTypes(Map.of("foo", "1"), List.of(configDescriptionString, configDescriptionInteger))
+                .get("foo"), is(instanceOf(String.class)));
     }
 }
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
index 57b877edd0..beeb7058a8 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
@@ -18,7 +18,6 @@ import static org.hamcrest.core.IsIterableContaining.hasItems;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,7 @@ public class ConfigurationTest {
         configuration.put("booleanField", false);
         configuration.put("stringField", "test");
         configuration.put("enumField", "ON");
-        configuration.put("listField", Arrays.asList("one", "two", "three"));
+        configuration.put("listField", List.of("one", "two", "three"));
         configuration.put("notExisitingProperty", true);
 
         ConfigClass configClass = configuration.as(ConfigClass.class);
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
index 22407ddf13..9cb9d29d15 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
@@ -18,8 +18,8 @@ import static org.mockito.Mockito.when;
 import static org.openhab.core.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -64,11 +64,11 @@ public class MetadataConfigDescriptionProviderImplTest extends JavaTest {
 
         when(mockProviderRestricted.getNamespace()).thenReturn(RESTRICTED);
         when(mockProviderRestricted.getDescription(any())).thenReturn("Restricted");
-        when(mockProviderRestricted.getParameterOptions(any())).thenReturn(Arrays.asList( //
+        when(mockProviderRestricted.getParameterOptions(any())).thenReturn(List.of( //
                 new ParameterOption("dimmer", "Dimmer"), //
                 new ParameterOption("switch", "Switch") //
         ));
-        when(mockProviderRestricted.getParameters(eq("dimmer"), any())).thenReturn(Arrays.asList( //
+        when(mockProviderRestricted.getParameters(eq("dimmer"), any())).thenReturn(List.of( //
                 ConfigDescriptionParameterBuilder.create("width", Type.INTEGER).build(), //
                 ConfigDescriptionParameterBuilder.create("height", Type.INTEGER).build() //
         ));
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
index a7105663d4..0e5ccd2e1d 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -243,7 +242,7 @@ public class ConfigDescriptionValidatorTest {
     }
 
     void assertRequired(String parameterName) {
-        List<ConfigValidationMessage> expected = Collections.singletonList(new ConfigValidationMessage(parameterName,
+        List<ConfigValidationMessage> expected = List.of(new ConfigValidationMessage(parameterName,
                 MessageKey.PARAMETER_REQUIRED.defaultMessage, MessageKey.PARAMETER_REQUIRED.key));
 
         try {
@@ -326,8 +325,8 @@ public class ConfigDescriptionValidatorTest {
     }
 
     void assertMinMax(String parameterName, Object value, MessageKey msgKey, String minMax) {
-        List<ConfigValidationMessage> expected = Collections
-                .singletonList(new ConfigValidationMessage(parameterName, msgKey.defaultMessage, msgKey.key, minMax));
+        List<ConfigValidationMessage> expected = List
+                .of(new ConfigValidationMessage(parameterName, msgKey.defaultMessage, msgKey.key, minMax));
         try {
             params.put(parameterName, value);
             configDescriptionValidator.validate(params, CONFIG_DESCRIPTION_URI);
@@ -386,7 +385,7 @@ public class ConfigDescriptionValidatorTest {
     }
 
     void assertType(String parameterName, Type type) {
-        List<ConfigValidationMessage> expected = Collections.singletonList(new ConfigValidationMessage(parameterName,
+        List<ConfigValidationMessage> expected = List.of(new ConfigValidationMessage(parameterName,
                 MessageKey.DATA_TYPE_VIOLATED.defaultMessage, MessageKey.DATA_TYPE_VIOLATED.key, type));
         try {
             params.put(parameterName, INVALID);
@@ -403,8 +402,8 @@ public class ConfigDescriptionValidatorTest {
 
     @Test
     public void assertValidationThrowsExceptionContainingMessagesForInvalidPatternForTxtConfigParameters() {
-        List<ConfigValidationMessage> expected = Collections.singletonList(
-                new ConfigValidationMessage(TXT_PATTERN_PARAM_NAME, MessageKey.PATTERN_VIOLATED.defaultMessage,
+        List<ConfigValidationMessage> expected = List
+                .of(new ConfigValidationMessage(TXT_PATTERN_PARAM_NAME, MessageKey.PATTERN_VIOLATED.defaultMessage,
                         MessageKey.PATTERN_VIOLATED.key, String.valueOf(MAX_VIOLATED), PATTERN));
         try {
             params.put(TXT_PATTERN_PARAM_NAME, String.valueOf(MAX_VIOLATED));
@@ -455,9 +454,9 @@ public class ConfigDescriptionValidatorTest {
 
     @Test
     public void assertValidationProvidesOnlyOneMessagePerParameterAlthoughMultipleViolationsOccur() {
-        List<ConfigValidationMessage> expected = Collections.singletonList(new ConfigValidationMessage(
-                TXT_MAX_PATTERN_PARAM_NAME, MessageKey.MAX_VALUE_TXT_VIOLATED.defaultMessage,
-                MessageKey.MAX_VALUE_TXT_VIOLATED.key, MAX.toString()));
+        List<ConfigValidationMessage> expected = List.of(new ConfigValidationMessage(TXT_MAX_PATTERN_PARAM_NAME,
+                MessageKey.MAX_VALUE_TXT_VIOLATED.defaultMessage, MessageKey.MAX_VALUE_TXT_VIOLATED.key,
+                MAX.toString()));
         try {
             params.put(TXT_MAX_PATTERN_PARAM_NAME, String.valueOf(MAX_VIOLATED));
             configDescriptionValidator.validate(params, CONFIG_DESCRIPTION_URI);
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
index dac5164525..e217f08b63 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.config.core.internal.validation;
 
-import static java.util.Collections.*;
-import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -23,7 +21,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.Test;
@@ -59,11 +56,11 @@ public class ConfigValidationExceptionTest {
             MAX);
 
     private static final ConfigValidationMessage MSG1 = createMessage(PARAM1, TXT_DEFAULT1,
-            MessageKey.PARAMETER_REQUIRED.key, emptyList());
+            MessageKey.PARAMETER_REQUIRED.key, List.of());
     private static final ConfigValidationMessage MSG2 = createMessage(PARAM2, TXT_DEFAULT2,
-            MessageKey.MAX_VALUE_TXT_VIOLATED.key, singletonList(MAX));
+            MessageKey.MAX_VALUE_TXT_VIOLATED.key, List.of(MAX));
 
-    private static final List<ConfigValidationMessage> ALL = Stream.of(MSG1, MSG2).collect(toList());
+    private static final List<ConfigValidationMessage> ALL = List.of(MSG1, MSG2);
 
     private static final Bundle BUNDLE = Mockito.mock(Bundle.class);
 
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
index 8e3e664fad..f98de5a636 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
@@ -12,13 +12,14 @@
  */
 package org.openhab.core.config.core.status;
 
-import static java.util.Collections.*;
-import static java.util.stream.Collectors.*;
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -129,14 +130,9 @@ public class ConfigStatusInfoTest {
         assertThat(info.getConfigStatusMessages(PARAM3, PARAM4).size(), is(2));
         assertThat(info.getConfigStatusMessages(PARAM3, PARAM4), hasItems(MSG3, MSG4));
 
-        assertThat(info
-                .getConfigStatusMessages(unmodifiableSet(Stream.of(Type.INFORMATION, Type.WARNING).collect(toSet())),
-                        unmodifiableSet(Stream.of(PARAM1, PARAM6).collect(toSet())))
-                .size(), is(5));
-        assertThat(
-                info.getConfigStatusMessages(
-                        unmodifiableSet(Stream.of(Type.INFORMATION, Type.WARNING).collect(toSet())),
-                        unmodifiableSet(Stream.of(PARAM1, PARAM6).collect(toSet()))),
+        assertThat(info.getConfigStatusMessages(Set.of(Type.INFORMATION, Type.WARNING), Set.of(PARAM1, PARAM6)).size(),
+                is(5));
+        assertThat(info.getConfigStatusMessages(Set.of(Type.INFORMATION, Type.WARNING), Set.of(PARAM1, PARAM6)),
                 hasItems(MSG1, MSG2, MSG3, MSG4, MSG6));
 
         assertThat(info.getConfigStatusMessages("unknown").size(), is(0));
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
index a61901c295..5c0f67e049 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
@@ -13,10 +13,8 @@
 package org.openhab.core.config.discovery;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
@@ -88,18 +86,11 @@ public abstract class AbstractDiscoveryService implements DiscoveryService {
      */
     public AbstractDiscoveryService(@Nullable Set<ThingTypeUID> supportedThingTypes, int timeout,
             boolean backgroundDiscoveryEnabledByDefault) throws IllegalArgumentException {
-        if (supportedThingTypes == null) {
-            this.supportedThingTypes = Collections.emptySet();
-        } else {
-            this.supportedThingTypes = Collections.unmodifiableSet(new HashSet<>(supportedThingTypes));
-        }
-
         if (timeout < 0) {
             throw new IllegalArgumentException("The timeout must be >= 0!");
         }
-
+        this.supportedThingTypes = supportedThingTypes == null ? Set.of() : Set.copyOf(supportedThingTypes);
         this.timeout = timeout;
-
         this.backgroundDiscoveryEnabled = backgroundDiscoveryEnabledByDefault;
     }
 
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
index 32c751ea39..fbac3afa39 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
@@ -14,7 +14,6 @@ package org.openhab.core.config.discovery.internal.console;
 
 import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -193,12 +192,12 @@ public class InboxConsoleCommandExtension extends AbstractConsoleCommandExtensio
 
     @Override
     public List<String> getUsages() {
-        return Arrays.asList(new String[] { buildCommandUsage(SUBCMD_LIST, "lists all current inbox entries"),
+        return List.of(buildCommandUsage(SUBCMD_LIST, "lists all current inbox entries"),
                 buildCommandUsage(SUBCMD_LIST_IGNORED, "lists all ignored inbox entries"),
                 buildCommandUsage(SUBCMD_APPROVE + " <thingUID> <label>", "creates a thing for an inbox entry"),
                 buildCommandUsage(SUBCMD_CLEAR, "clears all current inbox entries"),
                 buildCommandUsage(SUBCMD_REMOVE + " [<thingUID>|<thingTypeUID>]",
                         "remove the inbox entries of a given thing id or thing type"),
-                buildCommandUsage(SUBCMD_IGNORE + " <thingUID>", "ignores an inbox entry permanently") });
+                buildCommandUsage(SUBCMD_IGNORE + " <thingUID>", "ignores an inbox entry permanently"));
     }
 }
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
index ebbb330abd..65ceb89e96 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
@@ -12,18 +12,14 @@
  */
 package org.openhab.core.config.discovery.inbox;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,12 +57,10 @@ public class InboxPredicatesTest {
     private static final ThingTypeUID THING_TYPE_UID12 = new ThingTypeUID(BINDING_ID1, THING_TYPE_ID2);
     private static final ThingTypeUID THING_TYPE_UID21 = new ThingTypeUID(BINDING_ID2, THING_TYPE_ID1);
 
-    private static final Map<String, Object> PROPS1 = Collections
-            .unmodifiableMap(Stream.of(new SimpleEntry<>(PROP1, PROP_VAL1), new SimpleEntry<>(PROP2, PROP_VAL2))
-                    .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
-    private static final Map<String, Object> PROPS2 = Collections.singletonMap(PROP2, PROP_VAL2);
+    private static final Map<String, Object> PROPS1 = Map.ofEntries(entry(PROP1, PROP_VAL1), entry(PROP2, PROP_VAL2));
+    private static final Map<String, Object> PROPS2 = Map.of(PROP2, PROP_VAL2);
 
-    private static final List<DiscoveryResult> RESULTS = Arrays.asList(
+    private static final List<DiscoveryResult> RESULTS = List.of(
             DiscoveryResultBuilder.create(THING_UID11).withThingType(THING_TYPE_UID11).withProperties(PROPS1)
                     .withRepresentationProperty(PROP1).withLabel("label").build(),
             DiscoveryResultBuilder.create(THING_UID12).withThingType(THING_TYPE_UID11).withProperties(PROPS1)
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
index b576879718..cdbfffeaff 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
@@ -87,10 +87,10 @@ public class AutomaticInboxProcessorTest {
     private static final ThingType THING_TYPE3 = ThingTypeBuilder.instance(THING_TYPE_UID3, "label").isListed(true)
             .withRepresentationProperty(OTHER_KEY).build();
 
-    private static final Map<String, String> THING_PROPERTIES = Collections.singletonMap(DEVICE_ID_KEY, DEVICE_ID);
-    private static final Map<String, String> OTHER_THING_PROPERTIES = Collections.singletonMap(OTHER_KEY, OTHER_VALUE);
+    private static final Map<String, String> THING_PROPERTIES = Map.of(DEVICE_ID_KEY, DEVICE_ID);
+    private static final Map<String, String> OTHER_THING_PROPERTIES = Map.of(OTHER_KEY, OTHER_VALUE);
 
-    private static final Configuration CONFIG = new Configuration(Collections.singletonMap(CONFIG_KEY, CONFIG_VALUE));
+    private static final Configuration CONFIG = new Configuration(Map.of(CONFIG_KEY, CONFIG_VALUE));
 
     private AutomaticInboxProcessor automaticInboxProcessor;
     private PersistentInbox inbox;
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
index c1f05ad4e1..a1ad714a6f 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
@@ -21,8 +21,8 @@ import static org.mockito.Mockito.*;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -134,7 +134,7 @@ public class PersistentInboxTest {
     public void testApproveNormalization() throws URISyntaxException {
         DiscoveryResult result = DiscoveryResultBuilder.create(THING_UID).withProperty("foo", 3).build();
         configureConfigDescriptionRegistryMock("foo", Type.TEXT);
-        when(storage.getValues()).thenReturn(Collections.singletonList(result));
+        when(storage.getValues()).thenReturn(List.of(result));
 
         inbox.activate();
         inbox.approve(THING_UID, "Test");
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
index 6af3a6954a..5a330ad608 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
@@ -13,7 +13,6 @@
 package org.openhab.core.config.xml;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -64,7 +63,7 @@ public abstract class AbstractXmlBasedProvider<@NonNull T_ID, @NonNull T_OBJECT
      * @param object the object to be added
      */
     public final synchronized void add(Bundle bundle, T_OBJECT object) {
-        addAll(bundle, Collections.singletonList(object));
+        addAll(bundle, List.of(object));
     }
 
     /**
diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
index de481c8f7f..5aa69b667e 100644
--- a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
+++ b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
@@ -26,7 +26,6 @@ import java.time.ZonedDateTime;
 import java.time.format.TextStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -141,7 +140,7 @@ public class EphemerisManagerImpl implements EphemerisManager, ConfigOptionProvi
                     }
                     String[] setDefinition = value.split(",");
                     if (setDefinition.length > 0) {
-                        addDayset(setName, Arrays.asList(setDefinition));
+                        addDayset(setName, List.of(setDefinition));
                     } else {
                         logger.warn("Erroneous dayset definition {} : {}", e.getKey(), entry);
                     }
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
index 4fb4ffa6d4..a3646324ee 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.console.rfc147.internal.extension;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.openhab.core.io.console.Console;
@@ -52,6 +51,6 @@ public class HelpConsoleCommandExtension extends AbstractConsoleCommandExtension
 
     @Override
     public List<String> getUsages() {
-        return Collections.singletonList(buildCommandUsage(getDescription()));
+        return List.of(buildCommandUsage(getDescription()));
     }
 }
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
index 52682abaf8..4b63f06132 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
@@ -14,8 +14,8 @@ package org.openhab.core.io.console.internal.extension;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -86,7 +86,7 @@ public class ItemConsoleCommandExtension extends AbstractConsoleCommandExtension
                     if (args.length > 1) {
                         Item item = itemRegistry.get(args[1]);
                         if (item != null) {
-                            removeItems(console, Collections.singleton(item));
+                            removeItems(console, Set.of(item));
                         } else {
                             console.println("0 item(s) removed.");
                         }
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
index 58a67ee91a..c0da906fa3 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.console.internal.extension;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -56,7 +55,7 @@ public class SendConsoleCommandExtension extends AbstractConsoleCommandExtension
 
     @Override
     public List<String> getUsages() {
-        return Collections.singletonList(buildCommandUsage("<item> <command>", "sends a command for an item"));
+        return List.of(buildCommandUsage("<item> <command>", "sends a command for an item"));
     }
 
     @Override
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
index 83ee590bb3..d535eb77ad 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.console.internal.extension;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -48,7 +47,7 @@ public class StatusConsoleCommandExtension extends AbstractConsoleCommandExtensi
 
     @Override
     public List<String> getUsages() {
-        return Collections.singletonList(buildCommandUsage("<item>", "shows the current status of an item"));
+        return List.of(buildCommandUsage("<item>", "shows the current status of an item"));
     }
 
     @Override
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
index bf529f0c16..e59fec7bd5 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.console.internal.extension;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -56,7 +55,7 @@ public class UpdateConsoleCommandExtension extends AbstractConsoleCommandExtensi
 
     @Override
     public List<String> getUsages() {
-        return Collections.singletonList(buildCommandUsage("<item> <state>", "sends a status update for an item"));
+        return List.of(buildCommandUsage("<item> <state>", "sends a status update for an item"));
     }
 
     @Override
diff --git a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
index c200a73d7c..590c50e105 100644
--- a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
+++ b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.monitor.internal;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -33,7 +32,7 @@ public class EventLogger implements EventSubscriber {
 
     private final Map<String, Logger> eventLoggers = new HashMap<>();
 
-    private final Set<String> subscribedEventTypes = Collections.singleton(EventSubscriber.ALL_EVENT_TYPES);
+    private final Set<String> subscribedEventTypes = Set.of(EventSubscriber.ALL_EVENT_TYPES);
 
     @Override
     public Set<String> getSubscribedEventTypes() {
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
index 033ac41549..087f5da53b 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
@@ -13,10 +13,9 @@
 package org.openhab.core.io.rest.core.config;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -50,10 +49,10 @@ public class EnrichedConfigDescriptionParameterDTO extends ConfigDescriptionPara
 
         if (multiple && defaultValue != null) {
             if (defaultValue.contains(DEFAULT_LIST_DELIMITER)) {
-                defaultValues = Arrays.asList(defaultValue.split(DEFAULT_LIST_DELIMITER)).stream().map(v -> v.trim())
+                defaultValues = List.of(defaultValue.split(DEFAULT_LIST_DELIMITER)).stream().map(v -> v.trim())
                         .filter(v -> !v.isEmpty()).collect(Collectors.toList());
             } else {
-                defaultValues = Collections.singleton(defaultValue);
+                defaultValues = Set.of(defaultValue);
             }
         }
     }
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
index 2bfcf3fb59..e5274a1087 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
@@ -15,6 +15,7 @@ package org.openhab.core.io.rest.core.internal.binding;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -192,7 +193,7 @@ public class BindingResource implements RESTResource {
             return properties;
         }
 
-        return ConfigUtil.normalizeTypes(properties, Collections.singletonList(configDesc));
+        return ConfigUtil.normalizeTypes(properties, List.of(configDesc));
     }
 
     private @Nullable String getConfigId(String bindingId) {
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
index ca208913b0..9af62bc246 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
@@ -250,7 +250,7 @@ public class ConfigurableServiceResource implements RESTResource {
             return properties;
         }
 
-        return ConfigUtil.normalizeTypes(properties, Collections.singletonList(configDesc));
+        return ConfigUtil.normalizeTypes(properties, List.of(configDesc));
     }
 
     @DELETE
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
index b960392328..07b30d636e 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 
 import java.net.URI;
-import java.util.Arrays;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.openhab.core.config.core.ConfigDescription;
@@ -89,6 +89,6 @@ public class EnrichedConfigDescriptionDTOMapperTest {
         EnrichedConfigDescriptionParameterDTO ecdpdto = (EnrichedConfigDescriptionParameterDTO) cdpdto;
         assertThat(ecdpdto.defaultValues, is(notNullValue()));
         assertThat(ecdpdto.defaultValues, hasSize(3));
-        assertThat(ecdpdto.defaultValues, is(equalTo(Arrays.asList("first value", "second value", "third value"))));
+        assertThat(ecdpdto.defaultValues, is(equalTo(List.of("first value", "second value", "third value"))));
     }
 }
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
index a484a28ad3..65cc36d04e 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
@@ -17,8 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -74,10 +73,10 @@ public class ChannelTypeResourceTest {
         when(channelTypeRegistry.getChannelType(uid)).thenReturn(channelType);
 
         TriggerProfileType profileType = mock(TriggerProfileType.class);
-        when(profileType.getSupportedChannelTypeUIDs()).thenReturn(Collections.singletonList(uid));
-        when(profileType.getSupportedItemTypes()).thenReturn(Arrays.asList("Switch", "Dimmer"));
+        when(profileType.getSupportedChannelTypeUIDs()).thenReturn(List.of(uid));
+        when(profileType.getSupportedItemTypes()).thenReturn(List.of("Switch", "Dimmer"));
 
-        when(profileTypeRegistry.getProfileTypes()).thenReturn(Collections.singletonList(profileType));
+        when(profileTypeRegistry.getProfileTypes()).thenReturn(List.of(profileType));
 
         Response response = channelTypeResource.getLinkableItemTypes(uid.getAsString());
 
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
index e1e5906ed9..8382dacc0b 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
@@ -13,7 +13,6 @@
 package org.openhab.core.io.rest.sitemap;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -342,7 +341,7 @@ public class SitemapSubscriptionService implements ModelRepositoryChangeListener
 
     @Override
     public Set<String> getSubscribedEventTypes() {
-        return Collections.singleton(ItemStatePredictedEvent.TYPE);
+        return Set.of(ItemStatePredictedEvent.TYPE);
     }
 
     @Override
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/JerseyResponseBuilderUtils.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/JerseyResponseBuilderUtils.java
index 431ef5d836..00335852d0 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/JerseyResponseBuilderUtils.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/JerseyResponseBuilderUtils.java
@@ -13,7 +13,6 @@
 package org.openhab.core.io.rest.sitemap.internal;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +57,7 @@ public class JerseyResponseBuilderUtils extends DTO {
         jrbDTO.status = "CREATED";
         jrbDTO.context = new ContextDTO();
         jrbDTO.context.headers = new HashMap<>();
-        jrbDTO.context.headers.put("Location", Arrays.asList(location));
+        jrbDTO.context.headers.put("Location", List.of(location));
         jrbDTO.context.committingOutputStream = new StreamInfoDTO();
         jrbDTO.context.committingOutputStream.bufferSize = 0;
         jrbDTO.context.committingOutputStream.directWrite = true;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
index bc49d16303..647f3f9d35 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
@@ -20,9 +20,9 @@ import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.HttpHeaders;
@@ -163,7 +163,7 @@ public class SitemapResourceTest extends JavaTest {
         }).start();
 
         // non-null is sufficient here.
-        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(Collections.emptyList());
+        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(List.of());
 
         Response response = sitemapResource.getPageData(headers, null, SITEMAP_MODEL_NAME, SITEMAP_NAME, null, false);
 
@@ -184,7 +184,7 @@ public class SitemapResourceTest extends JavaTest {
         }).start();
 
         // non-null is sufficient here.
-        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(Collections.emptyList());
+        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(List.of());
 
         Response response = sitemapResource.getPageData(headers, null, SITEMAP_MODEL_NAME, SITEMAP_NAME, null, false);
 
@@ -205,7 +205,7 @@ public class SitemapResourceTest extends JavaTest {
         }).start();
 
         // non-null is sufficient here.
-        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(Collections.emptyList());
+        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(List.of());
 
         Response response = sitemapResource.getPageData(headers, null, SITEMAP_MODEL_NAME, SITEMAP_NAME, null, false);
 
@@ -226,7 +226,7 @@ public class SitemapResourceTest extends JavaTest {
         }).start();
 
         // non-null is sufficient here.
-        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(Collections.emptyList());
+        when(headers.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(List.of());
 
         Response response = sitemapResource.getPageData(headers, null, SITEMAP_MODEL_NAME, SITEMAP_NAME, null, false);
 
@@ -358,7 +358,7 @@ public class SitemapResourceTest extends JavaTest {
     }
 
     private void configureSitemapProviderMock() {
-        when(sitemapProvider.getSitemapNames()).thenReturn(Collections.singleton(SITEMAP_MODEL_NAME));
+        when(sitemapProvider.getSitemapNames()).thenReturn(Set.of(SITEMAP_MODEL_NAME));
         when(sitemapProvider.getSitemap(SITEMAP_MODEL_NAME)).thenReturn(defaultSitemap);
     }
 
@@ -370,12 +370,12 @@ public class SitemapResourceTest extends JavaTest {
 
         @Override
         public List<Class<? extends State>> getAcceptedDataTypes() {
-            return Collections.emptyList();
+            return List.of();
         }
 
         @Override
         public List<Class<? extends Command>> getAcceptedCommandTypes() {
-            return Collections.emptyList();
+            return List.of();
         }
     }
 }
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
index 4da989527c..c47523be82 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.rest.sse.internal.listeners;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -36,7 +35,7 @@ import org.osgi.service.component.annotations.Reference;
 @NonNullByDefault
 public class SseEventSubscriber implements EventSubscriber {
 
-    private final Set<String> subscribedEventTypes = Collections.singleton(EventSubscriber.ALL_EVENT_TYPES);
+    private final Set<String> subscribedEventTypes = Set.of(EventSubscriber.ALL_EVENT_TYPES);
 
     private final SsePublisher ssePublisher;
 
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
index ab306e8df7..5ea69b5780 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
@@ -13,7 +13,6 @@
 package org.openhab.core.io.rest.internal.filter;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -71,8 +70,8 @@ public class CorsFilter implements ContainerResponseFilter {
     static final String VARY_HEADER_WILDCARD = "*";
     static final String HEADERS_SEPARATOR = ",";
 
-    static final List<String> ACCEPTED_HTTP_METHODS_LIST = Arrays.asList(HTTP_GET_METHOD, HTTP_POST_METHOD,
-            HTTP_PUT_METHOD, HTTP_DELETE_METHOD, HTTP_HEAD_METHOD, HTTP_OPTIONS_METHOD);
+    static final List<String> ACCEPTED_HTTP_METHODS_LIST = List.of(HTTP_GET_METHOD, HTTP_POST_METHOD, HTTP_PUT_METHOD,
+            HTTP_DELETE_METHOD, HTTP_HEAD_METHOD, HTTP_OPTIONS_METHOD);
 
     static final String ACCEPTED_HTTP_METHODS = ACCEPTED_HTTP_METHODS_LIST.stream()
             .collect(Collectors.joining(HEADERS_SEPARATOR));
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
index 3690ba93a6..61464c245a 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
@@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
@@ -56,7 +55,7 @@ public class Stream2JSONInputStreamTest {
     @Test
     public void shouldStreamSingleObjectToJSON() throws Exception {
         DummyObject dummyObject = new DummyObject("demoKey", "demoValue");
-        List<DummyObject> dummyList = Arrays.asList(dummyObject);
+        List<DummyObject> dummyList = List.of(dummyObject);
         collection2InputStream = new Stream2JSONInputStream(Stream.of(dummyObject));
 
         assertThat(inputStreamToString(collection2InputStream), is(GSON.toJson(dummyList)));
@@ -66,7 +65,7 @@ public class Stream2JSONInputStreamTest {
     public void shouldStreamCollectionStreamToJSON() throws Exception {
         DummyObject dummyObject1 = new DummyObject("demoKey1", "demoValue1");
         DummyObject dummyObject2 = new DummyObject("demoKey2", "demoValue2");
-        List<DummyObject> dummyCollection = Arrays.asList(dummyObject1, dummyObject2);
+        List<DummyObject> dummyCollection = List.of(dummyObject1, dummyObject2);
         collection2InputStream = new Stream2JSONInputStream(dummyCollection.stream());
 
         assertThat(inputStreamToString(collection2InputStream), is(GSON.toJson(dummyCollection)));
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
index cee43aee41..3fdeae600e 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
@@ -12,13 +12,14 @@
  */
 package org.openhab.core.io.rest.internal.filter;
 
-import static java.util.Collections.*;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
 import static org.openhab.core.io.rest.internal.filter.CorsFilter.*;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import javax.ws.rs.container.ContainerRequestContext;
@@ -62,7 +63,7 @@ public class CorsFilterTest {
     @BeforeEach
     public void setUp() {
         filter = new CorsFilter();
-        filter.activate(singletonMap("enable", "true"));
+        filter.activate(Map.of("enable", "true"));
     }
 
     @Test
@@ -163,13 +164,13 @@ public class CorsFilterTest {
             String requestHeadersValue) {
         MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
         if (originValue != null) {
-            headers.put(ORIGIN_HEADER, singletonList(originValue));
+            headers.put(ORIGIN_HEADER, List.of(originValue));
         }
         if (requestMethodValue != null) {
-            headers.put(ACCESS_CONTROL_REQUEST_METHOD, singletonList(requestMethodValue));
+            headers.put(ACCESS_CONTROL_REQUEST_METHOD, List.of(requestMethodValue));
         }
         if (requestHeadersValue != null) {
-            headers.put(ACCESS_CONTROL_REQUEST_HEADERS, singletonList(requestHeadersValue));
+            headers.put(ACCESS_CONTROL_REQUEST_HEADERS, List.of(requestHeadersValue));
         }
 
         when(requestContext.getHeaders()).thenReturn(headers);
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
index 1acea42e8a..0df789361f 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
@@ -18,7 +18,7 @@ import static org.openhab.core.io.rest.internal.filter.ProxyFilter.*;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.List;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.MultivaluedHashMap;
@@ -169,10 +169,10 @@ public class ProxyFilterTest {
     private void setupContextHeaders(String protoHeader, String hostHeader) {
         MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
         if (protoHeader != null) {
-            headers.put(PROTO_PROXY_HEADER, Collections.singletonList(protoHeader));
+            headers.put(PROTO_PROXY_HEADER, List.of(protoHeader));
         }
         if (hostHeader != null) {
-            headers.put(HOST_PROXY_HEADER, Collections.singletonList(hostHeader));
+            headers.put(HOST_PROXY_HEADER, List.of(hostHeader));
         }
         when(context.getHeaders()).thenReturn(headers);
     }
diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
index 4c6d373770..5933914ab8 100644
--- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
+++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
@@ -273,7 +273,7 @@ public class FeatureInstaller implements ConfigurationListener {
                 Object repos = properties.get(PROPERTY_MVN_REPOS);
                 List<String> repoCfg;
                 if (repos instanceof String) {
-                    repoCfg = Arrays.asList(((String) repos).split(","));
+                    repoCfg = List.of(((String) repos).split(","));
                     return repoCfg.contains(onlineRepoUrl);
                 }
             } catch (IOException e) {
diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonService.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonService.java
index fefbbb0656..69c0b4064f 100644
--- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonService.java
+++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonService.java
@@ -14,7 +14,6 @@ package org.openhab.core.karaf.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -70,7 +69,7 @@ public class KarafAddonService implements AddonService {
         try {
             for (Feature feature : featuresService.listFeatures()) {
                 if (feature.getName().startsWith(FeatureInstaller.PREFIX)
-                        && Arrays.asList(FeatureInstaller.EXTENSION_TYPES).contains(getType(feature.getName()))) {
+                        && List.of(FeatureInstaller.EXTENSION_TYPES).contains(getType(feature.getName()))) {
                     Addon addon = getAddon(feature);
                     // for simple packaging, we filter out all openHAB 1 add-ons as they cannot be used through the UI
                     if (!FeatureInstaller.SIMPLE_PACKAGE.equals(featureInstaller.getCurrentPackage())
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
index 40afefa0e9..37d931f651 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
@@ -18,7 +18,6 @@ import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -59,7 +58,7 @@ public class ModelRepositoryImpl implements ModelRepository {
 
     private final Logger logger = LoggerFactory.getLogger(ModelRepositoryImpl.class);
     private final ResourceSet resourceSet;
-    private final Map<String, String> resourceOptions = Collections.singletonMap(XtextResource.OPTION_ENCODING,
+    private final Map<String, String> resourceOptions = Map.of(XtextResource.OPTION_ENCODING,
             StandardCharsets.UTF_8.name());
 
     private final List<ModelRepositoryChangeListener> listeners = new CopyOnWriteArrayList<>();
diff --git a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
index 94b7d58fc4..aba8124634 100644
--- a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
+++ b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
@@ -16,8 +16,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.util.URI;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,7 +35,7 @@ public class MappingUriExtensionsTest {
     private File confFolder;
 
     private static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] { //
+        return List.of(new Object[][] { //
                 { "conf", //
                         "file:///q:/conf", //
                         "file:///q:/conf", //
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/DSLRuleProvider.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/DSLRuleProvider.java
index 02c31cbc7a..5001382e11 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/DSLRuleProvider.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/DSLRuleProvider.java
@@ -14,7 +14,6 @@ package org.openhab.core.model.rule.runtime.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -257,8 +256,8 @@ public class DSLRuleProvider
         Configuration cfg = new Configuration();
         cfg.put("script", context + removeIndentation(script));
         cfg.put("type", MIMETYPE_OPENHAB_DSL_RULE);
-        List<Action> actions = Collections.singletonList(ActionBuilder.create().withId("script")
-                .withTypeUID("script.ScriptAction").withConfiguration(cfg).build());
+        List<Action> actions = List.of(ActionBuilder.create().withId("script").withTypeUID("script.ScriptAction")
+                .withConfiguration(cfg).build());
 
         return RuleBuilder.create(uid).withName(name).withTriggers(triggers).withActions(actions).build();
     }
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java
index 82d7a7600c..06459a197d 100644
--- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java
+++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java
@@ -13,7 +13,6 @@
 package org.openhab.core.model.script.runtime.internal.engine;
 
 import java.io.Reader;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -210,7 +209,7 @@ public class DSLScriptEngine implements javax.script.ScriptEngine {
 
             @Override
             public List<String> getMimeTypes() {
-                return Collections.singletonList(MIMETYPE_OPENHAB_DSL_RULE);
+                return List.of(MIMETYPE_OPENHAB_DSL_RULE);
             }
 
             @Override
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
index e2d3f2a06c..2b034ddf74 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
@@ -13,7 +13,6 @@
 package org.openhab.core.model.script.extension;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -68,7 +67,7 @@ public class ScriptEngineConsoleCommandExtension extends AbstractConsoleCommandE
 
     @Override
     public List<String> getUsages() {
-        return Collections.singletonList(buildCommandUsage("<script to execute>", "Executes a script"));
+        return List.of(buildCommandUsage("<script to execute>", "Executes a script"));
     }
 
     @Reference(policy = ReferencePolicy.DYNAMIC)
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
index 13e559ea35..0edf2667ff 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
@@ -420,8 +420,8 @@ public class PersistenceManagerImpl implements ItemRegistryChangeListener, Persi
 
     private @Nullable PersistenceServiceConfiguration getDefaultConfig(PersistenceService persistenceService) {
         List<PersistenceStrategy> strategies = persistenceService.getDefaultStrategies();
-        List<PersistenceItemConfiguration> configs = Collections.singletonList(new PersistenceItemConfiguration(
-                Collections.singletonList(new PersistenceAllConfig()), null, strategies, null));
+        List<PersistenceItemConfiguration> configs = List
+                .of(new PersistenceItemConfiguration(List.of(new PersistenceAllConfig()), null, strategies, null));
         return new PersistenceServiceConfiguration(configs, strategies, strategies);
     }
 
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
index 61a8901fca..8754dae659 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.semantics;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -87,9 +85,9 @@ public class SemanticTags {
                 Control.getNoFallbackControl(Control.FORMAT_PROPERTIES));
         try {
             String entry = rb.getString(tag.getAnnotation(TagInfo.class).id());
-            return Arrays.asList(entry.toLowerCase(locale).split(","));
+            return List.of(entry.toLowerCase(locale).split(","));
         } catch (MissingResourceException e) {
-            return Collections.singletonList(tag.getAnnotation(TagInfo.class).label());
+            return List.of(tag.getAnnotation(TagInfo.class).label());
         }
     }
 
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
index fb0505e941..bf5c11a84e 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.semantics.internal;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -220,15 +219,15 @@ public class SemanticsMetadataProvider extends AbstractProvider<Metadata>
     }
 
     private void initRelations() {
-        parentRelations.put(Arrays.asList(Equipment.class, Location.class), "hasLocation");
-        parentRelations.put(Arrays.asList(Point.class, Location.class), "hasLocation");
-        parentRelations.put(Arrays.asList(Location.class, Location.class), "isPartOf");
-        parentRelations.put(Arrays.asList(Equipment.class, Equipment.class), "isPartOf");
-        parentRelations.put(Arrays.asList(Point.class, Equipment.class), "isPointOf");
+        parentRelations.put(List.of(Equipment.class, Location.class), "hasLocation");
+        parentRelations.put(List.of(Point.class, Location.class), "hasLocation");
+        parentRelations.put(List.of(Location.class, Location.class), "isPartOf");
+        parentRelations.put(List.of(Equipment.class, Equipment.class), "isPartOf");
+        parentRelations.put(List.of(Point.class, Equipment.class), "isPointOf");
 
-        memberRelations.put(Arrays.asList(Equipment.class, Point.class), "hasPoint");
+        memberRelations.put(List.of(Equipment.class, Point.class), "hasPoint");
 
-        propertyRelations.put(Arrays.asList(Point.class), "relatesTo");
+        propertyRelations.put(List.of(Point.class), "relatesTo");
     }
 
     @Override
diff --git a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
index 887a45e40d..609a7c1091 100644
--- a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
+++ b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -144,7 +143,7 @@ public class JsonStorageTest extends JavaTest {
             configuration.put("testBigDecimal", new BigDecimal(12));
             configuration.put("testBoolean", true);
             configuration.put("testString", "hello world");
-            configuration.put("multiInt", Arrays.asList(1, 2, 3));
+            configuration.put("multiInt", List.of(1, 2, 3));
 
             InnerObject inner = new InnerObject();
             inner.configuration.put("testChildLong", Long.valueOf("12"));
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
index fffc61767d..d63d0b347e 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
@@ -13,7 +13,7 @@
 package org.openhab.core.magic.binding.handler;
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.magic.binding.internal.automation.modules.MagicThingActionsService;
@@ -57,6 +57,6 @@ public class MagicActionModuleThingHandler extends BaseThingHandler {
 
     @Override
     public Collection<Class<? extends ThingHandlerService>> getServices() {
-        return Collections.singletonList(MagicThingActionsService.class);
+        return List.of(MagicThingActionsService.class);
     }
 }
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
index c3ba1f08cc..732f2c8065 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
@@ -18,8 +18,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -49,8 +47,8 @@ public class MagicChattyThingHandler extends BaseThingHandler {
     private static final String PARAM_INTERVAL = "interval";
     private static final int START_DELAY = 3;
 
-    private static final List<String> RANDOM_TEXTS = Stream
-            .of("OPEN", "CLOSED", "ON", "OFF", "Hello", "This is a sentence").collect(Collectors.toList());
+    private static final List<String> RANDOM_TEXTS = List.of("OPEN", "CLOSED", "ON", "OFF", "Hello",
+            "This is a sentence");
 
     private final Set<ChannelUID> numberChannelUIDs = new HashSet<>();
     private final Set<ChannelUID> textChannelUIDs = new HashSet<>();
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
index e0e6e846fa..0d36aeb70a 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
@@ -14,7 +14,7 @@ package org.openhab.core.magic.binding.handler;
 
 import static org.openhab.core.magic.binding.MagicBindingConstants.*;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.magic.binding.internal.MagicDynamicStateDescriptionProvider;
@@ -51,15 +51,15 @@ public class MagicDynamicStateDescriptionThingHandler extends BaseThingHandler {
     public void initialize() {
         ChannelUID systemCommandChannelUID = new ChannelUID(getThing().getUID(), CHANNEL_SYSTEM_COMMAND);
         stateDescriptionProvider.setStateOptions(systemCommandChannelUID,
-                Arrays.asList(new StateOption(SYSTEM_COMMAND_HIBERNATE, SYSTEM_COMMAND_HIBERNATE),
+                List.of(new StateOption(SYSTEM_COMMAND_HIBERNATE, SYSTEM_COMMAND_HIBERNATE),
                         new StateOption(SYSTEM_COMMAND_REBOOT, SYSTEM_COMMAND_REBOOT),
                         new StateOption(SYSTEM_COMMAND_SHUTDOWN, SYSTEM_COMMAND_SHUTDOWN),
                         new StateOption(SYSTEM_COMMAND_SUSPEND, SYSTEM_COMMAND_SUSPEND),
                         new StateOption(SYSTEM_COMMAND_QUIT, SYSTEM_COMMAND_QUIT)));
 
         ChannelUID signalStrengthChannelUID = new ChannelUID(getThing().getUID(), CHANNEL_SIGNAL_STRENGTH);
-        stateDescriptionProvider.setStateOptions(signalStrengthChannelUID, Arrays.asList(
-                new StateOption("1", "Unusable"), new StateOption("2", "Okay"), new StateOption("3", "Amazing")));
+        stateDescriptionProvider.setStateOptions(signalStrengthChannelUID, List.of(new StateOption("1", "Unusable"),
+                new StateOption("2", "Okay"), new StateOption("3", "Amazing")));
 
         updateStatus(ThingStatus.ONLINE);
     }
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
index 015abbd975..75dda4eb16 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
@@ -14,7 +14,7 @@ package org.openhab.core.magic.binding.internal;
 
 import static org.openhab.core.magic.binding.MagicBindingConstants.THING_TYPE_CONFIG_THING;
 
-import java.util.Collections;
+import java.util.Set;
 import java.util.UUID;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -36,7 +36,7 @@ import org.osgi.service.component.annotations.Component;
 public class MagicDiscoveryService extends AbstractDiscoveryService {
 
     public MagicDiscoveryService() throws IllegalArgumentException {
-        super(Collections.singleton(THING_TYPE_CONFIG_THING), 0);
+        super(Set.of(THING_TYPE_CONFIG_THING), 0);
     }
 
     @Override
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
index afeed90f7c..51e6314b83 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
@@ -14,10 +14,7 @@ package org.openhab.core.magic.binding.internal;
 
 import static org.openhab.core.magic.binding.MagicBindingConstants.*;
 
-import java.util.Collections;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -59,13 +56,12 @@ import org.osgi.service.component.annotations.Reference;
 @NonNullByDefault
 public class MagicHandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections
-            .unmodifiableSet(Stream.of(THING_TYPE_EXTENSIBLE_THING, THING_TYPE_ON_OFF_LIGHT, THING_TYPE_DIMMABLE_LIGHT,
-                    THING_TYPE_COLOR_LIGHT, THING_TYPE_CONTACT_SENSOR, THING_TYPE_CONFIG_THING,
-                    THING_TYPE_DELAYED_THING, THING_TYPE_LOCATION, THING_TYPE_THERMOSTAT, THING_TYPE_FIRMWARE_UPDATE,
-                    THING_TYPE_BRIDGE_1, THING_TYPE_BRIDGE_2, THING_TYPE_BRIDGED_THING, THING_TYPE_CHATTY_THING,
-                    THING_TYPE_ROLLERSHUTTER, THING_TYPE_PLAYER, THING_TYPE_IMAGE, THING_TYPE_ACTION_MODULE,
-                    THING_TYPE_DYNAMIC_STATE_DESCRIPTION, THING_TYPE_ONLINE_OFFLINE).collect(Collectors.toSet()));
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_EXTENSIBLE_THING,
+            THING_TYPE_ON_OFF_LIGHT, THING_TYPE_DIMMABLE_LIGHT, THING_TYPE_COLOR_LIGHT, THING_TYPE_CONTACT_SENSOR,
+            THING_TYPE_CONFIG_THING, THING_TYPE_DELAYED_THING, THING_TYPE_LOCATION, THING_TYPE_THERMOSTAT,
+            THING_TYPE_FIRMWARE_UPDATE, THING_TYPE_BRIDGE_1, THING_TYPE_BRIDGE_2, THING_TYPE_BRIDGED_THING,
+            THING_TYPE_CHATTY_THING, THING_TYPE_ROLLERSHUTTER, THING_TYPE_PLAYER, THING_TYPE_IMAGE,
+            THING_TYPE_ACTION_MODULE, THING_TYPE_DYNAMIC_STATE_DESCRIPTION, THING_TYPE_ONLINE_OFFLINE);
 
     private final MagicDynamicStateDescriptionProvider stateDescriptionProvider;
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
index 293131bc81..8c904592d2 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
@@ -14,8 +14,8 @@ package org.openhab.core.magic.binding.internal;
 
 import java.math.BigDecimal;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -56,7 +56,7 @@ public class MagicServiceImpl implements MagicService {
         }
 
         if (PARAMETER_BACKEND_DECIMAL.equals(param)) {
-            return Arrays.asList(new ParameterOption(BigDecimal.ONE.toPlainString(), "1"),
+            return List.of(new ParameterOption(BigDecimal.ONE.toPlainString(), "1"),
                     new ParameterOption(BigDecimal.TEN.toPlainString(), "10"),
                     new ParameterOption(BigDecimal.valueOf(21d).toPlainString(), "21"));
         }
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
index 003bbbaa1e..dde847c57a 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
@@ -31,8 +31,6 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 
 import org.openhab.core.service.ReadyMarker;
@@ -72,8 +70,7 @@ public class SyntheticBundleInstaller {
     /**
      * A list of default extensions to be included in the synthetic bundle.
      */
-    private static final Set<String> DEFAULT_EXTENSIONS = Collections
-            .unmodifiableSet(Stream.of("*.xml", "*.properties", "*.json", ".keep").collect(Collectors.toSet()));
+    private static final Set<String> DEFAULT_EXTENSIONS = Set.of("*.xml", "*.properties", "*.json", ".keep");
 
     /**
      * Install synthetic bundle, denoted by its name, into the test runtime (by using the given bundle context). Only
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
index e4fb2877d4..b2639921a1 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.thing;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -70,7 +68,7 @@ public class Channel {
     Channel() {
         this.kind = ChannelKind.STATE;
         this.configuration = new Configuration();
-        this.properties = Collections.unmodifiableMap(new HashMap<>(0));
+        this.properties = Map.of();
     }
 
     /**
@@ -82,7 +80,7 @@ public class Channel {
         this.acceptedItemType = acceptedItemType;
         this.kind = ChannelKind.STATE;
         this.configuration = new Configuration();
-        this.properties = Collections.unmodifiableMap(new HashMap<>(0));
+        this.properties = Map.of();
     }
 
     /**
@@ -125,17 +123,9 @@ public class Channel {
         this.label = label;
         this.description = description;
         this.autoUpdatePolicy = autoUpdatePolicy;
-        this.defaultTags = Collections.<String> unmodifiableSet(new HashSet<>(defaultTags));
-        if (configuration == null) {
-            this.configuration = new Configuration();
-        } else {
-            this.configuration = configuration;
-        }
-        if (properties == null) {
-            this.properties = Collections.unmodifiableMap(new HashMap<>(0));
-        } else {
-            this.properties = properties;
-        }
+        this.defaultTags = Set.copyOf(defaultTags);
+        this.configuration = configuration == null ? new Configuration() : configuration;
+        this.properties = properties == null ? Map.of() : properties;
     }
 
     /**
@@ -211,7 +201,7 @@ public class Channel {
      */
     public Map<String, String> getProperties() {
         synchronized (this) {
-            return Collections.unmodifiableMap(new HashMap<>(properties));
+            return Map.copyOf(properties);
         }
     }
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
index 34152a60c1..422bb2249a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
@@ -16,13 +16,10 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -280,13 +277,12 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
                     StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.3f %unit%").build())
             .build();
 
-    private static final Collection<ChannelType> CHANNEL_TYPES = Collections
-            .unmodifiableList(Stream.of(SYSTEM_CHANNEL_SIGNAL_STRENGTH, SYSTEM_CHANNEL_LOW_BATTERY,
-                    SYSTEM_CHANNEL_BATTERY_LEVEL, SYSTEM_TRIGGER, SYSTEM_RAWBUTTON, SYSTEM_BUTTON, SYSTEM_RAWROCKER,
-                    SYSTEM_POWER, SYSTEM_LOCATION, SYSTEM_MOTION, SYSTEM_BRIGHTNESS, SYSTEM_COLOR,
-                    SYSTEM_COLOR_TEMPERATURE, SYSTEM_VOLUME, SYSTEM_MUTE, SYSTEM_MEDIA_CONTROL, SYSTEM_MEDIA_TITLE,
-                    SYSTEM_MEDIA_ARTIST, SYSTEM_WIND_DIRECTION, SYSTEM_WIND_SPEED, SYSTEM_OUTDOOR_TEMPERATURE,
-                    SYSTEM_ATMOSPHERIC_HUMIDITY, SYSTEM_BAROMETRIC_PRESSURE).collect(Collectors.toList()));
+    private static final Collection<ChannelType> CHANNEL_TYPES = List.of(SYSTEM_CHANNEL_SIGNAL_STRENGTH,
+            SYSTEM_CHANNEL_LOW_BATTERY, SYSTEM_CHANNEL_BATTERY_LEVEL, SYSTEM_TRIGGER, SYSTEM_RAWBUTTON, SYSTEM_BUTTON,
+            SYSTEM_RAWROCKER, SYSTEM_POWER, SYSTEM_LOCATION, SYSTEM_MOTION, SYSTEM_BRIGHTNESS, SYSTEM_COLOR,
+            SYSTEM_COLOR_TEMPERATURE, SYSTEM_VOLUME, SYSTEM_MUTE, SYSTEM_MEDIA_CONTROL, SYSTEM_MEDIA_TITLE,
+            SYSTEM_MEDIA_ARTIST, SYSTEM_WIND_DIRECTION, SYSTEM_WIND_SPEED, SYSTEM_OUTDOOR_TEMPERATURE,
+            SYSTEM_ATMOSPHERIC_HUMIDITY, SYSTEM_BAROMETRIC_PRESSURE);
 
     private final Map<LocalizedKey, @Nullable ChannelType> localizedChannelTypeCache = new ConcurrentHashMap<>();
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
index 28010d90ff..7d79c9d40a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.thing.binding;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -510,7 +509,7 @@ public abstract class BaseThingHandler implements ThingHandler {
      * @param value the value of the property
      */
     protected void updateProperty(String name, String value) {
-        updateProperties(Collections.singletonMap(name, value));
+        updateProperties(Map.of(name, value));
     }
 
     /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
index 062f95d90d..d972bd5712 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
@@ -14,7 +14,6 @@ package org.openhab.core.thing.binding.builder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -72,7 +71,7 @@ public class ThingBuilder {
     }
 
     public ThingBuilder withChannel(Channel channel) {
-        validateChannelUIDs(Collections.singletonList(channel));
+        validateChannelUIDs(List.of(channel));
         ThingHelper.ensureUniqueChannels(channels, channel);
         channels.add(channel);
         return this;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
index b713d4d640..bf8b8e2931 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
@@ -12,9 +12,6 @@
  */
 package org.openhab.core.thing.internal;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -94,8 +91,8 @@ public class CommunicationManager implements EventSubscriber, RegistryChangeList
     // the timeout to use for any item event processing
     public static final long THINGHANDLER_EVENT_TIMEOUT = TimeUnit.SECONDS.toMillis(30);
 
-    private static final Set<String> SUBSCRIBED_EVENT_TYPES = Collections.unmodifiableSet(
-            new HashSet<>(Arrays.asList(ItemStateEvent.TYPE, ItemCommandEvent.TYPE, ChannelTriggeredEvent.TYPE)));
+    private static final Set<String> SUBSCRIBED_EVENT_TYPES = Set.of(ItemStateEvent.TYPE, ItemCommandEvent.TYPE,
+            ChannelTriggeredEvent.TYPE);
 
     private final Logger logger = LoggerFactory.getLogger(CommunicationManager.class);
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
index ba3ec0f3e1..3b65cd6967 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
@@ -163,7 +163,7 @@ public class ThingConsoleCommandExtension extends AbstractConsoleCommandExtensio
 
     @Override
     public List<String> getUsages() {
-        return Arrays.asList(new String[] { buildCommandUsage(SUBCMD_LIST, "lists all things"),
+        return List.of(buildCommandUsage(SUBCMD_LIST, "lists all things"),
                 buildCommandUsage(SUBCMD_SHOW + " <thingUID>*",
                         "show details about one or more things; show details for all things if no thingUID provided"),
                 buildCommandUsage(SUBCMD_CLEAR, "removes all managed things"),
@@ -171,7 +171,7 @@ public class ThingConsoleCommandExtension extends AbstractConsoleCommandExtensio
                 buildCommandUsage(SUBCMD_TRIGGER + " <channelUID> [<event>]",
                         "triggers the <channelUID> with <event> (if given)"),
                 buildCommandUsage(SUBCMD_DISABLE + " <thingUID>", "disables a thing"),
-                buildCommandUsage(SUBCMD_ENABLE + " <thingUID>", "enables a thing") });
+                buildCommandUsage(SUBCMD_ENABLE + " <thingUID>", "enables a thing"));
     }
 
     private void printThings(Console console, Collection<Thing> things) {
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
index 005b53a3f7..63ad950799 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
@@ -17,7 +17,6 @@ import static org.openhab.core.thing.firmware.FirmwareStatusInfo.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -28,8 +27,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -77,9 +74,8 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public final class FirmwareUpdateServiceImpl implements FirmwareUpdateService, EventSubscriber {
     private static final String THREAD_POOL_NAME = FirmwareUpdateServiceImpl.class.getSimpleName();
-    private static final Set<String> SUPPORTED_TIME_UNITS = Collections.unmodifiableSet(
-            Stream.of(TimeUnit.SECONDS.name(), TimeUnit.MINUTES.name(), TimeUnit.HOURS.name(), TimeUnit.DAYS.name())
-                    .collect(Collectors.toSet()));
+    private static final Set<String> SUPPORTED_TIME_UNITS = Set.of(TimeUnit.SECONDS.name(), TimeUnit.MINUTES.name(),
+            TimeUnit.HOURS.name(), TimeUnit.DAYS.name());
     protected static final String PERIOD_CONFIG_KEY = "period";
     protected static final String DELAY_CONFIG_KEY = "delay";
     protected static final String TIME_UNIT_CONFIG_KEY = "timeUnit";
@@ -95,7 +91,7 @@ public final class FirmwareUpdateServiceImpl implements FirmwareUpdateService, E
 
     protected int timeout = 30 * 60 * 1000;
 
-    private final Set<String> subscribedEventTypes = Collections.singleton(ThingStatusInfoChangedEvent.TYPE);
+    private final Set<String> subscribedEventTypes = Set.of(ThingStatusInfoChangedEvent.TYPE);
 
     private final Map<ThingUID, FirmwareStatusInfo> firmwareStatusInfoMap = new ConcurrentHashMap<>();
     private final Map<ThingUID, ProgressCallbackImpl> progressCallbackMap = new ConcurrentHashMap<>();
@@ -430,9 +426,9 @@ public final class FirmwareUpdateServiceImpl implements FirmwareUpdateService, E
     private boolean isValid(Map<String, Object> config) {
         // the config description validator does not support option value validation at the moment; so we will validate
         // the time unit here
-        if (!SUPPORTED_TIME_UNITS.contains(config.get(TIME_UNIT_CONFIG_KEY))) {
-            logger.debug("Given time unit {} is not supported. Will keep current configuration.",
-                    config.get(TIME_UNIT_CONFIG_KEY));
+        Object timeUnit = config.get(TIME_UNIT_CONFIG_KEY);
+        if (timeUnit == null || !SUPPORTED_TIME_UNITS.contains(timeUnit)) {
+            logger.debug("Given time unit {} is not supported. Will keep current configuration.", timeUnit);
             return false;
         }
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
index 670e5690f6..c0c67164a5 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -64,20 +63,16 @@ public class SystemProfileFactory implements ProfileFactory, ProfileAdvisor, Pro
 
     private final ChannelTypeRegistry channelTypeRegistry;
 
-    private static final Set<ProfileType> SUPPORTED_PROFILE_TYPES = Collections
-            .unmodifiableSet(Stream
-                    .of(DEFAULT_TYPE, FOLLOW_TYPE, OFFSET_TYPE, RAWBUTTON_ON_OFF_SWITCH_TYPE,
-                            RAWBUTTON_TOGGLE_PLAYER_TYPE, RAWBUTTON_TOGGLE_PLAYER_TYPE, RAWBUTTON_TOGGLE_SWITCH_TYPE,
-                            RAWROCKER_DIMMER_TYPE, RAWROCKER_NEXT_PREVIOUS_TYPE, RAWROCKER_ON_OFF_TYPE,
-                            RAWROCKER_PLAY_PAUSE_TYPE, RAWROCKER_REWIND_FASTFORWARD_TYPE, RAWROCKER_STOP_MOVE_TYPE,
-                            RAWROCKER_UP_DOWN_TYPE, TIMESTAMP_CHANGE_TYPE, TIMESTAMP_UPDATE_TYPE)
-                    .collect(Collectors.toSet()));
+    private static final Set<ProfileType> SUPPORTED_PROFILE_TYPES = Set.of(DEFAULT_TYPE, FOLLOW_TYPE, OFFSET_TYPE,
+            RAWBUTTON_ON_OFF_SWITCH_TYPE, RAWBUTTON_TOGGLE_PLAYER_TYPE, RAWBUTTON_TOGGLE_SWITCH_TYPE,
+            RAWROCKER_DIMMER_TYPE, RAWROCKER_NEXT_PREVIOUS_TYPE, RAWROCKER_ON_OFF_TYPE, RAWROCKER_PLAY_PAUSE_TYPE,
+            RAWROCKER_REWIND_FASTFORWARD_TYPE, RAWROCKER_STOP_MOVE_TYPE, RAWROCKER_UP_DOWN_TYPE, TIMESTAMP_CHANGE_TYPE,
+            TIMESTAMP_UPDATE_TYPE);
 
-    private static final Set<ProfileTypeUID> SUPPORTED_PROFILE_TYPE_UIDS = Collections
-            .unmodifiableSet(Stream.of(DEFAULT, FOLLOW, OFFSET, RAWBUTTON_ON_OFF_SWITCH, RAWBUTTON_TOGGLE_PLAYER,
-                    RAWBUTTON_TOGGLE_PLAYER, RAWBUTTON_TOGGLE_SWITCH, RAWROCKER_DIMMER, RAWROCKER_NEXT_PREVIOUS,
-                    RAWROCKER_ON_OFF, RAWROCKER_PLAY_PAUSE, RAWROCKER_REWIND_FASTFORWARD, RAWROCKER_STOP_MOVE,
-                    RAWROCKER_UP_DOWN, TIMESTAMP_CHANGE, TIMESTAMP_UPDATE).collect(Collectors.toSet()));
+    private static final Set<ProfileTypeUID> SUPPORTED_PROFILE_TYPE_UIDS = Set.of(DEFAULT, FOLLOW, OFFSET,
+            RAWBUTTON_ON_OFF_SWITCH, RAWBUTTON_TOGGLE_PLAYER, RAWBUTTON_TOGGLE_SWITCH, RAWROCKER_DIMMER,
+            RAWROCKER_NEXT_PREVIOUS, RAWROCKER_ON_OFF, RAWROCKER_PLAY_PAUSE, RAWROCKER_REWIND_FASTFORWARD,
+            RAWROCKER_STOP_MOVE, RAWROCKER_UP_DOWN, TIMESTAMP_CHANGE, TIMESTAMP_UPDATE);
 
     private final Map<LocalizedKey, ProfileType> localizedProfileTypeCache = new ConcurrentHashMap<>();
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
index 5a0ac5ed4c..b777341c24 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
@@ -13,8 +13,6 @@
 package org.openhab.core.thing.type;
 
 import java.net.URI;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.openhab.core.config.core.ConfigDescription;
@@ -146,9 +144,9 @@ public class ChannelType extends AbstractDescriptionType {
         this.configDescriptionURI = configDescriptionURI;
 
         if (tags != null) {
-            this.tags = Collections.unmodifiableSet(new HashSet<>(tags));
+            this.tags = Set.copyOf(tags);
         } else {
-            this.tags = Collections.unmodifiableSet(new HashSet<>(0));
+            this.tags = Set.of();
         }
 
         this.advanced = advanced;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
index d356f3ce2a..eece031b03 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
@@ -150,7 +150,7 @@ public class ThingHelper {
      * @throws IllegalArgumentException in case there are duplicate channels found
      */
     public static void ensureUniqueChannels(final Collection<Channel> channels, final Channel channel) {
-        ensureUniqueChannels(channels, Collections.singleton(channel));
+        ensureUniqueChannels(channels, Set.of(channel));
     }
 
     private static void ensureUniqueChannels(final Collection<Channel> channels1, final Collection<Channel> channels2) {
@@ -158,7 +158,7 @@ public class ThingHelper {
                 ensureUniqueChannels(channels2.iterator(), new HashSet<>(channels1.size() + channels2.size())));
     }
 
-    private static HashSet<UID> ensureUniqueChannels(final Iterator<Channel> channels, final HashSet<UID> ids) {
+    private static Set<UID> ensureUniqueChannels(final Iterator<Channel> channels, final Set<UID> ids) {
         while (channels.hasNext()) {
             final Channel channel = channels.next();
             if (!ids.add(channel.getUID())) {
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
index 6c2d926e76..aa4baefc6e 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
@@ -17,9 +17,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -43,13 +42,7 @@ public class ThingBuilderTest {
     private static final String KEY2 = "key2";
     private static final String VALUE1 = "value1";
     private static final String VALUE2 = "value2";
-    private final Map<String, String> properties = new HashMap<String, String>() {
-        private static final long serialVersionUID = 1L;
-        {
-            put(KEY1, VALUE1);
-            put(KEY2, VALUE2);
-        }
-    };
+    private final Map<String, String> properties = Map.of(KEY1, VALUE1, KEY2, VALUE2);
     private ThingBuilder thingBuilder;
 
     @BeforeEach
@@ -78,7 +71,7 @@ public class ThingBuilderTest {
 
     @Test
     public void testWithChannelsDuplicatesCollections() {
-        assertThrows(IllegalArgumentException.class, () -> thingBuilder.withChannels(Arrays.asList( //
+        assertThrows(IllegalArgumentException.class, () -> thingBuilder.withChannels(List.of( //
                 ChannelBuilder.create(new ChannelUID(THING_UID, "channel1")).build(), //
                 ChannelBuilder.create(new ChannelUID(THING_UID, "channel1")).build())));
     }
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ChannelDTOTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ChannelDTOTest.java
index e3a0404cde..d05d5f1161 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ChannelDTOTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ChannelDTOTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -42,15 +41,15 @@ public class ChannelDTOTest {
     private static final ThingUID THING_UID = new ThingUID(THING_TYPE_UID, "thing-id");
     private static final ChannelTypeUID CHANNEL_TYPE_UID = new ChannelTypeUID("binding-id", "channel-type-id");
     private static final ChannelUID CHANNEL_UID = new ChannelUID(THING_UID, "channel1");
-    private final Map<String, String> properties = Collections.singletonMap("key1", "value1");
-    private final Set<String> tags = Collections.singleton("tag1");
+    private final Map<String, String> properties = Map.of("key1", "value1");
+    private final Set<String> tags = Set.of("tag1");
 
     @Test
     public void testChannelDTOMappingIsBidirectional() {
         Channel subject = ChannelBuilder.create(CHANNEL_UID, CoreItemFactory.STRING).withType(CHANNEL_TYPE_UID)
                 .withLabel("Test").withDescription("My test channel")
-                .withConfiguration(new Configuration(Collections.singletonMap("param1", "value1")))
-                .withProperties(properties).withDefaultTags(tags).withAutoUpdatePolicy(AutoUpdatePolicy.VETO).build();
+                .withConfiguration(new Configuration(Map.of("param1", "value1"))).withProperties(properties)
+                .withDefaultTags(tags).withAutoUpdatePolicy(AutoUpdatePolicy.VETO).build();
         Channel result = ChannelDTOMapper.map(ChannelDTOMapper.map(subject));
         assertThat(result, is(instanceOf(Channel.class)));
         assertThat(result.getChannelTypeUID(), is(CHANNEL_TYPE_UID));
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ThingDTOTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ThingDTOTest.java
index ce8915f4f5..21aae1b0ea 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ThingDTOTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/dto/ThingDTOTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,7 +43,7 @@ public class ThingDTOTest {
 
     private static final ThingTypeUID THING_TYPE_UID = new ThingTypeUID("binding-id", "thing-type-id");
     private static final ThingUID THING_UID = new ThingUID(THING_TYPE_UID, "thing-id");
-    private final Map<String, String> properties = Collections.singletonMap("key1", "value1");
+    private final Map<String, String> properties = Map.of("key1", "value1");
 
     @Test
     public void testThingDTOMappingIsBidirectional() {
@@ -53,8 +52,8 @@ public class ThingDTOTest {
                 .withChannels(
                         ChannelBuilder.create(new ChannelUID(THING_UID, "channel1"), CoreItemFactory.STRING).build(),
                         ChannelBuilder.create(new ChannelUID(THING_UID, "channel2"), CoreItemFactory.STRING).build())
-                .withConfiguration(new Configuration(Collections.singletonMap("param1", "value1")))
-                .withProperties(properties).withLocation("Somewhere over the rainbow").build();
+                .withConfiguration(new Configuration(Map.of("param1", "value1"))).withProperties(properties)
+                .withLocation("Somewhere over the rainbow").build();
         Thing result = ThingDTOMapper.map(ThingDTOMapper.map(subject), false);
         assertThat(result, is(instanceOf(ThingImpl.class)));
         assertThat(result.getThingTypeUID(), is(THING_TYPE_UID));
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
index fc40fde683..3bcac7cf9f 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -96,7 +96,7 @@ public class FirmwareEventFactoryTest extends JavaTest {
     public void testSerializationAndDeserializationFirmwareUpdateProgressInfo() throws Exception {
         FirmwareUpdateProgressInfo firmwareUpdateProgressInfo = FirmwareUpdateProgressInfo
                 .createFirmwareUpdateProgressInfo(thingUID, "1.2.3", ProgressStep.UPDATING,
-                        Arrays.asList(ProgressStep.WAITING, ProgressStep.UPDATING), false, 10);
+                        List.of(ProgressStep.WAITING, ProgressStep.UPDATING), false, 10);
         FirmwareUpdateProgressInfoEvent progressInfoEvent = FirmwareEventFactory
                 .createFirmwareUpdateProgressInfoEvent(firmwareUpdateProgressInfo);
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
index f4974d8da0..d5ea6572c8 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
@@ -16,7 +16,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -333,7 +332,7 @@ public class AutoUpdateManagerTest {
 
     @Test
     public void testAutoUpdateDisabled() {
-        aum.modified(Collections.singletonMap(AutoUpdateManager.PROPERTY_ENABLED, "false"));
+        aum.modified(Map.of(AutoUpdateManager.PROPERTY_ENABLED, "false"));
 
         aum.receiveCommand(event, item);
 
@@ -343,7 +342,7 @@ public class AutoUpdateManagerTest {
     @Test
     public void testAutoUpdateSendOptimisticUpdates() {
         links.add(new ItemChannelLink("test", CHANNEL_UID_ONLINE_1));
-        aum.modified(Collections.singletonMap(AutoUpdateManager.PROPERTY_SEND_OPTIMISTIC_UPDATES, "true"));
+        aum.modified(Map.of(AutoUpdateManager.PROPERTY_SEND_OPTIMISTIC_UPDATES, "true"));
 
         aum.receiveCommand(event, item);
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
index 0904d68130..4c21deff07 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
@@ -12,15 +12,16 @@
  */
 package org.openhab.core.thing.internal;
 
+import static java.util.Map.entry;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -79,10 +80,7 @@ public class ChannelItemProviderTest {
     public void setup() {
         provider = createProvider();
 
-        Map<String, Object> props = new HashMap<>();
-        props.put("enabled", "true");
-        props.put("initialDelay", "false");
-        provider.activate(props);
+        provider.activate(Map.ofEntries(entry("enabled", "true"), entry("initialDelay", "false")));
 
         when(thingRegistryMock.getChannel(same(CHANNEL_UID))).thenReturn(CHANNEL);
         when(itemFactoryMock.createItem(CoreItemFactory.NUMBER, ITEM_NAME)).thenReturn(ITEM);
@@ -199,8 +197,8 @@ public class ChannelItemProviderTest {
             provider.itemRegistryListener.beforeAdding((Item) invocation.getArguments()[1]);
             return null;
         }).when(listenerMock).added(same(provider), any(Item.class));
-        when(linkRegistryMock.getBoundChannels(eq(ITEM_NAME))).thenReturn(Collections.singleton(CHANNEL_UID));
-        when(linkRegistryMock.getLinks(eq(CHANNEL_UID))).thenReturn(Collections.singleton(LINK));
+        when(linkRegistryMock.getBoundChannels(eq(ITEM_NAME))).thenReturn(Set.of(CHANNEL_UID));
+        when(linkRegistryMock.getLinks(eq(CHANNEL_UID))).thenReturn(Set.of(LINK));
     }
 
     private ChannelItemProvider createProvider() {
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
index b4b03ef64b..0c3e80ced7 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
@@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -44,7 +43,7 @@ public class ChannelTypeBuilderTest {
     private static final String CATEGORY = "category";
     private static final String LABEL = "label";
     private static final String TAG = "tag";
-    private static final List<String> TAGS = Arrays.asList("TAG1", "TAG2");
+    private static final List<String> TAGS = List.of("TAG1", "TAG2");
     private static URI configDescriptionUri;
     private static final ChannelTypeUID CHANNEL_TYPE_UID = new ChannelTypeUID("bindingId", "channelId");
     private static final StateDescriptionFragment STATE_DESCRIPTION_FRAGMENT = StateDescriptionFragmentBuilder.create()
@@ -52,7 +51,7 @@ public class ChannelTypeBuilderTest {
             .build();
     private static final StateDescription STATE_DESCRIPTION = STATE_DESCRIPTION_FRAGMENT.toStateDescription();
     private static final EventDescription EVENT_DESCRIPTION = new EventDescription(
-            Arrays.asList(new EventOption(CommonTriggerEvents.DIR1_PRESSED, null),
+            List.of(new EventOption(CommonTriggerEvents.DIR1_PRESSED, null),
                     new EventOption(CommonTriggerEvents.DIR1_RELEASED, null)));
 
     private StateChannelTypeBuilder stateBuilder;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
index 69a226ef2d..0121661959 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -178,9 +177,7 @@ public class ThingTypeBuilderTest {
 
     @Test
     public void withExtensibleChannelTypeIdsShouldSetUnmodifiableExtensibleChannelTypeIds() {
-        ThingType thingType = builder
-                .withExtensibleChannelTypeIds(Arrays.asList(new String[] { "channelTypeId1", "channelTypeId2" }))
-                .build();
+        ThingType thingType = builder.withExtensibleChannelTypeIds(List.of("channelTypeId1", "channelTypeId2")).build();
 
         assertThat(thingType.getExtensibleChannelTypeIds(), is(hasSize(2)));
         try {
@@ -193,8 +190,7 @@ public class ThingTypeBuilderTest {
 
     @Test
     public void withSupportedBridgeTypeUIDsShouldSetUnmodifiableSupportedBridgeTypeUIDs() {
-        ThingType thingType = builder.withSupportedBridgeTypeUIDs(Arrays.asList(new String[] { "bridgeTypeUID1" }))
-                .build();
+        ThingType thingType = builder.withSupportedBridgeTypeUIDs(List.of("bridgeTypeUID1")).build();
 
         assertThat(thingType.getSupportedBridgeTypeUIDs(), is(hasSize(1)));
         try {
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
index 1eceda674e..abc0092ca0 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
@@ -12,10 +12,10 @@
  */
 package org.openhab.core.thing.util;
 
-import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -90,8 +90,8 @@ public class ThingHelperTest {
 
         assertTrue(ThingHelper.equals(thingA, thingB));
 
-        ((ThingImpl) thingB).setChannels(singletonList(
-                ChannelBuilder.create(new ChannelUID("binding:type:thingId:channel3"), "itemType3").build()));
+        ((ThingImpl) thingB).setChannels(
+                List.of(ChannelBuilder.create(new ChannelUID("binding:type:thingId:channel3"), "itemType3").build()));
 
         assertFalse(ThingHelper.equals(thingA, thingB));
     }
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
index c288e066c9..eca40bb394 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
@@ -12,20 +12,17 @@
  */
 package org.openhab.core.ui.internal.chart;
 
+import static java.util.Map.entry;
+
 import java.awt.image.BufferedImage;
 import java.io.EOFException;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -89,15 +86,15 @@ public class ChartServlet extends SmartHomeServlet {
     // The URI of this servlet
     public static final String SERVLET_NAME = "/chart";
 
-    protected static final Map<String, Long> PERIODS = Collections.unmodifiableMap(Stream.of( //
-            new SimpleEntry<>("h", 3600000L), new SimpleEntry<>("4h", 14400000L), //
-            new SimpleEntry<>("8h", 28800000L), new SimpleEntry<>("12h", 43200000L), //
-            new SimpleEntry<>("D", 86400000L), new SimpleEntry<>("2D", 172800000L), //
-            new SimpleEntry<>("3D", 259200000L), new SimpleEntry<>("W", 604800000L), //
-            new SimpleEntry<>("2W", 1209600000L), new SimpleEntry<>("M", 2592000000L), //
-            new SimpleEntry<>("2M", 5184000000L), new SimpleEntry<>("4M", 10368000000L), //
-            new SimpleEntry<>("Y", 31536000000L)//
-    ).collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+    protected static final Map<String, Long> PERIODS = Map.ofEntries( //
+            entry("h", 3600000L), entry("4h", 14400000L), //
+            entry("8h", 28800000L), entry("12h", 43200000L), //
+            entry("D", 86400000L), entry("2D", 172800000L), //
+            entry("3D", 259200000L), entry("W", 604800000L), //
+            entry("2W", 1209600000L), entry("M", 2592000000L), //
+            entry("2M", 5184000000L), entry("4M", 10368000000L), //
+            entry("Y", 31536000000L)//
+    );
 
     protected static final Map<String, ChartProvider> CHART_PROVIDERS = new ConcurrentHashMap<>();
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
index d990f0b240..a3f9c4c267 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
@@ -63,9 +63,9 @@ public class VoiceConsoleCommandExtension extends AbstractConsoleCommandExtensio
 
     @Override
     public List<String> getUsages() {
-        return Arrays.asList(new String[] { buildCommandUsage(SUBCMD_SAY + " <text>", "speaks a text"),
+        return List.of(buildCommandUsage(SUBCMD_SAY + " <text>", "speaks a text"),
                 buildCommandUsage(SUBCMD_INTERPRET + " <command>", "interprets a human language command"),
-                buildCommandUsage(SUBCMD_VOICES, "lists available voices of the TTS services") });
+                buildCommandUsage(SUBCMD_VOICES, "lists available voices of the TTS services"));
     }
 
     @Override
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 b75af96e76..e34c83cca3 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
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractRuleBasedInterpreter implements HumanLanguageInterpreter {
 
     private static final String JSGF = "JSGF";
-    private static final Set<String> SUPPORTED_GRAMMERS = Collections.unmodifiableSet(Collections.singleton(JSGF));
+    private static final Set<String> SUPPORTED_GRAMMERS = Set.of(JSGF);
 
     private static final String OK = "ok";
     private static final String SORRY = "sorry";
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
index ea921a914b..a1a92aa10f 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.voice.text;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.Set;
@@ -90,7 +88,7 @@ public final class ExpressionLet extends Expression {
 
     @Override
     List<Expression> getChildExpressions() {
-        return Collections.unmodifiableList(Arrays.asList(subExpression));
+        return List.of(subExpression);
     }
 
     @Override
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/addon/AddonEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/addon/AddonEventFactory.java
index 152be4b388..109d729012 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/addon/AddonEventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/addon/AddonEventFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.addon;
 
-import java.util.Collections;
+import java.util.Set;
 
 import org.openhab.core.events.AbstractEventFactory;
 import org.openhab.core.events.Event;
@@ -44,7 +44,7 @@ public class AddonEventFactory extends AbstractEventFactory {
      * Constructs a new AddonEventFactory.
      */
     public AddonEventFactory() {
-        super(Collections.singleton(AddonEvent.TYPE));
+        super(Set.of(AddonEvent.TYPE));
     }
 
     @Override
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
index 96ce8c1021..f0c7bf7435 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.common.registry;
 
-import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -315,10 +314,7 @@ public abstract class AbstractRegistry<@NonNull E extends Identifiable<K>, @NonN
         elementReadLock.lock();
         try {
             final E element = identifierToElement.get(key);
-            if (element == null) {
-                return null;
-            }
-            return new SimpleEntry<>(elementToProvider.get(element), element);
+            return element == null ? null : Map.entry(elementToProvider.get(element), element);
         } finally {
             elementReadLock.unlock();
         }
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
index 69a277bfee..67d146b7e6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.events;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -42,7 +40,7 @@ public abstract class AbstractEventFactory implements EventFactory {
      * @param supportedEventTypes the supported event types
      */
     public AbstractEventFactory(Set<String> supportedEventTypes) {
-        this.supportedEventTypes = Collections.unmodifiableSet(new HashSet<>(supportedEventTypes));
+        this.supportedEventTypes = Set.copyOf(supportedEventTypes);
     }
 
     @Override
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
index caa74a5425..3a79ff7a4c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.events;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -39,7 +38,7 @@ public abstract class AbstractTypedEventSubscriber<T extends Event> implements E
      * @param eventType the event type
      */
     protected AbstractTypedEventSubscriber(String eventType) {
-        this.subscribedEventTypes = Collections.singleton(eventType);
+        this.subscribedEventTypes = Set.of(eventType);
     }
 
     @Override
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
index d4b23a9655..83a5819b39 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.internal.events;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -71,8 +70,7 @@ public class OSGiEventManager implements EventHandler {
             final Set<EventSubscriber> entries = typedEventSubscribers.get(subscribedEventType);
             if (entries == null) {
                 // Use a copy on write array set because the set is written and read by different threads!
-                typedEventSubscribers.put(subscribedEventType,
-                        new CopyOnWriteArraySet<>(Collections.singleton(eventSubscriber)));
+                typedEventSubscribers.put(subscribedEventType, new CopyOnWriteArraySet<>(Set.of(eventSubscriber)));
             } else {
                 entries.add(eventSubscriber);
             }
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
index 4a5cc7762b..b5d7303fab 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
@@ -17,7 +17,6 @@ import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAdjuster;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,10 +58,10 @@ class CronAdjuster implements SchedulerTemporalAdjuster {
     private static final String[] MONTHS2 = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT",
             "NOV", "DEC" };
     private static final Map<String, Integer> MONTHS = IntStream.range(0, MONTHS2.length)
-            .mapToObj(i -> new SimpleEntry<>(MONTHS2[i], i)).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+            .mapToObj(i -> Map.entry(MONTHS2[i], i)).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
     private static final String[] WEEK_DAYS_STRINGS = { "MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN" };
     private static final Map<String, Integer> WEEK_DAYS = IntStream.range(0, WEEK_DAYS_STRINGS.length)
-            .mapToObj(i -> new SimpleEntry<>(WEEK_DAYS_STRINGS[i], i + 1))
+            .mapToObj(i -> Map.entry(WEEK_DAYS_STRINGS[i], i + 1))
             .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
 
     private final List<Field> fields = new ArrayList<>(7);
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
index 7715210efc..2431db28f6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
@@ -12,10 +12,7 @@
  */
 package org.openhab.core.items.events;
 
-import java.util.Collections;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventFilter;
@@ -33,8 +30,7 @@ import org.openhab.core.events.EventSubscriber;
  */
 public abstract class AbstractItemEventSubscriber implements EventSubscriber {
 
-    private final Set<String> subscribedEventTypes = Collections
-            .unmodifiableSet(Stream.of(ItemStateEvent.TYPE, ItemCommandEvent.TYPE).collect(Collectors.toSet()));
+    private final Set<String> subscribedEventTypes = Set.of(ItemStateEvent.TYPE, ItemCommandEvent.TYPE);
 
     @Override
     public Set<String> getSubscribedEventTypes() {
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
index 7aff8f7b3d..db7f187cdf 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.core.types;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -31,9 +29,9 @@ public class EventDescription {
      */
     public EventDescription(List<EventOption> options) {
         if (options != null) {
-            this.options = Collections.unmodifiableList(new ArrayList<>(options));
+            this.options = List.copyOf(options);
         } else {
-            this.options = Collections.unmodifiableList(new ArrayList<>(0));
+            this.options = List.of();
         }
     }
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
index ec1d773e10..17a8d55822 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
@@ -16,7 +16,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -59,7 +59,7 @@ public class ThreadPoolManagerTest {
     @Test
     public void testGetConfiguredScheduledPool() {
         ThreadPoolManager tpm = new ThreadPoolManager();
-        tpm.modified(Collections.singletonMap("test3", "5"));
+        tpm.modified(Map.of("test3", "5"));
         ThreadPoolExecutor result = (ThreadPoolExecutor) ThreadPoolManager.getScheduledPool("test3");
 
         assertThat(result, instanceOf(ScheduledExecutorService.class));
@@ -69,7 +69,7 @@ public class ThreadPoolManagerTest {
     @Test
     public void testGetConfiguredCachedPool() {
         ThreadPoolManager tpm = new ThreadPoolManager();
-        tpm.modified(Collections.singletonMap("test4", "4"));
+        tpm.modified(Map.of("test4", "4"));
         ThreadPoolExecutor result = (ThreadPoolExecutor) ThreadPoolManager.getPool("test4");
 
         assertEquals(4, result.getMaximumPoolSize());
@@ -81,7 +81,7 @@ public class ThreadPoolManagerTest {
         assertEquals(ThreadPoolManager.DEFAULT_THREAD_POOL_SIZE, result.getCorePoolSize());
 
         ThreadPoolManager tpm = new ThreadPoolManager();
-        tpm.modified(Collections.singletonMap("test5", "11"));
+        tpm.modified(Map.of("test5", "11"));
 
         assertEquals(11, result.getCorePoolSize());
     }
@@ -92,11 +92,11 @@ public class ThreadPoolManagerTest {
         assertEquals(ThreadPoolManager.DEFAULT_THREAD_POOL_SIZE, result.getMaximumPoolSize());
 
         ThreadPoolManager tpm = new ThreadPoolManager();
-        tpm.modified(Collections.singletonMap("test6", "7"));
+        tpm.modified(Map.of("test6", "7"));
 
         assertEquals(7, result.getMaximumPoolSize());
 
-        tpm.modified(Collections.singletonMap("test6", "3"));
+        tpm.modified(Map.of("test6", "3"));
         assertEquals(3, result.getMaximumPoolSize());
     }
 }
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
index 8487946839..1584a53924 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
@@ -21,7 +21,6 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -52,7 +51,7 @@ public class ResourceBundleClassLoaderTest {
 
         Bundle bundleMock = mock(Bundle.class);
         when(bundleMock.findEntries(any(), any(), anyBoolean()))
-                .thenAnswer(answer -> Collections.enumeration(Arrays.asList(hostPropertiesURL, fragmentPropertiesURL)));
+                .thenAnswer(answer -> Collections.enumeration(List.of(hostPropertiesURL, fragmentPropertiesURL)));
         when(bundleMock.getEntry(any())).thenReturn(hostPropertiesURL);
 
         ResourceBundleClassLoader classloader = new ResourceBundleClassLoader(bundleMock, "/OH-INF/i18n",
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
index c411aca0b2..793c0ef0da 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
@@ -16,8 +16,8 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -80,14 +80,14 @@ public class ItemBuilderTest {
 
         Item res = itemBuilderFactory.newItemBuilder("String", "test") //
                 .withCategory("category") //
-                .withGroups(Arrays.asList("a", "b")) //
+                .withGroups(List.of("a", "b")) //
                 .withLabel("label") //
                 .build();
 
         assertSame(mockItem, res);
         verify(mockFactory).createItem(eq("String"), eq("test"));
         verify(mockItem).setCategory(eq("category"));
-        verify(mockItem).addGroupNames(eq(Arrays.asList("a", "b")));
+        verify(mockItem).addGroupNames(eq(List.of("a", "b")));
         verify(mockItem).setLabel(eq("label"));
     }
 
@@ -98,7 +98,7 @@ public class ItemBuilderTest {
 
         Item resItem = itemBuilderFactory.newItemBuilder("Group", "test") //
                 .withCategory("category") //
-                .withGroups(Arrays.asList("a", "b")) //
+                .withGroups(List.of("a", "b")) //
                 .withLabel("label") //
                 .withBaseItem(baseItem)//
                 .withGroupFunction(mockFunction) //
@@ -108,7 +108,7 @@ public class ItemBuilderTest {
         GroupItem res = (GroupItem) resItem;
         verifyNoMoreInteractions(mockFactory);
         assertEquals("category", res.getCategory());
-        assertEquals(Arrays.asList("a", "b"), res.getGroupNames());
+        assertEquals(List.of("a", "b"), res.getGroupNames());
         assertEquals("label", res.getLabel());
         assertSame(mockFunction, res.getFunction());
         assertSame(baseItem, res.getBaseItem());
@@ -120,7 +120,7 @@ public class ItemBuilderTest {
         when(originalItem.getName()).thenReturn("name");
         when(originalItem.getLabel()).thenReturn("label");
         when(originalItem.getCategory()).thenReturn("category");
-        when(originalItem.getGroupNames()).thenReturn(Arrays.asList("a", "b"));
+        when(originalItem.getGroupNames()).thenReturn(List.of("a", "b"));
 
         when(mockFactory.createItem(anyString(), anyString())).thenReturn(mockItem);
 
@@ -129,7 +129,7 @@ public class ItemBuilderTest {
         assertSame(mockItem, res);
         verify(mockFactory).createItem(eq("type"), eq("name"));
         verify(mockItem).setCategory(eq("category"));
-        verify(mockItem).addGroupNames(eq(Arrays.asList("a", "b")));
+        verify(mockItem).addGroupNames(eq(List.of("a", "b")));
         verify(mockItem).setLabel(eq("label"));
     }
 
@@ -148,7 +148,7 @@ public class ItemBuilderTest {
         GroupItem res = (GroupItem) resItem;
         verifyNoMoreInteractions(mockFactory);
         assertEquals("category", res.getCategory());
-        assertEquals(Arrays.asList("a", "b"), res.getGroupNames());
+        assertEquals(List.of("a", "b"), res.getGroupNames());
         assertEquals("label", res.getLabel());
         assertSame(mockFunction, res.getFunction());
         assertSame(baseItem, res.getBaseItem());
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
index 4fff1979dc..fcfe59940c 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
@@ -15,7 +15,7 @@ package org.openhab.core.internal.items;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.openhab.core.library.items.SwitchItem;
@@ -125,7 +125,7 @@ public class ItemTagTest {
         SwitchItem item = new SwitchItem(ITEM1);
         assertThat(item.getTags().size(), is(0));
 
-        item.addTags(Arrays.asList(TAG1_UPPERCASE, TAG2_MIXED_CASE, TAG3));
+        item.addTags(List.of(TAG1_UPPERCASE, TAG2_MIXED_CASE, TAG3));
         assertThat(item.getTags().size(), is(3));
         assertThat(item.hasTag(TAG1), is(true));
         assertThat(item.hasTag(TAG2), is(true));
@@ -143,6 +143,6 @@ public class ItemTagTest {
         assertThat(item.hasTag(TAG2), is(true));
         assertThat(item.hasTag(TAG3), is(true));
 
-        assertThat(item.getTags().containsAll(Arrays.asList(TAG1_UPPERCASE, TAG2_MIXED_CASE, TAG3)), is(true));
+        assertThat(item.getTags().containsAll(List.of(TAG1_UPPERCASE, TAG2_MIXED_CASE, TAG3)), is(true));
     }
 }
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
index 01e57c1e18..2839a497b8 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
@@ -17,8 +17,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.LocalDateTime;
 import java.time.temporal.Temporal;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Timeout;
@@ -37,7 +37,7 @@ public class CronAdjusterTest {
     private static final String JAN_1ST_2015 = "2015-01-01T00:00:00";
 
     public static Collection<Object[]> arguments() {
-        return Arrays.asList(new Object[][] { { JAN_1ST_2015, "@reboot", new String[] { "2200-01-01T00:00" } },
+        return List.of(new Object[][] { { JAN_1ST_2015, "@reboot", new String[] { "2200-01-01T00:00" } },
                 { JAN_1ST_2015, "@hourly",
                         new String[] { "2015-01-01T01:00", "2015-01-01T02:00", "2015-01-01T03:00",
                                 "2015-01-01T04:00" } },
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
index 820c30ec23..e3b7090445 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
@@ -14,7 +14,6 @@ package org.openhab.core.internal.scheduler;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -61,7 +60,7 @@ public class CronSchedulerImplTest {
         cronScheduler.schedule(foo -> {
             s.release();
             ref.set(foo.get("foo"));
-        }, Collections.singletonMap("foo", "bar"), "#\n" //
+        }, Map.of("foo", "bar"), "#\n" //
                 + "\n" //
                 + " foo = bar \n" //
                 + "# bla bla foo=foo\n" //
@@ -78,7 +77,7 @@ public class CronSchedulerImplTest {
     public void testAddRemoveScheduler() throws InterruptedException {
         Semaphore s = new Semaphore(0);
         CronJob cronJob = m -> s.release();
-        Map<String, Object> map = Collections.singletonMap(CronJob.CRON, "* * * * * *");
+        Map<String, Object> map = Map.of(CronJob.CRON, "* * * * * *");
         cronScheduler.addSchedule(cronJob, map);
         s.acquire();
         cronScheduler.removeSchedule(cronJob);
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
index 894a730e1b..5ef292ab81 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -162,7 +161,7 @@ public class StateDescriptionServiceImplTest {
 
     @Test
     public void testFragmentsAreMergedInProviderOrder() {
-        final List<StateOption> options = Arrays.asList(new StateOption("value", "label"));
+        final List<StateOption> options = List.of(new StateOption("value", "label"));
 
         StateDescriptionFragment stateDescriptionFragment1 = StateDescriptionFragmentBuilder.create()
                 .withMinimum(BigDecimal.ZERO) //
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
index 4e3e75126b..1e317a8da1 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
 import java.math.BigDecimal;
-import java.util.Collections;
+import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ public class StateDescriptionFragmentImplTest {
         source.setStep(BigDecimal.ONE);
         source.setPattern("pattern");
         source.setReadOnly(Boolean.TRUE);
-        source.setOptions(Collections.emptyList());
+        source.setOptions(List.of());
     }
 
     @Test
@@ -58,14 +58,14 @@ public class StateDescriptionFragmentImplTest {
 
         // fragment with empty options should inherit new options
         StateDescriptionFragmentImpl sourceWithOptions = new StateDescriptionFragmentImpl();
-        sourceWithOptions.setOptions(Collections.singletonList(new StateOption("value1", "label1")));
+        sourceWithOptions.setOptions(List.of(new StateOption("value1", "label1")));
 
         fragment = source.merge(sourceWithOptions);
 
         assertThat(fragment.getOptions(), is(sourceWithOptions.getOptions()));
 
         // fragment with options should NOT inherit new options
-        sourceWithOptions.setOptions(Collections.singletonList(new StateOption("value2", "label2")));
+        sourceWithOptions.setOptions(List.of(new StateOption("value2", "label2")));
 
         fragment = source.merge(sourceWithOptions);
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
index f029a69556..baef2f4e4d 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
@@ -154,7 +154,7 @@ public class GenericItemTest {
 
             @Override
             public List<CommandOption> getCommandOptions() {
-                return Arrays.asList(new CommandOption("ALERT", "Alert"), new CommandOption("REBOOT", "Reboot"));
+                return List.of(new CommandOption("ALERT", "Alert"), new CommandOption("REBOOT", "Reboot"));
             }
         });
         item.setCommandDescriptionService(commandDescriptionService);
@@ -172,7 +172,7 @@ public class GenericItemTest {
 
                     @Override
                     public List<CommandOption> getCommandOptions() {
-                        return Arrays.asList(new CommandOption("C1", "Command 1"), new CommandOption("C2", "Command 2"),
+                        return List.of(new CommandOption("C1", "Command 1"), new CommandOption("C2", "Command 2"),
                                 new CommandOption("C3", "Command 3"));
                     }
                 });
@@ -186,7 +186,7 @@ public class GenericItemTest {
         TestItem item = new TestItem("test");
 
         StateDescriptionService stateDescriptionService = mock(StateDescriptionService.class);
-        List<StateOption> stateOptions = Arrays.asList(new StateOption("STATE1", "State 1"),
+        List<StateOption> stateOptions = List.of(new StateOption("STATE1", "State 1"),
                 new StateOption("STATE2", "State 2"));
         when(stateDescriptionService.getStateDescription("test", null)).thenReturn(
                 StateDescriptionFragmentBuilder.create().withOptions(stateOptions).build().toStateDescription());
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
index a8e6f64cc3..a7ccd2aa2e 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 
-import java.util.Arrays;
 import java.util.List;
 
 import javax.measure.quantity.Temperature;
@@ -39,7 +38,7 @@ public class CoreItemFactoryTest {
     @BeforeEach
     public void setup() {
         coreItemFactory = new CoreItemFactory();
-        itemTypeNames = Arrays.asList(coreItemFactory.getSupportedItemTypes());
+        itemTypeNames = List.of(coreItemFactory.getSupportedItemTypes());
     }
 
     @Test
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
index 8e2e9fd877..9be124eb14 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.core.library.types;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -21,9 +22,8 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
@@ -176,7 +176,7 @@ public class DateTimeTypeTest {
      */
     public static Collection<Object[]> parameters() {
         // for simplicity we use always the same input time.
-        return Arrays.asList(new Object[][] {
+        return List.of(new Object[][] {
                 { new ParameterSet(TimeZone.getTimeZone("UTC"), initTimeMap(), TimeZone.getTimeZone("UTC"),
                         "2014-03-30T10:58:47.033+0000", "2014-03-30T10:58:47.033+0000") },
                 { new ParameterSet(TimeZone.getTimeZone("UTC"), initTimeMap(), TimeZone.getTimeZone("CET"),
@@ -222,15 +222,8 @@ public class DateTimeTypeTest {
     }
 
     private static Map<String, Integer> initTimeMap() {
-        Map<String, Integer> inputTimeMap = new HashMap<>();
-        inputTimeMap.put("year", 2014);
-        inputTimeMap.put("month", 2);
-        inputTimeMap.put("date", 30);
-        inputTimeMap.put("hourOfDay", 10);
-        inputTimeMap.put("minute", 58);
-        inputTimeMap.put("second", 47);
-        inputTimeMap.put("milliseconds", 33);
-        return inputTimeMap;
+        return Map.ofEntries(entry("year", 2014), entry("month", 2), entry("date", 30), entry("hourOfDay", 10),
+                entry("minute", 58), entry("second", 47), entry("milliseconds", 33));
     }
 
     @Test
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
index 3cec4ea63c..8acc9b42d6 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
@@ -15,7 +15,6 @@ package org.openhab.core.types;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -38,19 +37,19 @@ public class CommandDescriptionBuilderTest {
 
     @Test
     public void builderWithEmptyOptions() {
-        List<CommandOption> options = Collections.emptyList();
+        List<CommandOption> options = List.of();
         assertThat(builder.withCommandOptions(options).build().getCommandOptions(), is(options));
     }
 
     @Test
     public void builderWithOption() {
         CommandOption option = new CommandOption("command", "label");
-        assertThat(builder.withCommandOption(option).build().getCommandOptions(), is(Arrays.asList(option)));
+        assertThat(builder.withCommandOption(option).build().getCommandOptions(), is(List.of(option)));
     }
 
     @Test
     public void builderWithOptions() {
-        List<CommandOption> options = Arrays.asList(new CommandOption("command1", "label1"),
+        List<CommandOption> options = List.of(new CommandOption("command1", "label1"),
                 new CommandOption("command2", "label2"));
         assertThat(builder.withCommandOptions(options).build().getCommandOptions(), is(options));
     }
@@ -58,7 +57,7 @@ public class CommandDescriptionBuilderTest {
     @Test
     public void subsequentBuildsCreateIndependentFragments() {
         CommandDescription commandDescription1 = builder
-                .withCommandOptions(Collections.singletonList(new CommandOption("command", "label"))).build();
+                .withCommandOptions(List.of(new CommandOption("command", "label"))).build();
         CommandDescription commandDescription2 = builder.withCommandOptions(Collections.emptyList()).build();
 
         assertThat(commandDescription1.getCommandOptions(), is(not(commandDescription2.getCommandOptions())));
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
index 1072bbab6a..27d93aba52 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -71,13 +70,12 @@ public class StateDescriptionFragmentBuilderTest {
     @Test
     public void builderWithOption() {
         StateOption option = new StateOption("value", "label");
-        assertThat(builder.withOption(option).build().getOptions(), is(Arrays.asList(option)));
+        assertThat(builder.withOption(option).build().getOptions(), is(List.of(option)));
     }
 
     @Test
     public void builderWithOptions() {
-        List<StateOption> options = Arrays.asList(new StateOption("value1", "label1"),
-                new StateOption("value2", "label2"));
+        List<StateOption> options = List.of(new StateOption("value1", "label1"), new StateOption("value2", "label2"));
         assertThat(builder.withOptions(options).build().getOptions(), is(options));
     }
 
@@ -85,7 +83,7 @@ public class StateDescriptionFragmentBuilderTest {
     @Test
     public void builderWithStateDescription() {
         StateDescription source = new StateDescription(BigDecimal.ZERO, BigDecimal.TEN, BigDecimal.ONE, "pattern", true,
-                Collections.singletonList(new StateOption("value", "label")));
+                List.of(new StateOption("value", "label")));
         StateDescriptionFragmentBuilder builder = StateDescriptionFragmentBuilder.create(source);
         StateDescriptionFragment fragment = builder.build();
 
@@ -103,7 +101,7 @@ public class StateDescriptionFragmentBuilderTest {
     public void subsequentBuildsCreateIndependentFragments() {
         StateDescriptionFragment fragment1 = builder.withMinimum(BigDecimal.ZERO).withMaximum(BigDecimal.TEN)
                 .withStep(BigDecimal.ONE).withPattern("pattern").withReadOnly(Boolean.FALSE)
-                .withOptions(Collections.singletonList(new StateOption("value", "label"))).build();
+                .withOptions(List.of(new StateOption("value", "label"))).build();
         StateDescriptionFragment fragment2 = builder.withMinimum(BigDecimal.ONE).withMaximum(BigDecimal.ONE)
                 .withStep(BigDecimal.ZERO).withPattern("pattern_new").withReadOnly(Boolean.TRUE)
                 .withOptions(Collections.emptyList()).build();
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
index b6b5c0be65..7ce4adf51e 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -129,7 +128,7 @@ public class AutomationIntegrationJsonTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(RuleStatusInfoEvent.TYPE);
+                return Set.of(RuleStatusInfoEvent.TYPE);
             }
 
             @Override
@@ -305,7 +304,7 @@ public class AutomationIntegrationJsonTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -354,7 +353,7 @@ public class AutomationIntegrationJsonTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
index 57c7752528..609c49d52b 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
@@ -17,7 +17,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -262,18 +261,17 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myLampItem3");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger")
-                        .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger")
+                .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
         Map<String, String> inputs = new HashMap<>();
         inputs.put("topic", "ItemStateChangeTrigger.topic");
         inputs.put("event", "ItemStateChangeTrigger.event");
 
-        List<Condition> conditions = Collections.singletonList(
-                ModuleBuilder.createCondition().withId("EventCondition_2").withTypeUID("core.GenericEventCondition")
+        List<Condition> conditions = List
+                .of(ModuleBuilder.createCondition().withId("EventCondition_2").withTypeUID("core.GenericEventCondition")
                         .withConfiguration(condition1Config).withInputs(inputs).build());
 
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21_ConnectionTest").withTriggers(triggers).withConditions(conditions)
@@ -287,7 +285,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber ruleEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(RuleStatusInfoEvent.TYPE);
+                return Set.of(RuleStatusInfoEvent.TYPE);
             }
 
             @Override
@@ -330,18 +328,17 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myLampItem3");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger")
-                        .withTypeUID("GenericEventTriggerWhichDoesNotExist").withConfiguration(triggerConfig).build());
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger")
+                .withTypeUID("GenericEventTriggerWhichDoesNotExist").withConfiguration(triggerConfig).build());
         Map<String, String> inputs = new HashMap<>();
         inputs.put("topic", "ItemStateChangeTrigger.topic");
         inputs.put("event", "ItemStateChangeTrigger.event");
 
         // def conditionInputs=[topicConnection] as Set
-        List<Condition> conditions = Collections.singletonList(
-                ModuleBuilder.createCondition().withId("EventCondition_2").withTypeUID("core.GenericEventCondition")
+        List<Condition> conditions = List
+                .of(ModuleBuilder.createCondition().withId("EventCondition_2").withTypeUID("core.GenericEventCondition")
                         .withConfiguration(condition1Config).withInputs(inputs).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21_UNINITIALIZED").withTriggers(triggers).withConditions(conditions)
@@ -359,7 +356,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myMotionItem3");
         params.put("state", "ON");
         Configuration condition1Config = new Configuration(params);
-        Map<String, Object> eventInputs = Collections.singletonMap("event", "ItemStateChangeTrigger3.event");
+        Map<String, Object> eventInputs = Map.of("event", "ItemStateChangeTrigger3.event");
         params = new HashMap<>();
         params.put("operator", "=");
         params.put("itemName", "myPresenceItem3");
@@ -369,10 +366,9 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myLampItem3");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger3")
-                        .withTypeUID("core.ItemStateChangeTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction3")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger3")
+                .withTypeUID("core.ItemStateChangeTrigger").withConfiguration(triggerConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction3")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21" + new Random().nextInt() + "_COMPOSITE").withTriggers(triggers)
@@ -394,7 +390,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -422,7 +418,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
     @Test
     public void assertThatRuleNowMethodExecutesActionsOfTheRule() throws ItemNotFoundException {
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("eventTopic", "runNowEventTopic/*"));
+        Configuration triggerConfig = new Configuration(Map.of("eventTopic", "runNowEventTopic/*"));
         Map<String, Object> params = new HashMap<>();
         params.put("itemName", "myLampItem3");
         params.put("command", "TOGGLE");
@@ -435,15 +431,15 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myLampItem3");
         params.put("command", "OFFF");
         Configuration actionConfig3 = new Configuration(params);
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId("GenericEventTriggerId")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("GenericEventTriggerId")
                 .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Arrays.asList(new Action[] {
+        List<Action> actions = List.of(
                 ModuleBuilder.createAction().withId("ItemPostCommandActionId").withTypeUID("core.ItemCommandAction")
                         .withConfiguration(actionConfig).build(),
                 ModuleBuilder.createAction().withId("ItemPostCommandActionId2").withTypeUID("core.ItemCommandAction")
                         .withConfiguration(actionConfig2).build(),
                 ModuleBuilder.createAction().withId("ItemPostCommandActionId3").withTypeUID("core.ItemCommandAction")
-                        .withConfiguration(actionConfig3).build() });
+                        .withConfiguration(actionConfig3).build());
 
         Rule rule = RuleBuilder.create("runNowRule" + new Random().nextInt()).withTriggers(triggers)
                 .withActions(actions).build();
@@ -461,7 +457,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -492,14 +488,14 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
     @Test
     public void assertThatRuleCanBeUpdated() throws ItemNotFoundException {
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("eventTopic", "runNowEventTopic/*"));
+        Configuration triggerConfig = new Configuration(Map.of("eventTopic", "runNowEventTopic/*"));
         Map<String, Object> params = new HashMap<>();
         params.put("itemName", "myLampItem3");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId("GenericEventTriggerId")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("GenericEventTriggerId")
                 .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandActionId")
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandActionId")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         String ruleId = "runNowRule" + new Random().nextInt();
@@ -516,7 +512,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -544,7 +540,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
         params.put("command", "OFF");
         actionConfig = new Configuration(params);
-        actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandActionId")
+        actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandActionId")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule updatedRule = RuleBuilder.create(ruleId).withTriggers(triggers).withActions(actions).build();
@@ -568,16 +564,15 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
     @Test
     public void testChainOfCompositeModules() throws ItemNotFoundException {
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("itemName", "myMotionItem4"));
-        Map<String, Object> eventInputs = Collections.singletonMap("event", "ItemStateChangeTrigger4.event");
+        Configuration triggerConfig = new Configuration(Map.of("itemName", "myMotionItem4"));
+        Map<String, Object> eventInputs = Map.of("event", "ItemStateChangeTrigger4.event");
         Map<String, Object> params = new HashMap<>();
         params.put("itemName", "myLampItem4");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger4")
-                        .withTypeUID("core.ItemStateChangeTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction4")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger4")
+                .withTypeUID("core.ItemStateChangeTrigger").withConfiguration(triggerConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction4")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21" + new Random().nextInt() + "_COMPOSITE").withTriggers(triggers)
@@ -601,7 +596,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -641,10 +636,9 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         params.put("itemName", "myLampItem2");
         params.put("command", "ON");
         Configuration actionConfig = new Configuration(params);
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
-                        .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
+                .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21").withTriggers(triggers).withActions(actions)
@@ -668,7 +662,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
             @Override
             public Collection<Rule> getAll() {
-                return Collections.singleton(rule);
+                return Set.of(rule);
             }
 
             @Override
@@ -715,7 +709,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -774,7 +768,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -812,8 +806,8 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         List<Trigger> templateTriggers = Collections.emptyList();
         List<Condition> templateConditions = Collections.emptyList();
         List<Action> templateActions = Collections.emptyList();
-        List<ConfigDescriptionParameter> templateConfigDescriptionParameters = Collections.singletonList(
-                ConfigDescriptionParameterBuilder.create("param", ConfigDescriptionParameter.Type.TEXT).build());
+        List<ConfigDescriptionParameter> templateConfigDescriptionParameters = List
+                .of(ConfigDescriptionParameterBuilder.create("param", ConfigDescriptionParameter.Type.TEXT).build());
         RuleTemplate template = new RuleTemplate(templateUID, "Test template Label", "Test template description", tags,
                 templateTriggers, templateConditions, templateActions, templateConfigDescriptionParameters,
                 Visibility.VISIBLE);
@@ -835,7 +829,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
             @Override
             public Collection<RuleTemplate> getTemplates(@Nullable Locale locale) {
-                return Collections.singleton(template);
+                return Set.of(template);
             }
 
             @Override
@@ -844,7 +838,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
 
             @Override
             public Collection<RuleTemplate> getAll() {
-                return Collections.singleton(template);
+                return Set.of(template);
             }
 
             @Override
@@ -913,11 +907,10 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         configs.put("command", "ON");
         Configuration actionConfig = new Configuration(configs);
         String triggerUID = "ItemStateChangeTrigger_" + rand;
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId(triggerUID)
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId(triggerUID)
                 .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections
-                .singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction_" + rand)
-                        .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction_" + rand)
+                .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule_" + rand).withTriggers(triggers).withActions(actions)
                 .withName("RuleByJAVA_API_" + rand).build();
@@ -950,20 +943,19 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         configs.put("command", "ON");
         Configuration actionConfig = new Configuration(configs);
         String triggerId = "ItemStateChangeTrigger" + random;
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId(triggerId)
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId(triggerId)
                 .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
         List<Condition> conditions = Stream.of(
                 ModuleBuilder.createCondition().withId("ItemStateCondition" + random)
                         .withTypeUID("core.GenericCompareCondition").withConfiguration(condition1Config)
-                        .withInputs(Collections.singletonMap("input", triggerId + ".event")).build(),
+                        .withInputs(Map.of("input", triggerId + ".event")).build(),
                 ModuleBuilder.createCondition().withId("ItemStateCondition" + (random + 1))
                         .withTypeUID("core.GenericCompareCondition").withConfiguration(condition2Config)
-                        .withInputs(Collections.singletonMap("input", triggerId + ".event")).build())
+                        .withInputs(Map.of("input", triggerId + ".event")).build())
                 .collect(toList());
 
-        List<Action> actions = Collections
-                .singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction" + random)
-                        .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction" + random)
+                .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule_" + random).withTriggers(triggers).withConditions(conditions)
                 .withActions(actions).withName("RuleByJAVA_API" + random).withTags("myRule_" + random).build();
@@ -991,7 +983,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
         EventSubscriber itemEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
index 357f23d42a..43ea37cdd9 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -47,7 +46,7 @@ public class HostFragmentSupportTest extends JavaOSGiTest {
     private static final Locale DEFAULT = Locale.ENGLISH;
     private static final Locale GERMAN = Locale.GERMANY;
 
-    private static final List<Locale> LOCALES = Arrays.asList(BULGARIAN, DEFAULT, GERMAN);
+    private static final List<Locale> LOCALES = List.of(BULGARIAN, DEFAULT, GERMAN);
 
     private final Logger logger = LoggerFactory.getLogger(HostFragmentSupportTest.class);
     private ModuleTypeRegistry registry;
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
index 9c4d6660cd..f11948e7e3 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
@@ -12,19 +12,16 @@
  */
 package org.openhab.core.automation.internal.module;
 
+import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -80,23 +77,20 @@ public class RunRuleModuleTest extends JavaOSGiTest {
 
             @Override
             public Collection<Item> getAll() {
-                return Arrays.asList(new Item[] { new SwitchItem("switch1"), new SwitchItem("switch2"),
-                        new SwitchItem("switch3"), new SwitchItem("ruleTrigger") });
+                return List.of(new SwitchItem("switch1"), new SwitchItem("switch2"), new SwitchItem("switch3"),
+                        new SwitchItem("ruleTrigger"));
             }
         });
         registerService(volatileStorageService);
     }
 
     private Rule createSceneRule() {
-        final Configuration sceneRuleAction1Config = new Configuration(Collections
-                .unmodifiableMap(Stream.of(new SimpleEntry<>("itemName", "switch1"), new SimpleEntry<>("command", "ON"))
-                        .collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()))));
-        final Configuration sceneRuleAction2Config = new Configuration(Collections
-                .unmodifiableMap(Stream.of(new SimpleEntry<>("itemName", "switch2"), new SimpleEntry<>("command", "ON"))
-                        .collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()))));
-        final Configuration sceneRuleAction3Config = new Configuration(Collections
-                .unmodifiableMap(Stream.of(new SimpleEntry<>("itemName", "switch3"), new SimpleEntry<>("command", "ON"))
-                        .collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()))));
+        final Configuration sceneRuleAction1Config = new Configuration(
+                Map.ofEntries(entry("itemName", "switch1"), entry("command", "ON")));
+        final Configuration sceneRuleAction2Config = new Configuration(
+                Map.ofEntries(entry("itemName", "switch2"), entry("command", "ON")));
+        final Configuration sceneRuleAction3Config = new Configuration(
+                Map.ofEntries(entry("itemName", "switch3"), entry("command", "ON")));
 
         final Rule sceneRule = RuleBuilder.create("exampleSceneRule").withActions(
                 ModuleBuilder.createAction().withId("sceneItemPostCommandAction1").withTypeUID("core.ItemCommandAction")
@@ -111,17 +105,14 @@ public class RunRuleModuleTest extends JavaOSGiTest {
     }
 
     private Rule createOuterRule() {
-        final Configuration outerRuleTriggerConfig = new Configuration(Collections.unmodifiableMap(Stream
-                .of(new SimpleEntry<>("eventSource", "ruleTrigger"), new SimpleEntry<>("eventTopic", "openhab/*"),
-                        new SimpleEntry<>("eventTypes", "ItemStateEvent"))
-                .collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()))));
+        final Configuration outerRuleTriggerConfig = new Configuration(
+                Map.ofEntries(entry("eventSource", "ruleTrigger"), entry("eventTopic", "openhab/*"),
+                        entry("eventTypes", "ItemStateEvent")));
 
         final List<String> ruleUIDs = new ArrayList<>();
         ruleUIDs.add("exampleSceneRule");
 
-        final Configuration outerRuleActionConfig = new Configuration(
-                Collections.unmodifiableMap(Stream.of(new SimpleEntry<>("ruleUIDs", ruleUIDs))
-                        .collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()))));
+        final Configuration outerRuleActionConfig = new Configuration(Map.of("ruleUIDs", ruleUIDs));
 
         final Rule outerRule = RuleBuilder.create("sceneActivationRule")
                 .withTriggers(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
@@ -180,7 +171,7 @@ public class RunRuleModuleTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
index f1bcbe30f5..b1b0146034 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
@@ -12,19 +12,17 @@
  */
 package org.openhab.core.automation.internal.module;
 
+import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Random;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -87,12 +85,12 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
             @Override
             public Collection<Item> getAll() {
-                return Arrays.asList(new Item[] { new SwitchItem("myMotionItem"), new SwitchItem("myPresenceItem"),
+                return List.of(new SwitchItem("myMotionItem"), new SwitchItem("myPresenceItem"),
                         new SwitchItem("myLampItem"), new SwitchItem("myMotionItem2"),
                         new SwitchItem("myPresenceItem2"), new SwitchItem("myLampItem2"),
                         new SwitchItem("myMotionItem3"), new SwitchItem("myPresenceItem3"),
                         new SwitchItem("myLampItem3"), new SwitchItem("myMotionItem4"),
-                        new SwitchItem("myPresenceItem4"), new SwitchItem("myLampItem4") });
+                        new SwitchItem("myPresenceItem4"), new SwitchItem("myLampItem4"));
             }
         });
         registerService(volatileStorageService);
@@ -113,7 +111,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -134,13 +132,10 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
     @Test
     public void itemStateUpdatedBySimpleRule() throws ItemNotFoundException, InterruptedException {
-        final Configuration triggerConfig = new Configuration(Stream
-                .of(new SimpleEntry<>("eventSource", "myMotionItem2"), new SimpleEntry<>("eventTopic", "openhab/*"),
-                        new SimpleEntry<>("eventTypes", "ItemStateEvent"))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+        final Configuration triggerConfig = new Configuration(Map.ofEntries(entry("eventSource", "myMotionItem2"),
+                entry("eventTopic", "openhab/*"), entry("eventTypes", "ItemStateEvent")));
         final Configuration actionConfig = new Configuration(
-                Stream.of(new SimpleEntry<>("itemName", "myLampItem2"), new SimpleEntry<>("command", "ON"))
-                        .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+                Map.ofEntries(entry("itemName", "myLampItem2"), entry("command", "ON")));
         final Rule rule = RuleBuilder.create("myRule21" + new Random().nextInt())
                 .withTriggers(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
                         .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build())
@@ -176,7 +171,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -208,16 +203,12 @@ public class RuntimeRuleTest extends JavaOSGiTest {
     }
 
     private Configuration newRightOperatorConfig(final Object right, final Object operator) {
-        return new Configuration(Stream.of(new SimpleEntry<>("right", right), new SimpleEntry<>("operator", operator))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+        return new Configuration(Map.of("right", right, "operator", operator));
     }
 
     private Configuration newRightOperatorInputPropertyConfig(final Object right, final Object operator,
             final Object inputProperty) {
-        return new Configuration(Stream
-                .of(new SimpleEntry<>("right", right), new SimpleEntry<>("operator", operator),
-                        new SimpleEntry<>("inputproperty", inputProperty))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+        return new Configuration(Map.of("right", right, "operator", operator, "inputproperty", inputProperty));
     }
 
     private void assertSatisfiedHandlerInput(final CompareConditionHandler handler, final boolean expected,
@@ -233,8 +224,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
     @Test
     public void compareConditionWorks() {
         final Configuration conditionConfig = newRightOperatorConfig("ON", "=");
-        final Map<String, String> inputs = Stream.of(new SimpleEntry<>("input", "someTrigger.someoutput"))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
+        final Map<String, String> inputs = Map.of("input", "someTrigger.someoutput");
         Condition condition = ModuleBuilder.createCondition().withId("id").withTypeUID("core.GenericCompareCondition")
                 .withConfiguration(conditionConfig).withInputs(inputs).build();
         CompareConditionHandler handler = new CompareConditionHandler(condition);
@@ -310,8 +300,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         assertSatisfiedHandlerInput(handler, false, "something matches?");
         assertSatisfiedHandlerInput(handler, true, "anything matches?");
 
-        assertFalse(handler.isSatisfied(Stream.of(new SimpleEntry<>("nothing", "nothing"))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()))));
+        assertFalse(handler.isSatisfied(Map.of("nothing", "nothing")));
 
         condition = ModuleBuilder.createCondition(condition)
                 .withConfiguration(newRightOperatorConfig("ONOFF", "matches")).build();
@@ -353,11 +342,9 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
     @Test
     public void ruleTriggeredByCompositeTrigger() throws ItemNotFoundException, InterruptedException {
-        final Configuration triggerConfig = new Configuration(Stream.of(new SimpleEntry<>("itemName", "myMotionItem3"))
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+        final Configuration triggerConfig = new Configuration(Map.of("itemName", "myMotionItem3"));
         final Configuration actionConfig = new Configuration(
-                Stream.of(new SimpleEntry<>("itemName", "myLampItem3"), new SimpleEntry<>("command", "ON"))
-                        .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+                Map.ofEntries(entry("itemName", "myLampItem3"), entry("command", "ON")));
         final Rule rule = RuleBuilder.create("myRule21" + new Random().nextInt() + "_COMPOSITE")
                 .withTriggers(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger3")
                         .withTypeUID("core.ItemStateChangeTrigger").withConfiguration(triggerConfig).build())
@@ -388,7 +375,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(RuleStatusInfoEvent.TYPE);
+                return Set.of(RuleStatusInfoEvent.TYPE);
             }
 
             @Override
@@ -429,12 +416,9 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         final String secondRuleAction = "secondRuleAction";
 
         try {
-            final Configuration triggerConfig = new Configuration(
-                    Stream.of(new SimpleEntry<>("itemName", "myMotionItem3"))
-                            .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+            final Configuration triggerConfig = new Configuration(Map.of("itemName", "myMotionItem3"));
             final Configuration actionConfig = new Configuration(
-                    Stream.of(new SimpleEntry<>("enable", false), new SimpleEntry<>("ruleUIDs", firstConfig))
-                            .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+                    Map.ofEntries(entry("enable", false), entry("ruleUIDs", firstConfig)));
 
             final Rule rule = RuleBuilder.create(firstRuleAction)
                     .withTriggers(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger3")
@@ -460,12 +444,9 @@ public class RuntimeRuleTest extends JavaOSGiTest {
                 assertEquals(RuleStatus.IDLE, ruleEngine.getStatus(thirdRuleUID));
             });
 
-            final Configuration triggerConfig2 = new Configuration(
-                    Stream.of(new SimpleEntry<>("itemName", "myMotionItem3"))
-                            .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+            final Configuration triggerConfig2 = new Configuration(Map.of("itemName", "myMotionItem3"));
             final Configuration actionConfig2 = new Configuration(
-                    Stream.of(new SimpleEntry<>("enable", true), new SimpleEntry<>("ruleUIDs", secondConfig))
-                            .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
+                    Map.ofEntries(entry("enable", true), entry("ruleUIDs", secondConfig)));
 
             final Rule rule2 = RuleBuilder.create(secondRuleAction)
                     .withTriggers(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger3")
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleOSGiTest.java b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleOSGiTest.java
index 8646a04a8e..52b01c3b52 100644
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleOSGiTest.java
+++ b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleOSGiTest.java
@@ -15,9 +15,8 @@ package org.openhab.core.automation.module.script;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -76,7 +75,7 @@ public class ScriptRuleOSGiTest extends JavaOSGiTest {
 
             @Override
             public Collection<Item> getAll() {
-                return Arrays.asList(new Item[] { new SwitchItem("MyTrigger"), new SwitchItem("ScriptItem") });
+                return List.of(new SwitchItem("MyTrigger"), new SwitchItem("ScriptItem"));
             }
 
             @Override
@@ -96,7 +95,7 @@ public class ScriptRuleOSGiTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
index e70eaf2e58..83c2cf7fd1 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -121,17 +120,17 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
          * Create Rule
          */
         logger.info("Create rule");
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("itemName", testItemName1));
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId("MyTrigger")
+        Configuration triggerConfig = new Configuration(Map.of("itemName", testItemName1));
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("MyTrigger")
                 .withTypeUID(ItemStateTriggerHandler.UPDATE_MODULE_TYPE_ID).withConfiguration(triggerConfig).build());
 
-        List<Condition> conditions = Collections.singletonList(getPassingCondition());
+        List<Condition> conditions = List.of(getPassingCondition());
 
         Map<String, Object> cfgEntries = new HashMap<>();
         cfgEntries.put("itemName", testItemName2);
         cfgEntries.put("command", "ON");
         Configuration actionConfig = new Configuration(cfgEntries);
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("MyItemPostCommandAction")
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("MyItemPostCommandAction")
                 .withTypeUID(ItemCommandActionHandler.ITEM_COMMAND_ACTION).withConfiguration(actionConfig).build());
 
         // prepare the execution
@@ -141,7 +140,7 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
index 598979088f..5099b7bae9 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
@@ -17,10 +17,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.text.SimpleDateFormat;
 import java.time.ZonedDateTime;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 import org.openhab.core.automation.Condition;
@@ -49,8 +50,8 @@ public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
 
     @Test
     public void assertThatConditionWorks() {
-        Configuration conditionConfiguration = new Configuration(Collections.singletonMap("days",
-                Arrays.asList(new String[] { "MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN" })));
+        Configuration conditionConfiguration = new Configuration(
+                Map.of("days", List.of("MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN")));
         Condition condition = ModuleBuilder.createCondition().withId("id")
                 .withTypeUID(DayOfWeekConditionHandler.MODULE_TYPE_ID).withConfiguration(conditionConfiguration)
                 .build();
@@ -59,15 +60,12 @@ public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
         assertThat(handler.isSatisfied(Collections.emptyMap()), is(true));
 
         condition = ModuleBuilder.createCondition(condition)
-                .withConfiguration(new Configuration(Collections.singletonMap("days", Collections.emptyList())))
-                .build();
+                .withConfiguration(new Configuration(Map.of("days", List.of()))).build();
         handler = new DayOfWeekConditionHandler(condition);
         assertThat(handler.isSatisfied(Collections.emptyMap()), is(false));
 
         condition = ModuleBuilder.createCondition(condition)
-                .withConfiguration(
-                        new Configuration(Collections.singletonMap("days", Collections.singletonList(dayOfWeek))))
-                .build();
+                .withConfiguration(new Configuration(Map.of("days", List.of(dayOfWeek)))).build();
         handler = new DayOfWeekConditionHandler(condition);
         assertThat(handler.isSatisfied(Collections.emptyMap()), is(true));
     }
@@ -82,13 +80,13 @@ public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
 
     @Override
     protected Condition getPassingCondition() {
-        Configuration conditionConfig = new Configuration(Collections.singletonMap("days", dayOfWeek));
+        Configuration conditionConfig = new Configuration(Map.of("days", dayOfWeek));
         return ModuleBuilder.createCondition().withId("MyDOWCondition")
                 .withTypeUID(DayOfWeekConditionHandler.MODULE_TYPE_ID).withConfiguration(conditionConfig).build();
     }
 
     @Override
     protected Configuration getFailingConfiguration() {
-        return new Configuration(Collections.singletonMap("days", Collections.emptyList()));
+        return new Configuration(Map.of("days", List.of()));
     }
 }
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
index 3f85ae23b1..8ab7e0be43 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
@@ -16,12 +16,12 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.BeforeEach;
@@ -71,7 +71,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
     @BeforeEach
     public void before() {
-        ItemProvider itemProvider = new TestItemProvider(Collections.singleton(new SwitchItem("myLampItem")));
+        ItemProvider itemProvider = new TestItemProvider(Set.of(new SwitchItem("myLampItem")));
         registerService(itemProvider);
         registerService(volatileStorageService);
         waitForAssert(() -> {
@@ -101,8 +101,8 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         String testExpression = "* * * * * ?";
 
         ;
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("cronExpression", testExpression));
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId("MyTimerTrigger")
+        Configuration triggerConfig = new Configuration(Map.of("cronExpression", testExpression));
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("MyTimerTrigger")
                 .withTypeUID(GenericCronTriggerHandler.MODULE_TYPE_ID).withConfiguration(triggerConfig).build());
 
         Rule rule = RuleBuilder.create("MyRule" + new Random().nextInt()).withTriggers(triggers)
@@ -157,7 +157,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
 
             @Override
             public java.util.Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -173,15 +173,15 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         logger.info("Create rule");
         String testExpression = "* * * * * ?";
 
-        Configuration triggerConfig = new Configuration(Collections.singletonMap("cronExpression", testExpression));
-        List<Trigger> triggers = Collections.singletonList(ModuleBuilder.createTrigger().withId("MyTimerTrigger")
+        Configuration triggerConfig = new Configuration(Map.of("cronExpression", testExpression));
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("MyTimerTrigger")
                 .withTypeUID(GenericCronTriggerHandler.MODULE_TYPE_ID).withConfiguration(triggerConfig).build());
 
         Map<String, Object> cfgEntries = new HashMap<>();
         cfgEntries.put("itemName", testItemName);
         cfgEntries.put("command", "ON");
         Configuration actionConfig = new Configuration(cfgEntries);
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("MyItemPostCommandAction")
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("MyItemPostCommandAction")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("MyRule" + new Random().nextInt()).withTriggers(triggers).withActions(actions)
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
index b1ce395ef0..d818fdd733 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
@@ -12,16 +12,13 @@
  */
 package org.openhab.core.automation.event;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -89,9 +86,9 @@ public class RuleEventTest extends JavaOSGiTest {
 
             @Override
             public Collection<Item> getAll() {
-                return Arrays.asList(new Item[] { new SwitchItem("myMotionItem"), new SwitchItem("myPresenceItem"),
+                return List.of(new SwitchItem("myMotionItem"), new SwitchItem("myPresenceItem"),
                         new SwitchItem("myLampItem"), new SwitchItem("myMotionItem2"),
-                        new SwitchItem("myPresenceItem2"), new SwitchItem("myLampItem2") });
+                        new SwitchItem("myPresenceItem2"), new SwitchItem("myLampItem2"));
             }
 
             @Override
@@ -110,12 +107,8 @@ public class RuleEventTest extends JavaOSGiTest {
         EventSubscriber ruleEventHandler = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                Set<String> types = new HashSet<>();
-                types.add(RuleAddedEvent.TYPE);
-                types.add(RuleRemovedEvent.TYPE);
-                types.add(RuleStatusInfoEvent.TYPE);
-                types.add(RuleUpdatedEvent.TYPE);
-                return types;
+                return Set.of(RuleAddedEvent.TYPE, RuleRemovedEvent.TYPE, RuleStatusInfoEvent.TYPE,
+                        RuleUpdatedEvent.TYPE);
             }
 
             @Override
@@ -132,21 +125,15 @@ public class RuleEventTest extends JavaOSGiTest {
         registerService(ruleEventHandler);
 
         // Creation of RULE
-        Map<String, Object> triggerCfgEntries = new HashMap<>();
-        triggerCfgEntries.put("eventSource", "myMotionItem2");
-        triggerCfgEntries.put("eventTopic", "openhab/*");
-        triggerCfgEntries.put("eventTypes", "ItemStateEvent");
-        Configuration triggerConfig = new Configuration(triggerCfgEntries);
+        Configuration triggerConfig = new Configuration(Map.ofEntries(entry("eventSource", "myMotionItem2"),
+                entry("eventTopic", "openhab/*"), entry("eventTypes", "ItemStateEvent")));
 
-        Map<String, Object> actionCfgEntries = new HashMap<>();
-        actionCfgEntries.put("itemName", "myLampItem2");
-        actionCfgEntries.put("command", "ON");
-        Configuration actionConfig = new Configuration(actionCfgEntries);
+        Configuration actionConfig = new Configuration(
+                Map.ofEntries(entry("itemName", "myLampItem2"), entry("command", "ON")));
 
-        List<Trigger> triggers = Collections
-                .singletonList(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
-                        .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
-        List<Action> actions = Collections.singletonList(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
+        List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId("ItemStateChangeTrigger2")
+                .withTypeUID("core.GenericEventTrigger").withConfiguration(triggerConfig).build());
+        List<Action> actions = List.of(ModuleBuilder.createAction().withId("ItemPostCommandAction2")
                 .withTypeUID("core.ItemCommandAction").withConfiguration(actionConfig).build());
 
         Rule rule = RuleBuilder.create("myRule21").withTriggers(triggers).withActions(actions)
@@ -183,7 +170,7 @@ public class RuleEventTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemCommandEvent.TYPE);
+                return Set.of(ItemCommandEvent.TYPE);
             }
 
             @Override
@@ -212,7 +199,7 @@ public class RuleEventTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(RuleRemovedEvent.TYPE);
+                return Set.of(RuleRemovedEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
index 7c7584be39..29fb9d7b53 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
@@ -15,10 +15,8 @@ package org.openhab.core.automation.internal;
 import static java.util.stream.Collectors.toSet;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -54,44 +52,42 @@ public class TestModuleTypeProvider implements ModuleTypeProvider {
 
     private TriggerType createTriggerType() {
         List<Output> outputs = new ArrayList<>(3);
-        outputs.add(createOutput("out1", new String[] { "tagA" }));
-        outputs.add(createOutput("out2", new String[] { "tagB", "tagC" }));
-        outputs.add(createOutput("out3", new String[] { "tagA", "tagB", "tagC" }));
+        outputs.add(createOutput("out1", Set.of("tagA")));
+        outputs.add(createOutput("out2", Set.of("tagB", "tagC")));
+        outputs.add(createOutput("out3", Set.of("tagA", "tagB", "tagC")));
         TriggerType t = new TriggerType(TRIGGER_TYPE, null, outputs);
         return t;
     }
 
     private ConditionType createConditionType() {
         List<Input> inputs = new ArrayList<>(3);
-        inputs.add(createInput("in0", new String[] { "tagE" })); // no connection, missing condition tag
-        inputs.add(createInput("in1", new String[] { "tagA" })); // conflict in2 -> out1 or in2 -> out3
-        inputs.add(createInput("in2", new String[] { "tagA", "tagB" })); // in2 -> out3
+        inputs.add(createInput("in0", Set.of("tagE"))); // no connection, missing condition tag
+        inputs.add(createInput("in1", Set.of("tagA"))); // conflict in2 -> out1 or in2 -> out3
+        inputs.add(createInput("in2", Set.of("tagA", "tagB"))); // in2 -> out3
         ConditionType t = new ConditionType(CONDITION_TYPE, null, inputs);
         return t;
     }
 
     private ActionType createActionType() {
         List<Input> inputs = new ArrayList<>(3);
-        inputs.add(createInput("in3", new String[] { "tagD" })); // conflict in3 -> out4 or in3 -> out5
-        inputs.add(createInput("in4", new String[] { "tagD", "tagE" })); // in4 -> out5
-        inputs.add(createInput("in5", new String[] { "tagA", "tagB", "tagC" })); // in5 -> out3
-        inputs.add(createInput("in6", new String[] { "tagA", "tagB" })); // conflict in6 has user defined connection
+        inputs.add(createInput("in3", Set.of("tagD"))); // conflict in3 -> out4 or in3 -> out5
+        inputs.add(createInput("in4", Set.of("tagD", "tagE"))); // in4 -> out5
+        inputs.add(createInput("in5", Set.of("tagA", "tagB", "tagC"))); // in5 -> out3
+        inputs.add(createInput("in6", Set.of("tagA", "tagB"))); // conflict in6 has user defined connection
 
         List<Output> outputs = new ArrayList<>(3);
-        outputs.add(createOutput("out4", new String[] { "tagD" }));
-        outputs.add(createOutput("out5", new String[] { "tagD", "tagE" }));
+        outputs.add(createOutput("out4", Set.of("tagD")));
+        outputs.add(createOutput("out5", Set.of("tagD", "tagE")));
         ActionType t = new ActionType(ACTION_TYPE, null, inputs, outputs);
         return t;
     }
 
-    private Output createOutput(String name, String[] tags) {
-        Set<String> tagSet = new HashSet<>(Arrays.asList(tags));
-        return new Output(name, String.class.getName(), null, null, tagSet, null, null);
+    private Output createOutput(String name, Set<String> tags) {
+        return new Output(name, String.class.getName(), null, null, tags, null, null);
     }
 
-    private Input createInput(String name, String[] tags) {
-        Set<String> tagSet = new HashSet<>(Arrays.asList(tags));
-        return new Input(name, String.class.getName(), null, null, tagSet, false, null, null);
+    private Input createInput(String name, Set<String> tags) {
+        return new Input(name, String.class.getName(), null, null, tags, false, null, null);
     }
 
     @Override
diff --git a/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
index 3c09d19c93..5f889694c2 100644
--- a/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
+++ b/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
@@ -21,8 +21,8 @@ import static org.mockito.Mockito.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,8 +61,7 @@ public class ConfigOptionRegistryOSGiTest extends JavaOSGiTest {
         when(configOptionsProviderMock.getParameterOptions(any(), any(), any(), any())).thenReturn(oList1);
 
         configDescriptionProviderMock = mock(ConfigDescriptionProvider.class);
-        when(configDescriptionProviderMock.getConfigDescriptions(any()))
-                .thenReturn(Collections.singleton(configDescription));
+        when(configDescriptionProviderMock.getConfigDescriptions(any())).thenReturn(Set.of(configDescription));
         when(configDescriptionProviderMock.getConfigDescription(any(), any())).thenReturn(configDescription);
     }
 
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
index e8ee6d16a8..cee5fe0dd6 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.core.config.discovery;
 
-import java.util.Collections;
 import java.util.Random;
+import java.util.Set;
 
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.ThingUID;
@@ -41,7 +41,7 @@ public class DiscoveryServiceMock extends AbstractDiscoveryService {
     }
 
     public DiscoveryServiceMock(ThingTypeUID thingType, int timeout, boolean faulty) {
-        super(Collections.singleton(thingType), timeout);
+        super(Set.of(thingType), timeout);
         this.thingType = thingType;
         this.faulty = faulty;
     }
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
index cf87bd37af..756bdf17a0 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.config.discovery.internal;
 
-import static java.util.Collections.singleton;
 import static java.util.stream.Collectors.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -25,7 +24,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -907,7 +905,7 @@ public class InboxOSGiTest extends JavaOSGiTest {
         final ThingTypeProvider thingTypeProvider = new ThingTypeProvider() {
             @Override
             public Collection<ThingType> getThingTypes(@Nullable Locale locale) {
-                return Collections.singleton(testThingType);
+                return Set.of(testThingType);
             }
 
             @Override
@@ -923,7 +921,7 @@ public class InboxOSGiTest extends JavaOSGiTest {
         final ConfigDescriptionProvider configDescriptionProvider = new ConfigDescriptionProvider() {
             @Override
             public Collection<ConfigDescription> getConfigDescriptions(@Nullable Locale locale) {
-                return Collections.singleton(testConfigDescription);
+                return Set.of(testConfigDescription);
             }
 
             @Override
@@ -969,11 +967,11 @@ public class InboxOSGiTest extends JavaOSGiTest {
         assertThat(inbox.getAll().size(), is(1));
 
         // should not remove a result
-        inbox.removeOlderResults(discoveryService2, now, singleton(testThingType.getUID()), null);
+        inbox.removeOlderResults(discoveryService2, now, Set.of(testThingType.getUID()), null);
         assertThat(inbox.getAll().size(), is(1));
 
         // should remove a result
-        inbox.removeOlderResults(discoveryService1, now, singleton(testThingType.getUID()), null);
+        inbox.removeOlderResults(discoveryService1, now, Set.of(testThingType.getUID()), null);
         assertThat(inbox.getAll().size(), is(0));
     }
 
@@ -984,7 +982,7 @@ public class InboxOSGiTest extends JavaOSGiTest {
         assertThat(inbox.getAll().size(), is(1));
 
         // should remove a result
-        inbox.removeOlderResults(discoveryService2, now, singleton(testThingType.getUID()), null);
+        inbox.removeOlderResults(discoveryService2, now, Set.of(testThingType.getUID()), null);
         assertThat(inbox.getAll().size(), is(0));
     }
 
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
index 177b7e4437..d0792336fc 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
-import static java.util.Arrays.asList;
 import static java.util.Collections.emptySet;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -22,7 +21,7 @@ import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.util.HashSet;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -69,7 +68,7 @@ public class DeltaUsbSerialScannerTest {
     public void testInitialNonEmptyResult() throws IOException {
         UsbSerialDeviceInformation usb1 = usbDeviceInfoGenerator.generate();
         UsbSerialDeviceInformation usb2 = usbDeviceInfoGenerator.generate();
-        when(usbSerialScanner.scan()).thenReturn(new HashSet<>(asList(usb1, usb2)));
+        when(usbSerialScanner.scan()).thenReturn(Set.of(usb1, usb2));
 
         Delta<UsbSerialDeviceInformation> delta = deltaUsbSerialScanner.scan();
 
@@ -88,10 +87,10 @@ public class DeltaUsbSerialScannerTest {
         UsbSerialDeviceInformation usb2 = usbDeviceInfoGenerator.generate();
         UsbSerialDeviceInformation usb3 = usbDeviceInfoGenerator.generate();
 
-        when(usbSerialScanner.scan()).thenReturn(new HashSet<>(asList(usb1, usb2)));
+        when(usbSerialScanner.scan()).thenReturn(Set.of(usb1, usb2));
         deltaUsbSerialScanner.scan();
 
-        when(usbSerialScanner.scan()).thenReturn(new HashSet<>(asList(usb2, usb3)));
+        when(usbSerialScanner.scan()).thenReturn(Set.of(usb2, usb3));
         Delta<UsbSerialDeviceInformation> delta = deltaUsbSerialScanner.scan();
 
         assertThat(delta.getAdded(), contains(usb3));
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
index 0a17c2fde8..229cc7b009 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
-import static java.util.Arrays.asList;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
@@ -20,8 +19,8 @@ import static org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.Po
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -78,7 +77,7 @@ public class PollingUsbSerialScannerTest {
         UsbSerialDeviceInformation usb2 = usbDeviceInfoGenerator.generate();
         UsbSerialDeviceInformation usb3 = usbDeviceInfoGenerator.generate();
 
-        when(usbSerialScannerMock.scan()).thenReturn(new HashSet<>(asList(usb1, usb2)));
+        when(usbSerialScannerMock.scan()).thenReturn(Set.of(usb1, usb2));
         when(usbSerialScannerMock.canPerformScans()).thenReturn(true);
 
         pollingScanner.doSingleScan();
@@ -99,8 +98,7 @@ public class PollingUsbSerialScannerTest {
         UsbSerialDeviceInformation usb2 = usbDeviceInfoGenerator.generate();
         UsbSerialDeviceInformation usb3 = usbDeviceInfoGenerator.generate();
 
-        when(usbSerialScannerMock.scan()).thenReturn(new HashSet<>(asList(usb1, usb2)))
-                .thenReturn(new HashSet<>(asList(usb2, usb3)));
+        when(usbSerialScannerMock.scan()).thenReturn(Set.of(usb1, usb2)).thenReturn(Set.of(usb2, usb3));
         when(usbSerialScannerMock.canPerformScans()).thenReturn(true);
 
         pollingScanner.unregisterDiscoveryListener(discoveryListenerMock);
@@ -127,8 +125,7 @@ public class PollingUsbSerialScannerTest {
         UsbSerialDeviceInformation usb2 = usbDeviceInfoGenerator.generate();
         UsbSerialDeviceInformation usb3 = usbDeviceInfoGenerator.generate();
 
-        when(usbSerialScannerMock.scan()).thenReturn(new HashSet<>(asList(usb1, usb2)))
-                .thenReturn(new HashSet<>(asList(usb2, usb3)));
+        when(usbSerialScannerMock.scan()).thenReturn(Set.of(usb1, usb2)).thenReturn(Set.of(usb2, usb3));
         when(usbSerialScannerMock.canPerformScans()).thenReturn(true);
 
         pollingScanner.startBackgroundScanning();
@@ -151,7 +148,7 @@ public class PollingUsbSerialScannerTest {
 
     @Test
     public void testNoBackgroundScanningWhenNoScansPossible() throws IOException, InterruptedException {
-        when(usbSerialScannerMock.scan()).thenReturn(new HashSet<>(asList(usbDeviceInfoGenerator.generate())));
+        when(usbSerialScannerMock.scan()).thenReturn(Set.of(usbDeviceInfoGenerator.generate()));
         when(usbSerialScannerMock.canPerformScans()).thenReturn(false);
 
         pollingScanner.startBackgroundScanning();
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
index a8cd6e3130..aa6f531c25 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
@@ -15,7 +15,6 @@ package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 import static java.lang.Integer.toHexString;
 import static java.nio.file.Files.*;
 import static java.nio.file.attribute.PosixFilePermission.*;
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -27,10 +26,10 @@ import static org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.Sy
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.BeforeEach;
@@ -113,7 +112,7 @@ public class SysFsUsbSerialScannerTest {
     public void testNonReadableDeviceFilesAreSkipped() throws IOException {
         createDevice("ttyUSB0", 0xABCD, 0X1234, "sample manufacturer", "sample product", "123-456-789", 0,
                 "interfaceDesc");
-        setPosixFilePermissions(devPath.resolve("ttyUSB0"), new HashSet<>(asList(OWNER_WRITE)));
+        setPosixFilePermissions(devPath.resolve("ttyUSB0"), Set.of(OWNER_WRITE));
         assertThat(scanner.scan(), is(empty()));
     }
 
@@ -121,7 +120,7 @@ public class SysFsUsbSerialScannerTest {
     public void testNonWritableDeviceFilesAreSkipped() throws IOException {
         createDevice("ttyUSB0", 0xABCD, 0X1234, "sample manufacturer", "sample product", "123-456-789", 0,
                 "interfaceDesc");
-        setPosixFilePermissions(devPath.resolve("ttyUSB0"), new HashSet<>(asList(OWNER_READ)));
+        setPosixFilePermissions(devPath.resolve("ttyUSB0"), Set.of(OWNER_READ));
         assertThat(scanner.scan(), is(empty()));
     }
 
@@ -194,17 +193,17 @@ public class SysFsUsbSerialScannerTest {
         createDirectories(serialDevicePath);
 
         // Create the symlink into the USB device folder structure
-        if (!Arrays.asList(deviceCreationOptions).contains(DeviceCreationOption.NON_USB_DEVICE)) {
+        if (!List.of(deviceCreationOptions).contains(DeviceCreationOption.NON_USB_DEVICE)) {
             createSymbolicLink(sysfsTtyPath.resolve(serialPortName), serialDevicePath);
         } else {
             createSymbolicLink(sysfsTtyPath.resolve(serialPortName), devPath);
         }
 
         // Create the files containing information about the USB device
-        if (!Arrays.asList(deviceCreationOptions).contains(DeviceCreationOption.NO_VENDOR_ID)) {
+        if (!List.of(deviceCreationOptions).contains(DeviceCreationOption.NO_VENDOR_ID)) {
             write(createFile(usbDevicePath.resolve("idVendor")), toHexString(vendorId).getBytes());
         }
-        if (!Arrays.asList(deviceCreationOptions).contains(DeviceCreationOption.NO_PRODUCT_ID)) {
+        if (!List.of(deviceCreationOptions).contains(DeviceCreationOption.NO_PRODUCT_ID)) {
             write(createFile(usbDevicePath.resolve("idProduct")), toHexString(productId).getBytes());
         }
         if (manufacturer != null) {
@@ -218,7 +217,7 @@ public class SysFsUsbSerialScannerTest {
         }
 
         // Create the files containing information about the USB interface
-        if (!Arrays.asList(deviceCreationOptions).contains(DeviceCreationOption.NO_INTERFACE_NUMBER)) {
+        if (!List.of(deviceCreationOptions).contains(DeviceCreationOption.NO_INTERFACE_NUMBER)) {
             write(createFile(usbInterfacePath.resolve("bInterfaceNumber")), toHexString(interfaceNumber).getBytes());
         }
         if (interfaceDescription != null) {
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
index 40cef291b9..5571ae72ee 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.config.discovery.usbserial.internal;
 
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
@@ -23,9 +22,9 @@ import static org.openhab.core.config.discovery.DiscoveryService.CONFIG_PROPERTY
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -103,13 +102,11 @@ public class UsbSerialDiscoveryServiceTest extends JavaOSGiTest {
         ThingTypeUID thingTypeC = new ThingTypeUID("g:h:i");
 
         UsbSerialDiscoveryParticipant discoveryParticipantA = mock(UsbSerialDiscoveryParticipant.class);
-        when(discoveryParticipantA.getSupportedThingTypeUIDs())
-                .thenReturn(new HashSet<>(asList(thingTypeA, thingTypeB)));
+        when(discoveryParticipantA.getSupportedThingTypeUIDs()).thenReturn(Set.of(thingTypeA, thingTypeB));
         registerService(discoveryParticipantA);
 
         UsbSerialDiscoveryParticipant discoveryParticipantB = mock(UsbSerialDiscoveryParticipant.class);
-        when(discoveryParticipantB.getSupportedThingTypeUIDs())
-                .thenReturn(new HashSet<>(asList(thingTypeB, thingTypeC)));
+        when(discoveryParticipantB.getSupportedThingTypeUIDs()).thenReturn(Set.of(thingTypeB, thingTypeC));
         registerService(discoveryParticipantB);
 
         assertThat(usbSerialDiscoveryService.getSupportedThingTypes(),
diff --git a/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java b/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
index dc55cf4fd9..950cc46cc6 100644
--- a/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
+++ b/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
@@ -26,7 +26,6 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -179,29 +178,27 @@ public class ConfigDispatcherOSGiTest extends JavaOSGiTest {
         /*
          * Assert that the configuration is updated with a list containing one value for a file in the root directory.
          */
-        verifyValuesOfConfigurationProperty("local.default.pid", "default.property", 1,
-                Collections.singletonList("default.value"));
+        verifyValuesOfConfigurationProperty("local.default.pid", "default.property", 1, List.of("default.value"));
 
         /*
          * Assert that the configuration is updated with a list containing one value for a file in the services
          * directory.
          */
-        verifyValuesOfConfigurationProperty("local.service.first.pid", "service.property", 1,
-                Collections.singletonList("service.value"));
+        verifyValuesOfConfigurationProperty("local.service.first.pid", "service.property", 1, List.of("service.value"));
 
         /*
          * Assert that the configuration is updated with a list containing more than one values for a file in the
          * services directory.
          */
         verifyValuesOfConfigurationProperty("local.service.second.pid", "service.property", 3,
-                Arrays.asList("first value", "second value", "third value"));
+                List.of("first value", "second value", "third value"));
 
         /*
          * Assert that the configuration is updated with a list containing trimmed values for a file in the
          * services directory.
          */
         verifyValuesOfConfigurationProperty("local.service.third.pid", "service.property", 3,
-                Arrays.asList("first value", "second value", "third value"));
+                List.of("first value", "second value", "third value"));
 
         /*
          * Assert that the configuration is updated with an empty list for a file in the services directory.
diff --git a/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java b/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
index da45204d36..225193ed61 100644
--- a/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
+++ b/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.core.ephemeris.internal;
 
+import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.openhab.core.ephemeris.internal.EphemerisManagerImpl.*;
@@ -21,13 +22,13 @@ import java.net.URL;
 import java.time.DayOfWeek;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -66,17 +67,14 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
         ephemerisManager = getService(EphemerisManager.class, EphemerisManagerImpl.class);
         assertNotNull(ephemerisManager);
 
-        ephemerisManager.modified(Stream
-                .of(new SimpleEntry<>(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, "Saturday,Sunday"),
-                        new SimpleEntry<>(CONFIG_COUNTRY, Locale.GERMANY.getCountry()))
-                .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+        ephemerisManager.modified(Map.ofEntries(entry(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, "Saturday,Sunday"),
+                entry(CONFIG_COUNTRY, Locale.GERMANY.getCountry())));
     }
 
     @Test
     public void testEphemerisManagerLoadedProperly() {
         assertTrue(ephemerisManager.daysets.containsKey(CONFIG_DAYSET_WEEKEND));
-        assertEquals(Stream.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY).collect(Collectors.toSet()),
-                ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
+        assertEquals(Set.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY), ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
         assertFalse(ephemerisManager.countries.isEmpty());
         assertFalse(ephemerisManager.regions.isEmpty());
         assertFalse(ephemerisManager.cities.isEmpty());
@@ -84,26 +82,22 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
 
     @Test
     public void testConfigurtationDaysetWeekendFailed() {
-        assertThrows(IllegalArgumentException.class, () -> ephemerisManager
-                .modified(Collections.singletonMap(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, "Foo,Bar")));
+        assertThrows(IllegalArgumentException.class,
+                () -> ephemerisManager.modified(Map.of(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, "Foo,Bar")));
     }
 
     @Test
     public void testConfigurtationDaysetWeekendIterable() {
-        ephemerisManager.modified(Collections.singletonMap(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND,
-                Stream.of("Saturday", "Sunday").collect(Collectors.toList())));
+        ephemerisManager.modified(Map.of(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, List.of("Saturday", "Sunday")));
         assertTrue(ephemerisManager.daysets.containsKey(CONFIG_DAYSET_WEEKEND));
-        assertEquals(Stream.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY).collect(Collectors.toSet()),
-                ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
+        assertEquals(Set.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY), ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
     }
 
     @Test
     public void testConfigurtationDaysetWeekendListAsString() {
-        ephemerisManager.modified(Collections.singletonMap(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND,
-                Stream.of("Saturday", "Sunday").collect(Collectors.toList()).toString()));
+        ephemerisManager.modified(Map.of(CONFIG_DAYSET_PREFIX + CONFIG_DAYSET_WEEKEND, List.of("Saturday", "Sunday")));
         assertTrue(ephemerisManager.daysets.containsKey(CONFIG_DAYSET_WEEKEND));
-        assertEquals(Stream.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY).collect(Collectors.toSet()),
-                ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
+        assertEquals(Set.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY), ephemerisManager.daysets.get(CONFIG_DAYSET_WEEKEND));
     }
 
     @Test
@@ -158,10 +152,10 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
                 null, Locale.US);
         assertNotNull(options);
         assertEquals(7, options.size());
-        assertEquals(Stream.of(new ParameterOption("MONDAY", "Monday"), new ParameterOption("TUESDAY", "Tuesday"),
+        assertEquals(List.of(new ParameterOption("MONDAY", "Monday"), new ParameterOption("TUESDAY", "Tuesday"),
                 new ParameterOption("WEDNESDAY", "Wednesday"), new ParameterOption("THURSDAY", "Thursday"),
                 new ParameterOption("FRIDAY", "Friday"), new ParameterOption("SATURDAY", "Saturday"),
-                new ParameterOption("SUNDAY", "Sunday")).collect(Collectors.toList()), options);
+                new ParameterOption("SUNDAY", "Sunday")), options);
     }
 
     @Test
@@ -170,10 +164,10 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
                 null, Locale.GERMAN);
         assertNotNull(options);
         assertEquals(7, options.size());
-        assertEquals(Stream.of(new ParameterOption("MONDAY", "Montag"), new ParameterOption("TUESDAY", "Dienstag"),
+        assertEquals(List.of(new ParameterOption("MONDAY", "Montag"), new ParameterOption("TUESDAY", "Dienstag"),
                 new ParameterOption("WEDNESDAY", "Mittwoch"), new ParameterOption("THURSDAY", "Donnerstag"),
                 new ParameterOption("FRIDAY", "Freitag"), new ParameterOption("SATURDAY", "Samstag"),
-                new ParameterOption("SUNDAY", "Sonntag")).collect(Collectors.toList()), options);
+                new ParameterOption("SUNDAY", "Sonntag")), options);
     }
 
     @Test
@@ -187,7 +181,7 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
 
     @Test
     public void testConfigOptionProviderRegionsAustria() {
-        ephemerisManager.modified(Collections.singletonMap(CONFIG_COUNTRY, COUNTRY_AUSTRALIA_KEY));
+        ephemerisManager.modified(Map.of(CONFIG_COUNTRY, COUNTRY_AUSTRALIA_KEY));
 
         final Collection<ParameterOption> options = ephemerisManager.getParameterOptions(CONFIG_URI, CONFIG_REGION,
                 null, null);
@@ -208,8 +202,8 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
     @Test
     public void testConfigOptionProviderCitiesNorthRhineWestphalia() {
         ephemerisManager.modified(Stream
-                .of(new SimpleEntry<>(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
-                        new SimpleEntry<>(CONFIG_REGION, REGION_NORTHRHINEWESTPHALIA_KEY))
+                .of(entry(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
+                        entry(CONFIG_REGION, REGION_NORTHRHINEWESTPHALIA_KEY))
                 .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
 
         final Collection<ParameterOption> options = ephemerisManager.getParameterOptions(CONFIG_URI, CONFIG_CITY, null,
@@ -219,10 +213,8 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
 
     @Test
     public void testConfigOptionProviderCitiesBavaria() {
-        ephemerisManager.modified(Stream
-                .of(new SimpleEntry<>(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
-                        new SimpleEntry<>(CONFIG_REGION, REGION_BAVARIA_KEY))
-                .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+        ephemerisManager.modified(Map.ofEntries(entry(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
+                entry(CONFIG_REGION, REGION_BAVARIA_KEY)));
 
         final Collection<ParameterOption> options = ephemerisManager.getParameterOptions(CONFIG_URI, CONFIG_CITY, null,
                 null);
@@ -233,10 +225,8 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
 
     @Test
     public void testConfigOptionProviderCitiesTasmania() {
-        ephemerisManager.modified(Stream
-                .of(new SimpleEntry<>(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
-                        new SimpleEntry<>(CONFIG_REGION, REGION_TASMANIA_KEY))
-                .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+        ephemerisManager.modified(Map.ofEntries(entry(CONFIG_COUNTRY, Locale.GERMANY.getCountry()),
+                entry(CONFIG_REGION, REGION_TASMANIA_KEY)));
 
         final Collection<ParameterOption> options = ephemerisManager.getParameterOptions(CONFIG_URI, CONFIG_CITY, null,
                 null);
@@ -249,8 +239,7 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
     public void testWeekends() {
         ZonedDateTime monday = ZonedDateTime.of(2019, 10, 28, 0, 0, 0, 0, ZoneId.of("Europe/Paris"));
         ZonedDateTime sunday = ZonedDateTime.of(2019, 10, 27, 0, 0, 0, 0, ZoneId.of("Europe/Paris"));
-        ephemerisManager.modified(Collections.singletonMap(CONFIG_DAYSET_PREFIX + INTERNAL_DAYSET,
-                Stream.of("Monday", "Tuesday").collect(Collectors.toList())));
+        ephemerisManager.modified(Map.of(CONFIG_DAYSET_PREFIX + INTERNAL_DAYSET, List.of("Monday", "Tuesday")));
         assertTrue(ephemerisManager.isWeekend(sunday));
         assertFalse(ephemerisManager.isWeekend(monday));
         assertTrue(ephemerisManager.isInDayset(INTERNAL_DAYSET, monday));
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
index c2667e81c9..68d9722415 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
@@ -26,9 +26,8 @@ import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
@@ -102,7 +101,7 @@ public class ItemResourceOSGiTest extends JavaOSGiTest {
         item3 = new DimmerItem(ITEM_NAME3);
         item4 = new StringItem(ITEM_NAME4);
 
-        when(itemProvider.getAll()).thenReturn(Arrays.asList(item1, item2, item3, item4));
+        when(itemProvider.getAll()).thenReturn(List.of(item1, item2, item3, item4));
         registerService(itemProvider);
 
         UriBuilder uriBuilder = mock(UriBuilder.class);
@@ -203,7 +202,7 @@ public class ItemResourceOSGiTest extends JavaOSGiTest {
         assertThat(response.getStatus(), is(Status.NOT_FOUND.getStatusCode()));
 
         unregisterService(itemProvider);
-        when(itemProvider.getAll()).thenReturn(Collections.singletonList(new SwitchItem("UnmanagedItem")));
+        when(itemProvider.getAll()).thenReturn(List.of(new SwitchItem("UnmanagedItem")));
         registerService(itemProvider);
 
         response = itemResource.addTag("UnmanagedItem", "MyTag");
@@ -325,8 +324,8 @@ public class ItemResourceOSGiTest extends JavaOSGiTest {
     @Test
     public void testRemoveMetadataUnmanagedMetadata() {
         MetadataProvider provider = mock(MetadataProvider.class);
-        when(provider.getAll()).thenReturn(
-                Collections.singleton(new Metadata(new MetadataKey("namespace", ITEM_NAME1), "some value", null)));
+        when(provider.getAll())
+                .thenReturn(Set.of(new Metadata(new MetadataKey("namespace", ITEM_NAME1), "some value", null)));
         registerService(provider);
 
         Response response = itemResource.removeMetadata(ITEM_NAME1, "namespace");
diff --git a/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java b/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
index 7be40cbbe3..2b6a605f7b 100644
--- a/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
+++ b/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
@@ -25,7 +25,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -461,8 +460,7 @@ public class FolderObserverTest extends JavaOSGiTest {
          */
         @Override
         public Iterable<String> getAllModelNamesOfType(String modelType) {
-            List<String> arrayOfModelsToBeRemoved = Collections.singletonList(MOCK_MODEL_TO_BE_REMOVED);
-            return arrayOfModelsToBeRemoved;
+            return List.of(MOCK_MODEL_TO_BE_REMOVED);
         }
 
         @Override
@@ -491,7 +489,7 @@ public class FolderObserverTest extends JavaOSGiTest {
 
         @Override
         public Set<String> removeAllModelsOfType(String modelType) {
-            return Collections.emptySet();
+            return Set.of();
         }
     }
 }
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
index 53a8634363..c5d8b62520 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
@@ -16,8 +16,8 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 import javax.measure.quantity.Length;
 import javax.measure.quantity.Temperature;
@@ -79,8 +79,7 @@ public class ScriptEngineOSGiTest extends JavaOSGiTest {
 
             @Override
             public Collection<Item> getAll() {
-                return Arrays.asList(new SwitchItem(ITEM_NAME),
-                        createNumberItem(NUMBER_ITEM_TEMPERATURE, Temperature.class),
+                return List.of(new SwitchItem(ITEM_NAME), createNumberItem(NUMBER_ITEM_TEMPERATURE, Temperature.class),
                         createNumberItem(NUMBER_ITEM_LENGTH, Length.class), new NumberItem(NUMBER_ITEM_DECIMAL));
             }
 
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
index 08a48e77d0..0fc881704e 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.model.thing.testsupport.hue;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.openhab.core.config.core.Configuration;
@@ -38,7 +37,7 @@ public class DumbThingHandlerFactory extends BaseThingHandlerFactory implements
 
     public static final ThingTypeUID THING_TYPE_TEST = new ThingTypeUID(BINDING_ID, "DUMB");
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = Collections.singleton(THING_TYPE_TEST);
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = Set.of(THING_TYPE_TEST);
 
     private boolean dumb;
 
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
index cf08e9b1c1..b1eb39355c 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
@@ -14,7 +14,6 @@ package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -45,7 +44,7 @@ public class DumbThingTypeProvider implements ThingTypeProvider {
         try {
             ChannelDefinition channel1 = new ChannelDefinitionBuilder("channel1",
                     new ChannelTypeUID(DumbThingHandlerFactory.BINDING_ID, "channel1")).build();
-            List<ChannelDefinition> channelDefinitions = Collections.singletonList(channel1);
+            List<ChannelDefinition> channelDefinitions = List.of(channel1);
 
             THING_TYPES.put(DumbThingHandlerFactory.THING_TYPE_TEST,
                     ThingTypeBuilder.instance(DumbThingHandlerFactory.THING_TYPE_TEST, "DUMB")
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
index 1e79f1455c..658e920078 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
@@ -13,7 +13,6 @@
 package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -68,17 +67,17 @@ public class TestHueChannelTypeProvider implements ChannelTypeProvider, ChannelG
                     .withDescription("description")
                     .withConfigDescriptionURI(new URI("Xhue", "XLCT001:Xcolor_temperature", null)).build();
 
-            channelTypes = Arrays.asList(ctColor, ctColorTemperature, ctColorX, ctColorTemperatureX);
+            channelTypes = List.of(ctColor, ctColorTemperature, ctColorX, ctColorTemperatureX);
 
             ChannelGroupType groupX = ChannelGroupTypeBuilder.instance(GROUP_CHANNEL_GROUP_TYPE_UID, "Channel Group")
                     .withDescription("Channel Group")
-                    .withChannelDefinitions(Arrays.asList(
+                    .withChannelDefinitions(List.of(
                             new ChannelDefinitionBuilder("foo", TestHueChannelTypeProvider.COLOR_CHANNEL_TYPE_UID)
                                     .build(),
                             new ChannelDefinitionBuilder("bar", TestHueChannelTypeProvider.COLOR_CHANNEL_TYPE_UID)
                                     .build()))
                     .build();
-            channelGroupTypes = Arrays.asList(groupX);
+            channelGroupTypes = List.of(groupX);
         } catch (Exception willNeverBeThrown) {
         }
     }
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
index ecc2d918fa..13eb8a89b6 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
@@ -15,9 +15,9 @@
 package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -55,8 +55,8 @@ public class TestHueThingTypeProvider implements ThingTypeProvider {
                     TestHueChannelTypeProvider.COLOR_TEMP_CHANNEL_TYPE_UID).build();
             THING_TYPES.put(TestHueThingHandlerFactory.THING_TYPE_LCT001, ThingTypeBuilder
                     .instance(TestHueThingHandlerFactory.THING_TYPE_LCT001, "LCT001")
-                    .withSupportedBridgeTypeUIDs(Arrays.asList(TestHueThingHandlerFactory.THING_TYPE_BRIDGE.toString()))
-                    .withDescription("Hue LAMP").isListed(false).withChannelDefinitions(Arrays.asList(color, colorTemp))
+                    .withSupportedBridgeTypeUIDs(List.of(TestHueThingHandlerFactory.THING_TYPE_BRIDGE.toString()))
+                    .withDescription("Hue LAMP").isListed(false).withChannelDefinitions(List.of(color, colorTemp))
                     .withConfigDescriptionURI(new URI("hue", "LCT001", null)).build());
 
             THING_TYPES.put(TestHueThingHandlerFactoryX.THING_TYPE_BRIDGE,
@@ -68,20 +68,18 @@ public class TestHueThingTypeProvider implements ThingTypeProvider {
 
             ChannelDefinition colorTempX = new ChannelDefinitionBuilder("Xcolor_temperature",
                     TestHueChannelTypeProvider.COLORX_TEMP_CHANNEL_TYPE_UID).build();
-            THING_TYPES.put(TestHueThingHandlerFactoryX.THING_TYPE_LCT001,
-                    ThingTypeBuilder.instance(TestHueThingHandlerFactoryX.THING_TYPE_LCT001, "XLCT001")
-                            .withSupportedBridgeTypeUIDs(
-                                    Arrays.asList(TestHueThingHandlerFactoryX.THING_TYPE_BRIDGE.toString()))
-                            .withDescription("Hue LAMP").isListed(false)
-                            .withChannelDefinitions(Arrays.asList(colorX, colorTempX))
-                            .withConfigDescriptionURI(new URI("Xhue", "XLCT001", null)).build());
+            THING_TYPES.put(TestHueThingHandlerFactoryX.THING_TYPE_LCT001, ThingTypeBuilder
+                    .instance(TestHueThingHandlerFactoryX.THING_TYPE_LCT001, "XLCT001")
+                    .withSupportedBridgeTypeUIDs(List.of(TestHueThingHandlerFactoryX.THING_TYPE_BRIDGE.toString()))
+                    .withDescription("Hue LAMP").isListed(false).withChannelDefinitions(List.of(colorX, colorTempX))
+                    .withConfigDescriptionURI(new URI("Xhue", "XLCT001", null)).build());
 
             ChannelGroupDefinition groupDefinition = new ChannelGroupDefinition("group",
                     TestHueChannelTypeProvider.GROUP_CHANNEL_GROUP_TYPE_UID);
             THING_TYPES.put(TestHueThingHandlerFactory.THING_TYPE_GROUPED, ThingTypeBuilder
                     .instance(TestHueThingHandlerFactory.THING_TYPE_GROUPED, "grouped")
-                    .withSupportedBridgeTypeUIDs(Arrays.asList(TestHueThingHandlerFactory.THING_TYPE_BRIDGE.toString()))
-                    .withDescription("Grouped Lamp").withChannelGroupDefinitions(Arrays.asList(groupDefinition))
+                    .withSupportedBridgeTypeUIDs(List.of(TestHueThingHandlerFactory.THING_TYPE_BRIDGE.toString()))
+                    .withDescription("Grouped Lamp").withChannelGroupDefinitions(List.of(groupDefinition))
                     .withConfigDescriptionURI(new URI("hue", "grouped", null)).build());
         } catch (Exception e) {
             logger.error("{}", e.getMessage());
diff --git a/itests/org.openhab.core.persistence.tests/src/main/java/org/openhab/core/persistence/tests/PersistenceExtensionsTest.java b/itests/org.openhab.core.persistence.tests/src/main/java/org/openhab/core/persistence/tests/PersistenceExtensionsTest.java
index 313f024363..7854a76237 100644
--- a/itests/org.openhab.core.persistence.tests/src/main/java/org/openhab/core/persistence/tests/PersistenceExtensionsTest.java
+++ b/itests/org.openhab.core.persistence.tests/src/main/java/org/openhab/core/persistence/tests/PersistenceExtensionsTest.java
@@ -17,7 +17,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.IntStream;
@@ -60,7 +59,7 @@ public class PersistenceExtensionsTest {
 
         @Override
         public Set<PersistenceService> getAll() {
-            return Collections.singleton(testPersistenceService);
+            return Set.of(testPersistenceService);
         }
 
         @Override
@@ -77,12 +76,12 @@ public class PersistenceExtensionsTest {
         item = new GenericItem("Test", "Test") {
             @Override
             public List<Class<? extends State>> getAcceptedDataTypes() {
-                return Collections.emptyList();
+                return List.of();
             }
 
             @Override
             public List<Class<? extends Command>> getAcceptedCommandTypes() {
-                return Collections.emptyList();
+                return List.of();
             }
         };
     }
diff --git a/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java b/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
index c82dcd1bcf..2bbcf7e2af 100644
--- a/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
+++ b/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
@@ -22,7 +22,6 @@ import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
@@ -101,8 +100,8 @@ public class JsonStorageServiceOSGiTest extends JavaOSGiTest {
     public void testSerialization() {
         assertThat(storage.getKeys().size(), is(0));
 
-        storage.put(KEY1, new PersistedItem(CoreItemFactory.STRING, Arrays.asList("LIGHT", "GROUND_FLOOR")));
-        storage.put(KEY2, new PersistedItem(CoreItemFactory.NUMBER, Arrays.asList("TEMPERATURE", "OUTSIDE")));
+        storage.put(KEY1, new PersistedItem(CoreItemFactory.STRING, List.of("LIGHT", "GROUND_FLOOR")));
+        storage.put(KEY2, new PersistedItem(CoreItemFactory.NUMBER, List.of("TEMPERATURE", "OUTSIDE")));
         assertThat(storage.getKeys().size(), is(2));
 
         storage.remove(KEY1);
@@ -116,7 +115,7 @@ public class JsonStorageServiceOSGiTest extends JavaOSGiTest {
 
         assertThat(storage.getKeys().size(), is(0));
 
-        pItem = storage.put(KEY1, new PersistedItem(CoreItemFactory.STRING, Arrays.asList("LIGHT", "GROUND_FLOOR")));
+        pItem = storage.put(KEY1, new PersistedItem(CoreItemFactory.STRING, List.of("LIGHT", "GROUND_FLOOR")));
         assertThat(storage.getKeys().size(), is(1));
         assertThat(pItem, is(nullValue()));
 
@@ -124,7 +123,7 @@ public class JsonStorageServiceOSGiTest extends JavaOSGiTest {
         assertThat(pItem, is(notNullValue()));
         assertThat(pItem.itemType, is(CoreItemFactory.STRING));
 
-        pItem = storage.put(KEY1, new PersistedItem(CoreItemFactory.NUMBER, Arrays.asList("TEMPERATURE")));
+        pItem = storage.put(KEY1, new PersistedItem(CoreItemFactory.NUMBER, List.of("TEMPERATURE")));
         assertThat(pItem, is(notNullValue()));
         assertThat(storage.getKeys().size(), is(1));
         assertThat(pItem.itemType, is(CoreItemFactory.STRING));
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
index 3c89b772cf..3074cac1f9 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
@@ -17,11 +17,9 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -78,29 +76,27 @@ public class OSGiEventManagerOSGiTest extends JavaOSGiTest {
         eventPublisher = getService(EventPublisher.class);
         assertNotNull(eventPublisher);
 
-        when(eventTypeFactoryAB.getSupportedEventTypes())
-                .thenReturn(new HashSet<>(Arrays.asList(EVENT_TYPE_A, EVENT_TYPE_B)));
+        when(eventTypeFactoryAB.getSupportedEventTypes()).thenReturn(Set.of(EVENT_TYPE_A, EVENT_TYPE_B));
         when(eventTypeFactoryAB.createEvent(any(), any(), any(), any()))
                 .thenAnswer(answer -> createEvent(answer.getArgument(0), answer.getArgument(2), answer.getArgument(1)));
         internalRegisterService(EVENT_TYPE_FACTORY_A_B, EventFactory.class, eventTypeFactoryAB);
 
-        when(eventTypeFactoryC.getSupportedEventTypes()).thenReturn(Collections.singleton(EVENT_TYPE_C));
+        when(eventTypeFactoryC.getSupportedEventTypes()).thenReturn(Set.of(EVENT_TYPE_C));
         when(eventTypeFactoryC.createEvent(any(), any(), any(), any()))
                 .thenAnswer(answer -> createEvent(answer.getArgument(0), answer.getArgument(2), answer.getArgument(1)));
         internalRegisterService(EVENT_TYPE_FACTORY_C, EventFactory.class, eventTypeFactoryC);
 
-        when(subscriber1.getSubscribedEventTypes()).thenReturn(Collections.singleton(EVENT_TYPE_A));
+        when(subscriber1.getSubscribedEventTypes()).thenReturn(Set.of(EVENT_TYPE_A));
         internalRegisterService(TYPE_BASED_SUBSCRIBER_1, EventSubscriber.class, subscriber1);
 
-        when(subscriber2.getSubscribedEventTypes()).thenReturn(Collections.singleton(EVENT_TYPE_A));
+        when(subscriber2.getSubscribedEventTypes()).thenReturn(Set.of(EVENT_TYPE_A));
         internalRegisterService(TYPE_BASED_SUBSCRIBER_2, EventSubscriber.class, subscriber2);
 
-        when(subscriber3.getSubscribedEventTypes())
-                .thenReturn(new HashSet<>(Arrays.asList(EVENT_TYPE_B, EVENT_TYPE_C)));
+        when(subscriber3.getSubscribedEventTypes()).thenReturn(Set.of(EVENT_TYPE_B, EVENT_TYPE_C));
         when(subscriber3.getEventFilter()).thenReturn(new TopicEventFilter(TOPIC));
         internalRegisterService(TOPIC_BASED_SUBSCRIBER_3, EventSubscriber.class, subscriber3);
 
-        when(subscriber4.getSubscribedEventTypes()).thenReturn(Collections.singleton(EventSubscriber.ALL_EVENT_TYPES));
+        when(subscriber4.getSubscribedEventTypes()).thenReturn(Set.of(EventSubscriber.ALL_EVENT_TYPES));
         when(subscriber4.getEventFilter()).thenReturn(new TopicEventFilter(TOPIC));
         internalRegisterService(ALL_EVENT_TYPES_SUBSCRIBER_4, EventSubscriber.class, subscriber4);
     }
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
index 64f8dcb477..e72de26f86 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
@@ -14,7 +14,6 @@ package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -67,7 +66,7 @@ public class ItemUpdaterOSGiTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemStateChangedEvent.TYPE);
+                return Set.of(ItemStateChangedEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
index cfbdad6e18..4b06f009f6 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 
-import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
 import org.junit.jupiter.api.AfterEach;
@@ -60,7 +60,7 @@ public class AbstractItemEventSubscriberOSGiTest extends JavaOSGiTest {
         eventPublisher = getService(EventPublisher.class);
         assertNotNull(eventPublisher);
 
-        when(itemProvider.getAll()).thenReturn(Collections.singletonList(new SwitchItem(ITEM_NAME)));
+        when(itemProvider.getAll()).thenReturn(List.of(new SwitchItem(ITEM_NAME)));
         registerService(itemProvider);
 
         EventSubscriber itemEventSubscriber = new AbstractItemEventSubscriber() {
@@ -76,8 +76,8 @@ public class AbstractItemEventSubscriberOSGiTest extends JavaOSGiTest {
         };
         registerService(itemEventSubscriber, EventSubscriber.class.getName());
 
-        when(mockMetadataProvider.getAll()).thenReturn(Collections
-                .singletonList(new Metadata(new MetadataKey("autoupdate", ITEM_NAME), Boolean.toString(false), null)));
+        when(mockMetadataProvider.getAll()).thenReturn(
+                List.of(new Metadata(new MetadataKey("autoupdate", ITEM_NAME), Boolean.toString(false), null)));
         registerService(mockMetadataProvider);
     }
 
@@ -131,7 +131,7 @@ public class AbstractItemEventSubscriberOSGiTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSupportedEventTypes() {
-                return Collections.singleton(someEventType);
+                return Set.of(someEventType);
             }
         };
         registerService(someEventFactory);
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
index 7aa2bdc69e..1ef8a0c3bb 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.thing.binding;
 
-import static java.util.Collections.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -26,11 +25,10 @@ import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.AfterEach;
@@ -253,7 +251,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
 
         @Override
         public Set<String> getSubscribedEventTypes() {
-            return unmodifiableSet(Stream.of("ConfigStatusInfoEvent").collect(Collectors.toSet()));
+            return Set.of("ConfigStatusInfoEvent");
         }
 
         @Override
@@ -314,7 +312,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
 
         Thread.sleep(2000);
 
-        thing.getHandler().handleConfigurationUpdate(singletonMap("param", "invalid"));
+        thing.getHandler().handleConfigurationUpdate(Map.of("param", "invalid"));
 
         waitForAssert(() -> {
             Event event = eventSubscriber.getReceivedEvent();
@@ -324,7 +322,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
             eventSubscriber.resetReceivedEvent();
         }, 2500, DFL_SLEEP_TIME);
 
-        thing.getHandler().handleConfigurationUpdate(singletonMap("param", "ok"));
+        thing.getHandler().handleConfigurationUpdate(Map.of("param", "ok"));
 
         waitForAssert(() -> {
             Event event = eventSubscriber.getReceivedEvent();
@@ -356,7 +354,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
                 .create(ThingStatus.UNINITIALIZED, ThingStatusDetail.HANDLER_CONFIGURATION_PENDING).build();
         assertThat(thing.getStatusInfo(), is(uninitialized));
 
-        thingRegistry.updateConfiguration(thingUID, singletonMap("parameter", "value"));
+        thingRegistry.updateConfiguration(thingUID, Map.of("parameter", "value"));
 
         // ThingHandler.initialize() has been called; thing with status ONLINE.NONE
         final ThingStatusInfo online = ThingStatusInfoBuilder.create(ThingStatus.ONLINE).build();
@@ -403,9 +401,9 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
         @Override
         public Collection<ConfigStatusMessage> getConfigStatus() {
             if ("invalid".equals(getThing().getConfiguration().get(PARAM))) {
-                return singletonList(ERROR);
+                return List.of(ERROR);
             }
-            return singletonList(INFO);
+            return List.of(INFO);
         }
     }
 
@@ -563,7 +561,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
 
             managedThingProvider.add(thing);
 
-            thingRegistry.updateConfiguration(thingUID, singletonMap("parameter", "value"));
+            thingRegistry.updateConfiguration(thingUID, Map.of("parameter", "value"));
 
             waitForAssert(() -> assertThat(listener.isUpdated(), is(true)), 10000, 100);
 
@@ -585,7 +583,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
         ThingTypeUID thingTypeUID = new ThingTypeUID("bindingId:type");
         ThingUID thingUID = new ThingUID("bindingId:type:thingId");
         Thing thing = ThingBuilder.create(thingTypeUID, thingUID)
-                .withConfiguration(new Configuration(singletonMap("parameter", "someValue"))).build();
+                .withConfiguration(new Configuration(Map.of("parameter", "someValue"))).build();
 
         managedThingProvider.add(thing);
 
@@ -593,7 +591,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
         configuration.put("parameter", null);
 
         assertThrows(ConfigValidationException.class,
-                () -> thingRegistry.updateConfiguration(thingUID, singletonMap("parameter", configuration)));
+                () -> thingRegistry.updateConfiguration(thingUID, Map.of("parameter", configuration)));
     }
 
     @Test
@@ -613,7 +611,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
         managedThingProvider.add(thing);
 
         // set the config to an initial value
-        thingRegistry.updateConfiguration(thingUID, singletonMap("parameter", "before"));
+        thingRegistry.updateConfiguration(thingUID, Map.of("parameter", "before"));
         assertThat(thing.getConfiguration().get("parameter"), is("before"));
 
         // let it fail next time...
@@ -622,7 +620,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest {
         ((SimpleThingHandler) thing.getHandler()).setCallback(callback);
 
         try {
-            thingRegistry.updateConfiguration(thingUID, singletonMap("parameter", "after"));
+            thingRegistry.updateConfiguration(thingUID, Map.of("parameter", "after"));
             fail("There should have been an exception!");
         } catch (IllegalStateException e) {
             // all good, we want that
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
index 4d96df1f2c..7f99907770 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.core.thing.binding;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -19,8 +20,6 @@ import static org.mockito.Mockito.*;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -132,13 +131,13 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
         thingHandlerFactory.activate(componentContext);
         registerService(thingHandlerFactory, ThingHandlerFactory.class.getName());
 
-        Map<String, String> thingTypeGenericProperties = new HashMap<>();
-        thingTypeGenericProperties.put(PROPERTY_ON_GENERIC_THING_TYPE, GENERIC_VALUE);
-        thingTypeGenericProperties.put(PROPERTY_ON_GENERIC_AND_SPECIFIC_THING_TYPE, GENERIC_VALUE);
+        Map<String, String> thingTypeGenericProperties = Map.ofEntries(
+                entry(PROPERTY_ON_GENERIC_THING_TYPE, GENERIC_VALUE),
+                entry(PROPERTY_ON_GENERIC_AND_SPECIFIC_THING_TYPE, GENERIC_VALUE));
 
-        Map<String, String> thingTypeSpecificProperties = new HashMap<>();
-        thingTypeSpecificProperties.put(PROPERTY_ON_SPECIFIC_THING_TYPE, SPECIFIC_VALUE);
-        thingTypeSpecificProperties.put(PROPERTY_ON_GENERIC_AND_SPECIFIC_THING_TYPE, SPECIFIC_VALUE);
+        Map<String, String> thingTypeSpecificProperties = Map.ofEntries(
+                entry(PROPERTY_ON_SPECIFIC_THING_TYPE, SPECIFIC_VALUE),
+                entry(PROPERTY_ON_GENERIC_AND_SPECIFIC_THING_TYPE, SPECIFIC_VALUE));
 
         thingTypeGeneric = registerThingTypeAndConfigDescription(THING_TYPE_GENERIC_UID, thingTypeGenericProperties);
         thingTypeSpecific = registerThingTypeAndConfigDescription(THING_TYPE_SPECIFIC_UID, thingTypeSpecificProperties);
@@ -218,8 +217,7 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
             updateStatus(ThingStatus.ONLINE);
             genericInits++;
             if (selfChanging) {
-                Map<String, Object> properties = new HashMap<>(1);
-                properties.put("providedspecific", "there");
+                Map<String, Object> properties = Map.of("providedspecific", "there");
                 changeThingType(THING_TYPE_SPECIFIC_UID, new Configuration(properties));
             }
         }
@@ -318,8 +316,7 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
         // println "[ChangeThingTypeOSGiTest] ======== assert loading specialized thing type works directly"
 
         StorageService storage = getService(StorageService.class);
-        Map<String, Object> properties = new HashMap<>(1);
-        properties.put("providedspecific", "there");
+        Map<String, Object> properties = Map.of("providedspecific", "there");
         Thing persistedThing = ThingFactory.createThing(thingTypeSpecific,
                 new ThingUID("testBinding", "persistedThing"), new Configuration(properties), null, null);
         persistedThing.setProperty("universal", "survives");
@@ -411,15 +408,13 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
                 .withChannelDefinitions(getChannelDefinitions(thingTypeUID))
                 .withConfigDescriptionURI(configDescriptionUri).withProperties(thingTypeProperties).build();
         ConfigDescription configDescription = ConfigDescriptionBuilder.create(configDescriptionUri)
-                .withParameters(
-                        Arrays.asList(
-                                ConfigDescriptionParameterBuilder
-                                        .create("parameter" + thingTypeUID.getId(),
-                                                ConfigDescriptionParameter.Type.TEXT)
-                                        .withRequired(false).withDefault("default" + thingTypeUID.getId()).build(),
-                                ConfigDescriptionParameterBuilder
-                                        .create("provided" + thingTypeUID.getId(), ConfigDescriptionParameter.Type.TEXT)
-                                        .withRequired(false).build()))
+                .withParameters(List.of(
+                        ConfigDescriptionParameterBuilder
+                                .create("parameter" + thingTypeUID.getId(), ConfigDescriptionParameter.Type.TEXT)
+                                .withRequired(false).withDefault("default" + thingTypeUID.getId()).build(),
+                        ConfigDescriptionParameterBuilder
+                                .create("provided" + thingTypeUID.getId(), ConfigDescriptionParameter.Type.TEXT)
+                                .withRequired(false).build()))
                 .build();
 
         thingTypes.put(thingTypeUID, thingType);
@@ -429,7 +424,6 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
     }
 
     private List<ChannelDefinition> getChannelDefinitions(ThingTypeUID thingTypeUID) throws URISyntaxException {
-        List<ChannelDefinition> channelDefinitions = new ArrayList<>();
         ChannelTypeUID channelTypeUID = new ChannelTypeUID("test:" + thingTypeUID.getId());
         ChannelType channelType = new ChannelType(channelTypeUID, false, "itemType", "channelLabel", "description",
                 "category", new HashSet<>(), null, new URI("scheme", "channelType:" + thingTypeUID.getId(), null));
@@ -437,7 +431,6 @@ public class ChangeThingTypeOSGiTest extends JavaOSGiTest {
         channelTypes.put(channelTypeUID, channelType);
 
         ChannelDefinition cd = new ChannelDefinitionBuilder("channel" + thingTypeUID.getId(), channelTypeUID).build();
-        channelDefinitions.add(cd);
-        return channelDefinitions;
+        return List.of(cd);
     }
 }
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
index 8a4d0e4bcf..1b21a2a52b 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
@@ -12,7 +12,8 @@
  */
 package org.openhab.core.thing.binding;
 
-import static java.util.Collections.*;
+import static java.util.Collections.emptyList;
+import static java.util.Map.entry;
 import static java.util.stream.Collectors.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -22,12 +23,11 @@ import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.Nullable;
@@ -233,14 +233,14 @@ public class ThingFactoryTest extends JavaOSGiTest {
                 .state(new ChannelTypeUID("bindingId:channelTypeId2"), "channelLabel2", "Dimmer").withTag("tag3")
                 .build();
 
-        registerChannelTypes(Stream.of(channelType1, channelType2).collect(toSet()), emptyList());
+        registerChannelTypes(Set.of(channelType1, channelType2), emptyList());
 
         ChannelDefinition channelDef1 = new ChannelDefinitionBuilder("ch1", channelType1.getUID()).build();
         ChannelDefinition channelDef2 = new ChannelDefinitionBuilder("ch2", channelType2.getUID()).build();
 
         ThingType thingType = ThingTypeBuilder.instance(new ThingTypeUID("bindingId:thingType"), "label")
-                .withSupportedBridgeTypeUIDs(emptyList())
-                .withChannelDefinitions(Stream.of(channelDef1, channelDef2).collect(toList())).build();
+                .withSupportedBridgeTypeUIDs(emptyList()).withChannelDefinitions(List.of(channelDef1, channelDef2))
+                .build();
         Configuration configuration = new Configuration();
 
         Thing thing = ThingFactory.createThing(thingType, new ThingUID(thingType.getUID(), "thingId"), configuration);
@@ -260,7 +260,7 @@ public class ThingFactoryTest extends JavaOSGiTest {
     public void createThingWithChannelsGroups() {
         ChannelType channelType1 = ChannelTypeBuilder
                 .state(new ChannelTypeUID("bindingId:channelTypeId1"), "channelLabel", "Color")
-                .withTags(Stream.of("tag1", "tag2").collect(toSet())).build();
+                .withTags(Set.of("tag1", "tag2")).build();
 
         ChannelType channelType2 = ChannelTypeBuilder
                 .state(new ChannelTypeUID("bindingId:channelTypeId2"), "channelLabel2", "Dimmer").withTag("tag3")
@@ -271,26 +271,24 @@ public class ThingFactoryTest extends JavaOSGiTest {
 
         ChannelGroupType channelGroupType1 = ChannelGroupTypeBuilder
                 .instance(new ChannelGroupTypeUID("bindingid:groupTypeId1"), "label").withDescription("description")
-                .withCategory("myCategory1")
-                .withChannelDefinitions(Stream.of(channelDef1, channelDef2).collect(toList())).build();
+                .withCategory("myCategory1").withChannelDefinitions(List.of(channelDef1, channelDef2)).build();
         ChannelGroupType channelGroupType2 = ChannelGroupTypeBuilder
                 .instance(new ChannelGroupTypeUID("bindingid:groupTypeId2"), "label").withDescription("description")
-                .withCategory("myCategory2").withChannelDefinitions(singletonList(channelDef1)).build();
+                .withCategory("myCategory2").withChannelDefinitions(List.of(channelDef1)).build();
 
         ChannelGroupDefinition channelGroupDef1 = new ChannelGroupDefinition("group1", channelGroupType1.getUID());
         ChannelGroupDefinition channelGroupDef2 = new ChannelGroupDefinition("group2", channelGroupType2.getUID());
 
-        registerChannelTypes(Stream.of(channelType1, channelType2).collect(toSet()),
-                Stream.of(channelGroupType1, channelGroupType2).collect(toSet()));
+        registerChannelTypes(Set.of(channelType1, channelType2), Set.of(channelGroupType1, channelGroupType2));
 
         ThingType thingType = ThingTypeBuilder.instance(new ThingTypeUID("bindingId:thingType"), "label")
                 .withSupportedBridgeTypeUIDs(emptyList())
-                .withChannelGroupDefinitions(Stream.of(channelGroupDef1, channelGroupDef2).collect(toList())).build();
+                .withChannelGroupDefinitions(List.of(channelGroupDef1, channelGroupDef2)).build();
         Configuration configuration = new Configuration();
 
         Thing thing = ThingFactory.createThing(thingType, new ThingUID(thingType.getUID(), "thingId"), configuration);
 
-        List<String> channelUIDs = Arrays.asList("bindingId:thingType:thingId:group1#ch1",
+        List<String> channelUIDs = List.of("bindingId:thingType:thingId:group1#ch1",
                 "bindingId:thingType:thingId:group1#ch2", "bindingId:thingType:thingId:group2#ch1");
         assertThat(thing.getChannels().size(), is(3));
         for (Channel channel : thing.getChannels()) {
@@ -300,9 +298,7 @@ public class ThingFactoryTest extends JavaOSGiTest {
 
     @Test
     public void createThingWithProperties() {
-        Map<String, String> properties = new HashMap<>();
-        properties.put("key1", "value1");
-        properties.put("key2", "value2");
+        Map<String, String> properties = Map.ofEntries(entry("key1", "value1"), entry("key2", "value2"));
 
         ThingType thingType = ThingTypeBuilder.instance(new ThingTypeUID("bindingId:thingType"), "label")
                 .withProperties(properties).build();
@@ -316,9 +312,7 @@ public class ThingFactoryTest extends JavaOSGiTest {
 
     @Test
     public void createBridgeWithProperties() {
-        Map<String, String> properties = new HashMap<>();
-        properties.put("key1", "value1");
-        properties.put("key2", "value2");
+        Map<String, String> properties = Map.ofEntries(entry("key1", "value1"), entry("key2", "value2"));
 
         ThingType thingType = ThingTypeBuilder.instance(new ThingTypeUID("bindingId", "thingTypeId"), "label")
                 .withProperties(properties).buildBridge();
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
index bc8a86f896..efeb42c85e 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
@@ -16,8 +16,7 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
+import java.util.Map;
 
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.ThingUID;
@@ -105,17 +104,11 @@ public class Constants {
     public static final Firmware FWBETA_EN = FirmwareBuilder.create(THING_TYPE_UID2, VBETA).withVendor(VENDOR2)
             .withModel(MODEL2).withDescription("English description vbeta").withChangelog("English changelog vbeta")
             .withOnlineChangelog(newURL("http://url/changelog-vbeta?lang=en"))
-            .withProperties(Collections.singletonMap(Firmware.PROPERTY_REQUIRES_FACTORY_RESET, "true")).build();
+            .withProperties(Map.of(Firmware.PROPERTY_REQUIRES_FACTORY_RESET, "true")).build();
     public static final Firmware FWGAMMA_EN = FirmwareBuilder.create(THING_TYPE_UID2, VGAMMA).withVendor(VENDOR2)
             .withModel(MODEL2).withDescription("English description vgamma").withChangelog("English changelog vgamma")
             .withOnlineChangelog(newURL("http://url/changelog-vgamma?lang=en"))
-            .withProperties(new HashMap<String, String>() {
-                private static final long serialVersionUID = 1L;
-                {
-                    put("prop1", "a");
-                    put("prop2", "b");
-                }
-            }).build();
+            .withProperties(Map.of("prop1", "a", "prop2", "b")).build();
 
     public static final Firmware FWALPHA_DE = FirmwareBuilder.create(THING_TYPE_UID2, VALPHA).withVendor(VENDOR2)
             .withModel(MODEL2).withDescription("German description valpha").withChangelog("German changelog valpha")
@@ -123,17 +116,11 @@ public class Constants {
     public static final Firmware FWBETA_DE = FirmwareBuilder.create(THING_TYPE_UID2, VBETA).withVendor(VENDOR2)
             .withModel(MODEL2).withDescription("German description vbeta").withChangelog("German changelog vbeta")
             .withOnlineChangelog(newURL("http://url/changelog-vbeta?lang=de"))
-            .withProperties(Collections.singletonMap(Firmware.PROPERTY_REQUIRES_FACTORY_RESET, "true")).build();
+            .withProperties(Map.of(Firmware.PROPERTY_REQUIRES_FACTORY_RESET, "true")).build();
     public static final Firmware FWGAMMA_DE = FirmwareBuilder.create(THING_TYPE_UID2, VGAMMA).withVendor(VENDOR2)
             .withModel(MODEL2).withDescription("German description vgamma").withChangelog("German changelog vgamma")
             .withOnlineChangelog(newURL("http://url/changelog-vgamma?lang=de"))
-            .withProperties(new HashMap<String, String>() {
-                private static final long serialVersionUID = 1L;
-                {
-                    put("prop1", "a");
-                    put("prop2", "b");
-                }
-            }).build();
+            .withProperties(Map.of("prop1", "a", "prop2", "b")).build();
 
     public static final Firmware FW120_EN = FirmwareBuilder.create(THING_TYPE_UID3, V120).withVendor(VENDOR1)
             .withModel(MODEL1).withDescription("English description v1.2.0").withChangelog("English changelog v1.2.0")
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
index 7622a00987..ffbe716674 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
@@ -17,9 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -165,8 +163,7 @@ public class FirmwareUpdateServiceFirmwareRestrictionTest extends JavaOSGiTest {
 
         // Mock the provider to return the firmwares
         FirmwareProvider lambdaFirmwareProvider = mock(FirmwareProvider.class);
-        Set<Firmware> resultSet = new HashSet<>(Arrays.asList(fw38, fw40));
-        when(lambdaFirmwareProvider.getFirmwares(any(), any())).thenReturn(resultSet);
+        when(lambdaFirmwareProvider.getFirmwares(any(), any())).thenReturn(Set.of(fw38, fw40));
         registerService(lambdaFirmwareProvider);
 
         FirmwareUpdateService firmwareUpdateService = getService(FirmwareUpdateService.class);
@@ -235,8 +232,7 @@ public class FirmwareUpdateServiceFirmwareRestrictionTest extends JavaOSGiTest {
 
     private void registerFirmwareProviderWithSingleFirmware(Firmware firmwareToReturn) {
         lambdaFirmwareProvider = mock(FirmwareProvider.class);
-        Set<Firmware> resultSet = new HashSet<>(Arrays.asList(firmwareToReturn));
-        when(lambdaFirmwareProvider.getFirmwares(any(), any())).thenReturn(resultSet);
+        when(lambdaFirmwareProvider.getFirmwares(any(), any())).thenReturn(Set.of(firmwareToReturn));
         when(lambdaFirmwareProvider.getFirmware(any(), any(), any())).thenReturn(firmwareToReturn);
         registerService(lambdaFirmwareProvider);
     }
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
index e56bff9eff..1ecb9ede0a 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
@@ -18,11 +18,10 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -110,8 +109,7 @@ public class FirmwareUpdateServicePrerequisiteVersionTest extends JavaOSGiTest {
 
     private FirmwareProvider createFirmwareProvider(Thing thing, Firmware... firmwares) {
         FirmwareProvider firmwareProvider = mock(FirmwareProvider.class);
-        when(firmwareProvider.getFirmwares(eq(thing), any(Locale.class)))
-                .thenReturn(new HashSet<>(Arrays.asList(firmwares)));
+        when(firmwareProvider.getFirmwares(eq(thing), any(Locale.class))).thenReturn(Set.of(firmwares));
         return firmwareProvider;
     }
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
index fa059bef61..1fc8f66f35 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
@@ -17,9 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.openhab.core.thing.Thing.*;
 import static org.openhab.core.thing.firmware.FirmwareStatus.*;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
@@ -221,9 +218,9 @@ public class ModelRestrictedFirmwareUpdateServiceOSGiTest extends JavaOSGiTest {
             @Override
             public Set<Firmware> getFirmwares(Thing thing, Locale locale) {
                 if (thing.getThingTypeUID().equals(THING_TYPE.getUID())) {
-                    return new HashSet<>(Arrays.asList(firmwares));
+                    return Set.of(firmwares);
                 } else {
-                    return Collections.emptySet();
+                    return Set.of();
                 }
             }
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProviderOSGiTest.java
index 55d62a679e..2233bb8b46 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProviderOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProviderOSGiTest.java
@@ -20,9 +20,9 @@ import static org.mockito.MockitoAnnotations.openMocks;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -163,7 +163,7 @@ public class ChannelCommandDescriptionProviderOSGiTest extends JavaOSGiTest {
         channelDefinitions.add(new ChannelDefinitionBuilder("7_1", channelType2.getUID()).build());
         channelDefinitions.add(new ChannelDefinitionBuilder("7_2", channelType3.getUID()).build());
 
-        registerService(new SimpleThingTypeProvider(Collections.singleton(ThingTypeBuilder
+        registerService(new SimpleThingTypeProvider(Set.of(ThingTypeBuilder
                 .instance(new ThingTypeUID("hue:lamp"), "label").withChannelDefinitions(channelDefinitions).build())));
 
         List<Item> items = new ArrayList<>();
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
index f4ba6314b1..525594b16e 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
@@ -19,11 +19,10 @@ import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -181,7 +180,7 @@ public class ChannelStateDescriptionProviderOSGiTest extends JavaOSGiTest {
         channelDefinitions.add(new ChannelDefinitionBuilder("7_1", channelType7.getUID()).build());
         channelDefinitions.add(new ChannelDefinitionBuilder("7_2", channelType7.getUID()).build());
 
-        registerService(new SimpleThingTypeProvider(Collections.singleton(ThingTypeBuilder
+        registerService(new SimpleThingTypeProvider(Set.of(ThingTypeBuilder
                 .instance(new ThingTypeUID("hue:lamp"), "label").withChannelDefinitions(channelDefinitions).build())));
 
         List<Item> items = new ArrayList<>();
@@ -422,8 +421,8 @@ public class ChannelStateDescriptionProviderOSGiTest extends JavaOSGiTest {
         final @Nullable StateDescription newState = StateDescriptionFragmentBuilder.create()
                 .withMinimum(BigDecimal.valueOf(10)).withMaximum(BigDecimal.valueOf(100))
                 .withStep(BigDecimal.valueOf(5)).withPattern("VALUE %d").withReadOnly(false)
-                .withOptions(Arrays.asList(new StateOption("value0", "label0"), new StateOption("value1", "label1")))
-                .build().toStateDescription();
+                .withOptions(List.of(new StateOption("value0", "label0"), new StateOption("value1", "label1"))).build()
+                .toStateDescription();
 
         @Override
         public @Nullable StateDescription getStateDescription(Channel channel, @Nullable StateDescription original,
@@ -440,8 +439,8 @@ public class ChannelStateDescriptionProviderOSGiTest extends JavaOSGiTest {
                         .withMaximum(original.getMaximum().add(BigDecimal.ONE))
                         .withStep(original.getStep().add(BigDecimal.TEN)).withPattern("NEW " + original.getPattern())
                         .withReadOnly(!original.isReadOnly())
-                        .withOptions(Collections.singletonList(new StateOption("NEW SOUND", "My great new sound.")))
-                        .build().toStateDescription();
+                        .withOptions(List.of(new StateOption("NEW SOUND", "My great new sound."))).build()
+                        .toStateDescription();
             }
             return null;
         }
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
index 873d2ecb1f..343ee20eb9 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
@@ -17,8 +17,8 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -208,8 +208,7 @@ public class CommunicationManagerOSGiTest extends JavaOSGiTest {
 
             @Override
             public Collection<ItemChannelLink> getAll() {
-                return Arrays.asList(LINK_1_S1, LINK_1_S2, LINK_2_S2, LINK_1_T1, LINK_1_T2, LINK_2_T2, LINK_3_S3,
-                        LINK_4_S4);
+                return List.of(LINK_1_S1, LINK_1_S2, LINK_2_S2, LINK_1_T1, LINK_1_T2, LINK_2_T2, LINK_3_S3, LINK_4_S4);
             }
         });
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
index f43b7e69f2..fab8ecfb30 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
@@ -23,6 +23,7 @@ import java.net.URI;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -134,9 +135,9 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
     public void setUp() throws Exception {
         configDescriptionChannel = new URI("test:channel");
         configDescriptionThing = new URI("test:test");
-        thing = ThingBuilder.create(THING_TYPE_UID, THING_UID).withChannels(Collections.singletonList( //
+        thing = ThingBuilder.create(THING_TYPE_UID, THING_UID).withChannels(List.of( //
                 ChannelBuilder.create(CHANNEL_UID, "Switch").withLabel("Test Label").withDescription("Test Description")
-                        .withType(CHANNEL_TYPE_UID).withDefaultTags(Collections.singleton("Test Tag")).build() //
+                        .withType(CHANNEL_TYPE_UID).withDefaultTags(Set.of("Test Tag")).build() //
         )).build();
         registerVolatileStorageService();
 
@@ -340,12 +341,12 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
         // verify a missing mandatory channel config prevents it from getting initialized
         when(mockConfigDescriptionProvider.getConfigDescription(eq(configDescriptionChannel), any()))
                 .thenReturn(ConfigDescriptionBuilder.create(configDescriptionChannel).withParameter(parameter).build());
-        assertThingStatus(Collections.singletonMap(CONFIG_PARAM_NAME, "value"), Collections.emptyMap(),
-                ThingStatus.UNINITIALIZED, ThingStatusDetail.HANDLER_CONFIGURATION_PENDING);
+        assertThingStatus(Map.of(CONFIG_PARAM_NAME, "value"), Collections.emptyMap(), ThingStatus.UNINITIALIZED,
+                ThingStatusDetail.HANDLER_CONFIGURATION_PENDING);
 
         // verify a satisfied config does not prevent it from getting initialized anymore
-        assertThingStatus(Collections.singletonMap(CONFIG_PARAM_NAME, "value"),
-                Collections.singletonMap(CONFIG_PARAM_NAME, "value"), ThingStatus.ONLINE, ThingStatusDetail.NONE);
+        assertThingStatus(Map.of(CONFIG_PARAM_NAME, "value"), Map.of(CONFIG_PARAM_NAME, "value"), ThingStatus.ONLINE,
+                ThingStatusDetail.NONE);
     }
 
     @Test
@@ -986,7 +987,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
         Configuration configThing = new Configuration(propsThing);
         Configuration configChannel = new Configuration(propsChannel);
 
-        Thing thing = ThingBuilder.create(THING_TYPE_UID, THING_UID).withChannels(Collections.singletonList( //
+        Thing thing = ThingBuilder.create(THING_TYPE_UID, THING_UID).withChannels(List.of( //
                 ChannelBuilder.create(CHANNEL_UID, "Switch").withType(CHANNEL_TYPE_UID).withConfiguration(configChannel)
                         .build() //
         )).withConfiguration(configThing).build();
@@ -1015,8 +1016,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
     private void registerThingTypeProvider() throws Exception {
         ThingType thingType = ThingTypeBuilder.instance(THING_TYPE_UID, "label")
                 .withConfigDescriptionURI(configDescriptionThing)
-                .withChannelDefinitions(
-                        Collections.singletonList(new ChannelDefinitionBuilder(CHANNEL_ID, CHANNEL_TYPE_UID).build()))
+                .withChannelDefinitions(List.of(new ChannelDefinitionBuilder(CHANNEL_ID, CHANNEL_TYPE_UID).build()))
                 .build();
 
         ThingTypeProvider mockThingTypeProvider = mock(ThingTypeProvider.class);
@@ -1037,8 +1037,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
     private void registerChannelGroupTypeProvider() throws Exception {
         ChannelGroupType channelGroupType = ChannelGroupTypeBuilder.instance(CHANNEL_GROUP_TYPE_UID, "Test Group Label")
                 .withDescription("Test Group Description").withCategory("Test Group Category")
-                .withChannelDefinitions(
-                        Collections.singletonList(new ChannelDefinitionBuilder(CHANNEL_ID, CHANNEL_TYPE_UID).build()))
+                .withChannelDefinitions(List.of(new ChannelDefinitionBuilder(CHANNEL_ID, CHANNEL_TYPE_UID).build()))
                 .build();
 
         ChannelGroupTypeProvider mockChannelGroupTypeProvider = mock(ChannelGroupTypeProvider.class);
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
index 0d69e8b5ae..5ee62cb752 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.thing.internal;
 
-import static java.util.Collections.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -24,7 +23,6 @@ import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
@@ -314,8 +312,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         registerThingTypeProvider();
 
         Thing thing2 = ThingBuilder.create(THING_TYPE_UID, THING_UID)
-                .withChannels(singletonList(ChannelBuilder.create(CHANNEL_UID, CoreItemFactory.SWITCH).build()))
-                .build();
+                .withChannels(List.of(ChannelBuilder.create(CHANNEL_UID, CoreItemFactory.SWITCH).build())).build();
 
         class ThingHandlerState {
             boolean raceCondition;
@@ -872,7 +869,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return Collections.singleton(ItemStateEvent.TYPE);
+                return Set.of(ItemStateEvent.TYPE);
             }
 
             @Override
@@ -1088,7 +1085,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         assertThat(thingManager, is(notNullValue()));
 
         ThingProvider customThingProvider = mock(ThingProvider.class);
-        when(customThingProvider.getAll()).thenReturn(Collections.singletonList(thing));
+        when(customThingProvider.getAll()).thenReturn(List.of(thing));
 
         registerService(customThingProvider);
 
@@ -1140,7 +1137,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         EventSubscriber thingStatusEventSubscriber = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return singleton(ThingStatusInfoEvent.TYPE);
+                return Set.of(ThingStatusInfoEvent.TYPE);
             }
 
             @Override
@@ -1236,7 +1233,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         EventSubscriber thingStatusEventSubscriber = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return singleton(ThingStatusInfoChangedEvent.TYPE);
+                return Set.of(ThingStatusInfoChangedEvent.TYPE);
             }
 
             @Override
@@ -1318,7 +1315,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         EventSubscriber thingStatusInfoEventSubscriber = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return singleton(ThingStatusInfoEvent.TYPE);
+                return Set.of(ThingStatusInfoEvent.TYPE);
             }
 
             @Override
@@ -1338,7 +1335,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest {
         EventSubscriber thingStatusInfoChangedEventSubscriber = new EventSubscriber() {
             @Override
             public Set<String> getSubscribedEventTypes() {
-                return singleton(ThingStatusInfoChangedEvent.TYPE);
+                return Set.of(ThingStatusInfoChangedEvent.TYPE);
             }
 
             @Override
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
index 84bd226b46..20b7c4be54 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
@@ -12,14 +12,12 @@
  */
 package org.openhab.core.thing.internal;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
@@ -93,11 +91,7 @@ public class ThingRegistryOSGiTest extends JavaOSGiTest {
 
             @Override
             public Set<String> getSubscribedEventTypes() {
-                Set<String> types = new HashSet<>();
-                types.add(ThingAddedEvent.TYPE);
-                types.add(ThingRemovedEvent.TYPE);
-                types.add(ThingUpdatedEvent.TYPE);
-                return types;
+                return Set.of(ThingAddedEvent.TYPE, ThingRemovedEvent.TYPE, ThingUpdatedEvent.TYPE);
             }
 
             @Override
@@ -164,7 +158,7 @@ public class ThingRegistryOSGiTest extends JavaOSGiTest {
 
             @Override
             public Collection<Thing> getAll() {
-                return Collections.singleton(thing);
+                return Set.of(thing);
             }
 
             @Override
@@ -175,9 +169,7 @@ public class ThingRegistryOSGiTest extends JavaOSGiTest {
 
         ThingRegistry thingRegistry = getService(ThingRegistry.class);
 
-        Map<String, Object> parameters = new HashMap<>();
-        parameters.put("param1", "value1");
-        parameters.put("param2", 1);
+        Map<String, Object> parameters = Map.ofEntries(entry("param1", "value1"), entry("param2", 1));
 
         thingRegistry.updateConfiguration(thingUID, parameters);
 
@@ -188,8 +180,7 @@ public class ThingRegistryOSGiTest extends JavaOSGiTest {
     public void assertThatThingRegistryThrowsExceptionForConfigUpdateOfNonExistingThing() {
         ThingRegistry thingRegistry = getService(ThingRegistry.class);
         ThingUID thingUID = new ThingUID(THING_TYPE_UID, "thing");
-        Map<String, Object> parameters = new HashMap<>();
-        parameters.put("param", "value1");
+        Map<String, Object> parameters = Map.of("param", "value1");
         assertThrows(IllegalArgumentException.class, () -> thingRegistry.updateConfiguration(thingUID, parameters));
     }
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
index cbf2d7af57..f87bc4b786 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
@@ -19,12 +19,9 @@ import static org.openhab.core.thing.firmware.Constants.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -86,12 +83,12 @@ public class FirmwareRegistryOSGiTest extends JavaOSGiTest {
         @Override
         public @Nullable Set<Firmware> getFirmwares(Thing thing, @Nullable Locale locale) {
             if (!thing.equals(thing1)) {
-                return Collections.emptySet();
+                return Set.of();
             }
             if (Locale.ENGLISH.equals(locale)) {
-                return Stream.of(FW111_EN, FW112_EN).collect(Collectors.toSet());
+                return Set.of(FW111_EN, FW112_EN);
             } else {
-                return Stream.of(FW111_DE, FW112_DE).collect(Collectors.toSet());
+                return Set.of(FW111_DE, FW112_DE);
             }
         }
 
@@ -142,15 +139,15 @@ public class FirmwareRegistryOSGiTest extends JavaOSGiTest {
         public @Nullable Set<Firmware> getFirmwares(Thing thing, @Nullable Locale locale) {
             if (THING_TYPE_UID1.equals(thing.getThingTypeUID())) {
                 if (Locale.ENGLISH.equals(locale)) {
-                    return Collections.singleton(FW111_FIX_EN);
+                    return Set.of(FW111_FIX_EN);
                 } else {
-                    return Collections.singleton(FW111_FIX_DE);
+                    return Set.of(FW111_FIX_DE);
                 }
             } else if (THING_TYPE_UID2.equals(thing.getThingTypeUID())) {
                 if (Locale.ENGLISH.equals(locale)) {
-                    return Stream.of(FWALPHA_EN, FWBETA_EN, FWGAMMA_EN).collect(Collectors.toSet());
+                    return Set.of(FWALPHA_EN, FWBETA_EN, FWGAMMA_EN);
                 } else {
-                    return Stream.of(FWALPHA_DE, FWBETA_DE, FWGAMMA_DE).collect(Collectors.toSet());
+                    return Set.of(FWALPHA_DE, FWBETA_DE, FWGAMMA_DE);
                 }
             }
             return null;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
index fac2588f04..46c3f279bf 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.core.thing.internal.firmware;
 
+import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -26,11 +27,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -229,7 +230,7 @@ public class FirmwareUpdateServiceTest extends JavaOSGiTest {
                     || THING_TYPE_UID1.equals(thing.getThingTypeUID())) {
                 return Collections.emptySet();
             } else {
-                return Collections.singleton(FWALPHA_EN);
+                return Set.of(FWALPHA_EN);
             }
         });
 
@@ -285,7 +286,7 @@ public class FirmwareUpdateServiceTest extends JavaOSGiTest {
                     || THING_TYPE_UID2.equals(thing.getThingTypeUID())) {
                 return Collections.emptySet();
             } else {
-                return Collections.singleton(FW113_EN);
+                return Set.of(FW113_EN);
             }
         });
 
@@ -660,7 +661,7 @@ public class FirmwareUpdateServiceTest extends JavaOSGiTest {
         when(mockFirmwareRegistry.getFirmwares(any(Thing.class), any())).thenAnswer(invocation -> {
             Thing thing = (Thing) invocation.getArguments()[0];
             if (THING_TYPE_UID1.equals(thing.getThingTypeUID())) {
-                return Collections.singleton(FWALPHA_RESTRICTED_TO_MODEL2);
+                return Set.of(FWALPHA_RESTRICTED_TO_MODEL2);
             } else {
                 return Collections.emptySet();
             }
@@ -861,9 +862,9 @@ public class FirmwareUpdateServiceTest extends JavaOSGiTest {
         when(mockFirmwareRegistry.getFirmwares(any(Thing.class))).thenAnswer(invocation -> {
             Thing thing = (Thing) invocation.getArguments()[0];
             if (THING_TYPE_UID3.equals(thing.getThingTypeUID())) {
-                return Collections.singleton(FW120_EN);
+                return Set.of(FW120_EN);
             } else {
-                return Collections.emptySet();
+                return Set.of();
             }
         });
 
@@ -985,10 +986,9 @@ public class FirmwareUpdateServiceTest extends JavaOSGiTest {
     }
 
     private void updateConfig(int period, int delay, TimeUnit timeUnit) throws IOException {
-        Map<String, Object> properties = new Hashtable<>();
-        properties.put(FirmwareUpdateServiceImpl.PERIOD_CONFIG_KEY, period);
-        properties.put(FirmwareUpdateServiceImpl.DELAY_CONFIG_KEY, delay);
-        properties.put(FirmwareUpdateServiceImpl.TIME_UNIT_CONFIG_KEY, timeUnit.name());
+        Map<String, Object> properties = Map.ofEntries(entry(FirmwareUpdateServiceImpl.PERIOD_CONFIG_KEY, period),
+                entry(FirmwareUpdateServiceImpl.DELAY_CONFIG_KEY, delay),
+                entry(FirmwareUpdateServiceImpl.TIME_UNIT_CONFIG_KEY, timeUnit.name()));
         firmwareUpdateService.modified(properties);
     }
 }
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
index 6146475979..ce749566ca 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
@@ -14,8 +14,6 @@ package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioStream;
@@ -32,8 +30,7 @@ import org.openhab.core.voice.KSServiceHandle;
  */
 public class KSServiceStub implements KSService {
 
-    private static final Set<AudioFormat> SUPPORTED_FORMATS = Stream.of(AudioFormat.MP3, AudioFormat.WAV)
-            .collect(Collectors.toSet());
+    private static final Set<AudioFormat> SUPPORTED_FORMATS = Set.of(AudioFormat.MP3, AudioFormat.WAV);
 
     private static final String KSSERVICE_STUB_ID = "ksServiceStubID";
     private static final String KSSERVICE_STUB_LABEL = "ksServiceStubLabel";
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
index c40c7c2223..a34c8480e3 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
@@ -14,8 +14,6 @@ package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioStream;
@@ -32,8 +30,7 @@ import org.openhab.core.voice.STTServiceHandle;
  */
 public class STTServiceStub implements STTService {
 
-    private static final Set<AudioFormat> SUPPORTED_FORMATS = Stream.of(AudioFormat.MP3, AudioFormat.WAV)
-            .collect(Collectors.toSet());
+    private static final Set<AudioFormat> SUPPORTED_FORMATS = Set.of(AudioFormat.MP3, AudioFormat.WAV);
 
     private static final String STTSERVICE_STUB_ID = "sttServiceStubID";
     private static final String STTSERVICE_STUB_LABEL = "sttServiceStubLabel";
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
index 6c47201819..b2c1ea31e6 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
@@ -13,11 +13,8 @@
 package org.openhab.core.voice.internal;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -39,10 +36,8 @@ import org.openhab.core.library.types.PercentType;
 public class SinkStub implements AudioSink {
 
     private boolean isStreamProcessed;
-    private static final Set<AudioFormat> SUPPORTED_AUDIO_FORMATS = Collections
-            .unmodifiableSet(Stream.of(AudioFormat.MP3, AudioFormat.WAV).collect(Collectors.toSet()));
-    private static final Set<Class<? extends AudioStream>> SUPPORTED_AUDIO_STREAMS = Collections
-            .singleton(AudioStream.class);
+    private static final Set<AudioFormat> SUPPORTED_AUDIO_FORMATS = Set.of(AudioFormat.MP3, AudioFormat.WAV);
+    private static final Set<Class<? extends AudioStream>> SUPPORTED_AUDIO_STREAMS = Set.of(AudioStream.class);
 
     private static final String SINK_STUB_ID = "sinkStubID";
     private static final String SINK_STUB_LABEL = "sinkStubLabel";
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
index 1126b77ebc..80da39d38c 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
@@ -17,8 +17,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioStream;
@@ -37,8 +35,7 @@ import org.osgi.framework.ServiceReference;
  */
 public class TTSServiceStub implements TTSService {
 
-    private static final Set<AudioFormat> SUPPORTED_FORMATS = Stream.of(AudioFormat.MP3, AudioFormat.WAV)
-            .collect(Collectors.toSet());
+    private static final Set<AudioFormat> SUPPORTED_FORMATS = Set.of(AudioFormat.MP3, AudioFormat.WAV);
 
     private static final String TTS_SERVICE_STUB_ID = "ttsServiceStubID";
     private static final String TTS_SERVICE_STUB_LABEL = "ttsServiceStubLabel";
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
index 7535672bb9..d5339f08d7 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
@@ -17,10 +17,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -84,7 +84,7 @@ public class SayCommandTest extends VoiceConsoleCommandExtensionTest {
         params[11] = new Object[] { true, false, false, ttsService, false, false };
         params[12] = new Object[] { true, true, true, ttsService, true, true };
 
-        return Arrays.asList(params);
+        return List.of(params);
     }
 
     @ParameterizedTest
diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
index 7545e50bb4..2e42e2e4fd 100644
--- a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
+++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
@@ -39,7 +39,7 @@ import org.osgi.service.component.annotations.Component;
 @Component(configurationPid = "binding.${bindingId}", service = ThingHandlerFactory.class)
 public class ${bindingIdCamelCase}HandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections.singleton(THING_TYPE_SAMPLE);
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_SAMPLE);
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {