openhab#8 move supla binding to addons

SUPLA · May 4, 2019 · 3f6fc43 · 3f6fc43
1 parent d0c9d2d
commit 3f6fc43
Show file tree

Hide file tree

Showing 55 changed files with 24 additions and 7 deletions.
diff --git a/...ding/org.openhab.binding.supla/.classpath → bundles/org.openhab.binding.supla/.classpath b/...ding/org.openhab.binding.supla/.classpath → bundles/org.openhab.binding.supla/.classpath
diff --git a/...inding/org.openhab.binding.supla/.project → bundles/org.openhab.binding.supla/.project b/...inding/org.openhab.binding.supla/.project → bundles/org.openhab.binding.supla/.project
diff --git a/...binding.supla/ESH-INF/binding/binding.xml → ...binding.supla/ESH-INF/binding/binding.xml b/...binding.supla/ESH-INF/binding/binding.xml → ...binding.supla/ESH-INF/binding/binding.xml
diff --git a/...supla/ESH-INF/i18n/supla_xx_XX.properties → ...supla/ESH-INF/i18n/supla_xx_XX.properties b/...supla/ESH-INF/i18n/supla_xx_XX.properties → ...supla/ESH-INF/i18n/supla_xx_XX.properties
diff --git a/...ab.binding.supla/ESH-INF/thing/bridge.xml → ...ab.binding.supla/ESH-INF/thing/bridge.xml b/...ab.binding.supla/ESH-INF/thing/bridge.xml → ...ab.binding.supla/ESH-INF/thing/bridge.xml
diff --git a/...upla/ESH-INF/thing/supla-cloud-bridge.xml → ...upla/ESH-INF/thing/supla-cloud-bridge.xml b/...upla/ESH-INF/thing/supla-cloud-bridge.xml → ...upla/ESH-INF/thing/supla-cloud-bridge.xml
diff --git a/...nding.supla/ESH-INF/thing/thing-types.xml → ...nding.supla/ESH-INF/thing/thing-types.xml b/...nding.supla/ESH-INF/thing/thing-types.xml → ...nding.supla/ESH-INF/thing/thing-types.xml
@@ -97,6 +97,18 @@
 		<label>Dimmer</label>
 	</channel-type>
 
+	<channel-type id="toggle-gate-channel">
+		<item-type>String</item-type>
+		<label>Open/Close Gate</label>
+		<command>
+			<options>
+				<option value="NONE">None</option>
+				<option value="SELECT">Alert</option>
+				<option value="LSELECT">Long Alert</option>
+			</options>
+		</command>
+	</channel-type>
+
 	<channel-type id="unknown-channel">
 		<item-type>String</item-type>
 		<label>Unknown channel</label>

diff --git a/...penhab.binding.supla/META-INF/MANIFEST.MF → ...penhab.binding.supla/META-INF/MANIFEST.MF b/...penhab.binding.supla/META-INF/MANIFEST.MF → ...penhab.binding.supla/META-INF/MANIFEST.MF
diff --git a/...openhab.binding.supla/OSGI-INF/.gitignore → ...openhab.binding.supla/OSGI-INF/.gitignore b/...openhab.binding.supla/OSGI-INF/.gitignore → ...openhab.binding.supla/OSGI-INF/.gitignore
diff --git a/...nding/org.openhab.binding.supla/README.md → bundles/org.openhab.binding.supla/README.md b/...nding/org.openhab.binding.supla/README.md → bundles/org.openhab.binding.supla/README.md
diff --git a/...ding/org.openhab.binding.supla/about.html → bundles/org.openhab.binding.supla/about.html b/...ding/org.openhab.binding.supla/about.html → bundles/org.openhab.binding.supla/about.html
diff --git a/...rg.openhab.binding.supla/build.properties → ...rg.openhab.binding.supla/build.properties b/...rg.openhab.binding.supla/build.properties → ...rg.openhab.binding.supla/build.properties
diff --git a/....openhab.binding.supla/doc/add-device.PNG → ....openhab.binding.supla/doc/add-device.PNG b/....openhab.binding.supla/doc/add-device.PNG → ....openhab.binding.supla/doc/add-device.PNG
diff --git a/....openhab.binding.supla/doc/add-server.PNG → ....openhab.binding.supla/doc/add-server.PNG b/....openhab.binding.supla/doc/add-server.PNG → ....openhab.binding.supla/doc/add-server.PNG
diff --git a/...ab.binding.supla/doc/configure-server.PNG → ...ab.binding.supla/doc/configure-server.PNG b/...ab.binding.supla/doc/configure-server.PNG → ...ab.binding.supla/doc/configure-server.PNG
diff --git a/...ding.supla/doc/configure-supla-device.PNG → ...ding.supla/doc/configure-supla-device.PNG b/...ding.supla/doc/configure-supla-device.PNG → ...ding.supla/doc/configure-supla-device.PNG
diff --git a/...hab.binding.supla/doc/discover-server.PNG → ...hab.binding.supla/doc/discover-server.PNG b/...hab.binding.supla/doc/discover-server.PNG → ...hab.binding.supla/doc/discover-server.PNG
diff --git a/...ab.binding.supla/doc/discovery-device.PNG → ...ab.binding.supla/doc/discovery-device.PNG b/...ab.binding.supla/doc/discovery-device.PNG → ...ab.binding.supla/doc/discovery-device.PNG
diff --git a/...penhab.binding.supla/doc/link-channel.PNG → ...penhab.binding.supla/doc/link-channel.PNG b/...penhab.binding.supla/doc/link-channel.PNG → ...penhab.binding.supla/doc/link-channel.PNG
diff --git a/...ding.supla/lib/nettyServer-fat-0.9.15.jar → ...ding.supla/lib/nettyServer-fat-0.9.15.jar b/...ding.supla/lib/nettyServer-fat-0.9.15.jar → ...ding.supla/lib/nettyServer-fat-0.9.15.jar
diff --git a/...pla/lib/swagger-java-client-fat-2.0.2.jar → ...pla/lib/swagger-java-client-fat-2.0.2.jar b/...pla/lib/swagger-java-client-fat-2.0.2.jar → ...pla/lib/swagger-java-client-fat-2.0.2.jar
diff --git a/...binding/org.openhab.binding.supla/pom.xml → bundles/org.openhab.binding.supla/pom.xml b/...binding/org.openhab.binding.supla/pom.xml → bundles/org.openhab.binding.supla/pom.xml
diff --git a/.../binding/supla/SuplaBindingConstants.java → .../binding/supla/SuplaBindingConstants.java b/.../binding/supla/SuplaBindingConstants.java → .../binding/supla/SuplaBindingConstants.java
@@ -69,6 +69,7 @@ public static class Channels {
         public static final String HUMIDITY_CHANNEL_ID = "humidity-channel";
         public static final String TEMPERATURE_AND_HUMIDITY_CHANNEL_ID = "temperature-and-humidity-channel";
         public static final String DIMMER_CHANNEL_ID = "dimmer-channel";
+        public static final String TOGGLE_GAT_CHANNEL_ID = "toggle-gate-channel";
         public static final String UNKNOWN_CHANNEL_ID = "unknown-channel";
     }
 }
diff --git a/.../supla/handler/AbstractDeviceHandler.java → .../supla/handler/AbstractDeviceHandler.java b/.../supla/handler/AbstractDeviceHandler.java → .../supla/handler/AbstractDeviceHandler.java
diff --git a/...ing/supla/handler/CloudBridgeHandler.java → ...ing/supla/handler/CloudBridgeHandler.java b/...ing/supla/handler/CloudBridgeHandler.java → ...ing/supla/handler/CloudBridgeHandler.java
diff --git a/...ing/supla/handler/CloudDeviceHandler.java → ...ing/supla/handler/CloudDeviceHandler.java b/...ing/supla/handler/CloudDeviceHandler.java → ...ing/supla/handler/CloudDeviceHandler.java
diff --git a/...upla/handler/SuplaCloudBridgeHandler.java → ...upla/handler/SuplaCloudBridgeHandler.java b/...upla/handler/SuplaCloudBridgeHandler.java → ...upla/handler/SuplaCloudBridgeHandler.java
diff --git a/...ing/supla/handler/SuplaDeviceHandler.java → ...ing/supla/handler/SuplaDeviceHandler.java b/...ing/supla/handler/SuplaDeviceHandler.java → ...ing/supla/handler/SuplaDeviceHandler.java
diff --git a/...nding/supla/internal/ChannelCallback.java → ...nding/supla/internal/ChannelCallback.java b/...nding/supla/internal/ChannelCallback.java → ...nding/supla/internal/ChannelCallback.java
diff --git a/...g/supla/internal/ChannelValueToState.java → ...g/supla/internal/ChannelValueToState.java b/...g/supla/internal/ChannelValueToState.java → ...g/supla/internal/ChannelValueToState.java
diff --git a/...inding/supla/internal/ReadWriteMonad.java → ...inding/supla/internal/ReadWriteMonad.java b/...inding/supla/internal/ReadWriteMonad.java → ...inding/supla/internal/ReadWriteMonad.java
diff --git a/...ng/supla/internal/SuplaConfiguration.java → ...ng/supla/internal/SuplaConfiguration.java b/...ng/supla/internal/SuplaConfiguration.java → ...ng/supla/internal/SuplaConfiguration.java
diff --git a/...g/supla/internal/SuplaDeviceRegistry.java → ...g/supla/internal/SuplaDeviceRegistry.java b/...g/supla/internal/SuplaDeviceRegistry.java → ...g/supla/internal/SuplaDeviceRegistry.java
diff --git a/...pla/internal/SuplaDeviceRegistryImpl.java → ...pla/internal/SuplaDeviceRegistryImpl.java b/...pla/internal/SuplaDeviceRegistryImpl.java → ...pla/internal/SuplaDeviceRegistryImpl.java
diff --git a/...g/supla/internal/SuplaHandlerFactory.java → ...g/supla/internal/SuplaHandlerFactory.java b/...g/supla/internal/SuplaHandlerFactory.java → ...g/supla/internal/SuplaHandlerFactory.java
diff --git a/...internal/cloud/AdditionalChannelType.java → ...internal/cloud/AdditionalChannelType.java b/...internal/cloud/AdditionalChannelType.java → ...internal/cloud/AdditionalChannelType.java
diff --git a/...upla/internal/cloud/ApiClientFactory.java → ...upla/internal/cloud/ApiClientFactory.java b/...upla/internal/cloud/ApiClientFactory.java → ...upla/internal/cloud/ApiClientFactory.java
diff --git a/...rnal/cloud/ChannelFunctionDispatcher.java → ...rnal/cloud/ChannelFunctionDispatcher.java b/...rnal/cloud/ChannelFunctionDispatcher.java → ...rnal/cloud/ChannelFunctionDispatcher.java
diff --git a/...upla/internal/cloud/ChannelIfoParser.java → ...upla/internal/cloud/ChannelIfoParser.java b/...upla/internal/cloud/ChannelIfoParser.java → ...upla/internal/cloud/ChannelIfoParser.java
@@ -22,14 +22,15 @@ public ChannelInfo parse(ChannelUID channelUID) {
         } else {
             trimmedId = fullId;
         }
-        return new ChannelInfo(parse(trimmedId), additionalChannelType.orElse(null));
+        return new ChannelInfo(parse(trimmedId, fullId), additionalChannelType.orElse(null));
     }
 
-    private int parse(String id) {
+    private int parse(String id, String fullId) {
         try {
             return Integer.parseInt(id);
         } catch (NumberFormatException ex) {
-            throw new IllegalArgumentException("Given id `" + id + "` is not int!", ex);
+            throw new IllegalArgumentException("Given id `" + id + "` is not int! Full ID = `" + fullId + "`", ex);
         }
     }
 }
+// ZjA0MWIwZWZmYWE5MTEzZGM3NDU3NjZjZDQ1ZTA3MTNjNGViNDUzOGYyNGQ3NjU2YTc5NGZkMTkzZjIzOTBhYQ.aHR0cHM6Ly9zdnIxOS5zdXBsYS5vcmc=
diff --git a/...ing/supla/internal/cloud/ChannelInfo.java → ...ing/supla/internal/cloud/ChannelInfo.java b/...ing/supla/internal/cloud/ChannelInfo.java → ...ing/supla/internal/cloud/ChannelInfo.java
diff --git a/.../supla/internal/cloud/CloudDiscovery.java → .../supla/internal/cloud/CloudDiscovery.java b/.../supla/internal/cloud/CloudDiscovery.java → .../supla/internal/cloud/CloudDiscovery.java
@@ -8,7 +8,6 @@
 import org.openhab.binding.supla.handler.CloudBridgeHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.grzeslowski.jsupla.api.ApiClientFactory;
 import pl.grzeslowski.jsupla.api.generated.ApiClient;
 import pl.grzeslowski.jsupla.api.generated.ApiException;
 import pl.grzeslowski.jsupla.api.generated.api.IoDevicesApi;

diff --git a/...upla/internal/cloud/HsbTypeConverter.java → ...upla/internal/cloud/HsbTypeConverter.java b/...upla/internal/cloud/HsbTypeConverter.java → ...upla/internal/cloud/HsbTypeConverter.java
diff --git a/...la/internal/cloud/LedCommandExecutor.java → ...la/internal/cloud/LedCommandExecutor.java b/...la/internal/cloud/LedCommandExecutor.java → ...la/internal/cloud/LedCommandExecutor.java
diff --git a/.../cloud/OneLineHttpLoggingInterceptor.java → .../cloud/OneLineHttpLoggingInterceptor.java b/.../cloud/OneLineHttpLoggingInterceptor.java → .../cloud/OneLineHttpLoggingInterceptor.java
diff --git a/...onswitch/CreateChannelFunctionSwitch.java → ...onswitch/CreateChannelFunctionSwitch.java b/...onswitch/CreateChannelFunctionSwitch.java → ...onswitch/CreateChannelFunctionSwitch.java
@@ -14,7 +14,6 @@
 import java.util.List;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static java.lang.String.valueOf;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
@@ -28,6 +27,7 @@
 import static org.openhab.binding.supla.SuplaBindingConstants.Channels.SWITCH_CHANNEL_RO_ID;
 import static org.openhab.binding.supla.SuplaBindingConstants.Channels.TEMPERATURE_AND_HUMIDITY_CHANNEL_ID;
 import static org.openhab.binding.supla.SuplaBindingConstants.Channels.TEMPERATURE_CHANNEL_ID;
+import static org.openhab.binding.supla.SuplaBindingConstants.Channels.TOGGLE_GAT_CHANNEL_ID;
 
 @SuppressWarnings("PackageAccessibility")
 public class CreateChannelFunctionSwitch implements ChannelFunctionDispatcher.FunctionSwitch<List<Channel>> {
@@ -50,12 +50,12 @@ public List<Channel> onControllingTheGatewayLock(pl.grzeslowski.jsupla.api.gener
 
     @Override
     public List<Channel> onControllingTheGate(pl.grzeslowski.jsupla.api.generated.model.Channel channel) {
-        return createSwitchChannel(channel);
+        return createToggleGateChannel(channel);
     }
 
     @Override
     public List<Channel> onControllingTheGarageDoor(pl.grzeslowski.jsupla.api.generated.model.Channel channel) {
-        return createSwitchChannel(channel);
+        return createToggleGateChannel(channel);
     }
 
     @Override
@@ -230,6 +230,10 @@ private List<Channel> createSwitchChannel(pl.grzeslowski.jsupla.api.generated.mo
         }
     }
 
+    private List<Channel> createToggleGateChannel(pl.grzeslowski.jsupla.api.generated.model.Channel channel) {
+        return singletonList(createChannel(channel, TOGGLE_GAT_CHANNEL_ID, "String"));
+    }
+
     private List<Channel> createLedChannels(final pl.grzeslowski.jsupla.api.generated.model.Channel channel) {
         return singletonList(createChannel(channel, RGB_CHANNEL_ID, "Color"));
     }

diff --git a/...nctionswitch/FindStateFunctionSwitch.java → ...nctionswitch/FindStateFunctionSwitch.java b/...nctionswitch/FindStateFunctionSwitch.java → ...nctionswitch/FindStateFunctionSwitch.java
diff --git a/...a/internal/discovery/BridgeDiscovery.java → ...a/internal/discovery/BridgeDiscovery.java b/...a/internal/discovery/BridgeDiscovery.java → ...a/internal/discovery/BridgeDiscovery.java
diff --git a/...rnal/discovery/SuplaDiscoveryService.java → ...rnal/discovery/SuplaDiscoveryService.java b/...rnal/discovery/SuplaDiscoveryService.java → ...rnal/discovery/SuplaDiscoveryService.java
diff --git a/...g/supla/internal/server/SuplaChannel.java → ...g/supla/internal/server/SuplaChannel.java b/...g/supla/internal/server/SuplaChannel.java → ...g/supla/internal/server/SuplaChannel.java
diff --git a/...-cloud-responses/channel-id-6961-LED.json → ...-cloud-responses/channel-id-6961-LED.json b/...-cloud-responses/channel-id-6961-LED.json → ...-cloud-responses/channel-id-6961-LED.json
diff --git a/...nses/channel-id-7035-open-close-gate.json → ...nses/channel-id-7035-open-close-gate.json b/...nses/channel-id-7035-open-close-gate.json → ...nses/channel-id-7035-open-close-gate.json
diff --git a/...es/channel-id-7036-gate-first-sensor.json → ...es/channel-id-7036-gate-first-sensor.json b/...es/channel-id-7036-gate-first-sensor.json → ...es/channel-id-7036-gate-first-sensor.json
diff --git a/...s/channel-id-7036-gate-second-sensor.json → ...s/channel-id-7036-gate-second-sensor.json b/...s/channel-id-7036-gate-second-sensor.json → ...s/channel-id-7036-gate-second-sensor.json
diff --git a/.../io-device-id-2796-RGB-with-channels.json → .../io-device-id-2796-RGB-with-channels.json b/.../io-device-id-2796-RGB-with-channels.json → .../io-device-id-2796-RGB-with-channels.json
diff --git a/...es/io-device-id-2832-gate-open-close.json → ...es/io-device-id-2832-gate-open-close.json b/...es/io-device-id-2832-gate-open-close.json → ...es/io-device-id-2832-gate-open-close.json