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

[addon] fix #2204 (#3905)

Browse Source 
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
This commit is contained in:
Andrew Fiddian-Green
2023-12-09 12:19:51 +01:00
committed by GitHub
parent 62a50a409a
commit bb30eab3b9
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfo.java
+3
View File
@@ -32,6 +32,9 @@ import org.openhab.core.common.registry.Identifiable;
*/
@NonNullByDefault
public class AddonInfo implements Identifiable<String> {
public static final String NA = "n/a";
private static final Set<String> SUPPORTED_ADDON_TYPES = Set.of("automation", "binding", "misc", "persistence",
"transformation", "ui", "voice");
bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java
+8 -1
View File
@@ -97,8 +97,15 @@ public class AddonInfoRegistry {
return a;
}
AddonInfo.Builder builder = AddonInfo.builder(a);
if (a.getDescription().isEmpty()) {
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())) {
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());
bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java
+3 -1
View File
@@ -94,7 +94,9 @@ public class AddonInfoAddonsXmlProvider implements AddonInfoProvider {
try {
String xml = Files.readString(f.toPath());
if (xml != null && !xml.isBlank()) {
addonInfos.addAll(reader.readFromXML(xml).getAddons().stream().collect(Collectors.toSet()));
addonInfos.addAll(reader.readFromXML(xml).getAddons().stream()
.map(a -> AddonInfo.builder(a).withName(AddonInfo.NA).withDescription(AddonInfo.NA).build())
.collect(Collectors.toSet()));
} else {
logger.warn("File '{}' contents are null or empty", f.getName());
}