From 97c90f347e36042d49a7daa5d5a56007014d7830 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Tue, 5 Oct 2021 15:50:15 +0200 Subject: [PATCH 1/2] Fix add-on type inconsistencies This makes the CommunityMarketplaceAddonService return the same add-on type responses as the KarafAddonService. This allows for add-ons tagged with "io" in the Marketplace to show up in the UI. Fixes #2507 Signed-off-by: Wouter Born --- .../internal/community/CommunityKarafAddonHandler.java | 2 +- .../community/CommunityBundleAddonHandler.java | 2 +- .../community/CommunityMarketplaceAddonService.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 f48c39d370e..cd47dafd3c3 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 @@ -52,7 +52,7 @@ @NonNullByDefault public class CommunityKarafAddonHandler implements MarketplaceAddonHandler { private static final Path KAR_CACHE_PATH = Path.of(OpenHAB.getUserDataFolder(), "marketplace", "kar"); - private static final List SUPPORTED_EXT_TYPES = List.of("automation", "binding", "io", "persistence", + private static final List SUPPORTED_EXT_TYPES = List.of("automation", "binding", "misc", "persistence", "transformation", "ui", "voice"); private static final String KAR_DOWNLOAD_URL_PROPERTY = "kar_download_url"; private static final String KAR_EXTENSION = ".kar"; diff --git a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityBundleAddonHandler.java b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityBundleAddonHandler.java index cf6277de577..7683c9f1f11 100644 --- a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityBundleAddonHandler.java +++ b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityBundleAddonHandler.java @@ -40,7 +40,7 @@ @Component(immediate = true) @NonNullByDefault public class CommunityBundleAddonHandler extends MarketplaceBundleInstaller implements MarketplaceAddonHandler { - private static final List SUPPORTED_EXT_TYPES = List.of("automation", "binding", "io", "persistence", + private static final List SUPPORTED_EXT_TYPES = List.of("automation", "binding", "misc", "persistence", "transformation", "ui", "voice"); private static final String JAR_DOWNLOAD_URL_PROPERTY = "jar_download_url"; diff --git a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java index 0f5c03dc403..a858ebfd815 100644 --- a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java +++ b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java @@ -100,11 +100,11 @@ public class CommunityMarketplaceAddonService implements AddonService { private static final Map TAG_ADDON_TYPE_MAP = Map.of( // "automation", new AddonType("automation", "Automation"), // "binding", new AddonType("binding", "Bindings"), // - "io", new AddonType("io", "I/O Services"), // - "persistence", new AddonType("persistence", "Persistence Services"), // + "io", new AddonType("misc", "Misc"), // + "persistence", new AddonType("persistence", "Persistence"), // "transformation", new AddonType("transformation", "Transformations"), // "ui", new AddonType("ui", "User Interfaces"), // - "voice", new AddonType("voice", "Voices")); + "voice", new AddonType("voice", "Voice")); private final Logger logger = LoggerFactory.getLogger(CommunityMarketplaceAddonService.class); private final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create(); @@ -336,7 +336,7 @@ private Addon convertTopicItemToAddon(DiscourseTopicItem topic, List properties = new HashMap<>(10); + Map properties = new HashMap<>(10); properties.put("created_at", createdDate); properties.put("like_count", likeCount); properties.put("views", views); @@ -386,7 +386,7 @@ private Addon convertTopicToAddon(DiscourseTopicResponseDTO topic) { String maturity = tags.stream().filter(CODE_MATURITY_LEVELS::contains).findAny().orElse(null); - HashMap properties = new HashMap<>(10); + Map properties = new HashMap<>(10); properties.put("created_at", createdDate); properties.put("updated_at", updatedDate); properties.put("last_posted", lastPostedDate); From 039ceb9a6c40ac30d6ff2a78826b0b86386412c8 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Tue, 5 Oct 2021 16:48:48 +0200 Subject: [PATCH 2/2] Update "io" tag to "misc" Signed-off-by: Wouter Born --- .../internal/community/CommunityMarketplaceAddonService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java index a858ebfd815..53984eb6cdf 100644 --- a/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java +++ b/bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java @@ -100,7 +100,7 @@ public class CommunityMarketplaceAddonService implements AddonService { private static final Map TAG_ADDON_TYPE_MAP = Map.of( // "automation", new AddonType("automation", "Automation"), // "binding", new AddonType("binding", "Bindings"), // - "io", new AddonType("misc", "Misc"), // + "misc", new AddonType("misc", "Misc"), // "persistence", new AddonType("persistence", "Persistence"), // "transformation", new AddonType("transformation", "Transformations"), // "ui", new AddonType("ui", "User Interfaces"), //