[addonservices] allow offline mode (openhab#2633)

* allow offline mode Signed-off-by: Jan N. Klug <jan.n.klug@rub.de> GitOrigin-RevId: d420bee
ConnectorIO · Jul 12, 2023 · bf4a92a · bf4a92a
1 parent ec3ef9b
commit bf4a92a
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/...g/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java b/...g/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java
@@ -14,6 +14,7 @@
 
 import static org.openhab.core.addon.Addon.CODE_MATURITY_LEVELS;
 
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
@@ -50,6 +51,8 @@
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventPublisher;
 import org.osgi.framework.Constants;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
@@ -114,12 +117,16 @@ public class CommunityMarketplaceAddonService implements AddonService {
     private final Set<MarketplaceAddonHandler> addonHandlers = new HashSet<>();
 
     private final EventPublisher eventPublisher;
+    private final ConfigurationAdmin configurationAdmin;
+
     private @Nullable String apiKey = null;
     private boolean showUnpublished = false;
 
     @Activate
-    public CommunityMarketplaceAddonService(final @Reference EventPublisher eventPublisher) {
+    public CommunityMarketplaceAddonService(final @Reference EventPublisher eventPublisher,
+            @Reference ConfigurationAdmin configurationAdmin) {
         this.eventPublisher = eventPublisher;
+        this.configurationAdmin = configurationAdmin;
     }
 
     @Activate
@@ -162,6 +169,10 @@ public void refreshSource() {
 
     @Override
     public List<Addon> getAddons(@Nullable Locale locale) {
+        if (!remoteEnabled()) {
+            return List.of();
+        }
+
         try {
             List<DiscourseCategoryResponseDTO> pages = new ArrayList<>();
 
@@ -201,6 +212,10 @@ public List<Addon> getAddons(@Nullable Locale locale) {
 
     @Override
     public @Nullable Addon getAddon(String id, @Nullable Locale locale) {
+        if (!remoteEnabled()) {
+            return null;
+        }
+
         URL url;
         try {
             url = new URL(String.format("%s%s", COMMUNITY_TOPIC_URL, id.replace(ADDON_ID_PREFIX, "")));
@@ -460,4 +475,13 @@ private void postFailureEvent(String extensionId, @Nullable String msg) {
         Event event = AddonEventFactory.createAddonFailureEvent(extensionId, msg);
         eventPublisher.post(event);
     }
+
+    private boolean remoteEnabled() {
+        try {
+            Configuration configuration = configurationAdmin.getConfiguration("org.openhab.addons", null);
+            return (boolean) Objects.requireNonNullElse(configuration.getProperties().get("remote"), true);
+        } catch (IOException e) {
+            return true;
+        }
+    }
 }
diff --git a/...lace/src/main/java/org/openhab/core/addon/marketplace/internal/json/JsonAddonService.java b/...lace/src/main/java/org/openhab/core/addon/marketplace/internal/json/JsonAddonService.java
@@ -43,12 +43,16 @@
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventPublisher;
 import org.osgi.framework.Constants;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -60,11 +64,13 @@
  * @author Yannick Schaus - Initial contribution
  * @author Jan N. Klug - Refactored for JSON marketplaces
  */
-@Component(immediate = true, configurationPid = "org.openhab.jsonaddonservice", //
+@Component(immediate = true, configurationPid = { "org.openhab.jsonaddonservice" }, //
         property = Constants.SERVICE_PID + "=org.openhab.jsonaddonservice")
 @ConfigurableService(category = "system", label = JsonAddonService.SERVICE_NAME, description_uri = JsonAddonService.CONFIG_URI)
 @NonNullByDefault
 public class JsonAddonService implements AddonService {
+    private final Logger logger = LoggerFactory.getLogger(JsonAddonService.class);
+
     static final String SERVICE_NAME = "Json 3rd Party Add-on Service";
     static final String CONFIG_URI = "system:jsonaddonservice";
 
@@ -92,10 +98,13 @@ public class JsonAddonService implements AddonService {
     private boolean showUnstable = false;
 
     private final EventPublisher eventPublisher;
+    private final ConfigurationAdmin configurationAdmin;
 
     @Activate
-    public JsonAddonService(@Reference EventPublisher eventPublisher, Map<String, Object> config) {
+    public JsonAddonService(@Reference EventPublisher eventPublisher, @Reference ConfigurationAdmin configurationAdmin,
+            Map<String, Object> config) {
         this.eventPublisher = eventPublisher;
+        this.configurationAdmin = configurationAdmin;
         modified(config);
     }
 
@@ -129,6 +138,11 @@ public String getName() {
     @Override
     @SuppressWarnings("unchecked")
     public void refreshSource() {
+        if (!remoteEnabled()) {
+            cachedAddons = List.of();
+            return;
+        }
+
         cachedAddons = (List<AddonEntryDTO>) addonserviceUrls.stream().map(urlString -> {
             try {
                 URL url = new URL(urlString);
@@ -251,4 +265,13 @@ private void postFailureEvent(String extensionId, @Nullable String msg) {
         Event event = AddonEventFactory.createAddonFailureEvent(extensionId, msg);
         eventPublisher.post(event);
     }
+
+    private boolean remoteEnabled() {
+        try {
+            Configuration configuration = configurationAdmin.getConfiguration("org.openhab.addons", null);
+            return (boolean) Objects.requireNonNullElse(configuration.getProperties().get("remote"), true);
+        } catch (IOException e) {
+            return true;
+        }
+    }
 }