Add download server api

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

examples/hawkbit-custom-theme-example/pom.xml

@@ -66,7 +66,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-ui</artifactId>
+         <artifactId>hawkbit-mgmt-ui</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

examples/hawkbit-example-app/pom.xml

@@ -84,7 +84,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-ui</artifactId>
+         <artifactId>hawkbit-mgmt-ui</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

hawkbit-autoconfigure/pom.xml

@@ -40,7 +40,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-ui</artifactId>
+         <artifactId>hawkbit-mgmt-ui</artifactId>
          <version>${project.version}</version>
          <optional>true</optional>
       </dependency>

hawkbit-ddi-api/pom.xml

@@ -33,11 +33,6 @@
          <groupId>javax.validation</groupId>
          <artifactId>validation-api</artifactId>
       </dependency>
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>javax.servlet-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-validator</artifactId>

hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java

@@ -18,11 +18,6 @@ public final class DdiRestConstants {
      */
     public static final String BASE_V1_REQUEST_MAPPING = "/{tenant}/controller/v1";
 
-    /**
-     * The base URL mapping of the artifact repository rest resources.
-     */
-    public static final String ARTIFACTS_V1_REQUEST_MAPPING = "/{tenant}/controller/artifacts/v1";
-
     /**
      * Deployment action resources.
      */
@@ -38,28 +33,17 @@ public final class DdiRestConstants {
      */
     public static final String FEEDBACK = "feedback";
 
-    /**
-     * Config data action resources.
-     */
-    public static final String CONFIG_DATA_ACTION = "configData";
-
-    /**
-     * The artifact URL mapping rest resource.
-     */
-    public static final String ARTIFACT_DOWNLOAD = "artifact";
-
-    /**
-     * The artifact by filename URL mapping rest resource.
-     */
-    public static final String ARTIFACT_DOWNLOAD_BY_FILENAME = "/filename";
-
     /**
      * File suffix for MDH hash download (see Linux md5sum).
      */
     public static final String ARTIFACT_MD5_DWNL_SUFFIX = ".MD5SUM";
 
-    // constant class, private constructor.
-    private DdiRestConstants() {
+    /**
+     * Config data action resources.
+     */
+    public static final String CONFIG_DATA_ACTION = "configData";
 
+    private DdiRestConstants() {
+        // constant class, private constructor.
     }
 }

hawkbit-ddi-dl-api/pom.xml

@@ -0,0 +1,29 @@
+<!--
+
+    Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.hawkbit</groupId>
+    <artifactId>hawkbit-parent</artifactId>
+    <version>0.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>hawkbit-ddi-dl-api</artifactId>
+  <name>hawkBit :: DDI Download Server (DL) API</name>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.springframework.security</groupId>
+         <artifactId>spring-security-web</artifactId>
+      </dependency>
+   </dependencies>
+</project>

hawkbit-ddi-dl-api/src/main/java/org/eclipse/hawkbit/ddi/dl/rest/api/DdiDlArtifactStoreControllerRestApi.java

@@ -6,11 +6,10 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.hawkbit.ddi.rest.api;
+package org.eclipse.hawkbit.ddi.dl.rest.api;
 
 import java.io.InputStream;
 
-import org.eclipse.hawkbit.ddi.json.model.DdiArtifact;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.web.bind.annotation.AuthenticationPrincipal;
@@ -22,19 +21,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
 /**
  * REST resource handling for artifact download operations.
  */
-@RequestMapping(DdiRestConstants.ARTIFACTS_V1_REQUEST_MAPPING)
-public interface DdiArtifactStoreControllerRestApi {
+@RequestMapping(DdiDlRestConstants.ARTIFACTS_V1_REQUEST_MAPPING)
+public interface DdiDlArtifactStoreControllerRestApi {
 
     /**
-     * Handles GET {@link DdiArtifact} download request. This could be full or
-     * partial download request.
+     * Handles GET download request. This could be full or partial download
+     * request.
      *
      * @param fileName
      *            to search for
-     * @param response
-     *            to write to
-     * @param request
-     *            from the client
      * @param targetid
      *            of authenticated target
      *
@@ -42,24 +37,21 @@ public interface DdiArtifactStoreControllerRestApi {
      *         {@link HttpStatus#OK} or in case of partial download
      *         {@link HttpStatus#PARTIAL_CONTENT}.
      */
-    @RequestMapping(method = RequestMethod.GET, value = DdiRestConstants.ARTIFACT_DOWNLOAD_BY_FILENAME + "/{fileName}")
+    @RequestMapping(method = RequestMethod.GET, value = DdiDlRestConstants.ARTIFACT_DOWNLOAD_BY_FILENAME + "/{fileName}")
     @ResponseBody
     public ResponseEntity<InputStream> downloadArtifactByFilename(@PathVariable("fileName") final String fileName,
-
             @AuthenticationPrincipal final String targetid);
 
     /**
-     * Handles GET {@link DdiArtifact} MD5 checksum file download request.
+     * Handles GET MD5 checksum file download request.
      *
      * @param fileName
      *            to search for
-     * @param response
-     *            to write to
      *
      * @return response of the servlet
      */
-    @RequestMapping(method = RequestMethod.GET, value = DdiRestConstants.ARTIFACT_DOWNLOAD_BY_FILENAME + "/{fileName}"
-            + DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX)
+    @RequestMapping(method = RequestMethod.GET, value = DdiDlRestConstants.ARTIFACT_DOWNLOAD_BY_FILENAME + "/{fileName}"
+            + DdiDlRestConstants.ARTIFACT_MD5_DWNL_SUFFIX)
     @ResponseBody
     public ResponseEntity<Void> downloadArtifactMD5ByFilename(@PathVariable("fileName") final String fileName);
 

hawkbit-ddi-dl-api/src/main/java/org/eclipse/hawkbit/ddi/dl/rest/api/DdiDlRestConstants.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.ddi.dl.rest.api;
+
+/**
+ * Constants for the direct device integration rest resources.
+ */
+public final class DdiDlRestConstants {
+
+    /**
+     * The base URL mapping of the artifact repository rest resources.
+     */
+    public static final String ARTIFACTS_V1_REQUEST_MAPPING = "/{tenant}/controller/artifacts/v1";
+
+    /**
+     * The artifact URL mapping rest resource.
+     */
+    public static final String ARTIFACT_DOWNLOAD = "artifact";
+
+    /**
+     * The artifact by filename URL mapping rest resource.
+     */
+    public static final String ARTIFACT_DOWNLOAD_BY_FILENAME = "/filename";
+
+    /**
+     * File suffix for MDH hash download (see Linux md5sum).
+     */
+    public static final String ARTIFACT_MD5_DWNL_SUFFIX = ".MD5SUM";
+
+    // constant class, private constructor.
+    private DdiDlRestConstants() {
+
+    }
+}

hawkbit-ddi-resource/pom.xml

@@ -26,6 +26,11 @@
          <artifactId>hawkbit-ddi-api</artifactId>
          <version>${project.version}</version>
       </dependency>
+      <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-ddi-dl-api</artifactId>
+         <version>${project.version}</version>
+      </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
          <artifactId>hawkbit-rest-core</artifactId>

hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.hawkbit.api.ArtifactUrlHandler;
 import org.eclipse.hawkbit.api.UrlProtocol;
+import org.eclipse.hawkbit.ddi.dl.rest.api.DdiDlRestConstants;
 import org.eclipse.hawkbit.ddi.json.model.DdiArtifact;
 import org.eclipse.hawkbit.ddi.json.model.DdiArtifactHash;
 import org.eclipse.hawkbit.ddi.json.model.DdiChunk;
@@ -93,9 +94,9 @@ public final class DataConversionHelper {
             final String linkHttps = artifactUrlHandler.getUrl(targetid, artifact.getSoftwareModule().getId(),
                     artifact.getFilename(), artifact.getSha1Hash(), UrlProtocol.HTTPS);
             file.add(new Link(linkHttps).withRel("download"));
-            file.add(new Link(linkHttps + DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum"));
+            file.add(new Link(linkHttps + DdiDlRestConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum"));
             file.add(new Link(linkHttp).withRel("download-http"));
-            file.add(new Link(linkHttp + DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum-http"));
+            file.add(new Link(linkHttp + DdiDlRestConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum-http"));
 
             files.add(file);
         });
@@ -147,7 +148,7 @@ public final class DataConversionHelper {
         final StringBuilder header = new StringBuilder();
         header.append("attachment;filename=");
         header.append(fileName);
-        header.append(DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX);
+        header.append(DdiDlRestConstants.ARTIFACT_MD5_DWNL_SUFFIX);
 
         response.setContentLength(content.length);
         response.setHeader("Content-Disposition", header.toString());

hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactStoreController.java

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifact;
 import org.eclipse.hawkbit.cache.CacheWriteNotify;
-import org.eclipse.hawkbit.ddi.rest.api.DdiArtifactStoreControllerRestApi;
+import org.eclipse.hawkbit.ddi.dl.rest.api.DdiDlArtifactStoreControllerRestApi;
 import org.eclipse.hawkbit.repository.ArtifactManagement;
 import org.eclipse.hawkbit.repository.ControllerManagement;
 import org.eclipse.hawkbit.repository.model.Action;
@@ -49,7 +49,7 @@ import org.springframework.web.context.WebApplicationContext;
  */
 @RestController
 @Scope(value = WebApplicationContext.SCOPE_REQUEST)
-public class DdiArtifactStoreController implements DdiArtifactStoreControllerRestApi {
+public class DdiArtifactStoreController implements DdiDlArtifactStoreControllerRestApi {
 
     private static final Logger LOG = LoggerFactory.getLogger(DdiArtifactStoreController.class);
 

hawkbit-mgmt-ui/pom.xml

@@ -16,7 +16,7 @@
       <artifactId>hawkbit-parent</artifactId>
       <version>0.2.0-SNAPSHOT</version>
    </parent>
-   <artifactId>hawkbit-ui</artifactId>
+   <artifactId>hawkbit-mgmt-ui</artifactId>
    <name>hawkBit :: UI</name>
    <description>Bosch IoT Software Provisioning server web application</description>
    <build>