fixed some warnings

Signed-off-by: Alexander Friese <af944580@googlemail.com>
openhab · Sep 21, 2024 · d43a139 · d43a139
1 parent 5c6c363
commit d43a139
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...myuplink/src/main/java/org/openhab/binding/myuplink/internal/command/AbstractCommand.java b/...myuplink/src/main/java/org/openhab/binding/myuplink/internal/command/AbstractCommand.java
@@ -175,8 +175,10 @@ public void onContent(@Nullable Response response, @Nullable ByteBuffer content)
         if (response != null && content != null) {
             super.onContent(response, content);
         }
-        logger.debug("[{}] received content, length: {}, encoding: {}", getClass().getSimpleName(),
-                getContentAsString().length(), this.getEncoding());
+        var contentAsString = getContentAsString();
+        var contentLength = contentAsString == null ? 0 : contentAsString.length();
+        logger.debug("[{}] received content, length: {}, encoding: {}", getClass().getSimpleName(), contentLength,
+                this.getEncoding());
     }
 
     /**

diff --git a/...src/main/java/org/openhab/binding/myuplink/internal/command/device/SetPointsAdvanced.java b/...src/main/java/org/openhab/binding/myuplink/internal/command/device/SetPointsAdvanced.java
@@ -30,8 +30,6 @@
 import org.openhab.core.library.types.StringType;
 import org.openhab.core.thing.Channel;
 import org.openhab.core.types.Command;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -44,7 +42,6 @@
  */
 @NonNullByDefault
 public class SetPointsAdvanced extends AbstractWriteCommand {
-    private final Logger logger = LoggerFactory.getLogger(SetPointsAdvanced.class);
     private final String url;
 
     public SetPointsAdvanced(MyUplinkThingHandler handler, Channel channel, Command command, String deviceId,

diff --git a/...myuplink/src/main/java/org/openhab/binding/myuplink/internal/provider/ChannelFactory.java b/...myuplink/src/main/java/org/openhab/binding/myuplink/internal/provider/ChannelFactory.java
@@ -103,7 +103,7 @@ public Channel createChannel(ThingUID thingUID, JsonObject channelData) {
     String determineAcceptedType(ChannelTypeUID channelTypeUID, String unit) {
         if (channelTypeUID.getId().equals(CHANNEL_TYPE_RW_SWITCH)) {
             return CoreItemFactory.SWITCH;
-        } else if (unit == null || unit.isEmpty()) {
+        } else if (unit.isEmpty()) {
             return CoreItemFactory.NUMBER;
         } else {
             Unit<?> parsedUnit = UnitUtils.parseUnit(unit);
@@ -215,7 +215,7 @@ private ChannelTypeUID determineStaticEnumType(JsonArray enumValues, boolean wri
         boolean containsOnAt1 = false;
 
         for (var element : enumValues) {
-            var enumText = Utils.getAsString(element.getAsJsonObject(), JSON_ENUM_KEY_TEXT).toLowerCase();
+            var enumText = Utils.getAsString(element.getAsJsonObject(), JSON_ENUM_KEY_TEXT, "").toLowerCase();
             var enumOrdinal = Utils.getAsString(element.getAsJsonObject(), JSON_KEY_CHANNEL_VALUE, GENERIC_NO_VAL);
 
             switch (enumText) {