[SECIOTSRK-658] +Extend Device entity, add kind field *fix CRC

diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Device.java b/servers/commons/src/main/java/com/samsung/commons/domain/Device.java
index 7ea34b9..6367b72 100644 (file)
--- a/servers/commons/src/main/java/com/samsung/commons/domain/Device.java
+++ b/servers/commons/src/main/java/com/samsung/commons/domain/Device.java
@@ -186,7 +186,7 @@ public class Device implements Serializable {
      */
     public Device() {
         this.parentUuid = "";
-        this.kind="";
+        this.kind = "";
     }
 
     /**

diff --git a/servers/commons/src/test/java/com/samsung/commons/EqualsVerfierTest.java b/servers/commons/src/test/java/com/samsung/commons/EqualsVerfierTest.java
index e9f2082..767de4a 100644 (file)
--- a/servers/commons/src/test/java/com/samsung/commons/EqualsVerfierTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/EqualsVerfierTest.java
@@ -37,8 +37,8 @@ public class EqualsVerfierTest {
                 .withPrefabValues(Agent.class, new Agent(null, NAME1, new Policy("test")), new Agent("uuid", NAME2, new Policy()))
                 .withPrefabValues(Agent.class, new Agent("uuid", NAME1, new Policy("test")), new Agent(null, NAME2, new Policy()))
                 .withPrefabValues(Device.class,
-                        new Device("uuid1", NAME1, "tv", "model1", 1, new Policy(), new User(), "parentUuid","kind"),
-                        new Device("uuid2", NAME2, "tv", "model2", 1, new Policy(), new User(), "parentUuid","kind"))
+                        new Device("uuid1", NAME1, "tv", "model1", 1, new Policy(), new User(), "parentUuid", "kind"),
+                        new Device("uuid2", NAME2, "tv", "model2", 1, new Policy(), new User(), "parentUuid", "kind"))
                 .usingGetClass().verify();
 
         forClass(Policy.class).usingGetClass().verify();

diff --git a/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java b/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java
index 80b9ef3..32f22ab 100644 (file)
--- a/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java
@@ -65,7 +65,7 @@ public class DeviceRepositoryTest {
         String type = "type";
         String model = "model";
         Integer status = 0;
-        Device device = new Device(uuid, name, type, model, status, policy, user, "parentUuid","kind");
+        Device device = new Device(uuid, name, type, model, status, policy, user, "parentUuid", "kind");
         assertNull(device.getId());
         device = deviceRepository.save(device);
         assertNotNull(device.getId());
@@ -84,7 +84,7 @@ public class DeviceRepositoryTest {
         String type = "type";
         String model = "model";
         Integer status = 0;
-        Device device = new Device(uuid, name, type, model, status, policy, user, "parentUuid","kind");
+        Device device = new Device(uuid, name, type, model, status, policy, user, "parentUuid", "kind");
         device = deviceRepository.save(device);
         assertNotNull(device);
         device = deviceRepository.findByUuid(uuid);

diff --git a/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java
index 0a06624..f39d7fd 100644 (file)
--- a/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java
@@ -69,11 +69,11 @@ public class AgentServiceTest {
 
         User user = userService.getUserByEmail("admin@samsung.com");
         Device device1 = new Device("uuid1", "name1", TYPE, "model", 1, policyService
-                .initPolicy(TYPE), user, "parentUuid","kind");
+                .initPolicy(TYPE), user, "parentUuid", "kind");
         device1.setAgents(createAgents(device1));
 
         Device device2 = new Device("uuid2", "name2", TYPE, "model", 1, policyService
-                .initPolicy(TYPE), user, "parentUuid","kind");
+                .initPolicy(TYPE), user, "parentUuid", "kind");
 
         deviceService.save(device1);
         deviceService.save(device2);
@@ -197,7 +197,7 @@ public class AgentServiceTest {
         User user = userService.getUserByEmail("admin@samsung.com");
         assertEquals(2, agentService.count());
         Policy policy = policyService.initPolicy("tv");
-        Device device = new Device("uuid1222222", "name1", "tv", "model", 1, policy, user, "parentUuid","kind");
+        Device device = new Device("uuid1222222", "name1", "tv", "model", 1, policy, user, "parentUuid", "kind");
         deviceService.save(device);
         agentService.init(initUuid, "init-name1111", device);
         assertEquals(AGENT_COUNT, agentService.count());

diff --git a/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java
index fb87813..27f4e68 100644 (file)
--- a/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java
@@ -107,7 +107,7 @@ public class PolicyServiceTest {
     public void init() {
         user = userService.getUserByEmail("admin@samsung.com");
         Device dvc = new Device("deviceuuid", "name", "type", "model", 0, policyService
-                .initPolicy(TYPE), user, "parentUuid","kind");
+                .initPolicy(TYPE), user, "parentUuid", "kind");
         List<Agent> agents = new ArrayList<>();
         policy1 = policyService.initPolicy(TYPE);
         Agent agent1 = new Agent("agent1uuid", "name1", policy1);
@@ -173,7 +173,7 @@ public class PolicyServiceTest {
         assertNull(policyService.findById(policy.getId()));
         policy = policyService.initPolicy(TYPE);
         Device newDevice = deviceService
-                .save(new Device("newuuid", "name", "type", "model", 0, policy, user, "parentUuid","kind"));
+                .save(new Device("newuuid", "name", "type", "model", 0, policy, user, "parentUuid", "kind"));
         Policy findingPolicy = policyService.findByDeviceId(newDevice.getId());
         assertNotNull(findingPolicy);
         policyService.remove(findingPolicy);

diff --git a/servers/dsm/src/test/java/com/samsung/dsm/rest/PolicyApiTest.java b/servers/dsm/src/test/java/com/samsung/dsm/rest/PolicyApiTest.java
index f721586..35d3174 100644 (file)
--- a/servers/dsm/src/test/java/com/samsung/dsm/rest/PolicyApiTest.java
+++ b/servers/dsm/src/test/java/com/samsung/dsm/rest/PolicyApiTest.java
@@ -72,7 +72,7 @@ public class PolicyApiTest {
     public void before() {
         User user = userService.getUserByEmail("admin@samsung.com");
         policy = policyService.initPolicy("phone");
-        Device device = new Device("1234", "s8", "phone", "samsung s8 edge", 1, policy, user, "parentUuid","kind");
+        Device device = new Device("1234", "s8", "phone", "samsung s8 edge", 1, policy, user, "parentUuid", "kind");
         List<Agent> agents = new ArrayList<>();
         agent = new Agent("5678", "name1", policyService.initPolicy("phone"));
         agent.setDevice(device);