Cleanup: Java21, SAT (#4757)

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

Author: holgerfriedrich

bundles/org.openhab.core.addon.marketplace.karaf/src/main/java/org/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java

@@ -165,7 +165,7 @@ private void installFromCache(String addonId) throws MarketplaceHandlerException
                             "The local cache folder doesn't contain a single file: " + addonPath, null);
                 }
                 try {
-                    karService.install(karFiles.get(0).toUri(), false);
+                    karService.install(karFiles.getFirst().toUri(), false);
                 } catch (Exception e) {
                     throw new MarketplaceHandlerException(
                             "Cannot install KAR from marketplace cache: " + e.getMessage(), e);

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java

@@ -32,17 +32,17 @@
 public abstract class AbstractJacksonYAMLParser<T> implements Parser<T> {
 
     /** The YAML object mapper instance */
-    protected static final ObjectMapper yamlMapper;
+    protected static final ObjectMapper YAML_MAPPER;
 
     static {
-        yamlMapper = new ObjectMapper(new YAMLFactory());
-        yamlMapper.findAndRegisterModules();
+        YAML_MAPPER = new ObjectMapper(new YAMLFactory());
+        YAML_MAPPER.findAndRegisterModules();
     }
 
     @Override
     public void serialize(Set<T> dataObjects, OutputStreamWriter writer) throws Exception {
         for (T dataObject : dataObjects) {
-            yamlMapper.writeValue(writer, dataObject);
+            YAML_MAPPER.writeValue(writer, dataObject);
         }
     }
 }

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/TemplateYAMLParser.java

@@ -43,16 +43,16 @@ public class TemplateYAMLParser extends AbstractJacksonYAMLParser<Template> {
     public Set<Template> parse(InputStreamReader reader) throws ParsingException {
         try {
             Set<Template> templates = new HashSet<>();
-            JsonNode rootNode = yamlMapper.readTree(reader);
+            JsonNode rootNode = YAML_MAPPER.readTree(reader);
             if (rootNode.isArray()) {
-                List<RuleTemplateDTO> templateDtos = yamlMapper.convertValue(rootNode,
+                List<RuleTemplateDTO> templateDtos = YAML_MAPPER.convertValue(rootNode,
                         new TypeReference<List<RuleTemplateDTO>>() {
                         });
                 for (RuleTemplateDTO templateDTO : templateDtos) {
                     templates.add(RuleTemplateDTOMapper.map(templateDTO));
                 }
             } else {
-                RuleTemplateDTO templateDto = yamlMapper.convertValue(rootNode, new TypeReference<RuleTemplateDTO>() {
+                RuleTemplateDTO templateDto = YAML_MAPPER.convertValue(rootNode, new TypeReference<RuleTemplateDTO>() {
                 });
                 templates.add(RuleTemplateDTOMapper.map(templateDto));
             }

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/parser/ValidationException.java

@@ -12,6 +12,8 @@
  */
 package org.openhab.core.automation.parser;
 
+import java.io.Serial;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -23,6 +25,7 @@
 @NonNullByDefault
 public class ValidationException extends Exception {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java

@@ -20,7 +20,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -223,7 +223,7 @@ protected void modified(Map<String, Object> config) {
     }
 
     private URL getUrl(String filename) throws FileNotFoundException {
-        if (Files.exists(Paths.get(filename))) {
+        if (Files.exists(Path.of(filename))) {
             try {
                 return (new URI("file:" + filename)).toURL();
             } catch (IllegalArgumentException | MalformedURLException | URISyntaxException e) {

bundles/org.openhab.core.io.websocket/src/main/java/org/openhab/core/io/websocket/log/LogWebSocket.java

@@ -198,7 +198,7 @@ public void onText(String message) {
         lastSentTime = System.currentTimeMillis();
 
         // Remove any duplicates from the live log buffer
-        long newestSequence = logs.get(0).getSequence();
+        long newestSequence = logs.getFirst().getSequence();
         synchronized (deferredLogs) {
             Iterator<LogDTO> iterator = deferredLogs.iterator();
             while (iterator.hasNext()) {

bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java

@@ -234,7 +234,6 @@ public void removeModelRepositoryChangeListener(ModelRepositoryChangeListener li
 
     @Override
     public void generateSyntaxFromModel(OutputStream out, String modelType, EObject modelContent) {
-        String result = "";
         synchronized (resourceSet) {
             String name = "tmp_generated_syntax_%d.%s".formatted(++counter, modelType);
             Resource resource = resourceSet.createResource(URI.createURI(name));

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImpl.java

@@ -722,7 +722,6 @@ private <T extends YamlElement> List<T> parseJsonMapNode(@Nullable JsonNode mapN
                             errors.add("could not create new instance of %s".formatted(elementClass.getSimpleName()));
                         }
                     }
-
                 } else {
                     try {
                         elt = objectMapper.treeToValue(node, elementClass);

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java

@@ -108,7 +108,6 @@ public String getName() {
      *
      * @param itemName name of item
      * @param alias alias of item
-     *
      * @return a {@link PersistedItem} or null if the item has not been persisted
      */
     default @Nullable PersistedItem persistedItem(String itemName, @Nullable String alias) {

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java

@@ -313,7 +313,7 @@ boolean checkSemantics(Item item) {
                 }
             }
         } else if (Equipment.class.isAssignableFrom(semanticTag)) {
-            if (parentLocations.size() > 0 && parentEquipments.size() > 0) {
+            if (!parentLocations.isEmpty() && !parentEquipments.isEmpty()) {
                 warnings.add(String.format(
                         "It belongs to location(s) %s and equipment(s) %s. An Equipment can only belong to one Location or another Equipment, but not both.",
                         parentLocations.toString(), parentEquipments.toString()));
@@ -333,7 +333,7 @@ boolean checkSemantics(Item item) {
                 warnings.add(String.format("It is a %s item, not a group. A location should be a Group Item.",
                         item.getType()));
             }
-            if (parentEquipments.size() > 0) {
+            if (!parentEquipments.isEmpty()) {
                 warnings.add(String.format(
                         "It belongs to equipment(s) %s. A Location can only belong to another Location, not Equipment.",
                         parentEquipments.toString()));