diff --git a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfo.java b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfo.java index 0e015645d9c..8e45c47c918 100644 --- a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfo.java +++ b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfo.java @@ -32,9 +32,6 @@ */ @NonNullByDefault public class AddonInfo implements Identifiable { - - public static final String NA = "n/a"; - private static final Set SUPPORTED_ADDON_TYPES = Set.of("automation", "binding", "misc", "persistence", "transformation", "ui", "voice"); diff --git a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java index 897547b9bb1..338a3cbfad6 100644 --- a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java +++ b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java @@ -97,15 +97,8 @@ public void removeAddonInfoProvider(AddonInfoProvider addonInfoProvider) { return a; } AddonInfo.Builder builder = AddonInfo.builder(a); - if (AddonInfo.NA.equals(a.getName())) { - builder.withName(b.getName()); - } else if (AddonInfo.NA.equals(b.getName())) { - builder.withName(a.getName()); - } - if (AddonInfo.NA.equals(a.getDescription())) { + if (a.getDescription().isEmpty()) { builder.withDescription(b.getDescription()); - } else if (AddonInfo.NA.equals(b.getDescription())) { - builder.withDescription(a.getDescription()); } if (a.getConnection() == null && b.getConnection() != null) { builder.withConnection(b.getConnection()); diff --git a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java index e9aa594bb70..0bb6c6cb851 100644 --- a/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java +++ b/bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java @@ -94,9 +94,7 @@ private void initialize() { try { String xml = Files.readString(f.toPath()); if (xml != null && !xml.isBlank()) { - addonInfos.addAll(reader.readFromXML(xml).getAddons().stream() - .map(a -> AddonInfo.builder(a).withName(AddonInfo.NA).withDescription(AddonInfo.NA).build()) - .collect(Collectors.toSet())); + addonInfos.addAll(reader.readFromXML(xml).getAddons().stream().collect(Collectors.toSet())); } else { logger.warn("File '{}' contents are null or empty", f.getName()); }