Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client

examples/hawkbit-example-feign-core-client/src/main/java/org/eclipse/hawkbit/feign/core/client/FeignClientConfiguration.java

@@ -8,16 +8,22 @@
  */
 package org.eclipse.hawkbit.feign.core.client;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.netflix.feign.FeignClientsConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import feign.Contract;
+import feign.Feign;
 
 /**
  * 
  *
  */
 @Configuration
+@ConditionalOnClass(Feign.class)
+@Import(FeignClientsConfiguration.class)
 public class FeignClientConfiguration {
 
     @Bean

examples/hawkbit-example-mgmt-client/pom.xml

@@ -0,0 +1,63 @@
+<!--
+
+    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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.eclipse.hawkbit</groupId>
+      <artifactId>hawkbit-examples-parent</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
+   </parent>
+   <packaging>jar</packaging>
+   <artifactId>hawkbit-example-mgmt-client</artifactId>
+   <name>hawkBit Management client API</name>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-example-feign-core-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-mgmt-api</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-system-api</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>com.netflix.feign</groupId>
+         <artifactId>feign-core</artifactId>
+         <!-- need to overwrite for the interface inheritance feature of feign-core -->
+         <version>8.14.2</version>
+      </dependency>
+      <dependency>
+         <groupId>com.netflix.feign</groupId>
+         <artifactId>feign-jackson</artifactId>
+         <version>8.14.2</version>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-databind</artifactId>
+      </dependency>
+      <dependency>
+         <artifactId>hibernate-validator</artifactId>
+         <groupId>org.hibernate</groupId>
+      </dependency>
+   </dependencies>
+</project>

examples/hawkbit-example-mgmt-client/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/CreateStartedRolloutExample.java

@@ -28,13 +28,11 @@ import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * Example for creating and starting a Rollout.
  *
  */
-@Component
 public class CreateStartedRolloutExample {
 
     /* known software module type name and key */

examples/hawkbit-example-mgmt-client/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/GettingStartedDefaultScenario.java

@@ -25,14 +25,12 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModule
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * 
  * Default getting started scenario.
  *
  */
-@Component
 public class GettingStartedDefaultScenario {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GettingStartedDefaultScenario.class);

examples/hawkbit-example-mgmt-spring-client/.gitignore

@@ -0,0 +1,3 @@
+/target/
+/bin/
+/.apt_generated/

examples/hawkbit-example-mgmt-spring-client/pom.xml

@@ -17,7 +17,7 @@
       <version>0.2.0-SNAPSHOT</version>
    </parent>
    <packaging>jar</packaging>
-   <artifactId>hawkbit-mgmt-api-client</artifactId>
+   <artifactId>hawkbit-example-mgmt-spring-client</artifactId>
    <name>hawkBit Management API example client</name>
 
    <build>
@@ -57,17 +57,7 @@
    <dependencies>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-example-feign-core-client</artifactId>
+         <artifactId>hawkbit-example-mgmt-client</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-mgmt-api</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-system-api</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -102,11 +92,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-logging</artifactId>
       </dependency>
-      <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
-         <version>1.0-rc2</version>
-      </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-configuration-processor</artifactId>

examples/hawkbit-example-mgmt-spring-client/src/main/java/org/eclipse/hawkbit/mgmt/client/Application.java

@@ -8,16 +8,19 @@
  */
 package org.eclipse.hawkbit.mgmt.client;
 
+import org.eclipse.hawkbit.feign.core.client.FeignClientConfiguration;
 import org.eclipse.hawkbit.mgmt.client.scenarios.CreateStartedRolloutExample;
 import org.eclipse.hawkbit.mgmt.client.scenarios.GettingStartedDefaultScenario;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import feign.auth.BasicAuthRequestInterceptor;
 
@@ -25,6 +28,8 @@ import feign.auth.BasicAuthRequestInterceptor;
 @EnableFeignClients
 @EnableConfigurationProperties(ClientConfigurationProperties.class)
 @Configuration
+@AutoConfigureAfter(FeignClientConfiguration.class)
+@Import(FeignClientConfiguration.class)
 public class Application implements CommandLineRunner {
 
     @Autowired
@@ -57,6 +62,16 @@ public class Application implements CommandLineRunner {
         return new BasicAuthRequestInterceptor(configuration.getUsername(), configuration.getPassword());
     }
 
+    @Bean
+    public GettingStartedDefaultScenario gettingStartedDefaultScenario() {
+        return new GettingStartedDefaultScenario();
+    }
+
+    @Bean
+    public CreateStartedRolloutExample createStartedRolloutExample() {
+        return new CreateStartedRolloutExample();
+    }
+
     private boolean containsArg(final String containsArg, final String... args) {
         for (final String arg : args) {
             if (arg.equalsIgnoreCase(containsArg)) {

examples/pom.xml

@@ -22,10 +22,12 @@
    <packaging>pom</packaging>
 
    <modules>
+      <module>hawkbit-example-feign-core-client</module>
       <module>hawkbit-device-simulator</module>
       <module>hawkbit-example-app</module>
-      <module>hawkbit-mgmt-api-client</module>
+      <module>hawkbit-example-mgmt-client</module>
-    <module>hawkbit-example-ddi-client</module>
+      <module>hawkbit-example-mgmt-spring-client</module>
+      <module>hawkbit-example-ddi-client</module>
   </modules>
 
 </project>

pom.xml

@@ -43,7 +43,7 @@
       <module>hawkbit-autoconfigure</module>
       <module>hawkbit-cache-redis</module>
       <module>hawkbit-test-report</module>
-<!--       <module>examples</module> -->
+      <module>examples</module>
    </modules>