[SECARSP-115] *update devices func: return UIDevice list, validate input values

[platform/core/security/suspicious-activity-monitor.git] / server / src / main / java / com / samsung / samserver / web / rest / service / RegisterDeviceRestService.java

diff --git a/server/src/main/java/com/samsung/samserver/web/rest/service/RegisterDeviceRestService.java b/server/src/main/java/com/samsung/samserver/web/rest/service/RegisterDeviceRestService.java
index 8ed8572..49b3b08 100644 (file)
--- a/server/src/main/java/com/samsung/samserver/web/rest/service/RegisterDeviceRestService.java
+++ b/server/src/main/java/com/samsung/samserver/web/rest/service/RegisterDeviceRestService.java
@@ -9,11 +9,9 @@ import org.slf4j.*;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.samsung.samserver.domain.*;
 import com.samsung.samserver.service.*;
 import com.samsung.samserver.web.rest.errors.DeviceServiceError;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -62,44 +60,32 @@ public class RegisterDeviceRestService {
             .osname(dInfo.getOsname())
             .osver(dInfo.getOsver())
             .ipaddr(request.getRemoteAddr())
-            .descr(dInfo.getDescr())
             .dtype(dt.get()));
         return ResponseEntity.ok()
             .headers(new HttpHeaders())
             .body(result.getDuid());
     }
 
+    /**
+     * View Model for Device Info to registration.
+     */
     @Getter @Setter @ToString
     public static class DInfo {
 
-        private String duid;
-
-        @JsonProperty("type")
         @NotNull
         private String type;
 
-        @JsonProperty("model")
         @NotNull
         private String model;
 
-        @JsonProperty("ipaddr")
-        private String ipaddr;
-
-        @JsonProperty("sn")
         @NotNull
         private String sn;
 
-        @JsonProperty("descr")
-        private String descr;
-
-        @JsonProperty("sw")
         private String sw;
 
-        @JsonProperty("osname")
         @NotNull
         private String osname;
 
-        @JsonProperty("osver")
         @NotNull
         private String osver;
     }