demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Remove OH2 leftover in Karaf Add-On service (#3026)

Browse Source 
OH1 add-ons are not present in the OH3 distribution as they are not supported anyway, so we do not to filter them.

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2022-07-03 14:07:41 +02:00 committed by GitHub
parent c5d9c90971
commit 37429e9b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
View File

@ -95,9 +95,9 @@ public class FeatureInstaller implements ConfigurationListener {
public static final String PREFIX = "openhab-";
public static final String PREFIX_PACKAGE = "package-";
public static final String[] EXTENSION_TYPES = new String[] { EXTENSION_TYPE_AUTOMATION, EXTENSION_TYPE_BINDING,
public static final List<String> EXTENSION_TYPES = List.of(EXTENSION_TYPE_AUTOMATION, EXTENSION_TYPE_BINDING,
EXTENSION_TYPE_MISC, EXTENSION_TYPE_PERSISTENCE, EXTENSION_TYPE_TRANSFORMATION, EXTENSION_TYPE_UI,
EXTENSION_TYPE_VOICE };
EXTENSION_TYPE_VOICE);
private final Logger logger = LoggerFactory.getLogger(FeatureInstaller.class);

28
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonService.java
View File

@ -14,9 +14,8 @@ package org.openhab.core.karaf.internal;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Arrays;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@ -45,7 +44,7 @@ public class KarafAddonService implements AddonService {
private final Logger logger = LoggerFactory.getLogger(KarafAddonService.class);
private final List<AddonType> typeList = new ArrayList<>(FeatureInstaller.EXTENSION_TYPES.length);
private final List<AddonType> typeList = new ArrayList<>(FeatureInstaller.EXTENSION_TYPES.size());
private final FeaturesService featuresService;
private final FeatureInstaller featureInstaller;
@ -82,27 +81,18 @@ public class KarafAddonService implements AddonService {
@Override
public List<Addon> getAddons(Locale locale) {
List<Addon> addons = new LinkedList<>();
try {
for (Feature feature : featuresService.listFeatures()) {
if (feature.getName().startsWith(FeatureInstaller.PREFIX)
&& List.of(FeatureInstaller.EXTENSION_TYPES).contains(getType(feature.getName()))) {
Addon addon = getAddon(feature);
// for simple packaging, we filter out all openHAB 1 add-ons as they cannot be used through the UI
if (!FeatureInstaller.SIMPLE_PACKAGE.equals(featureInstaller.getCurrentPackage())
|| !addon.getVersion().startsWith("1.")) {
addons.add(addon);
}
}
}
return Arrays.stream(featuresService.listFeatures()).filter(this::isAddon).map(this::getAddon)
.sorted(Comparator.comparing(Addon::getLabel)).collect(Collectors.toList());
} catch (Exception e) {
logger.error("Exception while retrieving features: {}", e.getMessage());
return Collections.emptyList();
return List.of();
}
}
// let's sort the result alphabetically
addons.sort(Comparator.comparing(Addon::getLabel));
return addons;
private boolean isAddon(Feature feature) {
return feature.getName().startsWith(FeatureInstaller.PREFIX)
&& FeatureInstaller.EXTENSION_TYPES.contains(getType(feature.getName()));
}
@Override