From a0bc90d98878b30c03e00080c3b1e29688018a23 Mon Sep 17 00:00:00 2001 From: "Jan N. Klug" Date: Sat, 24 Jun 2023 18:01:51 +0200 Subject: [PATCH] address review comments Signed-off-by: Jan N. Klug --- .../thing/binding/generic/converter/ColorChannelHandler.java | 1 + .../thing/binding/generic/converter/DimmerChannelHandler.java | 1 + .../generic/converter/FixedValueMappingChannelHandler.java | 1 + .../thing/binding/generic/converter/GenericChannelHandler.java | 1 + .../thing/binding/generic/converter/NumberChannelHandler.java | 1 + .../thing/binding/generic/converter/PlayerChannelHandler.java | 1 + .../binding/generic/converter/RollershutterChannelHandler.java | 1 + .../generic/converter/AbstractTransformingChannelHandler.java | 2 +- .../converter/AbstractTransformingItemConverterTest.java | 2 +- 9 files changed, 9 insertions(+), 2 deletions(-) rename bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/{ => internal}/generic/converter/AbstractTransformingChannelHandler.java (98%) rename bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/{ => internal}/generic/converter/AbstractTransformingItemConverterTest.java (98%) diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/ColorChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/ColorChannelHandler.java index 0a5e90d4143..e32f2d57579 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/ColorChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/ColorChannelHandler.java @@ -24,6 +24,7 @@ import org.openhab.core.library.types.PercentType; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/DimmerChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/DimmerChannelHandler.java index 58e4a33c566..36e098c4ebe 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/DimmerChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/DimmerChannelHandler.java @@ -21,6 +21,7 @@ import org.openhab.core.library.types.PercentType; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/FixedValueMappingChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/FixedValueMappingChannelHandler.java index c7b44735928..cfb4d8f9dbe 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/FixedValueMappingChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/FixedValueMappingChannelHandler.java @@ -20,6 +20,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/GenericChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/GenericChannelHandler.java index 7ea9f3077c4..c8023c69d1c 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/GenericChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/GenericChannelHandler.java @@ -20,6 +20,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/NumberChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/NumberChannelHandler.java index 2bab96a5c8b..774581e63d0 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/NumberChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/NumberChannelHandler.java @@ -23,6 +23,7 @@ import org.openhab.core.library.types.QuantityType; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/PlayerChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/PlayerChannelHandler.java index b86445fa962..1dc9f354161 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/PlayerChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/PlayerChannelHandler.java @@ -22,6 +22,7 @@ import org.openhab.core.library.types.RewindFastforwardType; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/RollershutterChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/RollershutterChannelHandler.java index 3c57d504272..fb07cbafce5 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/RollershutterChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/RollershutterChannelHandler.java @@ -23,6 +23,7 @@ import org.openhab.core.library.types.UpDownType; import org.openhab.core.thing.binding.generic.ChannelTransformation; import org.openhab.core.thing.binding.generic.ChannelValueConverterConfig; +import org.openhab.core.thing.binding.internal.generic.converter.AbstractTransformingChannelHandler; import org.openhab.core.types.Command; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingChannelHandler.java similarity index 98% rename from bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingChannelHandler.java rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingChannelHandler.java index 1db25c50938..c0fb7218a8a 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingChannelHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.thing.binding.generic.converter; +package org.openhab.core.thing.binding.internal.generic.converter; import java.util.Optional; import java.util.function.Consumer; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingItemConverterTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingItemConverterTest.java similarity index 98% rename from bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingItemConverterTest.java rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingItemConverterTest.java index 34683409611..556b75f0aca 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/generic/converter/AbstractTransformingItemConverterTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/internal/generic/converter/AbstractTransformingItemConverterTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.thing.binding.generic.converter; +package org.openhab.core.thing.binding.internal.generic.converter; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never;