lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

SDK AutoConfig & improvements & fixes (#1663)

Browse Source 
* SDK autoconfiguration added
* Option for custom error decoder and request interceptor added
* Fixed authentication for targets with security token

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-02-21 15:44:27 +02:00
committed by GitHub
parent ab61b168bd
commit 8ea3fdb5e7
10 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hawkbit-sdk/hawkbit-sdk-demo/pom.xml
View File

@@ -19,12 +19,14 @@
<version>${revision}</version>
</parent>
<artifactId>hawkbit-sdk-test</artifactId>
<artifactId>hawkbit-sdk-demo</artifactId>
<name>hawkBit :: SDK :: Test / Example</name>
<description>Test / Example of how SDK could be used to for devices and for Mgmt API access</description>
<properties>
<spring-shell.version>3.1.5</spring-shell.version>
<spring.app.class>org.eclipse.hawkbit.sdk.demo.multidevice.MultiDeviceApp</spring.app.class>
<start-class>${spring.app.class}</start-class>
</properties>
<dependencies>
@@ -45,4 +47,30 @@
<version>${spring-shell.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<outputDirectory>${baseDir}</outputDirectory>
<layout>JAR</layout>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>

4
hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
View File

@@ -93,8 +93,10 @@ public class SetupHelper {
securityTargetToken = randomToken();
mgmtTargetRestApi.updateTarget(controllerId,
new MgmtTargetRequestBody().setSecurityToken(securityTargetToken));
} else {
securityTargetToken = target.getSecurityToken();
}
} else if (!securityTargetToken.equals(target.getSecurityToken())){
} else if (!securityTargetToken.equals(target.getSecurityToken())) {
// update target's with the security token (since it doesn't match)
mgmtTargetRestApi.updateTarget(controllerId,
new MgmtTargetRequestBody().setSecurityToken(securityTargetToken));

1
hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/device/DeviceApp.java
View File

@@ -40,7 +40,6 @@ import java.util.concurrent.ScheduledExecutorService;
*/
@Slf4j
@SpringBootApplication
@Import({ HawkbitSDKConfigurtion.class})
public class DeviceApp {
public static void main(String[] args) {

1
hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/multidevice/MultiDeviceApp.java
View File

@@ -41,7 +41,6 @@ import java.util.concurrent.ScheduledExecutorService;
*/
@Slf4j
@SpringBootApplication
@Import({ HawkbitSDKConfigurtion.class})
public class MultiDeviceApp {
public static void main(String[] args) {

1
hawkbit-sdk/hawkbit-sdk-demo/src/main/resources/application.properties
View File

@@ -9,7 +9,6 @@
#
spring.main.web-application-type=none
spring.cloud.openfeign.httpclient.hc5.enabled=true
logging.level.org.eclipse.hawkbit=DEBUG