简柏林 / thingskit · Commits

Commit 19d103fef4163b41effcebbb0ea7b4f5bc16067e

Authored by ShvaykaD
Committed by Andrew Shvayka
1 parent 08f8ed2f

Claim device improvements (#1915) 

* add-device-to-claim-result

* code update

* code-update

* added-condition-on-empty-cache-clause

* remove empty row

* update code

* cleaned code
Inline Side-by-side
Showing 2 changed files with 2 additions and 6 deletions
@@ -418,11 +418,7 @@ public class DeviceController extends BaseController { @@ -418,11 +418,7 @@ public class DeviceController extends BaseController {
418 deferredResult.setResult(new ResponseEntity<>(result, status)); 418 deferredResult.setResult(new ResponseEntity<>(result, status));
419 } else { 419 } else {
420 status = HttpStatus.BAD_REQUEST; 420 status = HttpStatus.BAD_REQUEST;
421 - if (result.getResponse().equals(ClaimResponse.FAILURE)) {  
422 - deferredResult.setResult(new ResponseEntity<>(result.getResponse(), status));  
423 - } else {  
424 - deferredResult.setResult(new ResponseEntity<>(result, status));  
425 - } 421 + deferredResult.setResult(new ResponseEntity<>(result.getResponse(), status));
426 } 422 }
427 } else { 423 } else {
428 deferredResult.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); 424 deferredResult.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
@@ -116,7 +116,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService { @@ -116,7 +116,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
116 } 116 }
117 } else { 117 } else {
118 log.warn("Failed to find the device's claiming message![{}]", device.getName()); 118 log.warn("Failed to find the device's claiming message![{}]", device.getName());
119 - if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) { 119 + if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
120 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE)); 120 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
121 } else { 121 } else {
122 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED)); 122 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED));