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

Reduce SAT warnings (#4860)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2025-06-21 07:10:58 +02:00
committed by GitHub
parent 6eb7d0c9a6
commit e17577c7c5
6 changed files with 145 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
+6 -6
View File
@@ -57,7 +57,7 @@ public class UpgradeTool {
new YamlConfigurationV1TagsUpgrader() // Added in 5.0
);
private static final Logger logger = LoggerFactory.getLogger(UpgradeTool.class);
private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeTool.class);
private static @Nullable JsonStorage<UpgradeRecord> upgradeRecords = null;
private static Options getOptions() {
@@ -116,7 +116,7 @@ public class UpgradeTool {
.resolve(Path.of("jsondb", "org.openhab.core.tools.UpgradeTool"));
upgradeRecords = new JsonStorage<>(upgradeJsonDatabasePath.toFile(), null, 5, 0, 0, List.of());
} else {
logger.warn("Upgrade records storage is not initialized.");
LOGGER.warn("Upgrade records storage is not initialized.");
}
UPGRADERS.forEach(upgrader -> {
@@ -125,17 +125,17 @@ public class UpgradeTool {
return;
}
if (!force && lastExecuted(upgraderName) instanceof String executionDate) {
logger.info("Already executed '{}' on {}. Use '--force' to execute it again.", upgraderName,
LOGGER.info("Already executed '{}' on {}. Use '--force' to execute it again.", upgraderName,
executionDate);
return;
}
try {
logger.info("Executing {}: {}", upgraderName, upgrader.getDescription());
LOGGER.info("Executing {}: {}", upgraderName, upgrader.getDescription());
if (upgrader.execute(userdataPath, confPath)) {
updateUpgradeRecord(upgraderName);
}
} catch (Exception e) {
logger.error("Error executing upgrader {}: {}", upgraderName, e.getMessage());
LOGGER.error("Error executing upgrader {}: {}", upgraderName, e.getMessage());
}
});
} catch (ParseException e) {
@@ -173,7 +173,7 @@ public class UpgradeTool {
if (path.toFile().isDirectory()) {
return path;
} else {
logger.warn(
LOGGER.warn(
"The '{}' directory '{}' does not exist. Some tasks may fail. To set it, either set the environment variable ${{}} or provide a directory through the --{} option.",
pathName, path, env, option);
return null;
tools/upgradetool/src/main/java/org/openhab/core/tools/internal/YamlConfigurationV1TagsUpgrader.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class YamlConfigurationV1TagsUpgrader implements Upgrader {
fileContent.properties().forEach(entry -> {
String key = entry.getKey();
JsonNode node = entry.getValue();
if (key.equals("tags")) {
if ("tags".equals(key)) {
ObjectNode tagsMap = objectMapper.createObjectNode();
for (JsonNode tag : node) {
if (tag.hasNonNull("uid")) {