From bd1d8f4980f5ef055dbb21f81599e6cd206959f2 Mon Sep 17 00:00:00 2001 From: M Valla <12682715+mvalla@users.noreply.github.com> Date: Sat, 17 Jul 2021 22:40:58 +0200 Subject: [PATCH] [openwebnet] refactoring to internal package (#10995) Signed-off-by: Massimo Valla --- .../{ => internal}/OpenWebNetBindingConstants.java | 2 +- .../internal/OpenWebNetHandlerFactory.java | 14 +++++++------- .../discovery/BusGatewayUpnpDiscovery.java | 2 +- .../OpenWebNetDeviceDiscoveryService.java | 4 ++-- .../discovery/UsbGatewayDiscoveryService.java | 2 +- .../handler/OpenWebNetAutomationHandler.java | 6 +++--- .../handler/OpenWebNetBridgeHandler.java | 12 +++++------- .../handler/OpenWebNetEnergyHandler.java | 6 +++--- .../handler/OpenWebNetGenericHandler.java | 4 ++-- .../handler/OpenWebNetLightingHandler.java | 12 +++--------- .../handler/OpenWebNetThermoregulationHandler.java | 6 +++--- .../handler/OpenWebNetThingHandler.java | 4 ++-- .../handler/config/OpenWebNetBusBridgeConfig.java | 2 +- .../config/OpenWebNetZigBeeBridgeConfig.java | 2 +- .../{ => internal}/handler/OwnIdTest.java | 5 +++-- 15 files changed, 38 insertions(+), 45 deletions(-) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/OpenWebNetBindingConstants.java (99%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetAutomationHandler.java (98%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetBridgeHandler.java (97%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetEnergyHandler.java (97%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetGenericHandler.java (95%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetLightingHandler.java (95%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetThermoregulationHandler.java (98%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/OpenWebNetThingHandler.java (98%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/config/OpenWebNetBusBridgeConfig.java (94%) rename bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/{ => internal}/handler/config/OpenWebNetZigBeeBridgeConfig.java (92%) rename bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/{ => internal}/handler/OwnIdTest.java (98%) diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java similarity index 99% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java index b7fbf1492..1f039a06f 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet; +package org.openhab.binding.openwebnet.internal; import java.util.Collection; import java.util.HashSet; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetHandlerFactory.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetHandlerFactory.java index 0d4205d36..8b258df58 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetHandlerFactory.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetHandlerFactory.java @@ -12,16 +12,16 @@ */ package org.openhab.binding.openwebnet.internal; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.ALL_SUPPORTED_THING_TYPES; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.ALL_SUPPORTED_THING_TYPES; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.handler.OpenWebNetAutomationHandler; -import org.openhab.binding.openwebnet.handler.OpenWebNetBridgeHandler; -import org.openhab.binding.openwebnet.handler.OpenWebNetEnergyHandler; -import org.openhab.binding.openwebnet.handler.OpenWebNetGenericHandler; -import org.openhab.binding.openwebnet.handler.OpenWebNetLightingHandler; -import org.openhab.binding.openwebnet.handler.OpenWebNetThermoregulationHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetAutomationHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetBridgeHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetEnergyHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetGenericHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetLightingHandler; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetThermoregulationHandler; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/BusGatewayUpnpDiscovery.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/BusGatewayUpnpDiscovery.java index a2bd6a66f..2190cc9cb 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/BusGatewayUpnpDiscovery.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/BusGatewayUpnpDiscovery.java @@ -27,7 +27,7 @@ import org.jupnp.model.meta.ModelDetails; import org.jupnp.model.meta.RemoteDevice; import org.jupnp.model.meta.RemoteDeviceIdentity; import org.jupnp.model.types.UDN; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResultBuilder; import org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java index e6c58cf0a..2a339cca5 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java @@ -18,8 +18,8 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; -import org.openhab.binding.openwebnet.handler.OpenWebNetBridgeHandler; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.handler.OpenWebNetBridgeHandler; import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResultBuilder; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java index 6bc1b8d36..a56d0d928 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResultBuilder; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetAutomationHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAutomationHandler.java similarity index 98% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetAutomationHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAutomationHandler.java index dbf26618e..96ba3b147 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetAutomationHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAutomationHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_SHUTTER; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.CHANNEL_SHUTTER; import java.text.SimpleDateFormat; import java.util.Date; @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.PercentType; import org.openhab.core.library.types.StopMoveType; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetBridgeHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java similarity index 97% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetBridgeHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java index 713b83268..2b9c83fd8 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetBridgeHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java @@ -10,11 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.PROPERTY_FIRMWARE_VERSION; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.PROPERTY_SERIAL_NO; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.THING_TYPE_ZB_GATEWAY; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.*; import java.util.Collection; import java.util.Collections; @@ -26,10 +24,10 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; -import org.openhab.binding.openwebnet.handler.config.OpenWebNetBusBridgeConfig; -import org.openhab.binding.openwebnet.handler.config.OpenWebNetZigBeeBridgeConfig; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.binding.openwebnet.internal.discovery.OpenWebNetDeviceDiscoveryService; +import org.openhab.binding.openwebnet.internal.handler.config.OpenWebNetBusBridgeConfig; +import org.openhab.binding.openwebnet.internal.handler.config.OpenWebNetZigBeeBridgeConfig; import org.openhab.core.config.core.status.ConfigStatusMessage; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetEnergyHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java similarity index 97% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetEnergyHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java index ff7060cad..386e45126 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetEnergyHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_POWER; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.CHANNEL_POWER; import java.util.Set; import java.util.concurrent.ScheduledFuture; @@ -22,7 +22,7 @@ import javax.measure.quantity.Power; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.library.types.QuantityType; import org.openhab.core.library.unit.Units; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetGenericHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetGenericHandler.java similarity index 95% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetGenericHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetGenericHandler.java index 374dd20d7..760becaa6 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetGenericHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetGenericHandler.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetLightingHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetLightingHandler.java similarity index 95% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetLightingHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetLightingHandler.java index 554b4f0a5..095cfb970 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetLightingHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetLightingHandler.java @@ -10,22 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_BRIGHTNESS; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_SWITCH; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_SWITCH_01; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_SWITCH_02; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.THING_TYPE_BUS_DIMMER; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.THING_TYPE_ZB_DIMMER; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.THING_TYPE_ZB_ON_OFF_SWITCH_2UNITS; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.*; import java.util.Set; import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.library.types.IncreaseDecreaseType; import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.PercentType; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThermoregulationHandler.java similarity index 98% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThermoregulationHandler.java index b540a4bd2..7f3d81483 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThermoregulationHandler.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.*; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.*; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.openwebnet.OpenWebNetBindingConstants; +import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.QuantityType; import org.openhab.core.library.types.StringType; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThingHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThingHandler.java similarity index 98% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThingHandler.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThingHandler.java index 1ff15ef96..7e0ac4bfe 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThingHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetThingHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.*; +import static org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants.*; import java.util.Map; import java.util.concurrent.ScheduledFuture; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetBusBridgeConfig.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetBusBridgeConfig.java similarity index 94% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetBusBridgeConfig.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetBusBridgeConfig.java index a9e013df9..e9000fae4 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetBusBridgeConfig.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetBusBridgeConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler.config; +package org.openhab.binding.openwebnet.internal.handler.config; import java.math.BigDecimal; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetZigBeeBridgeConfig.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java similarity index 92% rename from bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetZigBeeBridgeConfig.java rename to bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java index 448140551..0271a2a95 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/config/OpenWebNetZigBeeBridgeConfig.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler.config; +package org.openhab.binding.openwebnet.internal.handler.config; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/handler/OwnIdTest.java b/bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/internal/handler/OwnIdTest.java similarity index 98% rename from bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/handler/OwnIdTest.java rename to bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/internal/handler/OwnIdTest.java index ce8910e12..3fc51cb54 100644 --- a/bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/handler/OwnIdTest.java +++ b/bundles/org.openhab.binding.openwebnet/src/test/java/org/openhab/binding/openwebnet/internal/handler/OwnIdTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.openwebnet.handler; +package org.openhab.binding.openwebnet.internal.handler; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -31,7 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Test class for {@link OpenWebNetBridgeHandler#ownID} and ThingID calculation using {@link OpenWebNetBridgeHandler} + * Test class for {@link OpenWebNetBridgeHandler#ownID} and ThingID + * calculation using {@link OpenWebNetBridgeHandler} * methods: normalizeWhere(), ownIdFromWhoWhere(), ownIdFromMessage(), thingIdFromWhere() * * @author Massimo Valla - Initial contribution