Some cleanup. More explicit handling of error messages

seime · Mar 3, 2023 · 2a7af45 · 2a7af45
1 parent 701ff3f
commit 2a7af45
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/...g.august/src/main/java/org/openhab/binding/august/internal/handler/AugustLockHandler.java b/...g.august/src/main/java/org/openhab/binding/august/internal/handler/AugustLockHandler.java
@@ -364,23 +364,27 @@ private void cancelUnlockedByUserFuture() {
     private void handleRemoteEventPushMessage(JsonElement message, JsonElement eventType) {
         switch (eventType.getAsInt()) {
             case 1:
-                RemoteOperateLockResponse remoteEvent = gson.fromJson(message,
-                        new TypeToken<RemoteOperateLockResponse>() {
-                        }.getType());
-                if (remoteEvent.info != null) {
-                    updateThingProperties(remoteEvent.info);
-                }
-
-                if (remoteEvent.lockState != null && !"kAugLockState_Unlocking".equals(remoteEvent.lockState)
-                        && !"kAugLockState_Locking".equals(remoteEvent.lockState)) {
-                    State lockState = parseLockState(remoteEvent.lockState);
-                    updateState(CHANNEL_LOCK_STATE, lockState);
+                if (!message.getAsJsonObject().get("error").isJsonNull()) {
+                    logger.debug("Ignoring error message from bridge");
+                } else {
 
+                    RemoteOperateLockResponse remoteEvent = gson.fromJson(message,
+                            new TypeToken<RemoteOperateLockResponse>() {
+                            }.getType());
+                    if (remoteEvent.info != null) {
+                        updateThingProperties(remoteEvent.info);
+                    }
+
+                    if (remoteEvent.lockState != null && !"kAugLockState_Unlocking".equals(remoteEvent.lockState)
+                            && !"kAugLockState_Locking".equals(remoteEvent.lockState)) {
+                        State lockState = parseLockState(remoteEvent.lockState);
+                        updateState(CHANNEL_LOCK_STATE, lockState);
+
+                    }
+                    if (remoteEvent.doorState != null) {
+                        updateState(CHANNEL_DOOR_STATE, parseDoorState(remoteEvent.doorState));
+                    }
                 }
-                if (remoteEvent.doorState != null) {
-                    updateState(CHANNEL_DOOR_STATE, parseDoorState(remoteEvent.doorState));
-                }
-
                 break;
             // Other events may occur
             default:

diff --git a/...c/test/java/org/openhab/binding/august/internal/dto/SerializationDeserializationTest.java b/...c/test/java/org/openhab/binding/august/internal/dto/SerializationDeserializationTest.java
@@ -178,7 +178,7 @@ void testLockAndDoorPushMessage() throws IOException {
         }.getType();
 
         final LockStatusDTO message = wireHelper
-                .deSerializeFromClasspathResource("/mock_responses/lock_status_unlocked_async.json", type);
+                .deSerializeFromClasspathResource("/mock_responses/pubnub/lock_status_unlocked_async.json", type);
 
         assertEquals("unlocked", message.lockStatus);
         assertEquals("closed", message.doorStatus);
@@ -190,7 +190,7 @@ void testLockPushMessage() throws IOException {
         }.getType();
 
         final LockStatusDTO message = wireHelper
-                .deSerializeFromClasspathResource("/mock_responses/lock_status_no_doorstate_async.json", type);
+                .deSerializeFromClasspathResource("/mock_responses/pubnub/lock_status_no_doorstate_async.json", type);
 
         assertEquals("unlocked", message.lockStatus);
     }

diff --git a/...gust/src/test/java/org/openhab/binding/august/internal/handler/AugustLockHandlerTest.java b/...gust/src/test/java/org/openhab/binding/august/internal/handler/AugustLockHandlerTest.java
@@ -195,8 +195,8 @@ void testUnlockDoor() throws IOException, InterruptedException {
 
         lockHandler.handleCommand(new ChannelUID(thing.getUID(), BindingConstants.CHANNEL_LOCK_STATE), OnOffType.OFF);
 
-        lockHandler.onPushMessage("ignored",
-                JsonParser.parseString(getClasspathJSONContent("/mock_responses/lock_status_unlocked_async.json")));
+        lockHandler.onPushMessage("ignored", JsonParser
+                .parseString(getClasspathJSONContent("/mock_responses/pubnub/lock_status_unlocked_async.json")));
         verify(thingHandlerCallback).stateUpdated(new ChannelUID(thing.getUID(), BindingConstants.CHANNEL_LOCK_STATE),
                 OnOffType.OFF);
     }

diff --git a/...k_responses/lock_status_locked_async.json → ...nses/pubnub/lock_status_locked_async.json b/...k_responses/lock_status_locked_async.json → ...nses/pubnub/lock_status_locked_async.json
diff --git a/...onses/lock_status_no_doorstate_async.json → ...ubnub/lock_status_no_doorstate_async.json b/...onses/lock_status_no_doorstate_async.json → ...ubnub/lock_status_no_doorstate_async.json
diff --git a/...responses/lock_status_unlocked_async.json → ...es/pubnub/lock_status_unlocked_async.json b/...responses/lock_status_unlocked_async.json → ...es/pubnub/lock_status_unlocked_async.json