Code format hawkbit (#1948)
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
@@ -9,6 +9,9 @@
|
||||
*/
|
||||
package org.eclipse.hawkbit.sdk.demo.device;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import feign.Client;
|
||||
import feign.Contract;
|
||||
import feign.codec.Decoder;
|
||||
@@ -29,9 +32,6 @@ import org.springframework.shell.standard.ShellComponent;
|
||||
import org.springframework.shell.standard.ShellMethod;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* Abstract class representing DDI device connecting directly to hawkVit.
|
||||
*/
|
||||
@@ -52,7 +52,7 @@ public class DeviceApp {
|
||||
|
||||
@Bean
|
||||
DdiTenant ddiTenant(final Tenant defaultTenant,
|
||||
final HawkbitClient hawkbitClient) {
|
||||
final HawkbitClient hawkbitClient) {
|
||||
return new DdiTenant(defaultTenant, hawkbitClient);
|
||||
}
|
||||
|
||||
@@ -69,7 +69,6 @@ public class DeviceApp {
|
||||
private final DdiController device;
|
||||
private final MgmtApi mgmtApi;
|
||||
|
||||
|
||||
Shell(final DdiTenant ddiTenant, final MgmtApi mgmtApi, final Optional<UpdateHandler> updateHandler) {
|
||||
this.ddiTenant = ddiTenant;
|
||||
this.mgmtApi = mgmtApi;
|
||||
@@ -88,7 +87,7 @@ public class DeviceApp {
|
||||
@ShellMethod(key = "setup")
|
||||
public void setup() {
|
||||
mgmtApi.setupTargetAuthentication();
|
||||
mgmtApi.setupTargetToken(device.getControllerId(),device.getTargetSecurityToken());
|
||||
mgmtApi.setupTargetToken(device.getControllerId(), device.getTargetSecurityToken());
|
||||
}
|
||||
|
||||
@ShellMethod(key = "start")
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
*/
|
||||
package org.eclipse.hawkbit.sdk.demo.dmf;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.eclipse.hawkbit.sdk.Controller;
|
||||
import org.eclipse.hawkbit.sdk.Tenant;
|
||||
@@ -26,9 +29,6 @@ import org.springframework.shell.standard.ShellComponent;
|
||||
import org.springframework.shell.standard.ShellMethod;
|
||||
import org.springframework.shell.standard.ShellOption;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* Abstract class representing DDI device connecting directly to hawkVit.
|
||||
*/
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
*/
|
||||
package org.eclipse.hawkbit.sdk.demo.multidevice;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import feign.Client;
|
||||
import feign.Contract;
|
||||
import feign.codec.Decoder;
|
||||
@@ -29,9 +32,6 @@ import org.springframework.shell.standard.ShellComponent;
|
||||
import org.springframework.shell.standard.ShellMethod;
|
||||
import org.springframework.shell.standard.ShellOption;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* Abstract class representing DDI device connecting directly to hawkVit.
|
||||
*/
|
||||
@@ -52,7 +52,7 @@ public class MultiDeviceApp {
|
||||
|
||||
@Bean
|
||||
DdiTenant ddiTenant(final Tenant defaultTenant,
|
||||
final HawkbitClient hawkbitClient) {
|
||||
final HawkbitClient hawkbitClient) {
|
||||
return new DdiTenant(defaultTenant, hawkbitClient);
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class MultiDeviceApp {
|
||||
public void startOne(@ShellOption("--id") final String controllerId) {
|
||||
final String securityTargetToken;
|
||||
if (setup) {
|
||||
securityTargetToken = mgmtApi.setupTargetToken(controllerId,null);
|
||||
securityTargetToken = mgmtApi.setupTargetToken(controllerId, null);
|
||||
} else {
|
||||
securityTargetToken = null;
|
||||
}
|
||||
@@ -96,12 +96,12 @@ public class MultiDeviceApp {
|
||||
ddiTenant.getController(controllerId).ifPresentOrElse(
|
||||
ddiController -> ddiController.start(Executors.newSingleThreadScheduledExecutor()),
|
||||
() -> ddiTenant.createController(Controller.builder()
|
||||
.controllerId(controllerId)
|
||||
.securityToken(securityTargetToken)
|
||||
.build(),updateHandler)
|
||||
.controllerId(controllerId)
|
||||
.securityToken(securityTargetToken)
|
||||
.build(), updateHandler)
|
||||
.setOverridePollMillis(10_000)
|
||||
.start(Executors.newSingleThreadScheduledExecutor())
|
||||
);
|
||||
);
|
||||
}
|
||||
|
||||
@ShellMethod(key = "stop-one")
|
||||
|
||||
Reference in New Issue
Block a user