From 7c17634daa15dd733b836ea3373a491f63c1f6f0 Mon Sep 17 00:00:00 2001 From: Christian Oeing Date: Sun, 16 Aug 2020 21:19:44 +0200 Subject: [PATCH] #7 Moved each device to a separate subfolder inside devices folder Signed-off-by: Christian Oeing --- .../boschshc/internal/PairingRequest.java | 38 ------------------- .../BoschSHCBindingConstants.java | 2 +- .../{ => devices}/BoschSHCConfiguration.java | 2 +- .../{ => devices}/BoschSHCHandler.java | 3 +- .../{ => devices}/BoschSHCHandlerFactory.java | 13 +++++-- .../{ => devices/bridge}/BoschHttpClient.java | 4 +- .../bridge}/BoschSHCBridgeConfiguration.java | 3 +- .../bridge}/BoschSHCBridgeHandler.java | 3 +- .../{ => devices/bridge}/BoschSslUtil.java | 3 +- .../internal/{ => devices/bridge}/Device.java | 2 +- .../bridge}/DeviceStatusUpdate.java | 2 +- .../{ => devices/bridge}/JsonRpcRequest.java | 2 +- .../{ => devices/bridge}/LongPollError.java | 2 +- .../{ => devices/bridge}/LongPollResult.java | 2 +- .../bridge}/PowerSwitchStateUpdate.java | 2 +- .../internal/{ => devices/bridge}/Room.java | 2 +- .../{ => devices/bridge}/SubscribeResult.java | 2 +- .../climatecontrol/ClimateControlHandler.java | 6 +-- .../BoschInWallSwitchHandler.java | 7 +++- .../inwallswitch}/PowerMeterState.java | 2 +- .../inwallswitch}/PowerSwitchState.java | 2 +- .../motiondetector}/LatestMotionState.java | 2 +- .../MotionDetectorHandler.java | 7 +++- .../shuttercontrol/OperationState.java | 2 +- .../shuttercontrol/ShutterControlHandler.java | 8 ++-- .../shuttercontrol/ShutterControlState.java | 2 +- .../thermostat/ThermostatHandler.java | 8 ++-- .../twinguard}/BoschTwinguardHandler.java | 8 ++-- .../twinguard}/TwinguardState.java | 2 +- .../windowcontact}/ShutterContactState.java | 2 +- .../windowcontact}/WindowContactHandler.java | 7 +++- .../internal/services/BoschSHCService.java | 2 +- 32 files changed, 65 insertions(+), 89 deletions(-) delete mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/BoschSHCBindingConstants.java (98%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/BoschSHCConfiguration.java (92%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/BoschSHCHandler.java (98%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/BoschSHCHandlerFactory.java (82%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/BoschHttpClient.java (99%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/BoschSHCBridgeConfiguration.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/BoschSHCBridgeHandler.java (99%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/BoschSslUtil.java (99%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/Device.java (95%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/DeviceStatusUpdate.java (95%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/JsonRpcRequest.java (95%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/LongPollError.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/LongPollResult.java (94%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/PowerSwitchStateUpdate.java (94%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/Room.java (92%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/bridge}/SubscribeResult.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/inwallswitch}/BoschInWallSwitchHandler.java (92%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/inwallswitch}/PowerMeterState.java (90%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/inwallswitch}/PowerSwitchState.java (92%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/motiondetector}/LatestMotionState.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/motiondetector}/MotionDetectorHandler.java (88%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/shuttercontrol/OperationState.java (88%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/shuttercontrol/ShutterControlHandler.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/shuttercontrol/ShutterControlState.java (93%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices}/thermostat/ThermostatHandler.java (85%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/twinguard}/BoschTwinguardHandler.java (91%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/twinguard}/TwinguardState.java (95%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/windowcontact}/ShutterContactState.java (90%) rename bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/{ => devices/windowcontact}/WindowContactHandler.java (88%) diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java deleted file mode 100644 index 782ba2460db65..0000000000000 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (c) 2010-2019 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.boschshc.internal; - -import com.google.gson.annotations.SerializedName; - -// Modeled after: BoschClientData in model/bosch-client-data.ts -class PairRequest { - - PairRequest(String name, String id) { - - this.type = "client"; - this.id = "oss_" + id; - this.name = "OSS " + name; - - this.primaryRole = "ROLE_RESTRICTED_CLIENT"; - this.deleted = false; - } - - @SerializedName("@type") - String type; - - String id; - String name; - - String primaryRole; - boolean deleted; -} diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBindingConstants.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java similarity index 98% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBindingConstants.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java index 15e82aebb8066..3dd85b1d1d94b 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBindingConstants.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.smarthome.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCConfiguration.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCConfiguration.java similarity index 92% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCConfiguration.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCConfiguration.java index 85702452acded..9e6b65332b344 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCConfiguration.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCConfiguration.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices; /** * The {@link BoschSHCConfiguration} class contains fields mapping thing configuration parameters. diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandler.java similarity index 98% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandler.java index 73f719df985c6..e8b3991e26d02 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices; import java.util.ArrayList; import java.util.Collection; @@ -26,6 +26,7 @@ import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.openhab.binding.boschshc.internal.services.BoschSHCService; import org.openhab.binding.boschshc.internal.services.BoschSHCServiceState; import org.slf4j.Logger; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandlerFactory.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java similarity index 82% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandlerFactory.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java index 777aa3db6048b..cb892d14836ff 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCHandlerFactory.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.*; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.*; import java.util.Arrays; import java.util.Collection; @@ -25,9 +25,14 @@ import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory; import org.eclipse.smarthome.core.thing.binding.ThingHandler; import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.openhab.binding.boschshc.internal.devices.climatecontrol.ClimateControlHandler; -import org.openhab.binding.boschshc.internal.shuttercontrol.ShutterControlHandler; -import org.openhab.binding.boschshc.internal.thermostat.ThermostatHandler; +import org.openhab.binding.boschshc.internal.devices.inwallswitch.BoschInWallSwitchHandler; +import org.openhab.binding.boschshc.internal.devices.motiondetector.MotionDetectorHandler; +import org.openhab.binding.boschshc.internal.devices.shuttercontrol.ShutterControlHandler; +import org.openhab.binding.boschshc.internal.devices.thermostat.ThermostatHandler; +import org.openhab.binding.boschshc.internal.devices.twinguard.BoschTwinguardHandler; +import org.openhab.binding.boschshc.internal.devices.windowcontact.WindowContactHandler; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschHttpClient.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClient.java similarity index 99% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschHttpClient.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClient.java index a64802ef4cd8b..07a5f15a0d240 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschHttpClient.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import static org.eclipse.jetty.http.HttpMethod.GET; @@ -85,7 +85,6 @@ public void checkAccessAndPairIfNecessary() throws InterruptedException, Pairing // check access accessPossible = isAccessPossible(); } - } public Boolean isAccessPossible() { @@ -147,7 +146,6 @@ public boolean doPairing() { logger.debug("Pairing failed with: {}", e); return false; } - } // // TODO add request function like newBoschRequest("smarthome/devices") diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeConfiguration.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeConfiguration.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeConfiguration.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeConfiguration.java index 6c6bc61febd7c..d266b8124f55c 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeConfiguration.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeConfiguration.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; /** * The {@link BoschSHCBridgeConfiguration} class contains fields mapping thing configuration parameters. @@ -28,5 +28,4 @@ public class BoschSHCBridgeConfiguration { * Password of the Bosch Smart Home Controller. Set during initialization via the Bosch app. */ public String password; - } diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeHandler.java similarity index 99% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeHandler.java index 3e656962c65ef..6b8b207fdac3e 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSHCBridgeHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSHCBridgeHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import static org.eclipse.jetty.http.HttpMethod.GET; import static org.eclipse.jetty.http.HttpMethod.POST; @@ -39,6 +39,7 @@ import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler; import org.eclipse.smarthome.core.thing.binding.ThingHandler; import org.eclipse.smarthome.core.types.Command; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; import org.openhab.binding.boschshc.internal.exceptions.PairingFailedException; import org.openhab.binding.boschshc.internal.services.JsonRestExceptionResponse; import org.slf4j.Logger; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSslUtil.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSslUtil.java similarity index 99% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSslUtil.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSslUtil.java index 26b684d09f646..14864fb4140bb 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschSslUtil.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschSslUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import java.io.BufferedInputStream; import java.io.File; @@ -182,5 +182,4 @@ private KeyStore createKeyStore(String keystore, String keystorePassword) return keyStore; } - } diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Device.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Device.java similarity index 95% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Device.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Device.java index dce5605503b2b..b88665780f3e3 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Device.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Device.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import java.util.ArrayList; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/DeviceStatusUpdate.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/DeviceStatusUpdate.java similarity index 95% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/DeviceStatusUpdate.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/DeviceStatusUpdate.java index 6f8dec9548525..f2eaccb1bf257 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/DeviceStatusUpdate.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/DeviceStatusUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import com.google.gson.JsonElement; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/JsonRpcRequest.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/JsonRpcRequest.java similarity index 95% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/JsonRpcRequest.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/JsonRpcRequest.java index 198d326804c66..7df1f28caefa0 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/JsonRpcRequest.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/JsonRpcRequest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; /** * Payload as POST data for triggering a RPC call on the Bosch Smart Home Controller. diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollError.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollError.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollError.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollError.java index 73623b3e8ed58..471f0c3ba9d38 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollError.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollError.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; /** * Error response of the Controller for a Long Poll API call. diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollResult.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollResult.java similarity index 94% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollResult.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollResult.java index 3c9635d205753..a0ab50c97c7e0 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LongPollResult.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollResult.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import java.util.ArrayList; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchStateUpdate.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/PowerSwitchStateUpdate.java similarity index 94% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchStateUpdate.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/PowerSwitchStateUpdate.java index 7bc126cf32b9e..60971f1e6d304 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchStateUpdate.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/PowerSwitchStateUpdate.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Room.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Room.java similarity index 92% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Room.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Room.java index a6114e2d2e3aa..3f61a1b34912f 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/Room.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/Room.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/SubscribeResult.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/SubscribeResult.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/SubscribeResult.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/SubscribeResult.java index 92b932842867b..b4bce4b7533b1 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/SubscribeResult.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/SubscribeResult.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.bridge; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java index f9f523e5cd0fa..bd8c4dc4535ae 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java @@ -12,8 +12,8 @@ */ package org.openhab.binding.boschshc.internal.devices.climatecontrol; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_SETPOINT_TEMPERATURE; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_TEMPERATURE; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_SETPOINT_TEMPERATURE; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_TEMPERATURE; import java.util.Arrays; @@ -22,7 +22,7 @@ import org.eclipse.smarthome.core.thing.ChannelUID; import org.eclipse.smarthome.core.thing.Thing; import org.eclipse.smarthome.core.types.Command; -import org.openhab.binding.boschshc.internal.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; import org.openhab.binding.boschshc.internal.services.roomclimatecontrol.RoomClimateControlService; import org.openhab.binding.boschshc.internal.services.roomclimatecontrol.RoomClimateControlServiceState; import org.openhab.binding.boschshc.internal.services.temperaturelevel.TemperatureLevelService; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschInWallSwitchHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/BoschInWallSwitchHandler.java similarity index 92% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschInWallSwitchHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/BoschInWallSwitchHandler.java index b19701d7c06ae..5e603408333d4 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschInWallSwitchHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/BoschInWallSwitchHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.inwallswitch; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.*; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.*; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.smarthome.core.library.types.DecimalType; @@ -25,6 +25,9 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; import org.eclipse.smarthome.core.types.State; +import org.openhab.binding.boschshc.internal.devices.BoschSHCConfiguration; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerMeterState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerMeterState.java similarity index 90% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerMeterState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerMeterState.java index 715544827605a..cb099b1a68d2a 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerMeterState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerMeterState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.inwallswitch; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerSwitchState.java similarity index 92% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerSwitchState.java index 345acbb5de676..9846e75e87097 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PowerSwitchState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/inwallswitch/PowerSwitchState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.inwallswitch; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LatestMotionState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/LatestMotionState.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LatestMotionState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/LatestMotionState.java index f7d41db2c4203..a47fd8c3e6cd6 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/LatestMotionState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/LatestMotionState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.motiondetector; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/MotionDetectorHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/MotionDetectorHandler.java similarity index 88% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/MotionDetectorHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/MotionDetectorHandler.java index 4038b1bbeecab..a7352e3fd90ee 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/MotionDetectorHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/motiondetector/MotionDetectorHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.motiondetector; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_LATEST_MOTION; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_LATEST_MOTION; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -24,6 +24,9 @@ import org.eclipse.smarthome.core.thing.ThingStatusDetail; import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; +import org.openhab.binding.boschshc.internal.devices.BoschSHCConfiguration; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/OperationState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/OperationState.java similarity index 88% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/OperationState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/OperationState.java index ed010d558bfef..695b74f0050d2 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/OperationState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/OperationState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal.shuttercontrol; +package org.openhab.binding.boschshc.internal.devices.shuttercontrol; /** * Operation State. diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlHandler.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlHandler.java index 1ff4b8af05371..09fba67362649 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal.shuttercontrol; +package org.openhab.binding.boschshc.internal.devices.shuttercontrol; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.*; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.*; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -24,8 +24,8 @@ import org.eclipse.smarthome.core.thing.Thing; import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; -import org.openhab.binding.boschshc.internal.BoschSHCBridgeHandler; -import org.openhab.binding.boschshc.internal.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlState.java similarity index 93% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlState.java index dd8e8b782415e..2f4a22398cb8a 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/shuttercontrol/ShutterControlState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal.shuttercontrol; +package org.openhab.binding.boschshc.internal.devices.shuttercontrol; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/thermostat/ThermostatHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandler.java similarity index 85% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/thermostat/ThermostatHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandler.java index 85a28c3c6e6dc..36dde7e929169 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/thermostat/ThermostatHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandler.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal.thermostat; +package org.openhab.binding.boschshc.internal.devices.thermostat; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_TEMPERATURE; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_VALVE_TAPPET_POSITION; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_TEMPERATURE; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_VALVE_TAPPET_POSITION; import java.util.Arrays; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.smarthome.core.thing.Thing; -import org.openhab.binding.boschshc.internal.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; import org.openhab.binding.boschshc.internal.services.temperaturelevel.TemperatureLevelService; import org.openhab.binding.boschshc.internal.services.temperaturelevel.TemperatureLevelServiceState; import org.openhab.binding.boschshc.internal.services.valvetappet.ValveTappetService; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschTwinguardHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/BoschTwinguardHandler.java similarity index 91% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschTwinguardHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/BoschTwinguardHandler.java index 45fd31306a4c5..8ccf9121f3ede 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/BoschTwinguardHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/BoschTwinguardHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.twinguard; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.*; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.*; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -25,6 +25,9 @@ import org.eclipse.smarthome.core.thing.ThingStatusDetail; import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; +import org.openhab.binding.boschshc.internal.devices.BoschSHCConfiguration; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,5 +104,4 @@ public void processUpdate(String id, @NonNull JsonElement state) { logger.warn("Received unknown update in in-wall switch: {}", state); } } - } diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/TwinguardState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardState.java similarity index 95% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/TwinguardState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardState.java index d96723430c7dd..30bd6779074ba 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/TwinguardState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.twinguard; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/ShutterContactState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/ShutterContactState.java similarity index 90% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/ShutterContactState.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/ShutterContactState.java index 5345d37f7b72d..57baef73a74ce 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/ShutterContactState.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/ShutterContactState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.windowcontact; import com.google.gson.annotations.SerializedName; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/WindowContactHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/WindowContactHandler.java similarity index 88% rename from bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/WindowContactHandler.java rename to bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/WindowContactHandler.java index 71e1dd0da237f..f7ad60fd39068 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/WindowContactHandler.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/windowcontact/WindowContactHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.boschshc.internal; +package org.openhab.binding.boschshc.internal.devices.windowcontact; -import static org.openhab.binding.boschshc.internal.BoschSHCBindingConstants.CHANNEL_CONTACT; +import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_CONTACT; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.smarthome.core.library.types.OpenClosedType; @@ -24,6 +24,9 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; import org.eclipse.smarthome.core.types.State; +import org.openhab.binding.boschshc.internal.devices.BoschSHCConfiguration; +import org.openhab.binding.boschshc.internal.devices.BoschSHCHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCService.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCService.java index 91a936fcf152b..fc0a27a3cdfff 100644 --- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCService.java +++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCService.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.boschshc.internal.BoschSHCBridgeHandler; +import org.openhab.binding.boschshc.internal.devices.bridge.BoschSHCBridgeHandler; import com.google.gson.Gson; import com.google.gson.JsonElement;