Fix "openhab --help" and "help openhab" in Karaf console (#2953)

* Enable "openhab --help" and "help openhab" in Karaf console Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · May 16, 2022 · b52d9f2 · b52d9f2
1 parent 9100473
commit b52d9f2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/bundles/org.openhab.core.io.console.karaf/bnd.bnd b/bundles/org.openhab.core.io.console.karaf/bnd.bnd
@@ -0,0 +1 @@
+Karaf-Commands: org.openhab.core.io.console.karaf.internal
diff --git a/bundles/org.openhab.core.io.console.karaf/pom.xml b/bundles/org.openhab.core.io.console.karaf/pom.xml
@@ -26,6 +26,12 @@
       <artifactId>org.openhab.core.io.console</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.karaf.wrapper</groupId>
+      <artifactId>org.apache.karaf.wrapper.core</artifactId>
+      <version>${karaf.compile.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/...onsole.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java b/...onsole.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
@@ -14,7 +14,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
@@ -66,7 +65,7 @@ public CommandWrapper(final ConsoleCommandExtension command) {
 
     @Override
     public Object execute(Session session, List<Object> argList) throws Exception {
-        String[] args = argList.stream().map(a -> a.toString()).collect(Collectors.toList()).toArray(new String[0]);
+        String[] args = argList.stream().map(Object::toString).toArray(String[]::new);
 
         final Console console = new OSGiConsole(getScope(), session.getConsole());
 

diff --git a/...ternal/command/InstallServiceCommand.java → ...karaf/internal/InstallServiceCommand.java b/...ternal/command/InstallServiceCommand.java → ...karaf/internal/InstallServiceCommand.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.core.karaf.internal.command;
+package org.openhab.core.io.console.karaf.internal;
 
 import static org.apache.karaf.shell.support.ansi.SimpleAnsi.*;
 

diff --git a/bundles/org.openhab.core.karaf/bnd.bnd b/bundles/org.openhab.core.karaf/bnd.bnd
diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml
@@ -43,12 +43,6 @@
       <version>${karaf.compile.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.wrapper</groupId>
-      <artifactId>org.apache.karaf.wrapper.core</artifactId>
-      <version>${karaf.compile.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.karaf.jaas</groupId>
       <artifactId>org.apache.karaf.jaas.modules</artifactId>

diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -116,6 +116,7 @@
 	<feature name="openhab-core-io-console-karaf" description="Karaf Console support for SmartHome stuff" version="${project.version}">
 		<feature>openhab-core-base</feature>
 		<feature>shell</feature>
+		<feature>service-wrapper</feature>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.console.karaf/${project.version}</bundle>
 	</feature>
 

diff --git a/tools/static-code-analysis/pmd/suppressions.properties b/tools/static-code-analysis/pmd/suppressions.properties
@@ -14,4 +14,4 @@ org.openhab.core.ui.internal.proxy.ProxyServletService=AvoidCatchingThrowable
 org.openhab.core.automation.internal.RuleEngineImpl=AvoidCatchingThrowable
 org.openhab.core.automation.internal.RuleRegistryImpl=CompareObjectsWithEquals
 org.openhab.core.automation.internal.provider.AutomationResourceBundlesEventQueue=AvoidCatchingThrowable
-org.openhab.core.karaf.internal.command.InstallServiceCommand=SystemPrintln
+org.openhab.core.io.console.karaf.internal.InstallServiceCommand=SystemPrintln