diff --git a/bundles/org.openhab.core.addon.marketplace.karaf/src/main/java/org/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java b/bundles/org.openhab.core.addon.marketplace.karaf/src/main/java/org/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java index 037e402179..d7c24404f5 100644 --- a/bundles/org.openhab.core.addon.marketplace.karaf/src/main/java/org/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java +++ b/bundles/org.openhab.core.addon.marketplace.karaf/src/main/java/org/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java @@ -165,7 +165,7 @@ public class CommunityKarafAddonHandler implements MarketplaceAddonHandler { "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); diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java index 47c0c1a266..c564104d35 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/AbstractJacksonYAMLParser.java @@ -32,17 +32,17 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; public abstract class AbstractJacksonYAMLParser implements Parser { /** 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 dataObjects, OutputStreamWriter writer) throws Exception { for (T dataObject : dataObjects) { - yamlMapper.writeValue(writer, dataObject); + YAML_MAPPER.writeValue(writer, dataObject); } } } diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/TemplateYAMLParser.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/TemplateYAMLParser.java index cc8359f387..8a6cdd115a 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/jackson/TemplateYAMLParser.java +++ b/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