Console commands: enhanced parsing of bridge/thing UID (openhab#7846)

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
andrewfg · Aug 31, 2020 · 6c12232 · 6c12232
1 parent 413c064
commit 6c12232
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 42 deletions.
diff --git a/...x/src/main/java/org/openhab/binding/freebox/internal/console/FreeboxCommandExtension.java b/...x/src/main/java/org/openhab/binding/freebox/internal/console/FreeboxCommandExtension.java
@@ -51,22 +51,30 @@ public FreeboxCommandExtension(final @Reference ThingRegistry thingRegistry) {
  @Override
  public void execute(String[] args, Console console) {
  if (args.length == 2) {
- FreeboxHandler handler = null;
+ Thing thing = null;
  try {
  ThingUID thingUID = new ThingUID(args[0]);
- Thing thing = thingRegistry.get(thingUID);
- if (thing != null) {
- ThingHandler thingHandler = thing.getHandler();
- if (thingHandler instanceof FreeboxHandler) {
- handler = (FreeboxHandler) thingHandler;
- }
- }
+ thing = thingRegistry.get(thingUID);
  } catch (IllegalArgumentException e) {
- handler = null;
+ thing = null;
  }
- if (handler == null) {
+ ThingHandler thingHandler = null;
+ FreeboxHandler handler = null;
+ if (thing != null) {
+ thingHandler = thing.getHandler();
+ if (thingHandler instanceof FreeboxHandler) {
+ handler = (FreeboxHandler) thingHandler;
+ }
+ }
+ if (thing == null) {
  console.println("Bad thing id '" + args[0] + "'");
  printUsage(console);
+ } else if (thingHandler == null) {
+ console.println("No handler initialized for the thing id '" + args[0] + "'");
+ printUsage(console);
+ } else if (handler == null) {
+ console.println("'" + args[0] + "' is not a freebox bridge id");
+ printUsage(console);
  } else {
  switch (args[1]) {
  case APP_TOKEN:

diff --git a/...s/src/main/java/org/openhab/binding/lgwebos/internal/console/LGWebOSCommandExtension.java b/...s/src/main/java/org/openhab/binding/lgwebos/internal/console/LGWebOSCommandExtension.java
@@ -53,22 +53,30 @@ public LGWebOSCommandExtension(final @Reference ThingRegistry thingRegistry) {
  @Override
  public void execute(String[] args, Console console) {
  if (args.length == 2) {
- LGWebOSHandler handler = null;
+ Thing thing = null;
  try {
  ThingUID thingUID = new ThingUID(args[0]);
- Thing thing = thingRegistry.get(thingUID);
- if (thing != null) {
- ThingHandler thingHandler = thing.getHandler();
- if (thingHandler instanceof LGWebOSHandler) {
- handler = (LGWebOSHandler) thingHandler;
- }
- }
+ thing = thingRegistry.get(thingUID);
  } catch (IllegalArgumentException e) {
- handler = null;
+ thing = null;
  }
- if (handler == null) {
+ ThingHandler thingHandler = null;
+ LGWebOSHandler handler = null;
+ if (thing != null) {
+ thingHandler = thing.getHandler();
+ if (thingHandler instanceof LGWebOSHandler) {
+ handler = (LGWebOSHandler) thingHandler;
+ }
+ }
+ if (thing == null) {
  console.println("Bad thing id '" + args[0] + "'");
  printUsage(console);
+ } else if (thingHandler == null) {
+ console.println("No handler initialized for the thing id '" + args[0] + "'");
+ printUsage(console);
+ } else if (handler == null) {
+ console.println("'" + args[0] + "' is not a LG webOS thing id");
+ printUsage(console);
  } else {
  switch (args[1]) {
  case APPLICATIONS:

diff --git a/...linky/src/main/java/org/openhab/binding/linky/internal/console/LinkyCommandExtension.java b/...linky/src/main/java/org/openhab/binding/linky/internal/console/LinkyCommandExtension.java
@@ -54,22 +54,30 @@ public LinkyCommandExtension(final @Reference ThingRegistry thingRegistry) {
  @Override
  public void execute(String[] args, Console console) {
  if (args.length >= 2) {
- LinkyHandler handler = null;
+ Thing thing = null;
  try {
  ThingUID thingUID = new ThingUID(args[0]);
- Thing thing = thingRegistry.get(thingUID);
- if (thing != null) {
- ThingHandler thingHandler = thing.getHandler();
- if (thingHandler instanceof LinkyHandler) {
- handler = (LinkyHandler) thingHandler;
- }
- }
+ thing = thingRegistry.get(thingUID);
  } catch (IllegalArgumentException e) {
- handler = null;
+ thing = null;
+ }
+ ThingHandler thingHandler = null;
+ LinkyHandler handler = null;
+ if (thing != null) {
+ thingHandler = thing.getHandler();
+ if (thingHandler instanceof LinkyHandler) {
+ handler = (LinkyHandler) thingHandler;
+ }
  }
- if (handler == null) {
+ if (thing == null) {
  console.println("Bad thing id '" + args[0] + "'");
  printUsage(console);
+ } else if (thingHandler == null) {
+ console.println("No handler initialized for the thing id '" + args[0] + "'");
+ printUsage(console);
+ } else if (handler == null) {
+ console.println("'" + args[0] + "' is not a Linky thing id");
+ printUsage(console);
  } else if (REPORT.equals(args[1])) {
  LocalDate now = LocalDate.now();
  LocalDate start = now.minusDays(7);

diff --git a/...src/main/java/org/openhab/binding/powermax/internal/console/PowermaxCommandExtension.java b/...src/main/java/org/openhab/binding/powermax/internal/console/PowermaxCommandExtension.java
@@ -46,21 +46,29 @@ public PowermaxCommandExtension() {
  @Override
  public void execute(String[] args, Console console) {
  if (args.length >= 2) {
- PowermaxBridgeHandler handler = null;
+ Thing thing = null;
  try {
- ThingUID bridgeUID = new ThingUID(args[0]);
- Thing thing = thingRegistry.get(bridgeUID);
- if (thing != null) {
- ThingHandler thingHandler = thing.getHandler();
- if (thingHandler instanceof PowermaxBridgeHandler) {
- handler = (PowermaxBridgeHandler) thingHandler;
- }
+ ThingUID thingUID = new ThingUID(args[0]);
+ thing = thingRegistry.get(thingUID);
+ } catch (IllegalArgumentException e) {
+ thing = null;
+ }
+ ThingHandler thingHandler = null;
+ PowermaxBridgeHandler handler = null;
+ if (thing != null) {
+ thingHandler = thing.getHandler();
+ if (thingHandler instanceof PowermaxBridgeHandler) {
+ handler = (PowermaxBridgeHandler) thingHandler;
  }
- } catch (Exception e) {
- handler = null;
  }
- if (handler == null) {
- console.println("Bad bridge id '" + args[0] + "'");
+ if (thing == null) {
+ console.println("Bad thing id '" + args[0] + "'");
+ printUsage(console);
+ } else if (thingHandler == null) {
+ console.println("No handler initialized for the thing id '" + args[0] + "'");
+ printUsage(console);
+ } else if (handler == null) {
+ console.println("'" + args[0] + "' is not a powermax bridge id");
  printUsage(console);
  } else {
  switch (args[1]) {