From c7aed14a49c5cd4cab4b943fde9a8212abf70431 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 25 Nov 2023 12:33:59 +0100 Subject: [PATCH] Reorganize API classes (#15934) Resolves #15731 Signed-off-by: Jacob Laursen --- .../{dto => api/dto/clip1}/ApiVersion.java | 2 +- .../dto/clip1}/ApiVersionUtils.java | 2 +- .../dto/clip1}/BridgeConfigUpdate.java | 2 +- .../{dto => api/dto/clip1}/Capabilities.java | 2 +- .../dto/clip1}/ColorTemperature.java | 2 +- .../{dto => api/dto/clip1}/Command.java | 2 +- .../{dto => api/dto/clip1}/Config.java | 2 +- .../{dto => api/dto/clip1}/ConfigUpdate.java | 2 +- .../{dto => api/dto/clip1}/Control.java | 2 +- .../dto/clip1}/CreateUserRequest.java | 2 +- .../{dto => api/dto/clip1}/ErrorResponse.java | 2 +- .../{dto => api/dto/clip1}/FullConfig.java | 2 +- .../{dto => api/dto/clip1}/FullGroup.java | 2 +- .../{dto => api/dto/clip1}/FullHueObject.java | 2 +- .../{dto => api/dto/clip1}/FullLight.java | 2 +- .../{dto => api/dto/clip1}/FullSensor.java | 2 +- .../{dto => api/dto/clip1}/Group.java | 2 +- .../{dto => api/dto/clip1}/HueObject.java | 2 +- .../dto/clip1}/LightLevelConfigUpdate.java | 4 +- .../dto/clip1}/NewLightsResponse.java | 2 +- .../dto/clip1}/PresenceConfigUpdate.java | 4 +- .../{dto => api/dto/clip1}/Scene.java | 2 +- .../{dto => api/dto/clip1}/Schedule.java | 2 +- .../dto/clip1}/ScheduleUpdate.java | 2 +- .../dto/clip1}/SearchForLightsRequest.java | 2 +- .../dto/clip1}/SensorConfigUpdate.java | 4 +- .../dto/clip1}/SetAttributesRequest.java | 2 +- .../dto/clip1}/SoftwareUpdate.java | 2 +- .../{dto => api/dto/clip1}/State.java | 2 +- .../{dto => api/dto/clip1}/StateUpdate.java | 6 +- .../dto/clip1}/SuccessResponse.java | 2 +- .../dto/clip1}/TemperatureConfigUpdate.java | 4 +- .../internal/{dto => api/dto/clip1}/User.java | 2 +- .../internal/{dto => api/dto/clip1}/Util.java | 2 +- .../{ => api}/dto/clip2/ActionEntry.java | 2 +- .../internal/{ => api}/dto/clip2/Alerts.java | 4 +- .../{ => api}/dto/clip2/BridgeConfig.java | 2 +- .../internal/{ => api}/dto/clip2/Button.java | 4 +- .../{ => api}/dto/clip2/ButtonReport.java | 4 +- .../{ => api}/dto/clip2/ColorTemperature.java | 2 +- .../internal/{ => api}/dto/clip2/ColorXy.java | 2 +- .../{ => api}/dto/clip2/ContactReport.java | 4 +- .../internal/{ => api}/dto/clip2/Dimming.java | 2 +- .../{ => api}/dto/clip2/Dynamics.java | 2 +- .../internal/{ => api}/dto/clip2/Effects.java | 4 +- .../internal/{ => api}/dto/clip2/Error.java | 2 +- .../internal/{ => api}/dto/clip2/Event.java | 2 +- .../internal/{ => api}/dto/clip2/Gamut2.java | 2 +- .../{ => api}/dto/clip2/LightLevel.java | 2 +- .../{ => api}/dto/clip2/LightLevelReport.java | 2 +- .../{ => api}/dto/clip2/MetaData.java | 4 +- .../{ => api}/dto/clip2/MirekSchema.java | 2 +- .../internal/{ => api}/dto/clip2/Motion.java | 2 +- .../{ => api}/dto/clip2/MotionReport.java | 2 +- .../internal/{ => api}/dto/clip2/OnState.java | 2 +- .../internal/{ => api}/dto/clip2/PairXy.java | 2 +- .../internal/{ => api}/dto/clip2/Power.java | 4 +- .../{ => api}/dto/clip2/ProductData.java | 4 +- .../internal/{ => api}/dto/clip2/Recall.java | 6 +- .../{ => api}/dto/clip2/RelativeRotary.java | 2 +- .../{ => api}/dto/clip2/Resource.java | 22 +++---- .../dto/clip2/ResourceReference.java | 4 +- .../{ => api}/dto/clip2/Resources.java | 2 +- .../{ => api}/dto/clip2/RotaryReport.java | 4 +- .../{ => api}/dto/clip2/Rotation.java | 4 +- .../{ => api}/dto/clip2/RotationEvent.java | 4 +- .../{ => api}/dto/clip2/TamperReport.java | 4 +- .../{ => api}/dto/clip2/Temperature.java | 2 +- .../dto/clip2/TemperatureReport.java | 2 +- .../{ => api}/dto/clip2/TimedEffects.java | 2 +- .../{ => api}/dto/clip2/enums/ActionType.java | 2 +- .../{ => api}/dto/clip2/enums/Archetype.java | 2 +- .../dto/clip2/enums/BatteryStateType.java | 2 +- .../dto/clip2/enums/ButtonEventType.java | 2 +- .../dto/clip2/enums/ContactStateType.java | 2 +- .../dto/clip2/enums/DirectionType.java | 2 +- .../{ => api}/dto/clip2/enums/EffectType.java | 2 +- .../dto/clip2/enums/ResourceType.java | 2 +- .../dto/clip2/enums/RotationEventType.java | 2 +- .../dto/clip2/enums/SceneRecallAction.java | 2 +- .../clip2/enums/SmartSceneRecallAction.java | 2 +- .../dto/clip2/enums/SmartSceneState.java | 2 +- .../dto/clip2/enums/TamperStateType.java | 2 +- .../dto/clip2/enums/ZigbeeStatus.java | 2 +- .../{ => api}/dto/clip2/helper/Setters.java | 26 ++++---- .../serialization/InstantDeserializer.java | 2 +- .../hue/internal/connection/Clip2Bridge.java | 18 ++--- .../hue/internal/connection/HueBridge.java | 44 ++++++------- .../internal/console/HueCommandExtension.java | 10 +-- .../discovery/Clip2ThingDiscoveryService.java | 10 +-- .../discovery/HueDeviceDiscoveryService.java | 8 +-- .../internal/handler/Clip2BridgeHandler.java | 14 ++-- .../internal/handler/Clip2ThingHandler.java | 38 +++++------ .../internal/handler/GroupStatusListener.java | 4 +- .../internal/handler/HueBridgeHandler.java | 20 +++--- .../hue/internal/handler/HueClient.java | 10 +-- .../hue/internal/handler/HueGroupHandler.java | 10 +-- .../hue/internal/handler/HueLightHandler.java | 10 +-- .../internal/handler/HueSensorHandler.java | 8 +-- .../internal/handler/LightStateConverter.java | 12 ++-- .../internal/handler/LightStatusListener.java | 2 +- .../handler/SensorStatusListener.java | 2 +- .../internal/handler/sensors/ClipHandler.java | 4 +- .../handler/sensors/DimmerSwitchHandler.java | 4 +- .../sensors/GeofencePresenceHandler.java | 6 +- .../handler/sensors/LightLevelHandler.java | 8 +-- .../handler/sensors/PresenceHandler.java | 8 +-- .../handler/sensors/TapSwitchHandler.java | 4 +- .../handler/sensors/TemperatureHandler.java | 8 +-- .../binding/hue/internal/ApiVersionTest.java | 2 +- .../binding/hue/internal/HueBridgeTest.java | 2 +- .../hue/internal/LightStateConverterTest.java | 8 +-- .../binding/hue/internal/SceneTest.java | 6 +- .../hue/internal/clip2/Clip2DtoTest.java | 66 +++++++++---------- .../internal/handler/HueLightHandlerTest.java | 8 +-- .../hue/internal/handler/HueLightState.java | 2 +- .../HueDeviceDiscoveryServiceOSGiTest.java | 2 +- 117 files changed, 308 insertions(+), 308 deletions(-) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ApiVersion.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ApiVersionUtils.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/BridgeConfigUpdate.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Capabilities.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ColorTemperature.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Command.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Config.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ConfigUpdate.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Control.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/CreateUserRequest.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ErrorResponse.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/FullConfig.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/FullGroup.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/FullHueObject.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/FullLight.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/FullSensor.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Group.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/HueObject.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/LightLevelConfigUpdate.java (89%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/NewLightsResponse.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/PresenceConfigUpdate.java (87%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Scene.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Schedule.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/ScheduleUpdate.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/SearchForLightsRequest.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/SensorConfigUpdate.java (83%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/SetAttributesRequest.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/SoftwareUpdate.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/State.java (99%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/StateUpdate.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/SuccessResponse.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/TemperatureConfigUpdate.java (82%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/User.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{dto => api/dto/clip1}/Util.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ActionEntry.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Alerts.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/BridgeConfig.java (92%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Button.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ButtonReport.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ColorTemperature.java (98%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ColorXy.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ContactReport.java (89%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Dimming.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Dynamics.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Effects.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Error.java (92%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Event.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Gamut2.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/LightLevel.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/LightLevelReport.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/MetaData.java (89%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/MirekSchema.java (96%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Motion.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/MotionReport.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/OnState.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/PairXy.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Power.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ProductData.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Recall.java (85%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/RelativeRotary.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Resource.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/ResourceReference.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Resources.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/RotaryReport.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Rotation.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/RotationEvent.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/TamperReport.java (89%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/Temperature.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/TemperatureReport.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/TimedEffects.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/ActionType.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/Archetype.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/BatteryStateType.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/ButtonEventType.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/ContactStateType.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/DirectionType.java (91%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/EffectType.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/ResourceType.java (97%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/RotationEventType.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/SceneRecallAction.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/SmartSceneRecallAction.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/SmartSceneState.java (93%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/TamperStateType.java (90%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/enums/ZigbeeStatus.java (95%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/dto/clip2/helper/Setters.java (94%) rename bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/{ => api}/serialization/InstantDeserializer.java (95%) diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersion.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersion.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersion.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersion.java index e15dbd4dd..0180aff0a 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersion.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersion.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersionUtils.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersionUtils.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersionUtils.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersionUtils.java index 2e4cbb6c7..f3f91cad7 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ApiVersionUtils.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ApiVersionUtils.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/BridgeConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/BridgeConfigUpdate.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/BridgeConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/BridgeConfigUpdate.java index 6e30ceeac..9a8fac8f1 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/BridgeConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/BridgeConfigUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * Collection of updates to the bridge configuration. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Capabilities.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Capabilities.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Capabilities.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Capabilities.java index 80c82ad81..e8ac93edb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Capabilities.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Capabilities.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * Collection of capabilities for lights. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ColorTemperature.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ColorTemperature.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ColorTemperature.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ColorTemperature.java index 4dce4b6c2..a57043b05 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ColorTemperature.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ColorTemperature.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * Collection of color temperature capabilities to control lights. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Command.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Command.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Command.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Command.java index 520f24e90..b943bf30e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Command.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Command.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import com.google.gson.Gson; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Config.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Config.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Config.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Config.java index 1e67ff79b..600294c0e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Config.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Config.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.ArrayList; import java.util.Date; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ConfigUpdate.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ConfigUpdate.java index 00c0afb87..6e32fbdc8 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ConfigUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import static java.util.stream.Collectors.joining; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Control.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Control.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Control.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Control.java index 36ae34597..077dda488 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Control.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Control.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/CreateUserRequest.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/CreateUserRequest.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/CreateUserRequest.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/CreateUserRequest.java index 2e29b9050..9e8c43121 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/CreateUserRequest.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/CreateUserRequest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ErrorResponse.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ErrorResponse.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ErrorResponse.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ErrorResponse.java index 86e910b6e..4a99bc6f7 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ErrorResponse.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ErrorResponse.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullConfig.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullConfig.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullConfig.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullConfig.java index 7e23c6332..2dadab5f7 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullConfig.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullGroup.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullGroup.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullGroup.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullGroup.java index 2bdd1df35..b7d89c9dd 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullGroup.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullGroup.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullHueObject.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullHueObject.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullHueObject.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullHueObject.java index 8189fb695..6483a72c0 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullHueObject.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullHueObject.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import static org.openhab.binding.hue.internal.HueBindingConstants.NORMALIZE_ID_REGEX; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullLight.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullLight.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullLight.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullLight.java index 4e339e421..a679ddde5 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullLight.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullLight.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.time.Duration; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullSensor.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullSensor.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullSensor.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullSensor.java index cd78f43a2..f0ae7f0e9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/FullSensor.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/FullSensor.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.Map; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Group.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Group.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Group.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Group.java index 62a5d5818..a725be857 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Group.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Group.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * Basic group information. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/HueObject.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/HueObject.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/HueObject.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/HueObject.java index 9dabe9935..6dc94bb70 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/HueObject.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/HueObject.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.Map; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/LightLevelConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/LightLevelConfigUpdate.java similarity index 89% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/LightLevelConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/LightLevelConfigUpdate.java index 4fac25c81..de51dc303 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/LightLevelConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/LightLevelConfigUpdate.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; /** * Updates the configuration of a light level sensor diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/NewLightsResponse.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/NewLightsResponse.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/NewLightsResponse.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/NewLightsResponse.java index 50a74aaef..05f438d98 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/NewLightsResponse.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/NewLightsResponse.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * @author Q42 - Initial contribution diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/PresenceConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/PresenceConfigUpdate.java similarity index 87% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/PresenceConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/PresenceConfigUpdate.java index eeaae93fd..baad51a58 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/PresenceConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/PresenceConfigUpdate.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; /** * Updates the configuration of a presence sensor diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Scene.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Scene.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java index ee13d71ac..03d179006 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Scene.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Schedule.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Schedule.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Schedule.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Schedule.java index 6892b3ad0..73353c7ed 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Schedule.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Schedule.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.Map; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ScheduleUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ScheduleUpdate.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ScheduleUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ScheduleUpdate.java index 7fea44816..4c64837f9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/ScheduleUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/ScheduleUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.Date; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SearchForLightsRequest.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SearchForLightsRequest.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SearchForLightsRequest.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SearchForLightsRequest.java index 91174e678..5c3e1abd2 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SearchForLightsRequest.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SearchForLightsRequest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SensorConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SensorConfigUpdate.java similarity index 83% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SensorConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SensorConfigUpdate.java index 50452c71a..f2a5c4a91 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SensorConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SensorConfigUpdate.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; -import static org.openhab.binding.hue.internal.dto.FullSensor.CONFIG_ON; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.CONFIG_ON; /** * Collection of updates to the sensor configuration. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SetAttributesRequest.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SetAttributesRequest.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SetAttributesRequest.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SetAttributesRequest.java index 09ae2c155..f3f6f4b69 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SetAttributesRequest.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SetAttributesRequest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SoftwareUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SoftwareUpdate.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SoftwareUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SoftwareUpdate.java index 461b8589b..de5ffa82d 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SoftwareUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SoftwareUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; /** * Details of a bridge firmware update. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/State.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/State.java similarity index 99% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/State.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/State.java index 8bb646be2..2879c9d6f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/State.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/State.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.Arrays; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/StateUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/StateUpdate.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/StateUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/StateUpdate.java index 53bd9d48a..8844d1c5b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/StateUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/StateUpdate.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; -import org.openhab.binding.hue.internal.dto.State.AlertMode; -import org.openhab.binding.hue.internal.dto.State.Effect; +import org.openhab.binding.hue.internal.api.dto.clip1.State.AlertMode; +import org.openhab.binding.hue.internal.api.dto.clip1.State.Effect; /** * Collection of updates to the state of a light. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SuccessResponse.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SuccessResponse.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SuccessResponse.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SuccessResponse.java index f0eb43d44..d6c53d44c 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/SuccessResponse.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/SuccessResponse.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.lang.reflect.Type; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/TemperatureConfigUpdate.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/TemperatureConfigUpdate.java similarity index 82% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/TemperatureConfigUpdate.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/TemperatureConfigUpdate.java index ff66933ad..38960594f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/TemperatureConfigUpdate.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/TemperatureConfigUpdate.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; -import static org.openhab.binding.hue.internal.dto.FullSensor.CONFIG_LED_INDICATION; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.CONFIG_LED_INDICATION; /** * Updates the configuration of a temperature sensor diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/User.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/User.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/User.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/User.java index 375734d92..17c729239 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/User.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/User.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.util.Date; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Util.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Util.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Util.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Util.java index 9b4dbf400..5459813dc 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/Util.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Util.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto; +package org.openhab.binding.hue.internal.api.dto.clip1; import java.nio.charset.StandardCharsets; import java.util.regex.Matcher; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ActionEntry.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ActionEntry.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ActionEntry.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ActionEntry.java index 835d4918b..aa9c9deeb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ActionEntry.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ActionEntry.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Alerts.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Alerts.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Alerts.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Alerts.java index 6d8b86bd9..1020a99dd 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Alerts.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Alerts.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.List; import java.util.Objects; @@ -18,7 +18,7 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/BridgeConfig.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/BridgeConfig.java similarity index 92% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/BridgeConfig.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/BridgeConfig.java index 66d4250ec..c013078d2 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/BridgeConfig.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/BridgeConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Button.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Button.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Button.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Button.java index c4f75f673..f3135dc76 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Button.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Button.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ButtonReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ButtonReport.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ButtonReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ButtonReport.java index 947c02825..a334d21eb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ButtonReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ButtonReport.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType; /** * DTO for CLIP 2 button report. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorTemperature.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorTemperature.java similarity index 98% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorTemperature.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorTemperature.java index 4b5fd5a5e..c41720be2 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorTemperature.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorTemperature.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorXy.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorXy.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorXy.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorXy.java index 9b909c51b..7c19f21d3 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ColorXy.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ColorXy.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ContactReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ContactReport.java similarity index 89% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ContactReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ContactReport.java index 99c8c2a83..7e1743ebe 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ContactReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ContactReport.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.clip2.enums.ContactStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ContactStateType; /** * DTO for CLIP 2 home security alarm contact. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dimming.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dimming.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dimming.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dimming.java index c51c80c51..b6b847d59 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dimming.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dimming.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dynamics.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dynamics.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dynamics.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dynamics.java index fd898e673..7b912f5d5 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Dynamics.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Dynamics.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Duration; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Effects.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Effects.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Effects.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Effects.java index d73020a5e..b5050ef4f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Effects.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Effects.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.List; import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.EffectType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.EffectType; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Error.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Error.java similarity index 92% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Error.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Error.java index 244376829..90ae7ab0e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Error.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Error.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Event.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Event.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Event.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Event.java index 04d397df9..c7e9fe2db 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Event.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Event.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Gamut2.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Gamut2.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Gamut2.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Gamut2.java index b218e57fb..bd0179f27 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Gamut2.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Gamut2.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevel.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevel.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevel.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevel.java index 9921fba97..673e32533 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevel.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevel.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevelReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevelReport.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevelReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevelReport.java index 189c64f4d..7c14d6241 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/LightLevelReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/LightLevelReport.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MetaData.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MetaData.java similarity index 89% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MetaData.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MetaData.java index b41661946..1c21cd6fa 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MetaData.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MetaData.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MirekSchema.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MirekSchema.java similarity index 96% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MirekSchema.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MirekSchema.java index 3a3dee205..940c4a039 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MirekSchema.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MirekSchema.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Motion.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Motion.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Motion.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Motion.java index 3b0ce60c8..9b6de00ec 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Motion.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Motion.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MotionReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MotionReport.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MotionReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MotionReport.java index 8146e524e..c6078eba8 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/MotionReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/MotionReport.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/OnState.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/OnState.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/OnState.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/OnState.java index 7ab06791a..d0ba4056f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/OnState.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/OnState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/PairXy.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/PairXy.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/PairXy.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/PairXy.java index fa608129e..bf70fc73e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/PairXy.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/PairXy.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; /** * DTO that contains an x and y pair of doubles. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Power.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Power.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Power.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Power.java index 3becfcdd7..caa2c21a9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Power.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Power.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.clip2.enums.BatteryStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.BatteryStateType; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.OnOffType; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ProductData.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ProductData.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ProductData.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ProductData.java index 357d272af..1d009e0a9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ProductData.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ProductData.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Recall.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Recall.java similarity index 85% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Recall.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Recall.java index f489e1cda..35af29a2f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Recall.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Recall.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Duration; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.SceneRecallAction; -import org.openhab.binding.hue.internal.dto.clip2.enums.SmartSceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SmartSceneRecallAction; /** * DTO for scene and smart scene recall. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RelativeRotary.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RelativeRotary.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RelativeRotary.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RelativeRotary.java index 3de553a83..e56e00246 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RelativeRotary.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RelativeRotary.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resource.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resource.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resource.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resource.java index 2791bbeab..04e92905b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resource.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.math.BigDecimal; import java.math.MathContext; @@ -26,16 +26,16 @@ import java.util.Optional; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ContactStateType; -import org.openhab.binding.hue.internal.dto.clip2.enums.EffectType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; -import org.openhab.binding.hue.internal.dto.clip2.enums.SceneRecallAction; -import org.openhab.binding.hue.internal.dto.clip2.enums.SmartSceneRecallAction; -import org.openhab.binding.hue.internal.dto.clip2.enums.SmartSceneState; -import org.openhab.binding.hue.internal.dto.clip2.enums.TamperStateType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ZigbeeStatus; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ContactStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.EffectType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SmartSceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SmartSceneState; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.TamperStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ZigbeeStatus; import org.openhab.binding.hue.internal.exceptions.DTOPresentButEmptyException; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ResourceReference.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ResourceReference.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ResourceReference.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ResourceReference.java index f8baf1c0f..47298a816 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/ResourceReference.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ResourceReference.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; /** * DTO that contains an API reference element. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resources.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resources.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resources.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resources.java index ce554136d..85f01d64f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Resources.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Resources.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotaryReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotaryReport.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotaryReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotaryReport.java index 3d2159afb..9b7c1fa6e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotaryReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotaryReport.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.RotationEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.RotationEventType; /** * DTO for CLIP 2 relative rotary report. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Rotation.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Rotation.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Rotation.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Rotation.java index e6e6f18d4..fa2364bc9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Rotation.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Rotation.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.DirectionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.DirectionType; import org.openhab.core.library.types.DecimalType; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotationEvent.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotationEvent.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotationEvent.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotationEvent.java index 1712c7987..8c0e4679b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/RotationEvent.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/RotationEvent.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.enums.RotationEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.RotationEventType; import org.openhab.core.library.types.StringType; import org.openhab.core.types.State; import org.openhab.core.types.UnDefType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TamperReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TamperReport.java similarity index 89% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TamperReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TamperReport.java index 50d250898..50b30ef1d 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TamperReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TamperReport.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.clip2.enums.TamperStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.TamperStateType; /** * DTO for CLIP 2 home security tamper switch. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Temperature.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Temperature.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Temperature.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Temperature.java index 401476a70..f86ea8fa1 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/Temperature.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/Temperature.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TemperatureReport.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TemperatureReport.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TemperatureReport.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TemperatureReport.java index 1833daca6..83088abae 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TemperatureReport.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TemperatureReport.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Instant; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TimedEffects.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TimedEffects.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TimedEffects.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TimedEffects.java index e59dc68f4..60730bdcb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/TimedEffects.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/TimedEffects.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2; +package org.openhab.binding.hue.internal.api.dto.clip2; import java.time.Duration; import java.util.Objects; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ActionType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ActionType.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ActionType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ActionType.java index 93484e6d2..e11a7e8eb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ActionType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ActionType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/Archetype.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/Archetype.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/Archetype.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/Archetype.java index 30c0b1c6e..80f0d9791 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/Archetype.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/Archetype.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/BatteryStateType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/BatteryStateType.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/BatteryStateType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/BatteryStateType.java index 959409c46..624598cc8 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/BatteryStateType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/BatteryStateType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ButtonEventType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ButtonEventType.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ButtonEventType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ButtonEventType.java index ad2b7f822..6a1287ffe 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ButtonEventType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ButtonEventType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ContactStateType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ContactStateType.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ContactStateType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ContactStateType.java index 2892e77ca..c50ab0d3c 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ContactStateType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ContactStateType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/DirectionType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/DirectionType.java similarity index 91% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/DirectionType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/DirectionType.java index 1af547499..4ed4e918e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/DirectionType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/DirectionType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/EffectType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/EffectType.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/EffectType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/EffectType.java index 09663a145..870912249 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/EffectType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/EffectType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import java.util.Set; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ResourceType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ResourceType.java similarity index 97% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ResourceType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ResourceType.java index 56c2f0061..2562de2b4 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ResourceType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ResourceType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import java.util.EnumSet; import java.util.Set; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/RotationEventType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/RotationEventType.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/RotationEventType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/RotationEventType.java index 38e1ccd68..359dd6235 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/RotationEventType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/RotationEventType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SceneRecallAction.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SceneRecallAction.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SceneRecallAction.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SceneRecallAction.java index 36987c960..c7057d0b7 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SceneRecallAction.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SceneRecallAction.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneRecallAction.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneRecallAction.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneRecallAction.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneRecallAction.java index b12c45282..f2be1d943 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneRecallAction.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneRecallAction.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneState.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneState.java similarity index 93% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneState.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneState.java index 470f9fc7d..e54a1f823 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/SmartSceneState.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/SmartSceneState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/TamperStateType.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/TamperStateType.java similarity index 90% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/TamperStateType.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/TamperStateType.java index 23199b1af..afa632dfb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/TamperStateType.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/TamperStateType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ZigbeeStatus.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ZigbeeStatus.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ZigbeeStatus.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ZigbeeStatus.java index f9c33d1fe..b97e812cc 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/enums/ZigbeeStatus.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ZigbeeStatus.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.enums; +package org.openhab.binding.hue.internal.api.dto.clip2.enums; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/helper/Setters.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/helper/Setters.java similarity index 94% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/helper/Setters.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/helper/Setters.java index df400725a..641a80257 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/dto/clip2/helper/Setters.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/helper/Setters.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.dto.clip2.helper; +package org.openhab.binding.hue.internal.api.dto.clip2.helper; import java.math.BigDecimal; import java.time.Duration; @@ -21,18 +21,18 @@ import javax.measure.Unit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.Alerts; -import org.openhab.binding.hue.internal.dto.clip2.ColorTemperature; -import org.openhab.binding.hue.internal.dto.clip2.ColorXy; -import org.openhab.binding.hue.internal.dto.clip2.Dimming; -import org.openhab.binding.hue.internal.dto.clip2.Effects; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.MirekSchema; -import org.openhab.binding.hue.internal.dto.clip2.OnState; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.TimedEffects; -import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType; -import org.openhab.binding.hue.internal.dto.clip2.enums.EffectType; +import org.openhab.binding.hue.internal.api.dto.clip2.Alerts; +import org.openhab.binding.hue.internal.api.dto.clip2.ColorTemperature; +import org.openhab.binding.hue.internal.api.dto.clip2.ColorXy; +import org.openhab.binding.hue.internal.api.dto.clip2.Dimming; +import org.openhab.binding.hue.internal.api.dto.clip2.Effects; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.MirekSchema; +import org.openhab.binding.hue.internal.api.dto.clip2.OnState; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.TimedEffects; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.EffectType; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.PercentType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/serialization/InstantDeserializer.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/serialization/InstantDeserializer.java similarity index 95% rename from bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/serialization/InstantDeserializer.java rename to bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/serialization/InstantDeserializer.java index 1843c3c04..510c94418 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/serialization/InstantDeserializer.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/serialization/InstantDeserializer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.hue.internal.serialization; +package org.openhab.binding.hue.internal.api.serialization; import java.lang.reflect.Type; import java.time.Instant; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java index 9a8abb1cc..da156b655 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java @@ -70,18 +70,18 @@ import org.eclipse.jetty.http2.frames.ResetFrame; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise.Completable; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.openhab.binding.hue.internal.dto.CreateUserRequest; -import org.openhab.binding.hue.internal.dto.SuccessResponse; -import org.openhab.binding.hue.internal.dto.clip2.BridgeConfig; -import org.openhab.binding.hue.internal.dto.clip2.Event; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.Resources; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip1.CreateUserRequest; +import org.openhab.binding.hue.internal.api.dto.clip1.SuccessResponse; +import org.openhab.binding.hue.internal.api.dto.clip2.BridgeConfig; +import org.openhab.binding.hue.internal.api.dto.clip2.Event; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.Resources; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.serialization.InstantDeserializer; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.HttpUnauthorizedException; import org.openhab.binding.hue.internal.handler.Clip2BridgeHandler; -import org.openhab.binding.hue.internal.serialization.InstantDeserializer; import org.openhab.core.io.net.http.HttpClientFactory; import org.openhab.core.io.net.http.HttpUtil; import org.slf4j.Logger; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/HueBridge.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/HueBridge.java index 650af07aa..7efdee40d 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/HueBridge.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/HueBridge.java @@ -48,28 +48,28 @@ import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.util.StringContentProvider; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; -import org.openhab.binding.hue.internal.dto.ApiVersion; -import org.openhab.binding.hue.internal.dto.ApiVersionUtils; -import org.openhab.binding.hue.internal.dto.Config; -import org.openhab.binding.hue.internal.dto.ConfigUpdate; -import org.openhab.binding.hue.internal.dto.CreateUserRequest; -import org.openhab.binding.hue.internal.dto.ErrorResponse; -import org.openhab.binding.hue.internal.dto.FullConfig; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.FullHueObject; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.Group; -import org.openhab.binding.hue.internal.dto.HueObject; -import org.openhab.binding.hue.internal.dto.NewLightsResponse; -import org.openhab.binding.hue.internal.dto.Scene; -import org.openhab.binding.hue.internal.dto.Schedule; -import org.openhab.binding.hue.internal.dto.ScheduleUpdate; -import org.openhab.binding.hue.internal.dto.SearchForLightsRequest; -import org.openhab.binding.hue.internal.dto.SetAttributesRequest; -import org.openhab.binding.hue.internal.dto.StateUpdate; -import org.openhab.binding.hue.internal.dto.SuccessResponse; -import org.openhab.binding.hue.internal.dto.Util; +import org.openhab.binding.hue.internal.api.dto.clip1.ApiVersion; +import org.openhab.binding.hue.internal.api.dto.clip1.ApiVersionUtils; +import org.openhab.binding.hue.internal.api.dto.clip1.Config; +import org.openhab.binding.hue.internal.api.dto.clip1.ConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.CreateUserRequest; +import org.openhab.binding.hue.internal.api.dto.clip1.ErrorResponse; +import org.openhab.binding.hue.internal.api.dto.clip1.FullConfig; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.FullHueObject; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.Group; +import org.openhab.binding.hue.internal.api.dto.clip1.HueObject; +import org.openhab.binding.hue.internal.api.dto.clip1.NewLightsResponse; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; +import org.openhab.binding.hue.internal.api.dto.clip1.Schedule; +import org.openhab.binding.hue.internal.api.dto.clip1.ScheduleUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.SearchForLightsRequest; +import org.openhab.binding.hue.internal.api.dto.clip1.SetAttributesRequest; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.SuccessResponse; +import org.openhab.binding.hue.internal.api.dto.clip1.Util; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.DeviceOffException; import org.openhab.binding.hue.internal.exceptions.EmptyResponseException; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java index b299cf569..c75ecb0d4 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java @@ -25,11 +25,11 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.AssetNotLoadedException; import org.openhab.binding.hue.internal.handler.Clip2BridgeHandler; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java index 829476e36..1f1f9cb42 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.AssetNotLoadedException; import org.openhab.binding.hue.internal.handler.Clip2BridgeHandler; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueDeviceDiscoveryService.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueDeviceDiscoveryService.java index d05a10943..ec6ea4ca5 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueDeviceDiscoveryService.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueDeviceDiscoveryService.java @@ -25,10 +25,10 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.FullHueObject; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.FullHueObject; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; import org.openhab.binding.hue.internal.handler.HueBridgeHandler; import org.openhab.binding.hue.internal.handler.HueGroupHandler; import org.openhab.binding.hue.internal.handler.HueLightHandler; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java index 2891cf9e4..c94d39ef8 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java @@ -30,17 +30,17 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.ProductData; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.Resources; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; import org.openhab.binding.hue.internal.config.Clip2BridgeConfig; import org.openhab.binding.hue.internal.connection.Clip2Bridge; import org.openhab.binding.hue.internal.connection.HueTlsTrustManagerProvider; import org.openhab.binding.hue.internal.discovery.Clip2ThingDiscoveryService; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.ProductData; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.Resources; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.AssetNotLoadedException; import org.openhab.binding.hue.internal.exceptions.HttpUnauthorizedException; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2ThingHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2ThingHandler.java index a436f7f88..aef0ff5bf 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2ThingHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2ThingHandler.java @@ -35,26 +35,26 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.hue.internal.action.DynamicsActions; +import org.openhab.binding.hue.internal.api.dto.clip2.Alerts; +import org.openhab.binding.hue.internal.api.dto.clip2.ColorXy; +import org.openhab.binding.hue.internal.api.dto.clip2.Dimming; +import org.openhab.binding.hue.internal.api.dto.clip2.Effects; +import org.openhab.binding.hue.internal.api.dto.clip2.Gamut2; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.MirekSchema; +import org.openhab.binding.hue.internal.api.dto.clip2.ProductData; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.Resources; +import org.openhab.binding.hue.internal.api.dto.clip2.TimedEffects; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.EffectType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.SmartSceneRecallAction; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ZigbeeStatus; +import org.openhab.binding.hue.internal.api.dto.clip2.helper.Setters; import org.openhab.binding.hue.internal.config.Clip2ThingConfig; -import org.openhab.binding.hue.internal.dto.clip2.Alerts; -import org.openhab.binding.hue.internal.dto.clip2.ColorXy; -import org.openhab.binding.hue.internal.dto.clip2.Dimming; -import org.openhab.binding.hue.internal.dto.clip2.Effects; -import org.openhab.binding.hue.internal.dto.clip2.Gamut2; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.MirekSchema; -import org.openhab.binding.hue.internal.dto.clip2.ProductData; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.Resources; -import org.openhab.binding.hue.internal.dto.clip2.TimedEffects; -import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType; -import org.openhab.binding.hue.internal.dto.clip2.enums.EffectType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; -import org.openhab.binding.hue.internal.dto.clip2.enums.SceneRecallAction; -import org.openhab.binding.hue.internal.dto.clip2.enums.SmartSceneRecallAction; -import org.openhab.binding.hue.internal.dto.clip2.enums.ZigbeeStatus; -import org.openhab.binding.hue.internal.dto.clip2.helper.Setters; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.AssetNotLoadedException; import org.openhab.core.i18n.TimeZoneProvider; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/GroupStatusListener.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/GroupStatusListener.java index 27705e871..b8cdad3b9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/GroupStatusListener.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/GroupStatusListener.java @@ -15,8 +15,8 @@ package org.openhab.binding.hue.internal.handler; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.Scene; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; /** * The {@link GroupStatusListener} is notified when a group status has changed or a group has been removed or added. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java index 30991dd19..5a1f61ef9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java @@ -35,20 +35,20 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; +import org.openhab.binding.hue.internal.api.dto.clip1.ApiVersionUtils; +import org.openhab.binding.hue.internal.api.dto.clip1.Config; +import org.openhab.binding.hue.internal.api.dto.clip1.ConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullConfig; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; +import org.openhab.binding.hue.internal.api.dto.clip1.State; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.binding.hue.internal.config.HueBridgeConfig; import org.openhab.binding.hue.internal.connection.HueBridge; import org.openhab.binding.hue.internal.connection.HueTlsTrustManagerProvider; import org.openhab.binding.hue.internal.discovery.HueDeviceDiscoveryService; -import org.openhab.binding.hue.internal.dto.ApiVersionUtils; -import org.openhab.binding.hue.internal.dto.Config; -import org.openhab.binding.hue.internal.dto.ConfigUpdate; -import org.openhab.binding.hue.internal.dto.FullConfig; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.Scene; -import org.openhab.binding.hue.internal.dto.State; -import org.openhab.binding.hue.internal.dto.StateUpdate; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.exceptions.DeviceOffException; import org.openhab.binding.hue.internal.exceptions.EmptyResponseException; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueClient.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueClient.java index ea9bca0f5..fe79b34b1 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueClient.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueClient.java @@ -14,12 +14,12 @@ package org.openhab.binding.hue.internal.handler; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; +import org.openhab.binding.hue.internal.api.dto.clip1.ConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.binding.hue.internal.discovery.HueDeviceDiscoveryService; -import org.openhab.binding.hue.internal.dto.ConfigUpdate; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.StateUpdate; /** * Access to the Hue system for light handlers. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueGroupHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueGroupHandler.java index 118edaef3..8eb767f7d 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueGroupHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueGroupHandler.java @@ -25,11 +25,11 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.ColorTemperature; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.Scene; -import org.openhab.binding.hue.internal.dto.State; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.ColorTemperature; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; +import org.openhab.binding.hue.internal.api.dto.clip1.State; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.IncreaseDecreaseType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueLightHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueLightHandler.java index a574f8f09..9dda77940 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueLightHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueLightHandler.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.Capabilities; -import org.openhab.binding.hue.internal.dto.ColorTemperature; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.State; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.Capabilities; +import org.openhab.binding.hue.internal.api.dto.clip1.ColorTemperature; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.State; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.IncreaseDecreaseType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java index 8d3210a57..9f274be66 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueSensorHandler.java @@ -13,7 +13,7 @@ package org.openhab.binding.hue.internal.handler; import static org.openhab.binding.hue.internal.HueBindingConstants.*; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; import static org.openhab.core.thing.Thing.*; import java.time.LocalDateTime; @@ -27,9 +27,9 @@ import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStateConverter.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStateConverter.java index 525d1f452..cefb96088 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStateConverter.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStateConverter.java @@ -16,12 +16,12 @@ import javax.measure.quantity.Temperature; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.hue.internal.dto.ColorTemperature; -import org.openhab.binding.hue.internal.dto.State; -import org.openhab.binding.hue.internal.dto.State.AlertMode; -import org.openhab.binding.hue.internal.dto.State.ColorMode; -import org.openhab.binding.hue.internal.dto.State.Effect; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.ColorTemperature; +import org.openhab.binding.hue.internal.api.dto.clip1.State; +import org.openhab.binding.hue.internal.api.dto.clip1.State.AlertMode; +import org.openhab.binding.hue.internal.api.dto.clip1.State.ColorMode; +import org.openhab.binding.hue.internal.api.dto.clip1.State.Effect; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.IncreaseDecreaseType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStatusListener.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStatusListener.java index bcdaad913..7c8be4d58 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStatusListener.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/LightStatusListener.java @@ -13,7 +13,7 @@ package org.openhab.binding.hue.internal.handler; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; /** * The {@link LightStatusListener} is notified when a light status has changed or a light has been removed or added. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/SensorStatusListener.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/SensorStatusListener.java index 6a113c131..c572e5a43 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/SensorStatusListener.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/SensorStatusListener.java @@ -13,7 +13,7 @@ package org.openhab.binding.hue.internal.handler; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; /** * The {@link SensorStatusListener} is notified when a sensor status has changed or a sensor has been removed or added. diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/ClipHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/ClipHandler.java index 89a5c88e3..f98329b90 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/ClipHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/ClipHandler.java @@ -20,8 +20,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.thing.Thing; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/DimmerSwitchHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/DimmerSwitchHandler.java index 8adc3ed73..7225aa65e 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/DimmerSwitchHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/DimmerSwitchHandler.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java index ac992a7dc..5ac1407f7 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/GeofencePresenceHandler.java @@ -13,14 +13,14 @@ package org.openhab.binding.hue.internal.handler.sensors; import static org.openhab.binding.hue.internal.HueBindingConstants.*; -import static org.openhab.binding.hue.internal.dto.FullSensor.STATE_PRESENCE; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.STATE_PRESENCE; import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.OnOffType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java index 933fb05c6..b6c0156f5 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/LightLevelHandler.java @@ -13,16 +13,16 @@ package org.openhab.binding.hue.internal.handler.sensors; import static org.openhab.binding.hue.internal.HueBindingConstants.*; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; import java.math.BigDecimal; import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.LightLevelConfigUpdate; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.LightLevelConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java index be50280af..39caa2029 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/PresenceHandler.java @@ -13,15 +13,15 @@ package org.openhab.binding.hue.internal.handler.sensors; import static org.openhab.binding.hue.internal.HueBindingConstants.*; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.PresenceConfigUpdate; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.PresenceConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueClient; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TapSwitchHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TapSwitchHandler.java index 217301cc3..81053688b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TapSwitchHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TapSwitchHandler.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TemperatureHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TemperatureHandler.java index 3a664bff2..c2464aafa 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TemperatureHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/sensors/TemperatureHandler.java @@ -13,16 +13,16 @@ package org.openhab.binding.hue.internal.handler.sensors; import static org.openhab.binding.hue.internal.HueBindingConstants.*; -import static org.openhab.binding.hue.internal.dto.FullSensor.*; +import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*; import java.math.BigDecimal; import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.FullSensor; -import org.openhab.binding.hue.internal.dto.SensorConfigUpdate; -import org.openhab.binding.hue.internal.dto.TemperatureConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullSensor; +import org.openhab.binding.hue.internal.api.dto.clip1.SensorConfigUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.TemperatureConfigUpdate; import org.openhab.binding.hue.internal.handler.HueSensorHandler; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.QuantityType; diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/ApiVersionTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/ApiVersionTest.java index 7cb58b7a2..53817f81d 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/ApiVersionTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/ApiVersionTest.java @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; -import org.openhab.binding.hue.internal.dto.ApiVersion; +import org.openhab.binding.hue.internal.api.dto.clip1.ApiVersion; /** * @author Samuel Leisering - Initial contribution diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/HueBridgeTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/HueBridgeTest.java index a207a3c5c..6b606b470 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/HueBridgeTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/HueBridgeTest.java @@ -25,9 +25,9 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.Test; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; import org.openhab.binding.hue.internal.config.HueBridgeConfig; import org.openhab.binding.hue.internal.connection.HueBridge; -import org.openhab.binding.hue.internal.dto.Scene; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.core.i18n.CommunicationException; import org.openhab.core.i18n.ConfigurationException; diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/LightStateConverterTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/LightStateConverterTest.java index 3640bd996..87b5d4192 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/LightStateConverterTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/LightStateConverterTest.java @@ -19,10 +19,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; -import org.openhab.binding.hue.internal.dto.ColorTemperature; -import org.openhab.binding.hue.internal.dto.State; -import org.openhab.binding.hue.internal.dto.State.ColorMode; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.ColorTemperature; +import org.openhab.binding.hue.internal.api.dto.clip1.State; +import org.openhab.binding.hue.internal.api.dto.clip1.State.ColorMode; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.binding.hue.internal.handler.LightStateConverter; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/SceneTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/SceneTest.java index 3498c8570..2ea2bd57f 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/SceneTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/SceneTest.java @@ -19,9 +19,9 @@ import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; -import org.openhab.binding.hue.internal.dto.FullGroup; -import org.openhab.binding.hue.internal.dto.Scene; -import org.openhab.binding.hue.internal.dto.State; +import org.openhab.binding.hue.internal.api.dto.clip1.FullGroup; +import org.openhab.binding.hue.internal.api.dto.clip1.Scene; +import org.openhab.binding.hue.internal.api.dto.clip1.State; /** * @author HJiang - initial contribution diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/clip2/Clip2DtoTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/clip2/Clip2DtoTest.java index 79b32776d..a42a26b9a 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/clip2/Clip2DtoTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/clip2/Clip2DtoTest.java @@ -29,39 +29,39 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; -import org.openhab.binding.hue.internal.dto.clip2.ActionEntry; -import org.openhab.binding.hue.internal.dto.clip2.Alerts; -import org.openhab.binding.hue.internal.dto.clip2.Button; -import org.openhab.binding.hue.internal.dto.clip2.ContactReport; -import org.openhab.binding.hue.internal.dto.clip2.Dimming; -import org.openhab.binding.hue.internal.dto.clip2.Effects; -import org.openhab.binding.hue.internal.dto.clip2.Event; -import org.openhab.binding.hue.internal.dto.clip2.LightLevel; -import org.openhab.binding.hue.internal.dto.clip2.MetaData; -import org.openhab.binding.hue.internal.dto.clip2.MirekSchema; -import org.openhab.binding.hue.internal.dto.clip2.Motion; -import org.openhab.binding.hue.internal.dto.clip2.Power; -import org.openhab.binding.hue.internal.dto.clip2.ProductData; -import org.openhab.binding.hue.internal.dto.clip2.RelativeRotary; -import org.openhab.binding.hue.internal.dto.clip2.Resource; -import org.openhab.binding.hue.internal.dto.clip2.ResourceReference; -import org.openhab.binding.hue.internal.dto.clip2.Resources; -import org.openhab.binding.hue.internal.dto.clip2.Rotation; -import org.openhab.binding.hue.internal.dto.clip2.RotationEvent; -import org.openhab.binding.hue.internal.dto.clip2.TamperReport; -import org.openhab.binding.hue.internal.dto.clip2.Temperature; -import org.openhab.binding.hue.internal.dto.clip2.TimedEffects; -import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType; -import org.openhab.binding.hue.internal.dto.clip2.enums.Archetype; -import org.openhab.binding.hue.internal.dto.clip2.enums.BatteryStateType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType; -import org.openhab.binding.hue.internal.dto.clip2.enums.DirectionType; -import org.openhab.binding.hue.internal.dto.clip2.enums.EffectType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ResourceType; -import org.openhab.binding.hue.internal.dto.clip2.enums.RotationEventType; -import org.openhab.binding.hue.internal.dto.clip2.enums.ZigbeeStatus; -import org.openhab.binding.hue.internal.dto.clip2.helper.Setters; -import org.openhab.binding.hue.internal.serialization.InstantDeserializer; +import org.openhab.binding.hue.internal.api.dto.clip2.ActionEntry; +import org.openhab.binding.hue.internal.api.dto.clip2.Alerts; +import org.openhab.binding.hue.internal.api.dto.clip2.Button; +import org.openhab.binding.hue.internal.api.dto.clip2.ContactReport; +import org.openhab.binding.hue.internal.api.dto.clip2.Dimming; +import org.openhab.binding.hue.internal.api.dto.clip2.Effects; +import org.openhab.binding.hue.internal.api.dto.clip2.Event; +import org.openhab.binding.hue.internal.api.dto.clip2.LightLevel; +import org.openhab.binding.hue.internal.api.dto.clip2.MetaData; +import org.openhab.binding.hue.internal.api.dto.clip2.MirekSchema; +import org.openhab.binding.hue.internal.api.dto.clip2.Motion; +import org.openhab.binding.hue.internal.api.dto.clip2.Power; +import org.openhab.binding.hue.internal.api.dto.clip2.ProductData; +import org.openhab.binding.hue.internal.api.dto.clip2.RelativeRotary; +import org.openhab.binding.hue.internal.api.dto.clip2.Resource; +import org.openhab.binding.hue.internal.api.dto.clip2.ResourceReference; +import org.openhab.binding.hue.internal.api.dto.clip2.Resources; +import org.openhab.binding.hue.internal.api.dto.clip2.Rotation; +import org.openhab.binding.hue.internal.api.dto.clip2.RotationEvent; +import org.openhab.binding.hue.internal.api.dto.clip2.TamperReport; +import org.openhab.binding.hue.internal.api.dto.clip2.Temperature; +import org.openhab.binding.hue.internal.api.dto.clip2.TimedEffects; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.Archetype; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.BatteryStateType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.DirectionType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.EffectType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ResourceType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.RotationEventType; +import org.openhab.binding.hue.internal.api.dto.clip2.enums.ZigbeeStatus; +import org.openhab.binding.hue.internal.api.dto.clip2.helper.Setters; +import org.openhab.binding.hue.internal.api.serialization.InstantDeserializer; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightHandlerTest.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightHandlerTest.java index 5f47d7c43..7ba9acd98 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightHandlerTest.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightHandlerTest.java @@ -23,10 +23,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.openhab.binding.hue.internal.dto.FullConfig; -import org.openhab.binding.hue.internal.dto.FullLight; -import org.openhab.binding.hue.internal.dto.State.ColorMode; -import org.openhab.binding.hue.internal.dto.StateUpdate; +import org.openhab.binding.hue.internal.api.dto.clip1.FullConfig; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; +import org.openhab.binding.hue.internal.api.dto.clip1.State.ColorMode; +import org.openhab.binding.hue.internal.api.dto.clip1.StateUpdate; import org.openhab.core.config.core.Configuration; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.HSBType; diff --git a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightState.java b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightState.java index c0e8b14e2..c12fc8c10 100644 --- a/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightState.java +++ b/bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightState.java @@ -13,7 +13,7 @@ package org.openhab.binding.hue.internal.handler; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.hue.internal.dto.State.ColorMode; +import org.openhab.binding.hue.internal.api.dto.clip1.State.ColorMode; /** * Builder for the current state of a hue light. diff --git a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/HueDeviceDiscoveryServiceOSGiTest.java b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/HueDeviceDiscoveryServiceOSGiTest.java index 6be21f452..b1cac633d 100644 --- a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/HueDeviceDiscoveryServiceOSGiTest.java +++ b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/HueDeviceDiscoveryServiceOSGiTest.java @@ -32,10 +32,10 @@ import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.openhab.binding.hue.internal.api.dto.clip1.FullLight; import org.openhab.binding.hue.internal.config.HueBridgeConfig; import org.openhab.binding.hue.internal.connection.HueBridge; import org.openhab.binding.hue.internal.discovery.HueDeviceDiscoveryService; -import org.openhab.binding.hue.internal.dto.FullLight; import org.openhab.binding.hue.internal.exceptions.ApiException; import org.openhab.binding.hue.internal.handler.HueBridgeHandler; import org.openhab.core.config.core.Configuration;