From 2bdd620c1591afda05397554050b3e60a15da9d7 Mon Sep 17 00:00:00 2001 From: "m.dalakov" Date: Fri, 27 Oct 2017 17:16:42 +0300 Subject: [PATCH] [SECIOTSRK-658] *Extend Device entity *cleanup --- .../main/java/com/samsung/ci/basic/api/Rest.java | 6 ++-- ...istrationAndUnregistrationWithoutCloudTest.java | 2 +- .../useractions/DeviceApiWithoutCloudTest.java | 8 ++--- .../java/com/samsung/commons/domain/Device.java | 34 +++++++++------------- .../commons/repository/DeviceRepository.java | 15 ++-------- .../com/samsung/commons/service/DeviceService.java | 6 ++-- .../commons/service/impl/DeviceServiceImpl.java | 13 +++------ .../java/com/samsung/commons/utils/TestUtils.java | 8 ++--- .../com/samsung/commons/EqualsVerfierTest.java | 4 +-- .../com/samsung/commons/IncreaseCoverageTest.java | 2 +- .../samsung/commons/domain/device/DeviceTest.java | 4 +-- .../commons/repository/DeviceRepositoryTest.java | 4 +-- .../samsung/commons/service/AgentServiceTest.java | 6 ++-- .../samsung/commons/service/DeviceServiceTest.java | 28 +++++++++--------- .../samsung/commons/service/PolicyServiceTest.java | 4 +-- .../commons/service/impl/ReportServiceTest.java | 16 +++++----- .../com/samsung/dsm/rest/device/DeviceApi.java | 14 ++------- .../java/com/samsung/dsm/EqualsHashCodeTest.java | 2 +- .../java/com/samsung/dsm/IncreaseCoverageTest.java | 2 +- .../test/java/com/samsung/dsm/ToStringTest.java | 2 +- .../com/samsung/dsm/model/view/ViewDeviceTest.java | 2 +- .../java/com/samsung/dsm/rest/DeviceApiTest.java | 10 +++---- .../java/com/samsung/dsm/rest/PolicyApiTest.java | 2 +- .../java/com/samsung/dsm/rest/ReportApiTest.java | 6 ++-- .../DeviceUnRegistrationPostDataExtractorTest.java | 8 ++--- .../impl/PolicyPostDataExtractorTest.java | 10 +++---- .../impl/ReportPostDataExtractorTest.java | 4 +-- 27 files changed, 95 insertions(+), 127 deletions(-) diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java index 8d9ef38..2b30f9f 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java @@ -179,12 +179,12 @@ public final class Rest { } /** - * Find device by cloud user uuid except kind standard + * Find device by cloud user uuid except mode standard * @param uuid * @return response */ - public static Response findDeviceByCloudUserUuidExceptKindStandard(String uuid) { - Response resp = given().when().get(RestAssured.baseURI + "/dsm/restapi/device/" + uuid + "/byCloudUserUuidNotStandardKind"); + public static Response findDeviceByCloudUserUuidExceptModeStandard(String uuid) { + Response resp = given().when().get(RestAssured.baseURI + "/dsm/restapi/device/" + uuid + "/byCloudUserUuidNotStandard"); resp.then().log().all(); return resp; } diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java index 814f542..7fb6695 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java @@ -176,7 +176,7 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs registerHubDevice(uuid); Thread.sleep(TIMEOUT); //rest - Response response = Rest.findDeviceByCloudUserUuidExceptKindStandard(uuid); + Response response = Rest.findDeviceByCloudUserUuidExceptModeStandard(uuid); String body = response.getBody().asString(); assertTrue(body.contains(DEVICE_DUID_HUB)); assertFalse(body.contains(DEVICE_DUID)); diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java index 702779b..b70ba65 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java @@ -74,9 +74,9 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction { assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID2, DEVICE_UNREGISTER_ACTION)); } - private void checkfindByCloudUserUuidExceptKindStandard(String uuid) { - log("checkfindByCloudUserUuidExceptModelStandard"); - Response resp = Rest.findDeviceByCloudUserUuidExceptKindStandard(uuid); + private void checkfindByCloudUserUuidExceptModeStandard(String uuid) { + log("checkfindByCloudUserUuidExceptModeStandard"); + Response resp = Rest.findDeviceByCloudUserUuidExceptModeStandard(uuid); final int size = 1; checkResponseSize(resp, size); } @@ -100,7 +100,7 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction { registerDevices(uuid); Thread.sleep(TIMEOUT); - checkfindByCloudUserUuidExceptKindStandard(uuid); + checkfindByCloudUserUuidExceptModeStandard(uuid); unregisterDevices(); deleteIoTUser(uuid); 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 6367b72..03d0cf2 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Device.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Device.java @@ -163,7 +163,7 @@ public class Device implements Serializable { private String parentUuid; @Column - private String kind; + private String mode; /** * Policy ID (FK) */ @@ -186,7 +186,7 @@ public class Device implements Serializable { */ public Device() { this.parentUuid = ""; - this.kind = ""; + this.mode = ""; } /** @@ -202,7 +202,7 @@ public class Device implements Serializable { * @param parentUuid the parent uuid */ public Device(String uuid, String name, String type, String model, Integer status, Policy policy, User user, - String parentUuid, String kind) { + String parentUuid, String mode) { super(); this.uuid = uuid; this.name = name; @@ -212,7 +212,7 @@ public class Device implements Serializable { this.policy = policy; this.user = user; this.parentUuid = (parentUuid == null) ? "" : parentUuid; - this.kind = (kind == null) ? "" : kind; + this.mode = (mode == null) ? "" : mode; } /** @@ -229,7 +229,7 @@ public class Device implements Serializable { * @param parentUuid the parent uuid */ public Device(String uuid, String name, String type, String model, Integer status, Policy policy, User user, - boolean removed, String parentUuid, String kind) { + boolean removed, String parentUuid, String mode) { super(); this.uuid = uuid; this.name = name; @@ -240,7 +240,7 @@ public class Device implements Serializable { this.user = user; this.removed = removed; this.parentUuid = (parentUuid == null) ? "" : parentUuid; - this.kind = (kind == null) ? "" : kind; + this.mode = (mode == null) ? "" : mode; } /** @@ -459,13 +459,9 @@ public class Device implements Serializable { return parentUuid; } - /** - * Gets kind. - * - * @return the kind - */ - public String getKind() { - return kind; + + public String getMode() { + return mode; } /** @@ -477,13 +473,9 @@ public class Device implements Serializable { this.parentUuid = (parentUuid == null) ? "" : parentUuid; } - /** - * Sets kind. - * - * @param kind the kind - */ - public void setKind(String kind) { - this.kind = kind; + + public void setMode(String mode) { + this.mode = mode; } @Override @@ -491,7 +483,7 @@ public class Device implements Serializable { return "Device [id=" + id + ", uuid=" + uuid + ", name=" + name + ", type=" + type + ", model=" + model + ", status=" + status + ", removed=" + removed + ", parentUuid=" + parentUuid + ", policy=" + policy + ", user=" + user - + ", kind=" + kind + + ", mode=" + mode + ", agents=" + agents + ", reports=" + reports + "]"; } diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java index 561a448..8a56f43 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java @@ -78,21 +78,12 @@ public interface DeviceRepository extends CrudRepository { List findByUserAndRemovedOrderByIdAsc(User user, boolean removed); /** - * Find by user and model is not list. - * - * @param user the user - * @param model the model - * @return the list - */ - List findByUserAndModelNotLike(User user, String model); - - /** - * Find by user and kind is not list. + * Find by user and mode is not list. * * @param user the user - * @param kind the kind + * @param mode the mode * @return the list */ - List findByUserAndKindIsNot(User user, String kind); + List findByUserAndModeIsNot(User user, String mode); } diff --git a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java index 22fa5bc..948ace6 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java @@ -98,7 +98,7 @@ public interface DeviceService extends CommonService { * @param route the route * @return {@link Device} */ - Device init(String uuid, String name, String type, String model, int status, User user, String route, String kind); + Device init(String uuid, String name, String type, String model, int status, User user, String route, String mode); /** * Remove all devices @@ -119,8 +119,6 @@ public interface DeviceService extends CommonService { */ void markNotRemoved(Set devices); - List findByUserAndModelIsNot(User user, String model); - - List findByUserAndKindIsNot(User user, String kind); + List findByUserAndModeIsNot(User user, String mode); } diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java index 70cbdfd..cacb8f9 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java @@ -111,13 +111,13 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public Device init(String uuid, String name, String type, String model, int status, User user, String parentUuid, String kind) { + public Device init(String uuid, String name, String type, String model, int status, User user, String parentUuid, String mode) { if (name.isEmpty() || uuid.isEmpty() || type.isEmpty() || model.isEmpty()) { throw new IllegalArgumentException("Cannot create device with empty fields"); } Policy policy = policyService.initPolicy(type); - 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, mode); return save(device); } @@ -142,13 +142,8 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public List findByUserAndModelIsNot(User user, String model) { - return deviceRepository.findByUserAndModelNotLike(user, model); - } - - @Override - public List findByUserAndKindIsNot(User user, String kind) { - return deviceRepository.findByUserAndKindIsNot(user, kind); + public List findByUserAndModeIsNot(User user, String mode) { + return deviceRepository.findByUserAndModeIsNot(user, mode); } } diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java b/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java index c1cc1ec..b562f6e 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java @@ -84,8 +84,8 @@ public class TestUtils { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername("admin"); String parentUuid = "parentId"; - String kind = "kind"; - return deviceService.save(new Device("uuid", "name", TYPE, "model", 1, policy, user, parentUuid, kind)); + String mode = "mode"; + return deviceService.save(new Device("uuid", "name", TYPE, "model", 1, policy, user, parentUuid, mode)); } /** @@ -97,14 +97,14 @@ public class TestUtils { public List createAndSaveDevices(boolean offline) { User user = userService.findByUsername("admin"); String parentUuid = "parentId"; - String kind = "kind"; + String mode = "mode"; List devices = new ArrayList<>(); for (int i = 0; i < DEVICES_COUNT; i++) { devices.add(deviceService.save( new Device("uuid" + i, "name" + i, TYPE, "model" + i, offline ? 0 : 1, - policyService.initPolicy(TYPE), user, false, parentUuid, kind))); + policyService.initPolicy(TYPE), user, false, parentUuid, mode))); } return devices; 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 767de4a..ef3a55c 100644 --- 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", "mode"), + new Device("uuid2", NAME2, "tv", "model2", 1, new Policy(), new User(), "parentUuid", "mode")) .usingGetClass().verify(); forClass(Policy.class).usingGetClass().verify(); diff --git a/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java b/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java index f7b02d1..f18a0b4 100644 --- a/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java @@ -56,7 +56,7 @@ public class IncreaseCoverageTest { device.getReports(); device.setRemoved(true); device.isRemoved(); - assertEquals("Device [id=null, uuid=null, name=null, type=null, model=null, status=null, removed=true, parentUuid=, policy=null, user=null, kind=, agents=null, reports=null]", device + assertEquals("Device [id=null, uuid=null, name=null, type=null, model=null, status=null, removed=true, parentUuid=, policy=null, user=null, mode=, agents=null, reports=null]", device .toString()); new Device(null, null, null, null, null, null, null, null, null); diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java index 85040e2..f5703e4 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java @@ -104,7 +104,7 @@ public class DeviceTest { */ @Test public void testDeviceConstructor() { - Device device = new Device(uuid, name, type, model, status, policy, user, "route", "kind"); + Device device = new Device(uuid, name, type, model, status, policy, user, "route", "mode"); assertEquals(uuid, device.getUuid()); assertEquals(name, device.getName()); @@ -120,7 +120,7 @@ public class DeviceTest { */ @Test public void testSetters() { - Device device = new Device("uuid", "name", "type", "model", 0, policy, user, "route", "kind"); + Device device = new Device("uuid", "name", "type", "model", 0, policy, user, "route", "mode"); device.setUuid(uuid); device.setName(name); 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 32f22ab..d2c5a2d 100644 --- 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", "mode"); 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", "mode"); 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 f39d7fd..e31ba63 100644 --- 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", "mode"); device1.setAgents(createAgents(device1)); Device device2 = new Device("uuid2", "name2", TYPE, "model", 1, policyService - .initPolicy(TYPE), user, "parentUuid", "kind"); + .initPolicy(TYPE), user, "parentUuid", "mode"); 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", "mode"); 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/DeviceServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java index 74b4005..8ae7667 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java @@ -76,7 +76,7 @@ public class DeviceServiceTest { private static final String IN_EXISTENT_UUID = "in-existent-uuid"; - private static final String KIND = "standard"; + private static final String MODE = "standard"; private User user; @@ -104,13 +104,13 @@ public class DeviceServiceTest { @Before public void before() { user = userService.getUserByEmail("admin@samsung.com"); - Device device = new Device(DEVICE_UUID, NAME, TYPE, MODEL, 1, policyService.initPolicy(TYPE), user, PARENT_UUID, KIND); + Device device = new Device(DEVICE_UUID, NAME, TYPE, MODEL, 1, policyService.initPolicy(TYPE), user, PARENT_UUID, MODE); device.setReports(createReports(device)); device.setAgents(createAgents(device)); deviceService.save(device); deviceService.save(new Device(DEVICE_UUID_WITHOUT_AGENTS, "name2", TYPE, MODEL, 1, policyService - .initPolicy(TYPE), user, PARENT_UUID, KIND)); + .initPolicy(TYPE), user, PARENT_UUID, MODE)); // Alone agent. No device. agentService.save(new Agent("789", "agent3", policyService.initPolicy(TYPE))); @@ -189,7 +189,7 @@ public class DeviceServiceTest { @Test public void testSave() { Policy policy = policyService.initPolicy(TYPE); - Device newDevice = new Device(NEWUUID, NEWNAME, NEWTYPE, NEWMODEL, 0, policy, user, PARENT_UUID, KIND); + Device newDevice = new Device(NEWUUID, NEWNAME, NEWTYPE, NEWMODEL, 0, policy, user, PARENT_UUID, MODE); Device savedDevice = deviceService.save(newDevice); @@ -204,7 +204,7 @@ public class DeviceServiceTest { public void testRemove() { Policy policy = policyService.initPolicy(TYPE); Device newDevice = deviceService - .save(new Device(NEWUUID, NEWNAME, NEWTYPE, NEWMODEL, 0, policy, user, false, PARENT_UUID, KIND)); + .save(new Device(NEWUUID, NEWNAME, NEWTYPE, NEWMODEL, 0, policy, user, false, PARENT_UUID, MODE)); deviceService.remove(deviceService.findById(newDevice.getId())); assertNull(deviceService.findById(newDevice.getId())); } @@ -310,10 +310,10 @@ public class DeviceServiceTest { @Test public void testInit() throws Exception { String route = ROUTE; - String kind = KIND; + String mode = MODE; String initUuid = "inituuid"; assertEquals(2, deviceService.count()); - deviceService.init(initUuid, "initname", "inittype", "initmodel", 0, user, route, kind); + deviceService.init(initUuid, "initname", "inittype", "initmodel", 0, user, route, mode); assertEquals(DEVICE_COUNT, deviceService.count()); Device initedDevice = deviceService.findByUUID(initUuid); @@ -329,10 +329,10 @@ public class DeviceServiceTest { @Test public void testSameInit() throws Exception { String route = ROUTE; - String kind = KIND; + String mode = MODE; String initUuid = "init-uuid"; assertEquals(2, deviceService.count()); - deviceService.init(initUuid, "init-name", "init-type", "init-model", 0, user, route, kind); + deviceService.init(initUuid, "init-name", "init-type", "init-model", 0, user, route, mode); assertEquals(DEVICE_COUNT, deviceService.count()); Device initializedDevice = deviceService.findByUUID(initUuid); @@ -340,7 +340,7 @@ public class DeviceServiceTest { assertNotNull(initializedDevice.getPolicy()); try { - deviceService.init(initUuid, "duplicate-name", "duplicate-type", "duplicate-model", 0, user, route, kind); + deviceService.init(initUuid, "duplicate-name", "duplicate-type", "duplicate-model", 0, user, route, mode); fail(); } catch (Exception e) { @@ -376,7 +376,7 @@ public class DeviceServiceTest { */ @Test(expected = Exception.class) public void testDeviceNameIsEmpty() throws Exception { - deviceService.init(DEVICE_UUID, "", TYPE, MODEL, 0, new User(), ROUTE, KIND); + deviceService.init(DEVICE_UUID, "", TYPE, MODEL, 0, new User(), ROUTE, MODE); } /** @@ -386,7 +386,7 @@ public class DeviceServiceTest { */ @Test(expected = Exception.class) public void testDeviceUuidIsEmpty() throws Exception { - deviceService.init("", NAME, TYPE, MODEL, 0, new User(), ROUTE, KIND); + deviceService.init("", NAME, TYPE, MODEL, 0, new User(), ROUTE, MODE); } /** @@ -396,7 +396,7 @@ public class DeviceServiceTest { */ @Test(expected = Exception.class) public void testDeviceTypeIsEmpty() throws Exception { - deviceService.init(DEVICE_UUID, NAME, "", MODEL, 0, new User(), ROUTE, KIND); + deviceService.init(DEVICE_UUID, NAME, "", MODEL, 0, new User(), ROUTE, MODE); } /** @@ -406,6 +406,6 @@ public class DeviceServiceTest { */ @Test(expected = Exception.class) public void testDeviceModelIsEmpty() throws Exception { - deviceService.init(DEVICE_UUID, NAME, TYPE, "", 0, new User(), ROUTE, KIND); + deviceService.init(DEVICE_UUID, NAME, TYPE, "", 0, new User(), ROUTE, MODE); } } \ No newline at end of file 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 27f4e68..cc15b21 100644 --- 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", "mode"); List 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", "mode")); Policy findingPolicy = policyService.findByDeviceId(newDevice.getId()); assertNotNull(findingPolicy); policyService.remove(findingPolicy); diff --git a/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java index 37b975f..4cb8c9a 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java @@ -76,7 +76,7 @@ public class ReportServiceTest { private static final String ADMIN = "admin"; - private static final String KIND = "kind"; + private static final String MODE = "mode"; @Autowired private ReportService reportService; @@ -114,7 +114,7 @@ public class ReportServiceTest { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, MODE)); ReportType reportType = reportTypeService.findByName(ReportType.Type.SMACK.toString()); reportService.save(new Report(reportType, SMACK_REPORT, DATE, STATUS, device)); List reports = reportService.findReportsByType(reportType); @@ -131,7 +131,7 @@ public class ReportServiceTest { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, MODE)); ReportType reportType = reportTypeService.findByName(ReportType.Type.SMACK.toString()); reportService.save(new Report(reportType, SMACK_REPORT, DATE, STATUS, device)); List reports = reportService.findReportsByResult(STATUS); @@ -148,7 +148,7 @@ public class ReportServiceTest { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, MODE)); ReportType reportType = reportTypeService.findByName(ReportType.Type.SMACK.toString()); reportService.save(new Report(reportType, SMACK_REPORT, DATE, STATUS, device)); List reports = reportService.findReportsByDateBetween(new Date(), new Date()); @@ -166,7 +166,7 @@ public class ReportServiceTest { User user = userService.findByUsername(ADMIN); Policy policy = policyService.initPolicy(TYPE); Integer status = 1; - long deviceId = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, status, policy, user, PARENT_ID, KIND)) + long deviceId = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, status, policy, user, PARENT_ID, MODE)) .getId(); Report saved = reportService.save(deviceId, DAC, DATE, status, report); @@ -254,7 +254,7 @@ public class ReportServiceTest { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, MODE)); ReportType type1 = reportTypeService.findByName(DAC); for (int i = 0; i < REPORT_COUNT; i++) { @@ -307,7 +307,7 @@ public class ReportServiceTest { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); int status = 1; - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, status, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, status, policy, user, PARENT_UUID, MODE)); ReportType type = reportTypeService.findByName(DAC); Report report = reportService.save(new Report(type, "report", DATE, status, device)); return Params.create(device, report); @@ -364,7 +364,7 @@ public class ReportServiceTest { public void testGetDeviceReportTypes() { Policy policy = policyService.initPolicy(TYPE); User user = userService.findByUsername(ADMIN); - Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, KIND)); + Device device = deviceService.save(new Device(UUID, NAME, TYPE, MODEL, STATUS, policy, user, PARENT_UUID, MODE)); ReportType type1 = reportTypeService.findByName(DAC); ReportType type2 = reportTypeService.findByName(SMACK); ReportType type3 = reportTypeService.findByName("syscall"); diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java index eb51ea0..7d690b3 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java @@ -108,25 +108,17 @@ public class DeviceApi { } /** - * Find by cloud user uuid except model standard response entity. + * Find by cloud user uuid except mode standard response entity. * * @param iotCloudUserUuId the iot cloud user uu id * @return the response entity */ @Deprecated @RequestMapping(value = "/{iotCloudUserUuId}/byCloudUserUuidNotStandard") - public ResponseEntity> findByCloudUserUuidExceptModelStandard(@PathVariable String iotCloudUserUuId) { + public ResponseEntity> findByCloudUserUuidExceptModeStandard(@PathVariable String iotCloudUserUuId) { User user = ofNullable(iotCloudService.findAssociatedUserByUuid(iotCloudUserUuId)) .orElseThrow(IotCloudAssociatedUserNotExists::new); - return new ResponseEntity<>(deviceConverter.convert(deviceService.findByUserAndKindIsNot(user, "standard")), OK); + return new ResponseEntity<>(deviceConverter.convert(deviceService.findByUserAndModeIsNot(user, "standard")), OK); } - @RequestMapping(value = "/{iotCloudUserUuId}/byCloudUserUuidNotStandardKind") - public ResponseEntity> findByCloudUserUuidExceptKindStandard(@PathVariable String iotCloudUserUuId) { - User user = ofNullable(iotCloudService.findAssociatedUserByUuid(iotCloudUserUuId)) - .orElseThrow(IotCloudAssociatedUserNotExists::new); - return new ResponseEntity<>(deviceConverter.convert(deviceService.findByUserAndKindIsNot(user, "standard")), OK); - } - - } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/EqualsHashCodeTest.java b/servers/dsm/src/test/java/com/samsung/dsm/EqualsHashCodeTest.java index 04af99e..30fc87c 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/EqualsHashCodeTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/EqualsHashCodeTest.java @@ -65,7 +65,7 @@ public class EqualsHashCodeTest { PolicyConfig.PolicyGroup.Policy[] policies = { new PolicyConfig.PolicyGroup.Policy(NAME, 1, new String[] { "as" }) }; - Device device = new Device(UUID, NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "kind"); + Device device = new Device(UUID, NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "mode"); device.setId(1L); ViewPolicyGroup viewPolicyGroup1 = new ViewPolicyGroup(new PolicyConfig.PolicyGroup(NAME, policies)); diff --git a/servers/dsm/src/test/java/com/samsung/dsm/IncreaseCoverageTest.java b/servers/dsm/src/test/java/com/samsung/dsm/IncreaseCoverageTest.java index 5529cab..889d052 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/IncreaseCoverageTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/IncreaseCoverageTest.java @@ -192,7 +192,7 @@ public class IncreaseCoverageTest { } private static void viewDevice() { - Device device = new Device("uuid", NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "kind"); + Device device = new Device("uuid", NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "mode"); device.setId(1L); ViewDevice viewDevice = new ViewDevice(device); diff --git a/servers/dsm/src/test/java/com/samsung/dsm/ToStringTest.java b/servers/dsm/src/test/java/com/samsung/dsm/ToStringTest.java index fcdb55f..6b8a24d 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/ToStringTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/ToStringTest.java @@ -72,7 +72,7 @@ public class ToStringTest { deviceStatusView.setStatus("status"); deviceStatusView.setStatusText("status text"); - Device device = new Device(UUID, NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "kind"); + Device device = new Device(UUID, NAME, "type", "model", 1, new Policy(), new User(), "parentUuid", "mode"); device.setId(1L); PolicyConfig.PolicyGroup.Policy[] policies = { diff --git a/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewDeviceTest.java b/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewDeviceTest.java index 7e094af..9239fae 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewDeviceTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewDeviceTest.java @@ -22,7 +22,7 @@ public class ViewDeviceTest { */ @Test public void getViewDevicesList() { - Device device = new Device("uuid", "name", "tv", "model", 1, new Policy(), new User(), "parentUuid", "kind"); + Device device = new Device("uuid", "name", "tv", "model", 1, new Policy(), new User(), "parentUuid", "mode"); device.setId(1L); List devices = new ArrayList<>(); diff --git a/servers/dsm/src/test/java/com/samsung/dsm/rest/DeviceApiTest.java b/servers/dsm/src/test/java/com/samsung/dsm/rest/DeviceApiTest.java index e91172f..ac28ecd 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/rest/DeviceApiTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/rest/DeviceApiTest.java @@ -46,7 +46,7 @@ public class DeviceApiTest { private static final String PARENT_UUID = "parentUuid"; - private static final String KIND = "kind"; + private static final String MODE = "mode"; private static final String ROOT_URL = "/restapi"; @@ -82,7 +82,7 @@ public class DeviceApiTest { // Device with agent Device device = new Device("1234", "s8", "phone", "samsung s8 edge", 1, policyService - .initPolicy("phone"), user, PARENT_UUID, KIND); + .initPolicy("phone"), user, PARENT_UUID, MODE); List agents = new ArrayList<>(); Agent agent = new Agent("5678", "name1", policyService.initPolicy("phone")); @@ -93,13 +93,13 @@ public class DeviceApiTest { devices.add(deviceService.save(device)); devices.add(deviceService.save(new Device("1235", "s4", "phone", "samsung s7 edge", 1, policyService - .initPolicy("phone"), user, PARENT_UUID, KIND))); + .initPolicy("phone"), user, PARENT_UUID, MODE))); devices.add(deviceService .save(new Device("1236", "airconditioner samsung", "airconditioner", "AR12JSFSRWK", 1, policyService - .initPolicy("airconditioner"), user, false, PARENT_UUID, KIND))); + .initPolicy("airconditioner"), user, false, PARENT_UUID, MODE))); devices.add(deviceService .save(new Device("1237", "vacuum cleaner samsung", "vacuum cleaner", "FY128192JJJ", 1, policyService - .initPolicy("vacuum cleaner"), user, true, PARENT_UUID, KIND))); + .initPolicy("vacuum cleaner"), user, true, PARENT_UUID, MODE))); // User without devices userService.save(new User("another", "another@samsung.com", false, new Date(), roleService.findById(1L))); 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 35d3174..0eab960 100644 --- 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", "mode"); List agents = new ArrayList<>(); agent = new Agent("5678", "name1", policyService.initPolicy("phone")); agent.setDevice(device); diff --git a/servers/dsm/src/test/java/com/samsung/dsm/rest/ReportApiTest.java b/servers/dsm/src/test/java/com/samsung/dsm/rest/ReportApiTest.java index 306541a..1c110bd 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/rest/ReportApiTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/rest/ReportApiTest.java @@ -173,11 +173,11 @@ public class ReportApiTest { User user = userService.findByUsername("admin"); Device device = new Device("1234", "s4", "phone", "samsung s7 edge", 1, policyService - .initPolicy("phone"), user, "parentUuid", "kind"); + .initPolicy("phone"), user, "parentUuid", "mode"); deviceService.save(device); Device deviceForAudit = new Device("4321", "s4", "phone", "samsung s7 edge", 1, policyService - .initPolicy("phone"), user, "parentUuid", "kind"); + .initPolicy("phone"), user, "parentUuid", "mode"); deviceService.save(deviceForAudit); ReportType reportType = reportTypeRepository.findByType(ReportType.Type.DAC.toString()); @@ -299,7 +299,7 @@ public class ReportApiTest { public void reportByDeviceUUIDOkForAuditTrail() throws Exception { User user = userService.findByUsername("admin"); Device deviceForAuditTrail = new Device("111111111", "s4", "phone", "samsung s7 edge", 1, policyService - .initPolicy("phone"), user, "parentUuid", "kind"); + .initPolicy("phone"), user, "parentUuid", "mode"); deviceService.save(deviceForAuditTrail); // SMACK saveSmackReports(deviceForAuditTrail); diff --git a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractorTest.java b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractorTest.java index 88c6859..9796112 100644 --- a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractorTest.java +++ b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractorTest.java @@ -74,11 +74,11 @@ public class DeviceUnRegistrationPostDataExtractorTest { @Test public void testExtractorDelete() throws Exception { String route = "route"; - String kind = "kind"; + String mode = "mode"; Policy policy = policyService.initPolicy(TYPE); policy = policyService.save(policy); User user = userService.getUserByEmail("admin@samsung.com"); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, kind); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, mode); deviceService.save(device); Cbor> cbor = new Cbor<>(); HashMap map = new HashMap<>(); @@ -102,11 +102,11 @@ public class DeviceUnRegistrationPostDataExtractorTest { @Test public void testExtractorUnregistrated() throws Exception { String route = "route"; - String kind = "kind"; + String mode = "mode"; Policy policy = policyService.initPolicy(TYPE); policy = policyService.save(policy); User user = userService.getUserByEmail("admin@samsung.com"); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, kind); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, mode); deviceService.save(device); Cbor> cbor = new Cbor<>(); HashMap map = new HashMap<>(); diff --git a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractorTest.java b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractorTest.java index 29d48e9..e231f2d 100644 --- a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractorTest.java +++ b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractorTest.java @@ -34,7 +34,7 @@ import com.samsung.servermq.utils.rest.ServerSender; @EnableAutoConfiguration public class PolicyPostDataExtractorTest { - private static final String KIND = "kind"; + private static final String MODE = "mode"; private static final String ROUTE = "route"; private static final String ADMIN_EMAIL = "admin@samsung.com"; private static final String DUID = "testuuid"; @@ -71,7 +71,7 @@ public class PolicyPostDataExtractorTest { public void testExtractorWithoutAgent() { Policy policy = policyService.initPolicy(TYPE); User user = userService.getUserByEmail(ADMIN_EMAIL); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, KIND); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, MODE); deviceService.save(device); assertNotNull(deviceService.findByUUID(DUID)); Cbor> cbor = new Cbor<>(); @@ -98,7 +98,7 @@ public class PolicyPostDataExtractorTest { String testAgentName = "Test Agent"; Policy policy = policyService.initPolicy(TYPE); User user = userService.getUserByEmail(ADMIN_EMAIL); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, KIND); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, MODE); deviceService.save(device); agentService.init(testAgentUuid, testAgentName, device); assertNotNull(deviceService.findByUUID(DUID)); @@ -125,7 +125,7 @@ public class PolicyPostDataExtractorTest { public void testExtractorWithException() throws Exception { Policy policy = policyService.initPolicy(TYPE); User user = userService.getUserByEmail(ADMIN_EMAIL); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, KIND); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, MODE); deviceService.save(device); assertNotNull(deviceService.findByUUID(DUID)); Cbor> cbor = new Cbor<>(); @@ -151,7 +151,7 @@ public class PolicyPostDataExtractorTest { public void testExtractorWithEmptyAgent() throws Exception { Policy policy = policyService.initPolicy(TYPE); User user = userService.getUserByEmail(ADMIN_EMAIL); - Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, KIND); + Device device = new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, ROUTE, MODE); deviceService.save(device); assertNotNull(deviceService.findByUUID(DUID)); Cbor> cbor = new Cbor<>(); diff --git a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractorTest.java b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractorTest.java index 308011a..fe9ea0b 100644 --- a/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractorTest.java +++ b/servers/mq/src/test/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractorTest.java @@ -68,10 +68,10 @@ public class ReportPostDataExtractorTest { @Test public void testExtractor() throws Exception { String route = "route"; - String kind = "kind"; + String mode = "mode"; Policy policy = policyService.initPolicy(TYPE); User user = userService.getUserByEmail("admin@samsung.com"); - Device device = deviceService.save(new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, kind)); + Device device = deviceService.save(new Device(DUID, NAME, TYPE, MODEL, STATUS, policy, user, route, mode)); assertNotNull(deviceService.findByUUID(DUID)); Cbor> cbor = new Cbor<>(); HashMap map = new HashMap<>(); -- 2.7.4