fix rebase conflicts

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · Jan 30, 2022 · fcbd3f0 · fcbd3f0
1 parent 4b7b1ec
commit fcbd3f0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/...ketplace/src/main/java/org/openhab/core/addon/marketplace/AbstractRemoteAddonService.java b/...ketplace/src/main/java/org/openhab/core/addon/marketplace/AbstractRemoteAddonService.java
@@ -39,8 +39,6 @@
 import org.openhab.core.storage.StorageService;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -52,7 +50,6 @@
  */
 @NonNullByDefault
 public abstract class AbstractRemoteAddonService implements AddonService {
-    private final Logger logger = LoggerFactory.getLogger(AbstractRemoteAddonService.class);
     protected static final Map<String, AddonType> TAG_ADDON_TYPE_MAP = Map.of( //
             "automation", new AddonType("automation", "Automation"), //
             "binding", new AddonType("binding", "Bindings"), //

diff --git a/...g/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java b/...g/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java
@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -44,7 +43,6 @@
 import org.openhab.core.addon.marketplace.internal.community.model.DiscourseCategoryResponseDTO.DiscourseUser;
 import org.openhab.core.addon.marketplace.internal.community.model.DiscourseTopicResponseDTO;
 import org.openhab.core.addon.marketplace.internal.community.model.DiscourseTopicResponseDTO.DiscoursePostLink;
-import org.openhab.core.config.core.ConfigParser;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.events.EventPublisher;
 import org.openhab.core.storage.StorageService;

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
@@ -20,7 +20,6 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -35,7 +34,6 @@
 import org.openhab.core.addon.marketplace.AbstractRemoteAddonService;
 import org.openhab.core.addon.marketplace.MarketplaceAddonHandler;
 import org.openhab.core.addon.marketplace.internal.json.model.AddonEntryDTO;
-import org.openhab.core.config.core.ConfigParser;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.events.EventPublisher;
 import org.openhab.core.storage.StorageService;