Claim device improvements (#1913)

* add-device-to-claim-result

* code update

* code-update

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

* remove empty row

* update code

@@ -112,14 +112,14 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                     Device savedDevice = deviceService.saveDevice(device);
                     Device savedDevice = deviceService.saveDevice(device);
                     return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(savedDevice, ClaimResponse.SUCCESS));
                     return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(savedDevice, ClaimResponse.SUCCESS));
                 }
                 }
-                return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(device, ClaimResponse.CLAIMED));
+                return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(null, ClaimResponse.CLAIMED));
             }
             }
         } else {
         } else {
             log.warn("Failed to find the device's claiming message![{}]", device.getName());
             log.warn("Failed to find the device's claiming message![{}]", device.getName());
             if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
             if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
                 return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
             } else {
             } else {
-                return Futures.immediateFuture(new ClaimResult(device, ClaimResponse.CLAIMED));
+                return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED));
             }
             }
         }
         }
     }
     }