Merge pull request openhab#1 from paulianttila/melcloud

Some code review fixes
thewiep · Sep 17, 2019 · 1c1f395 · 1c1f395
2 parents 3043d0b + 7c8dd5b
commit 1c1f395
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 41 deletions.
diff --git a/bundles/org.openhab.binding.melcloud/.gitignore b/bundles/org.openhab.binding.melcloud/.gitignore
diff --git a/bundles/org.openhab.binding.melcloud/README.md b/bundles/org.openhab.binding.melcloud/README.md
@@ -1,5 +1,4 @@
 
-### N.B.: For developers who wants contribute not use this repo. Use Instead the openhab2-fork at https://github.com/lucacalcaterra/openhab2-addons 
 # MELCloud Binding
 
 This is an openHAB binding for Mitsubishi MELCloud (https://www.melcloud.com/). 

diff --git a/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml b/bundles/org.openhab.binding.melcloud/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="org.openhab.binding.ihc-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+    <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${project.version}/xml/features</repository>
+
+    <feature name="openhab-binding-melcloud" description="MELCloud Binding" version="${project.version}">
+        <feature>openhab-runtime-base</feature>
+        <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.melcloud/${project.version}</bundle>
+    </feature>
+</features>
diff --git a/....melcloud/src/main/java/org/openhab/binding/melcloud/internal/api/MelCloudConnection.java b/....melcloud/src/main/java/org/openhab/binding/melcloud/internal/api/MelCloudConnection.java
@@ -77,7 +77,6 @@ public void login(String username, String password, int languageId)
             logger.debug("Login response: {}", loginResponse);
             LoginClientResponse resp = gson.fromJson(loginResponse, LoginClientResponse.class);
             if (resp.getErrorId() != null) {
-
                 String errorMsg = String.format("Login failed, error code: %s", resp.getErrorId());
                 if (resp.getErrorMessage() != null) {
                     errorMsg.concat(String.format(" (%s)", resp.getErrorMessage()));
@@ -103,19 +102,16 @@ public List<Device> fetchDeviceList() throws MelCloudCommException {
                     if (building.getStructure().getDevices() != null) {
                         devices.addAll(building.getStructure().getDevices());
                     }
-
                     building.getStructure().getFloors().forEach(floor -> {
                         if (floor.getDevices() != null) {
                             devices.addAll(floor.getDevices());
                         }
-
                         floor.getAreas().forEach(area -> {
                             if (area.getDevices() != null) {
                                 devices.addAll(area.getDevices());
                             }
                         });
                     });
-
                 });
                 logger.debug("Found {} devices", devices.size());
 

diff --git a/...g.melcloud/src/main/java/org/openhab/binding/melcloud/internal/config/AcDeviceConfig.java b/...g.melcloud/src/main/java/org/openhab/binding/melcloud/internal/config/AcDeviceConfig.java
@@ -28,5 +28,4 @@ public class AcDeviceConfig {
     public String toString() {
         return "[deviceID=" + deviceID + ", buildingID=" + buildingID + ", pollingInterval=" + pollingInterval + "]";
     }
-
 }
diff --git a/...ng.melcloud/src/main/java/org/openhab/binding/melcloud/internal/config/AccountConfig.java b/...ng.melcloud/src/main/java/org/openhab/binding/melcloud/internal/config/AccountConfig.java
@@ -26,7 +26,13 @@ public class AccountConfig {
 
     @Override
     public String toString() {
-        return "[username=" + username + ", password=" + password + ", languageId=" + language + "]";
+        return "[username=" + username + ", password=" + getPasswordForPrinting() + ", languageId=" + language + "]";
     }
 
+    private String getPasswordForPrinting() {
+        if (password != null) {
+            return password.isEmpty() ? "<empty>" : "*********";
+        }
+        return "<null>";
+    }
 }
diff --git a/...ud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java b/...ud/src/main/java/org/openhab/binding/melcloud/internal/handler/MelCloudDeviceHandler.java
@@ -90,8 +90,7 @@ public void initialize() {
         config = getThing().getConfiguration().as(AcDeviceConfig.class);
         logger.debug("A.C. device config: {}", config);
 
-        initializeBridge((getBridge() == null) ? null : getBridge().getHandler(),
-                (getBridge() == null) ? null : getBridge().getStatus());
+        initializeBridge(bridge.getHandler(), bridge.getStatus());
     }
 
     @Override
@@ -107,7 +106,10 @@ public void dispose() {
     @Override
     public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) {
         logger.debug("bridgeStatusChanged {} for thing {}", bridgeStatusInfo, getThing().getUID());
-        initializeBridge((getBridge() == null) ? null : getBridge().getHandler(), bridgeStatusInfo.getStatus());
+        Bridge bridge = getBridge();
+        if (bridge != null) {
+            initializeBridge(bridge.getHandler(), bridgeStatusInfo.getStatus());
+        }
 
         if (bridgeStatusInfo.getStatus() == ThingStatus.ONLINE) {
             startAutomaticRefresh();
@@ -165,13 +167,13 @@ public void handleCommand(ChannelUID channelUID, Command command) {
             case CHANNEL_SET_TEMPERATURE:
                 BigDecimal val = null;
                 if (command instanceof QuantityType) {
-                    QuantityType<Temperature> quantity = ((QuantityType<Temperature>) command).toUnit(CELSIUS);
+                    QuantityType<Temperature> quantity = new QuantityType<Temperature>(command.toString())
+                            .toUnit(CELSIUS);
                     if (quantity != null) {
                         val = quantity.toBigDecimal().setScale(1, RoundingMode.HALF_UP);
                     }
                 } else {
                     val = new BigDecimal(command.toString()).setScale(1, RoundingMode.HALF_UP);
-
                 }
                 if (val != null) {
                     // round nearest .5
@@ -210,7 +212,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         } else {
             logger.debug("Nothing to send");
         }
-
     }
 
     private DeviceStatus getDeviceStatusCopy(DeviceStatus deviceStatus) {

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -123,7 +123,7 @@
     <module>org.openhab.binding.mail</module>
     <module>org.openhab.binding.max</module>
     <module>org.openhab.binding.mcp23017</module>
-	<module>org.openhab.binding.melcloud</module>
+    <module>org.openhab.binding.melcloud</module>
     <module>org.openhab.binding.meteoblue</module>
     <module>org.openhab.binding.meteostick</module>
     <module>org.openhab.binding.miele</module>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,5 +28,4 @@ public class AcDeviceConfig { @@
         public String toString() {
             return "[deviceID=" + deviceID + ", buildingID=" + buildingID + ", pollingInterval=" + pollingInterval + "]";
         }
     }