Remove all dependencies to the dashboard UI (openhab#175)

ghys · kaikreuzer · commit 81b1cc5aea1d · 2020-01-18T09:32:33.000+01:00
* Remove all dependencies to the dashboard UI Migrate all dashboard tiles to the core tile functionality (openhab/openhab-core#1329) Signed-off-by: Yannick Schaus <github@schaus.net>
diff --git a/bundles/org.openhab.ui.basic/pom.xml b/bundles/org.openhab.ui.basic/pom.xml
@@ -23,11 +23,6 @@
       <artifactId>org.openhab.core.io.rest.sitemap</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/BasicUITile.java b/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/BasicUITile.java
@@ -12,17 +12,18 @@
  */
 package org.openhab.ui.basic.internal;
 
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.service.component.annotations.Component;
 
 /**
- * The dashboard tile for the Basic UI
+ * The tile for the Basic UI
  *
  * @author Kai Kreuzer
+ * @author Yannick Schaus - remove dependency to dashboard
  *
  */
 @Component
-public class BasicUIDashboardTile implements DashboardTile {
+public class BasicUITile implements Tile {
 
     @Override
     public String getName() {
diff --git a/bundles/org.openhab.ui.cometvisu/pom.xml b/bundles/org.openhab.ui.cometvisu/pom.xml
@@ -39,12 +39,12 @@
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core</artifactId>
+      <artifactId>org.openhab.core.boot</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/CometVisuTile.java b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/CometVisuTile.java
@@ -17,7 +17,7 @@
 import java.util.Set;
 
 import org.openhab.core.model.sitemap.SitemapProvider;
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
@@ -26,9 +26,10 @@
 /**
  *
  * @author Tobias Bräutigam - Initial contribution
+ * @author Yannick Schaus - remove dependency to dashboard
  */
 @Component
-public class CometVisuDashboardTile implements DashboardTile {
+public class CometVisuTile implements Tile {
     private Set<SitemapProvider> sitemapProviders = new HashSet<>();
 
     @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
diff --git a/bundles/org.openhab.ui.habot/pom.xml b/bundles/org.openhab.ui.habot/pom.xml
@@ -26,8 +26,13 @@
       <version>0.6.3</version>
     </dependency>
     <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.boot</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.ui</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/tile/internal/HABotHttpContext.java b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/tile/internal/HABotHttpContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.ui.habot.dashboard.internal;
+package org.openhab.ui.habot.tile.internal;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/tile/internal/HABotTile.java b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/tile/internal/HABotTile.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.ui.habot.dashboard.internal;
+package org.openhab.ui.habot.tile.internal;
 
 import java.util.Map;
 
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -27,13 +27,13 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The dashboard tile and resource registering for HABot
+ * The tile and resource registering for HABot
  *
  * @author Yannick Schaus - Initial contribution
  */
-@Component(service = DashboardTile.class, immediate = true, name = "org.openhab.habot", property = {
+@Component(service = Tile.class, immediate = true, name = "org.openhab.habot", property = {
         "service.config.description.uri=ui:habot", "service.config.label=HABot", "service.config.category=ui" })
-public class HABotDashboardTile implements DashboardTile {
+public class HABotTile implements Tile {
 
     @Override
     public String getName() {
@@ -52,13 +52,13 @@ public String getOverlay() {
 
     @Override
     public String getImageUrl() {
-        return "../habot/statics/dashboardtile.png";
+        return "../habot/statics/tile.png";
     }
 
     public static final String HABOT_ALIAS = "/habot";
     public static final String RESOURCES_BASE = "web/dist/pwa-mat";
 
-    private final Logger logger = LoggerFactory.getLogger(HABotDashboardTile.class);
+    private final Logger logger = LoggerFactory.getLogger(HABotTile.class);
 
     protected HttpService httpService;
 
diff --git a/bundles/org.openhab.ui.habot/web/src/statics/tile.png b/bundles/org.openhab.ui.habot/web/src/statics/tile.png
diff --git a/bundles/org.openhab.ui.habpanel/pom.xml b/bundles/org.openhab.ui.habpanel/pom.xml
@@ -22,8 +22,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.ui</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.ui.habpanel/src/main/java/org/openhab/ui/habpanel/internal/HABPanelTile.java b/bundles/org.openhab.ui.habpanel/src/main/java/org/openhab/ui/habpanel/internal/HABPanelTile.java
@@ -12,19 +12,19 @@
  */
 package org.openhab.ui.habpanel.internal;
 
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.http.NamespaceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The dashboard tile and resource registering for HABPanel
+ * The tile and resource registering for HABPanel
  *
  * @author Yannick Schaus - Initial contribution
  *
  */
-public class HABPanelDashboardTile implements DashboardTile {
+public class HABPanelTile implements Tile {
 
     @Override
     public String getName() {
@@ -48,7 +48,7 @@ public String getImageUrl() {
 
     public static final String HABPANEL_ALIAS = "/habpanel";
 
-    private final Logger logger = LoggerFactory.getLogger(HABPanelDashboardTile.class);
+    private final Logger logger = LoggerFactory.getLogger(HABPanelTile.class);
 
     protected HttpService httpService;
 
diff --git a/bundles/org.openhab.ui.homebuilder/pom.xml b/bundles/org.openhab.ui.homebuilder/pom.xml
@@ -14,8 +14,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.ui</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.ui.homebuilder/src/main/java/org/openhab/ui/homebuilder/internal/HomeBuilderTile.java b/bundles/org.openhab.ui.homebuilder/src/main/java/org/openhab/ui/homebuilder/internal/HomeBuilderTile.java
@@ -12,17 +12,18 @@
  */
 package org.openhab.ui.homebuilder.internal;
 
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.service.component.annotations.Component;
 
 /**
- * The dashboard tile for Home Builder
+ * The tile for Home Builder
  *
  * @author Kuba Wolanin - Initial contribution
+ * @author Yannick Schaus - remove dependency to dashboard
  *
  */
 @Component
-public class HomeBuilderDashboardTile implements DashboardTile {
+public class HomeBuilderTile implements Tile {
 
     @Override
     public String getName() {
diff --git a/bundles/org.openhab.ui.restdocs/pom.xml b/bundles/org.openhab.ui.restdocs/pom.xml
@@ -12,8 +12,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openhab.ui.bundles</groupId>
-      <artifactId>org.openhab.ui.dashboard</artifactId>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.ui</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.ui.restdocs/src/main/java/org/openhab/ui/restdocs/internal/RESTTile.java b/bundles/org.openhab.ui.restdocs/src/main/java/org/openhab/ui/restdocs/internal/RESTTile.java
@@ -12,17 +12,18 @@
  */
 package org.openhab.ui.restdocs.internal;
 
-import org.openhab.ui.dashboard.DashboardTile;
+import org.openhab.core.ui.tiles.Tile;
 import org.osgi.service.component.annotations.Component;
 
 /**
- * The dashboard tile for the REST API,
+ * The tile for the REST API,
  *
  * @author Kai Kreuzer - Initial contribution
+ * @author Yannick Schaus - remove dependency to dashboard
  *
  */
 @Component
-public class RESTDashboardTile implements DashboardTile {
+public class RESTTile implements Tile {
 
     protected void activate() {
     }
@@ -47,7 +48,7 @@ public String getOverlay() {
 
     @Override
     public String getImageUrl() {
-        return "../doc/images/dashboardtile.png";
+        return "../doc/images/tile.png";
     }
 
 }
diff --git a/bundles/org.openhab.ui.restdocs/src/main/resources/swagger/images/tile.png b/bundles/org.openhab.ui.restdocs/src/main/resources/swagger/images/tile.png

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* SPDX-License-Identifier: EPL-2.0`
`12`	`12`	`*/`
`13`		`-package org.openhab.ui.habot.dashboard.internal;`
	`13`	`+package org.openhab.ui.habot.tile.internal;`
`14`	`14`
`15`	`15`	`import java.io.IOException;`
`16`	`16`	`import java.net.MalformedURLException;`
Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,18 @@`
`12`	`12`	`*/`
`13`	`13`	`package org.openhab.ui.restdocs.internal;`
`14`	`14`
`15`		`-import org.openhab.ui.dashboard.DashboardTile;`
	`15`	`+import org.openhab.core.ui.tiles.Tile;`
`16`	`16`	`import org.osgi.service.component.annotations.Component;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * The dashboard tile for the REST API,`
	`19`	`+ * The tile for the REST API,`
`20`	`20`	`*`
`21`	`21`	`* @author Kai Kreuzer - Initial contribution`
	`22`	`+ * @author Yannick Schaus - remove dependency to dashboard`
`22`	`23`	`*`
`23`	`24`	`*/`
`24`	`25`	`@Component`
`25`		`-public class RESTDashboardTile implements DashboardTile {`
	`26`	`+public class RESTTile implements Tile {`
`26`	`27`
`27`	`28`	`protected void activate() {`
`28`	`29`	`}`
`@@ -47,7 +48,7 @@ public String getOverlay() {`
`47`	`48`
`48`	`49`	`@Override`
`49`	`50`	`public String getImageUrl() {`
`50`		`- return "../doc/images/dashboardtile.png";`
	`51`	`+ return "../doc/images/tile.png";`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`}`