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

Fix mayors squid:S1604 and squid:S1151 (#344)

Browse Source 
* Fixed Last Mayor issues

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Disable lambda for Java GWT client code

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove lambda

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2016-11-10 15:00:57 +01:00
committed by Michael Hirsch
parent 23eb0c3c73
commit c1e5689f6a
7 changed files with 81 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulatedDeviceFactory.java
View File

@@ -22,7 +22,7 @@ import feign.Logger;
/**
* The simulated device factory to create either {@link DMFSimulatedDevice} or
* {@link DDISimulatedDevice#}.
* {@link DDISimulatedDevice}.
*/
@Service
public class SimulatedDeviceFactory {
@@ -61,22 +61,32 @@ public class SimulatedDeviceFactory {
final int pollDelaySec, final URL baseEndpoint, final String gatewayToken, final boolean pollImmediatly) {
switch (protocol) {
case DMF_AMQP:
final AbstractSimulatedDevice device = new DMFSimulatedDevice(id, tenant, spSenderService, pollDelaySec);
device.setNextPollCounterSec(pollDelaySec);
if (pollImmediatly) {
spSenderService.createOrUpdateThing(tenant, id);
}
return device;
return createDmfDevice(id, tenant, pollDelaySec, pollImmediatly);
case DDI_HTTP:
final ControllerResource controllerResource = Feign.builder().logger(new Logger.ErrorLogger())
.requestInterceptor(new GatewayTokenInterceptor(gatewayToken)).logLevel(Logger.Level.BASIC)
.target(ControllerResource.class, baseEndpoint.toString());
return new DDISimulatedDevice(id, tenant, pollDelaySec, controllerResource, deviceUpdater);
return createDdiDevice(id, tenant, pollDelaySec, baseEndpoint, gatewayToken);
default:
throw new IllegalArgumentException("Protocol " + protocol + " unknown");
}
}
private AbstractSimulatedDevice createDdiDevice(final String id, final String tenant, final int pollDelaySec,
final URL baseEndpoint, final String gatewayToken) {
final ControllerResource controllerResource = Feign.builder().logger(new Logger.ErrorLogger())
.requestInterceptor(new GatewayTokenInterceptor(gatewayToken)).logLevel(Logger.Level.BASIC)
.target(ControllerResource.class, baseEndpoint.toString());
return new DDISimulatedDevice(id, tenant, pollDelaySec, controllerResource, deviceUpdater);
}
private AbstractSimulatedDevice createDmfDevice(final String id, final String tenant, final int pollDelaySec,
final boolean pollImmediatly) {
final AbstractSimulatedDevice device = new DMFSimulatedDevice(id, tenant, spSenderService, pollDelaySec);
device.setNextPollCounterSec(pollDelaySec);
if (pollImmediatly) {
spSenderService.createOrUpdateThing(tenant, id);
}
return device;
}
/**
* Creating a simulated device and send an immediate DMF poll to update
* server.