[enocean] Fix unusable bundle after a refactoring about null annotati…

…on (#15302) Fix bundle unusable after #14023 (closes #15181) Fix a case issue with some directory Fix trigger channel issue Signed-off-by: Gwendal Roulleau <gwendal.roulleau@gmail.com>
openhab · Jul 26, 2023 · 2961593 · 2961593
1 parent 6dccbcb
commit 2961593
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 25 deletions.
diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_20/A5_20_04.java
@@ -49,7 +49,7 @@ public A5_20_04(ERP1Message packet) {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         switch (channelId) {
             case CHANNEL_STATUS_REQUEST_EVENT:

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_03/D2_03_0A.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_03/D2_03_0A.java
@@ -48,7 +48,7 @@ public D2_03_0A(ERP1Message packet) {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         switch (channelId) {
             case CHANNEL_PUSHBUTTON:

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_01.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_01.java
@@ -38,7 +38,7 @@
  * battery channels may be not supported by the physical device (depending on the actual model). If a channel is not
  * supported by a device it will transmit a 'not supported' message which is ignored by this implementation.
  * Consequently channels that are not supported by the physical device will never send updates to linked items.
- * 
+ *
  * @author Thomas Lauterbach - Initial contribution
  */
 @NonNullByDefault
@@ -164,7 +164,7 @@ protected State getMotionState() {
     }
 
     protected State getTemperature() {
-        double unscaledTemp = (double) (bytes[5] & 0xFF);
+        double unscaledTemp = bytes[5] & 0xFF;
         if (unscaledTemp <= 250) {
             double scaledTemp = unscaledTemp * 0.32 - 20;
             return new QuantityType<>(scaledTemp, SIUnits.CELSIUS);
@@ -198,7 +198,7 @@ protected State getBatteryLevel() {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         // Sensor values
         if (bytes[0] == MessageType.SENSORVALUES.getIntValue()) {

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_06/D2_06_50.java
@@ -115,7 +115,7 @@ protected State getCalibrationStep() {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         // Alarm
         if (bytes[0] == 0x02) {

diff --git a/...g.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEP.java b/...g.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEP.java
@@ -114,7 +114,7 @@ public State convertToState(String channelId, String channelTypeId, Configuratio
         return convertToStateImpl(channelId, channelTypeId, getCurrentStateFunc, config);
     }
 
-    public @Nullable String convertToEvent(String channelId, String channelTypeId, String lastEvent,
+    public @Nullable String convertToEvent(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         if (!getEEPType().isChannelSupported(channelId, channelTypeId)) {
             throw new IllegalArgumentException(
@@ -223,7 +223,7 @@ protected State convertToStateImpl(String channelId, String channelTypeId,
         return UnDefType.UNDEF;
     }
 
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         return null;
     }

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_01/F6_01_01.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_01/F6_01_01.java
@@ -35,7 +35,7 @@ public F6_01_01(ERP1Message packet) {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         return getBit(bytes[0], 4) ? CommonTriggerEvents.PRESSED : CommonTriggerEvents.RELEASED;
     }

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02_01.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02_01.java
@@ -45,7 +45,7 @@ public F6_02_01(ERP1Message packet) {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         if (t21 && nu) {
             if (CHANNEL_ROCKERSWITCH_ACTION.equals(channelTypeId)) {
@@ -59,7 +59,7 @@ public F6_02_01(ERP1Message packet) {
         } else if (t21 && !nu) {
             if (CHANNEL_ROCKERSWITCH_ACTION.equals(channelTypeId)) {
                 return CommonTriggerEvents.RELEASED;
-            } else {
+            } else if (lastEvent != null) {
                 if (lastEvent.equals(CommonTriggerEvents.DIR1_PRESSED)) {
                     return CommonTriggerEvents.DIR1_RELEASED;
                 } else if (lastEvent.equals(CommonTriggerEvents.DIR2_PRESSED)) {

diff --git a/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02_02.java b/...inding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/F6_02/F6_02_02.java
@@ -45,7 +45,7 @@ public F6_02_02(ERP1Message packet) {
     }
 
     @Override
-    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, String lastEvent,
+    protected @Nullable String convertToEventImpl(String channelId, String channelTypeId, @Nullable String lastEvent,
             Configuration config) {
         if (t21 && nu) {
             if (CHANNEL_ROCKERSWITCH_ACTION.equals(channelTypeId)) {
@@ -58,7 +58,7 @@ public F6_02_02(ERP1Message packet) {
         } else if (t21 && !nu) {
             if (CHANNEL_ROCKERSWITCH_ACTION.equals(channelTypeId)) {
                 return CommonTriggerEvents.RELEASED;
-            } else {
+            } else if (lastEvent != null) {
                 if (lastEvent.equals(CommonTriggerEvents.DIR1_PRESSED)) {
                     return CommonTriggerEvents.DIR1_RELEASED;
                 } else if (lastEvent.equals(CommonTriggerEvents.DIR2_PRESSED)) {

diff --git a/.../src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java b/.../src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
@@ -189,13 +189,10 @@ public void packetReceived(BasePacket packet) {
                                 break;
                             case TRIGGER:
                                 String lastEvent = lastEvents.get(channelId);
-                                if (lastEvent != null) {
-                                    String event = eep.convertToEvent(channelId, channelTypeId, lastEvent,
-                                            channelConfig);
-                                    if (event != null) {
-                                        triggerChannel(channel.getUID(), event);
-                                        lastEvents.put(channelId, event);
-                                    }
+                                String event = eep.convertToEvent(channelId, channelTypeId, lastEvent, channelConfig);
+                                if (event != null) {
+                                    triggerChannel(channel.getUID(), event);
+                                    lastEvents.put(channelId, event);
                                 }
                                 break;
                         }

diff --git a/...cean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java b/...cean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java
@@ -208,7 +208,7 @@ private synchronized void initTransceiver() {
             }
 
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_PENDING, "opening serial port...");
-            localTransceiver.initilize();
+            localTransceiver.initialize();
 
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_PENDING, "starting rx thread...");
             localTransceiver.startReceiving(scheduler);

diff --git a/...rnal/messages/Responses/BaseResponse.java → ...rnal/messages/responses/BaseResponse.java b/...rnal/messages/Responses/BaseResponse.java → ...rnal/messages/responses/BaseResponse.java
diff --git a/.../messages/Responses/RDBaseIdResponse.java → .../messages/responses/RDBaseIdResponse.java b/.../messages/Responses/RDBaseIdResponse.java → .../messages/responses/RDBaseIdResponse.java
diff --git a/...s/Responses/RDLearnedClientsResponse.java → ...s/responses/RDLearnedClientsResponse.java b/...s/Responses/RDLearnedClientsResponse.java → ...s/responses/RDLearnedClientsResponse.java
diff --git a/...essages/Responses/RDRepeaterResponse.java → ...essages/responses/RDRepeaterResponse.java b/...essages/Responses/RDRepeaterResponse.java → ...essages/responses/RDRepeaterResponse.java
diff --git a/...messages/Responses/RDVersionResponse.java → ...messages/responses/RDVersionResponse.java b/...messages/Responses/RDVersionResponse.java → ...messages/responses/RDVersionResponse.java
diff --git a/...sages/Responses/SMACKTeachInResponse.java → ...sages/responses/SMACKTeachInResponse.java b/...sages/Responses/SMACKTeachInResponse.java → ...sages/responses/SMACKTeachInResponse.java
diff --git a/...an/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java b/...an/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java
@@ -180,7 +180,7 @@ public EnOceanTransceiver(String path, TransceiverErrorListener errorListener, S
         this.path = path;
     }
 
-    public void initilize()
+    public void initialize()
             throws UnsupportedCommOperationException, PortInUseException, IOException, TooManyListenersException {
         SerialPortManager localSerialPortManager = serialPortManager;
         if (localSerialPortManager == null) {
@@ -224,7 +224,7 @@ public void startReceiving(ScheduledExecutorService scheduler) {
         @Nullable
         Future<?> localReadingTask = readingTask;
         if (localReadingTask == null || localReadingTask.isCancelled()) {
-            localReadingTask = scheduler.submit(new Runnable() {
+            readingTask = scheduler.submit(new Runnable() {
                 @Override
                 public void run() {
                     receivePackets();
@@ -313,13 +313,24 @@ protected int read(byte[] buffer, int length) {
         InputStream localInputStream = inputStream;
         if (localInputStream != null) {
             try {
-                localInputStream.read(buffer, 0, length);
+                return localInputStream.read(buffer, 0, length);
             } catch (IOException e) {
                 logger.debug("IOException occured while reading the input stream", e);
                 return 0;
             }
+        } else {
+            logger.warn("Cannot read from null stream");
+            Future<?> localReadingTask = readingTask;
+            if (localReadingTask != null) {
+                localReadingTask.cancel(true);
+                readingTask = null;
+            }
+            TransceiverErrorListener localListener = errorListener;
+            if (localListener != null) {
+                localListener.errorOccured(new IOException("Cannot read from null stream"));
+            }
+            return 0;
         }
-        return 0;
     }
 
     protected void informListeners(BasePacket packet) {