Updated to latest versio of API lib

seime · Jan 2, 2022 · fb506cb · fb506cb
1 parent e8191b3
commit fb506cb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/bundles/org.openhab.binding.groheondus/pom.xml b/bundles/org.openhab.binding.groheondus/pom.xml
@@ -20,9 +20,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.grohe</groupId>
+      <groupId>io.github.floriansw</groupId>
       <artifactId>ondus-api</artifactId>
-      <version>1.0.0</version>
+      <version>2.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/...in/java/org/openhab/binding/groheondus/internal/discovery/GroheOndusDiscoveryService.java b/...in/java/org/openhab/binding/groheondus/internal/discovery/GroheOndusDiscoveryService.java
@@ -24,8 +24,6 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.grohe.ondus.api.OndusService;
-import org.grohe.ondus.api.model.BaseAppliance;
 import org.openhab.binding.groheondus.internal.handler.GroheOndusAccountHandler;
 import org.openhab.core.config.discovery.AbstractDiscoveryService;
 import org.openhab.core.config.discovery.DiscoveryResult;
@@ -34,6 +32,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.floriansw.ondus.api.OndusService;
+import io.github.floriansw.ondus.api.model.BaseAppliance;
+
 /**
  * @author Florian Schmidt - Initial contribution
  */
@@ -78,10 +79,10 @@ protected void startScan() {
             ThingUID bridgeUID = bridgeHandler.getThing().getUID();
             ThingUID thingUID = null;
             switch (appliance.getType()) {
-                case org.grohe.ondus.api.model.guard.Appliance.TYPE:
+                case io.github.floriansw.ondus.api.model.guard.Appliance.TYPE:
                     thingUID = new ThingUID(THING_TYPE_SENSEGUARD, bridgeUID, appliance.getApplianceId());
                     break;
-                case org.grohe.ondus.api.model.sense.Appliance.TYPE:
+                case io.github.floriansw.ondus.api.model.sense.Appliance.TYPE:
                     thingUID = new ThingUID(THING_TYPE_SENSE, bridgeUID, appliance.getApplianceId());
                     break;
                 default:

diff --git a/...c/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusAccountHandler.java b/...c/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusAccountHandler.java
@@ -23,7 +23,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.grohe.ondus.api.OndusService;
 import org.openhab.binding.groheondus.internal.AccountServlet;
 import org.openhab.binding.groheondus.internal.GroheOndusAccountConfiguration;
 import org.openhab.core.storage.Storage;
@@ -37,6 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.floriansw.ondus.api.OndusService;
+
 /**
  * @author Florian Schmidt and Arne Wohlert - Initial contribution
  */

diff --git a/.../src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusBaseHandler.java b/.../src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusBaseHandler.java
@@ -18,10 +18,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.grohe.ondus.api.OndusService;
-import org.grohe.ondus.api.model.BaseAppliance;
-import org.grohe.ondus.api.model.Location;
-import org.grohe.ondus.api.model.Room;
 import org.openhab.binding.groheondus.internal.GroheOndusApplianceConfiguration;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
@@ -34,6 +30,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.floriansw.ondus.api.OndusService;
+import io.github.floriansw.ondus.api.model.BaseAppliance;
+import io.github.floriansw.ondus.api.model.Location;
+import io.github.floriansw.ondus.api.model.Room;
+
 /**
  * @author Florian Schmidt - Initial contribution
  */

diff --git a/...ain/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java b/...ain/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java
@@ -26,14 +26,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.grohe.ondus.api.OndusService;
-import org.grohe.ondus.api.model.BaseApplianceCommand;
-import org.grohe.ondus.api.model.BaseApplianceData;
-import org.grohe.ondus.api.model.guard.Appliance;
-import org.grohe.ondus.api.model.guard.ApplianceCommand;
-import org.grohe.ondus.api.model.guard.ApplianceData;
-import org.grohe.ondus.api.model.guard.ApplianceData.Data;
-import org.grohe.ondus.api.model.guard.ApplianceData.Measurement;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;
@@ -51,6 +43,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.floriansw.ondus.api.OndusService;
+import io.github.floriansw.ondus.api.model.BaseApplianceCommand;
+import io.github.floriansw.ondus.api.model.BaseApplianceData;
+import io.github.floriansw.ondus.api.model.guard.Appliance;
+import io.github.floriansw.ondus.api.model.guard.ApplianceCommand;
+import io.github.floriansw.ondus.api.model.guard.ApplianceData;
+import io.github.floriansw.ondus.api.model.guard.ApplianceData.Data;
+import io.github.floriansw.ondus.api.model.guard.ApplianceData.Measurement;
+
 /**
  * @author Florian Schmidt and Arne Wohlert - Initial contribution
  */

diff --git a/...src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseHandler.java b/...src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseHandler.java
@@ -25,12 +25,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.grohe.ondus.api.OndusService;
-import org.grohe.ondus.api.model.ApplianceStatus;
-import org.grohe.ondus.api.model.BaseApplianceData;
-import org.grohe.ondus.api.model.sense.Appliance;
-import org.grohe.ondus.api.model.sense.ApplianceData;
-import org.grohe.ondus.api.model.sense.ApplianceData.Measurement;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
@@ -46,6 +40,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.floriansw.ondus.api.OndusService;
+import io.github.floriansw.ondus.api.model.ApplianceStatus;
+import io.github.floriansw.ondus.api.model.BaseApplianceData;
+import io.github.floriansw.ondus.api.model.sense.Appliance;
+import io.github.floriansw.ondus.api.model.sense.ApplianceData;
+import io.github.floriansw.ondus.api.model.sense.ApplianceData.Measurement;
+
 /**
  * @author Florian Schmidt - Initial contribution
  */