Merge pull request #39 from stefan-kaestle/feature/7-put-each-device-…

…in-subfolder Moved each device to a separate subfolder inside devices folder
openhab · Aug 17, 2020 · c7c80ec · c7c80ec
2 parents 0faf1cd + 59c848a
commit c7c80ec
Show file tree

Hide file tree

Showing 32 changed files with 65 additions and 89 deletions.
diff --git a/....binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java b/....binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/PairingRequest.java
diff --git a/...hc/internal/BoschSHCBindingConstants.java → ...nal/devices/BoschSHCBindingConstants.java b/...hc/internal/BoschSHCBindingConstants.java → ...nal/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/...chshc/internal/BoschSHCConfiguration.java → ...ternal/devices/BoschSHCConfiguration.java b/...chshc/internal/BoschSHCConfiguration.java → ...ternal/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/...ng/boschshc/internal/BoschSHCHandler.java → ...shc/internal/devices/BoschSHCHandler.java b/...ng/boschshc/internal/BoschSHCHandler.java → ...shc/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/...hshc/internal/BoschSHCHandlerFactory.java → ...ernal/devices/BoschSHCHandlerFactory.java b/...hshc/internal/BoschSHCHandlerFactory.java → ...ernal/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/...ng/boschshc/internal/BoschHttpClient.java → ...ernal/devices/bridge/BoschHttpClient.java b/...ng/boschshc/internal/BoschHttpClient.java → ...ernal/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/...internal/BoschSHCBridgeConfiguration.java → ...s/bridge/BoschSHCBridgeConfiguration.java b/...internal/BoschSHCBridgeConfiguration.java → ...s/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/...chshc/internal/BoschSHCBridgeHandler.java → ...devices/bridge/BoschSHCBridgeHandler.java b/...chshc/internal/BoschSHCBridgeHandler.java → ...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/...nding/boschshc/internal/BoschSslUtil.java → ...internal/devices/bridge/BoschSslUtil.java b/...nding/boschshc/internal/BoschSslUtil.java → ...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/...hab/binding/boschshc/internal/Device.java → ...chshc/internal/devices/bridge/Device.java b/...hab/binding/boschshc/internal/Device.java → ...chshc/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/...boschshc/internal/DeviceStatusUpdate.java → ...al/devices/bridge/DeviceStatusUpdate.java b/...boschshc/internal/DeviceStatusUpdate.java → ...al/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/...ing/boschshc/internal/JsonRpcRequest.java → ...ternal/devices/bridge/JsonRpcRequest.java b/...ing/boschshc/internal/JsonRpcRequest.java → ...ternal/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/...ding/boschshc/internal/LongPollError.java → ...nternal/devices/bridge/LongPollError.java b/...ding/boschshc/internal/LongPollError.java → ...nternal/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/...ing/boschshc/internal/LongPollResult.java → ...ternal/devices/bridge/LongPollResult.java b/...ing/boschshc/internal/LongPollResult.java → ...ternal/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/...hshc/internal/PowerSwitchStateUpdate.java → ...evices/bridge/PowerSwitchStateUpdate.java b/...hshc/internal/PowerSwitchStateUpdate.java → ...evices/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/...enhab/binding/boschshc/internal/Room.java → ...oschshc/internal/devices/bridge/Room.java b/...enhab/binding/boschshc/internal/Room.java → ...oschshc/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/...ng/boschshc/internal/SubscribeResult.java → ...ernal/devices/bridge/SubscribeResult.java b/...ng/boschshc/internal/SubscribeResult.java → ...ernal/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/...a/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java b/...a/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/...hc/internal/BoschInWallSwitchHandler.java → ...nwallswitch/BoschInWallSwitchHandler.java b/...hc/internal/BoschInWallSwitchHandler.java → ...nwallswitch/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/...ng/boschshc/internal/PowerMeterState.java → ...devices/inwallswitch/PowerMeterState.java b/...ng/boschshc/internal/PowerMeterState.java → ...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/...g/boschshc/internal/PowerSwitchState.java → ...evices/inwallswitch/PowerSwitchState.java b/...g/boschshc/internal/PowerSwitchState.java → ...evices/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/.../boschshc/internal/LatestMotionState.java → ...ces/motiondetector/LatestMotionState.java b/.../boschshc/internal/LatestMotionState.java → ...ces/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/...chshc/internal/MotionDetectorHandler.java → ...motiondetector/MotionDetectorHandler.java b/...chshc/internal/MotionDetectorHandler.java → ...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/...ternal/shuttercontrol/OperationState.java → ...evices/shuttercontrol/OperationState.java b/...ternal/shuttercontrol/OperationState.java → ...evices/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/...shuttercontrol/ShutterControlHandler.java → ...shuttercontrol/ShutterControlHandler.java b/...shuttercontrol/ShutterControlHandler.java → ...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/...l/shuttercontrol/ShutterControlState.java → ...s/shuttercontrol/ShutterControlState.java b/...l/shuttercontrol/ShutterControlState.java → ...s/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/...nternal/thermostat/ThermostatHandler.java → ...devices/thermostat/ThermostatHandler.java b/...nternal/thermostat/ThermostatHandler.java → ...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;