diff --git a/bundles/org.opensmarthouse.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java b/bundles/org.opensmarthouse.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java index fdbf9132d69..7e4a877bf3b 100644 --- a/bundles/org.opensmarthouse.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java +++ b/bundles/org.opensmarthouse.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java @@ -57,26 +57,6 @@ public interface DiscoveryListener { */ void thingRemoved(DiscoveryService source, ThingUID thingUID); - /** - * Removes all results belonging to one of the given types that are older - * than the given timestamp. - * - * @param source the discovery service which is the source of this event (not - * null) - * @param timestamp timestamp, all older results will be removed - * @param thingTypeUIDs collection of {@code ThingType}s, only results of these - * {@code ThingType}s will be removed; if {@code null} then - * {@link DiscoveryService#getSupportedThingTypes()} will be used - * instead - * @return collection of thing UIDs of all removed things - * @deprecated use {@link #removeOlderResults(DiscoveryService, long, Collection, ThingUID)} instead - */ - @Deprecated - default @Nullable Collection removeOlderResults(DiscoveryService source, long timestamp, - @Nullable Collection thingTypeUIDs) { - return removeOlderResults(source, timestamp, thingTypeUIDs, null); - } - /** * Removes all results belonging to one of the given types that are older * than the given timestamp. diff --git a/bundles/org.opensmarthouse.core.config/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java b/bundles/org.opensmarthouse.core.config/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java index e96ab88fa44..21ce5fe6b77 100644 --- a/bundles/org.opensmarthouse.core.config/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java +++ b/bundles/org.opensmarthouse.core.config/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java @@ -29,11 +29,6 @@ @NonNullByDefault public interface ConfigOptionProvider { - @Deprecated - default @Nullable Collection getParameterOptions(URI uri, String param, @Nullable Locale locale) { - return getParameterOptions(uri, param, null, locale); - } - /** * Provides a collection of {@link ParameterOptions}s. *