From: Yevhen Zozulia Date: Mon, 21 Aug 2017 11:03:28 +0000 (+0300) Subject: Revert "[SECIOTSRK-409] Tests coverage. Continue" X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50555b062d9818c3e55360d68dd1f460d765030b;p=platform%2Fcore%2Fsecurity%2Fsuspicious-activity-monitor.git Revert "[SECIOTSRK-409] Tests coverage. Continue" This reverts commit 1bf6813202146c4786854e3d7bb7783bf4a593e1. --- diff --git a/servers/commons/src/main/java/com/samsung/commons/service/CommonCrudService.java b/servers/commons/src/main/java/com/samsung/commons/service/CommonCrudService.java index 4bb6d9a..d982e9e 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/CommonCrudService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/CommonCrudService.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.List; /** - * Default implementation of basic Create, Read, Delete operations + * Default implementation of basic CRUD operations * * @param type of Entity * @param type of ID of Entity 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 84b2add..10c5ea6 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 @@ -21,7 +21,14 @@ import java.util.Set; * @see Device * @since 2017-06-26 */ -public interface DeviceService { +public interface DeviceService extends CommonService { + /** + * Service method provides getting List of all devices in DB. + * + * @return List<{@link Device}> containing all devices in DB. + */ + List getAll(); + /** * Service method returns Device by UUID in DB. * @@ -82,6 +89,11 @@ public interface DeviceService { Device init(String uuid, String name, String type, String model, int status, User user, String route); /** + * Remove all devices + */ + void removeAll(); + + /** * Remove all specified devices * * @param devices devices diff --git a/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java b/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java index 960993e..82452fb 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java @@ -20,7 +20,7 @@ import java.util.List; * @see Report * @since 2016-09-01 */ -public interface ReportService { +public interface ReportService extends CommonService { /** * Service method saves report. * @@ -59,6 +59,12 @@ public interface ReportService { List findReportsByDeviceUuid(String deviceUuid); /** + * Find all reports + */ + List findAll(); + + + /** * Service method provides getting Smart Security report by Device id. * * @param deviceId id of Device @@ -68,4 +74,9 @@ public interface ReportService { * @param report report */ Report saveReport(long deviceId, String type, String date, int result, String report); + + /** + * Remove all + */ + void removeAll(); } 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 c494b42..69e60e6 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 @@ -9,7 +9,6 @@ import com.samsung.commons.domain.Agent; import com.samsung.commons.domain.Device; import com.samsung.commons.domain.User; import com.samsung.commons.repository.DeviceRepository; -import com.samsung.commons.service.CommonCrudService; import com.samsung.commons.service.DeviceService; import com.samsung.commons.service.PolicyService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,42 +27,49 @@ import java.util.Set; * @since 2017-06-26 */ @Service("deviceService") -public class DeviceServiceImpl extends CommonCrudService implements DeviceService { +public class DeviceServiceImpl implements DeviceService { + @Autowired private DeviceRepository deviceRepository; @Autowired private PolicyService policyService; - /** - * Provide CRUD repository - * - * @param repository CRUD repo - */ - public DeviceServiceImpl(DeviceRepository repository) { - super(repository); + @Override + public Device findById(Long id) { + return deviceRepository.findOne(id); + } - this.deviceRepository = repository; + @Override + public List getAll() { + return (List) deviceRepository.findAll(); } @Override - public Device findByUUID(String uuid) { - return deviceRepository.findByUuid(uuid); + public long count() { + return deviceRepository.count(); } @Override - public List findByUser(User user) { - return deviceRepository.findByUserAndRemovedOrderByIdAsc(user, false); + public Device save(Device device) { + device = deviceRepository.save(device); + + return device; } @Override - public List findUserDevicesByType(long userId, String type) { - return deviceRepository.findByUserIdAndType(userId, type); + public void remove(Device device) { + deviceRepository.delete(device); } @Override - public List findUserDevicesByStatus(long userId, int status) { - return deviceRepository.findByUserIdAndStatus(userId, status); + public Device findByUUID(String uuid) { + return deviceRepository.findByUuid(uuid); + } + + @Override + public List findByUser(User user) { + return deviceRepository.findByUserAndRemovedOrderByIdAsc(user, false); } @Override @@ -81,13 +87,18 @@ public class DeviceServiceImpl extends CommonCrudService implement agent.setDevice(device); device.getAgents().add(agent); - return save(device); + return deviceRepository.save(device); + } + + @Override + public void removeAll() { + deviceRepository.deleteAll(); } @Override public void remove(Set devices) { for (Device device : devices) { - delete(device); + remove(device); } } @@ -99,4 +110,14 @@ public class DeviceServiceImpl extends CommonCrudService implement return save(new Device(uuid, name, type, model, status, policyService.initPolicy(route), user)); } + + @Override + public List findUserDevicesByStatus(long userId, int status) { + return deviceRepository.findByUserIdAndStatus(userId, status); + } + + @Override + public List findUserDevicesByType(long userId, String type) { + return deviceRepository.findByUserIdAndType(userId, type); + } } diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java index e30f861..c0612e0 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java @@ -11,7 +11,6 @@ import com.samsung.commons.domain.ReportType; import com.samsung.commons.repository.DeviceRepository; import com.samsung.commons.repository.ReportRepository; import com.samsung.commons.repository.ReportTypeRepository; -import com.samsung.commons.service.CommonCrudService; import com.samsung.commons.service.ReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,8 +27,9 @@ import java.util.List; * @since 2016-09-01 */ @Service("reportService") -public class ReportServiceImpl extends CommonCrudService implements ReportService { +public class ReportServiceImpl implements ReportService { + @Autowired private ReportRepository reportRepository; @Autowired @@ -38,21 +38,14 @@ public class ReportServiceImpl extends CommonCrudService implement @Autowired private DeviceRepository deviceRepository; - /** - * Provide CRUD repository - * - * @param repository CRUD repo - */ - public ReportServiceImpl(ReportRepository repository) { - super(repository); - - this.reportRepository = repository; + @Override + public Report save(Report t) { + t.setReport(strip(t.getReport())); + return reportRepository.save(t); } - @Override - public Report save(Report report) { - report.setReport(strip(report.getReport())); - return reportRepository.save(report); + private String strip(String str){ + return str.replace("\n", "").replace("\b", "").replace("\t", "").replace("\r", ""); } @Override @@ -67,15 +60,18 @@ public class ReportServiceImpl extends CommonCrudService implement } @Override - public Report saveReport(long deviceId, String type, String date, int result, String report) { - Report deviceReport = findReport(deviceId, ReportType.Type.getType(type)); + public void remove(Report report) { + reportRepository.delete(report); + } - if (deviceReport == null) { - return save(deviceId, type, date, result, report); - } else { - deviceReport.setReport(report); - return save(deviceReport); - } + @Override + public Report findById(Long id) { + return reportRepository.findOne(id); + } + + @Override + public long count() { + return reportRepository.count(); } @Override @@ -93,7 +89,25 @@ public class ReportServiceImpl extends CommonCrudService implement return reportRepository.findByDeviceUuid(deviceUuid); } - private String strip(String str){ - return str.replace("\n", "").replace("\b", "").replace("\t", "").replace("\r", ""); + @Override + public List findAll() { + return (List) reportRepository.findAll(); + } + + @Override + public Report saveReport(long deviceId, String type, String date, int result, String report) { + Report deviceReport = findReport(deviceId, ReportType.Type.getType(type)); + + if (deviceReport == null) { + return save(deviceId, type, date, result, report); + } else { + deviceReport.setReport(report); + return save(deviceReport); + } + } + + @Override + public void removeAll() { + reportRepository.deleteAll(); } } \ No newline at end of file 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 20b9650..9cb3258 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 @@ -17,7 +17,6 @@ import com.samsung.commons.domain.Device; import com.samsung.commons.domain.Policy; import com.samsung.commons.domain.User; import com.samsung.commons.service.impl.AgentServiceImpl; -import com.samsung.commons.service.impl.DeviceServiceImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -57,7 +56,7 @@ public class AgentServiceTest { private UserService userService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; private Agent agent; @@ -79,7 +78,7 @@ public class AgentServiceTest { @After public void after() { - deviceService.deleteAll(); + deviceService.removeAll(); agentService.deleteAll(); } 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 25c2c04..e592130 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 @@ -3,7 +3,6 @@ package com.samsung.commons.service; import com.samsung.commons.domain.*; import com.samsung.commons.repository.ReportTypeRepository; import com.samsung.commons.service.impl.AgentServiceImpl; -import com.samsung.commons.service.impl.DeviceServiceImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,7 +54,7 @@ public class DeviceServiceTest { private UserService userService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private PolicyService policyService; @@ -86,7 +85,7 @@ public class DeviceServiceTest { @After public void after() { - deviceService.deleteAll(); + deviceService.removeAll(); // Some agents aren't bound to device (so need to delete'em separately) agentService.deleteAll(); @@ -110,6 +109,11 @@ public class DeviceServiceTest { } @Test + public void testGetAll() { + assertEquals(deviceService.getAll().size(), 2); + } + + @Test public void testSave() { String route = "route"; Policy policy = policyService.initPolicy(route); @@ -122,10 +126,35 @@ public class DeviceServiceTest { } @Test + public void testRemove() { + Policy policy = policyService.initPolicy("route"); + Device newDevice = deviceService.save(new Device("newuuid", "newname", "newtype", "newmodel", 0, policy, user)); + deviceService.remove(deviceService.findById(newDevice.getId())); + assertNull(deviceService.findById(newDevice.getId())); + } + + // Just to increase coverage + // Must remove all without exceptions + @Test + public void testRemoveAll() { + Device saved = deviceService.save(new Device("some_uuid", "name", "type", "model", 1, policyService.initPolicy("route"), user)); + + HashSet devices = new HashSet<>(); + devices.add(saved); + + deviceService.remove(devices); + } + + @Test public void testFindByUUID() { assertEquals(DEVICE_UUID, deviceService.findByUUID(DEVICE_UUID).getUuid()); } + @Test + public void testCount() { + assertEquals(deviceService.count(), 2); + } + @Test(expected = IllegalArgumentException.class) public void testAddAgentToNotFoundDevice() { deviceService.setDeviceAgents(UNEXISTENT_UUID, new Agent()); @@ -152,7 +181,7 @@ public class DeviceServiceTest { @Test public void testAgentsAndReportsMustBeRemovedWithDevice() { - deviceService.delete(deviceService.findByUUID(DEVICE_UUID)); + deviceService.remove(deviceService.findByUUID(DEVICE_UUID)); // Device removed assertNull(deviceService.findByUUID(DEVICE_UUID)); @@ -195,8 +224,10 @@ public class DeviceServiceTest { try { deviceService.init(initUuid, "duplikatename", "duplikatetype", "duplikatemodel", 0, user, "route"); + } catch (Exception e) { + throw e; } finally { - deviceService.delete(initedDevice); + deviceService.remove(initedDevice); } } 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 0300171..9ed2eae 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 @@ -5,7 +5,6 @@ import com.samsung.commons.domain.Device; import com.samsung.commons.domain.Policy; import com.samsung.commons.domain.User; import com.samsung.commons.service.impl.AgentServiceImpl; -import com.samsung.commons.service.impl.DeviceServiceImpl; import com.samsung.commons.service.impl.PolicyServiceImpl; import org.junit.After; import org.junit.Before; @@ -49,7 +48,7 @@ public class PolicyServiceTest { private PolicyServiceImpl policyService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private AgentServiceImpl agentService; @@ -85,7 +84,7 @@ public class PolicyServiceTest { @After public void after() { - deviceService.delete(device); + deviceService.remove(device); agentService.delete(agent); } @@ -128,7 +127,7 @@ public class PolicyServiceTest { assertNotNull(policyService.findByDeviceId(newDevice.getId())); policyService.delete(policyService.findByDeviceId(newDevice.getId())); assertEquals("", policyService.findByDeviceId(newDevice.getId()).getPolicy()); - deviceService.delete(newDevice); + deviceService.remove(newDevice); assertNull(policyService.findOne(policy.getId())); } diff --git a/servers/commons/src/test/java/com/samsung/commons/service/ReportServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/ReportServiceTest.java index bf56f85..9367333 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/ReportServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/ReportServiceTest.java @@ -16,8 +16,6 @@ import com.samsung.commons.domain.Device; import com.samsung.commons.domain.Report; import com.samsung.commons.domain.ReportType; import com.samsung.commons.repository.ReportTypeRepository; -import com.samsung.commons.service.impl.DeviceServiceImpl; -import com.samsung.commons.service.impl.ReportServiceImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,10 +44,10 @@ import static org.hamcrest.core.IsNot.not; public class ReportServiceTest { @Autowired - private ReportServiceImpl reportService; + private ReportService reportService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private UserService userService; @@ -64,26 +62,31 @@ public class ReportServiceTest { private ReportType reportType; + private Report report; private static final long NON_EXISTENT_ID = 42L; @Before public void before() { - device = deviceService.save(new Device("uuid", "name", "type", "model", 1, - policyService.initPolicy("policy"), userService.findUserByEmail("admin@samsung.com"))); - - reportType = reportTypeRepository.findByType(SIM.type); - - reportService.save(new Report(reportType, "report", "date", 0, device)); + device = new Device("uuid", "name", "type", "model", 1, + policyService.initPolicy("policy"), userService.findUserByEmail("admin@samsung.com")); + deviceService.save(device); + reportType = reportTypeRepository.findByType(ReportType.Type.SIM.type); + report = reportService.save(new Report(reportType, "report", "date", 0, device)); } @After public void after() { - deviceService.deleteAll(); + deviceService.removeAll(); + } + + @Test + public void test_Save() { + assertThat(reportService.save(device.getId(), SMART_SECURITY.type, "date", 1, "report"), is(notNullValue())); } @Test - public void saveNewOrSaveForFound() { + public void test_Save_Report() { // Report was found assertThat(reportService.saveReport(device.getId(), SIM.type, "date", 1, "report"), is(notNullValue())); @@ -92,24 +95,52 @@ public class ReportServiceTest { } @Test(expected = IllegalArgumentException.class) - public void saveReportWrongDeviceId() { + public void test_Save_Report_Wrong_Device_Id() { reportService.saveReport(NON_EXISTENT_ID, SMART_SECURITY.type, null, 0, null); } @Test - public void findReportsByDeviceId() { + public void test_Find_Report_By_Id() { + assertThat(reportService.findById(report.getId()), is(notNullValue())); + assertThat(reportService.findById(NON_EXISTENT_ID), is(nullValue())); + } + + @Test + public void test_Find_Reports_By_Device_Id() { assertThat(reportService.findReportsByDeviceId(device.getId()), is(not(empty()))); assertThat(reportService.findReportsByDeviceId(NON_EXISTENT_ID), is(empty())); } @Test - public void findByDidAndType() { - assertThat(reportService.findReport(device.getId(), SIM), is(notNullValue())); + public void test_Find_Report_By_Did_And_Type() { + assertThat(reportService.findReport(device.getId(), ReportType.Type.SIM), is(notNullValue())); + } + + @Test + public void test_Find_Report_By_Did_And_Type_Negative() { + assertThat(reportService.findReport(device.getId(), ReportType.Type.SMACK), is(nullValue())); + assertThat(reportService.findReport(NON_EXISTENT_ID, ReportType.Type.SIM), is(nullValue())); + } + + @Test + public void test_FindAll() { + assertThat(reportService.findAll().size(), is(1)); + } + + @Test + public void test_Remove() { + reportService.remove(report); + assertThat(reportService.findAll(), is(empty())); + } + + @Test + public void test_RemoveAll() { + reportService.removeAll(); + assertThat(reportService.findAll(), is(empty())); } @Test - public void findByDidAndTypeNegative() { - assertThat(reportService.findReport(device.getId(), SMACK), is(nullValue())); - assertThat(reportService.findReport(NON_EXISTENT_ID, SIM), is(nullValue())); + public void test_Count() { + assertThat(reportService.count(), is(1L)); } } diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java index fcb5407..4d07169 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java @@ -10,7 +10,6 @@ import java.security.Principal; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import com.samsung.commons.service.impl.DeviceServiceImpl; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -29,6 +28,7 @@ import com.samsung.commons.domain.Policy; import com.samsung.commons.domain.User; import com.samsung.commons.model.MQPolicy; import com.samsung.commons.service.AgentService; +import com.samsung.commons.service.DeviceService; import com.samsung.commons.service.PolicyService; import com.samsung.commons.service.ReportService; import com.samsung.commons.service.UserService; @@ -39,8 +39,6 @@ import com.samsung.dsm.policy.parser.PolicyConfigParser; import com.samsung.dsm.policy.parser.PolicyParserFactory; import com.samsung.dsm.rest.mq.MQSenderImpl; -import static com.samsung.dsm.policy.parser.PolicyParserFactory.Type.JSON; - /** *

Dashboard Devices controller

* Provides IoT Devices management methods. @@ -59,7 +57,7 @@ public class DashboardDevicesController { private UserService userService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private AgentService agentService; @@ -97,11 +95,12 @@ public class DashboardDevicesController { @RequestMapping(value = "/overview/{id}", method = RequestMethod.GET) public String iotDeviceOverview(Model model, @PathVariable Long id) { ViewDevice viewDevice; - Device device = deviceService.findOne(id); + Device device = deviceService.findById(id); try { viewDevice = new ViewDevice(device); - viewDevice.setOverview(new DeviceOverview(device.getPolicy().getPolicy(), JSON, + viewDevice.setOverview(new DeviceOverview(device.getPolicy().getPolicy(), + PolicyParserFactory.Type.JSON, reportService.findReportsByDeviceId(id), agentService.findDeviceAgents(device.getUuid()))); } catch (NullPointerException e) { @@ -125,7 +124,7 @@ public class DashboardDevicesController { @RequestMapping(value = "/reports/{id}", method = RequestMethod.GET) public String iotDeviceReports(Model model, @PathVariable Long id) { ViewDevice viewDevice; - Device device = deviceService.findOne(id); + Device device = deviceService.findById(id); try { viewDevice = new ViewDevice(device); @@ -151,7 +150,7 @@ public class DashboardDevicesController { @RequestMapping(value = "/agents/{id}", method = RequestMethod.GET) public String iotDeviceAgents(Model model, @PathVariable Long id) { ViewDevice viewDevice; - Device device = deviceService.findOne(id); + Device device = deviceService.findById(id); try { viewDevice = new ViewDevice(device); @@ -161,7 +160,7 @@ public class DashboardDevicesController { return "redirect:/dashboard/devices"; } - viewDevice.setAgents(agentService.findDeviceAgents(device.getUuid()), JSON); + viewDevice.setAgents(agentService.findDeviceAgents(device.getUuid()), PolicyParserFactory.Type.JSON); model.addAttribute("device", viewDevice); return "device-agents"; @@ -177,7 +176,7 @@ public class DashboardDevicesController { @RequestMapping(value = "/policies/{id}", method = RequestMethod.GET) public String iotDevicePolicies(Model model, @PathVariable Long id) { try { - ViewDevice device = new ViewDevice(deviceService.findOne(id), JSON); + ViewDevice device = new ViewDevice(deviceService.findById(id), PolicyParserFactory.Type.JSON); model.addAttribute("device", device); } catch (NullPointerException e) { log.error("There is no user with such id", e); @@ -202,7 +201,7 @@ public class DashboardDevicesController { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } try { - PolicyConfigParser parser = new PolicyParserFactory().getParser(JSON); + PolicyConfigParser parser = new PolicyParserFactory().getParser(PolicyParserFactory.Type.JSON); parser.toPolicyObject(policy.getPolicies()); Device device = deviceService.findByUUID(policy.getUuid()); Policy fullPolicy = policyService.findByDeviceId(device.getId()); diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java index 2fad249..6b9370b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java @@ -5,6 +5,22 @@ */ package com.samsung.dsm.rest.report; +import static java.lang.String.format; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.StringJoiner; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -13,20 +29,10 @@ import com.samsung.commons.domain.IotCloudUser; import com.samsung.commons.domain.Report; import com.samsung.commons.model.Notification; import com.samsung.commons.service.IotCloudService; -import com.samsung.commons.service.impl.ReportServiceImpl; +import com.samsung.commons.service.ReportService; import com.samsung.dsm.report.analyzer.impl.MACReportAnalyzer; import com.samsung.dsm.rest.mq.MQSenderImpl; import com.samsung.dsm.service.GrantedApplicationService; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import java.util.*; - -import static java.lang.String.format; /** *

Report API

Report REST operations @@ -43,7 +49,7 @@ public class ReportApi { public static final String FOR_STUB = "smack_test"; @Autowired - private ReportServiceImpl reportService; + private ReportService reportService; @Autowired private IotCloudService iotCloudService; @@ -82,7 +88,7 @@ public class ReportApi { @RequestMapping(value = "/newreport/{reportId}") public void newReportNotification(@PathVariable Long reportId) { log.info("Get new report" + reportId); - Report report = reportService.findOne(reportId); + Report report = reportService.findById(reportId); log.info("============================REPORT====================================="); log.info(report); log.info("======================================================================="); diff --git a/servers/dsm/src/test/java/com/samsung/dsm/controller/DashboardDevicesControllerTest.java b/servers/dsm/src/test/java/com/samsung/dsm/controller/DashboardDevicesControllerTest.java index c0b5e24..dc63de5 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/controller/DashboardDevicesControllerTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/controller/DashboardDevicesControllerTest.java @@ -1,6 +1,6 @@ package com.samsung.dsm.controller; -import com.samsung.commons.service.impl.DeviceServiceImpl; +import com.samsung.commons.service.DeviceService; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -16,11 +16,11 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import java.security.Principal; - import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import java.security.Principal; + /** * @author Mail to: Artem Motchanyi, a.motchanyi@samsung.com * @version 1.0 @@ -36,19 +36,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class DashboardDevicesControllerTest { - /** - * The mock mvc. - */ + /** The mock mvc. */ private MockMvc mockMvc; - /** - * The web application context. - */ + /** The web application context. */ @Autowired private WebApplicationContext webApplicationContext; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Mock private Principal principalMock; @@ -62,7 +58,7 @@ public class DashboardDevicesControllerTest { @After public void after() { - deviceService.deleteAll(); + deviceService.removeAll(); } /** @@ -73,8 +69,8 @@ public class DashboardDevicesControllerTest { @Test public void dashboardNegativeTest() throws Exception { mockMvc.perform(get("/dashboard/devices/").principal(principalMock)) - .andExpect(status().isOk()) - .andExpect(view().name("devices")) - .andExpect(forwardedUrl("devices")); + .andExpect(status().isOk()) + .andExpect(view().name("devices")) + .andExpect(forwardedUrl("devices")); } } 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 e0f930b..1333962 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 @@ -1,14 +1,18 @@ package com.samsung.dsm.rest; -import com.samsung.commons.domain.Agent; -import com.samsung.commons.domain.Device; -import com.samsung.commons.domain.User; -import com.samsung.commons.service.IotCloudService; -import com.samsung.commons.service.PolicyService; -import com.samsung.commons.service.impl.DeviceServiceImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import com.samsung.commons.service.impl.RoleServiceImpl; import com.samsung.commons.service.impl.UserServiceImpl; -import com.samsung.dsm.utils.JsonUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -23,12 +27,15 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import java.util.*; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import com.samsung.commons.domain.Agent; +import com.samsung.commons.domain.Device; +import com.samsung.commons.domain.User; +import com.samsung.commons.service.DeviceService; +import com.samsung.commons.service.IotCloudService; +import com.samsung.commons.service.PolicyService; +import com.samsung.commons.service.RoleService; +import com.samsung.commons.service.UserService; +import com.samsung.dsm.utils.JsonUtils; @RunWith(SpringJUnit4ClassRunner.class) @@ -51,7 +58,7 @@ public class DeviceApiTest { private IotCloudService iotCloudService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private PolicyService policyService; 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 92f37f3..1fccd77 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 @@ -4,9 +4,9 @@ import com.samsung.commons.domain.Agent; import com.samsung.commons.domain.Device; import com.samsung.commons.domain.Policy; import com.samsung.commons.domain.User; +import com.samsung.commons.service.DeviceService; import com.samsung.commons.service.PolicyService; import com.samsung.commons.service.UserService; -import com.samsung.commons.service.impl.DeviceServiceImpl; import com.samsung.commons.utils.UrlBuilder; import com.samsung.dsm.utils.JsonUtils; import org.junit.After; @@ -48,7 +48,7 @@ public class PolicyApiTest { private UserService userService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired private PolicyService policyService; @@ -81,7 +81,9 @@ public class PolicyApiTest { @After public void after() { - deviceService.deleteAll(); + for (Device device : devices) { + deviceService.remove(device); + } } @Test 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 a264740..b00b9eb 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 @@ -6,10 +6,6 @@ import com.samsung.commons.domain.ReportType; import com.samsung.commons.domain.User; import com.samsung.commons.repository.ReportTypeRepository; import com.samsung.commons.service.*; -import com.samsung.commons.service.impl.DeviceServiceImpl; -import com.samsung.commons.service.impl.IotCloudServiceImpl; -import com.samsung.commons.service.impl.PolicyServiceImpl; -import com.samsung.commons.service.impl.ReportServiceImpl; import com.samsung.dsm.utils.CloudUserBuilder; import com.samsung.dsm.utils.UserBuilder; import org.junit.After; @@ -87,19 +83,19 @@ public class ReportApiTest { private ReportTypeRepository reportTypeRepository; @Autowired - private ReportServiceImpl reportService; + private ReportService reportService; @Autowired private UserService userService; @Autowired - private DeviceServiceImpl deviceService; + private DeviceService deviceService; @Autowired - private PolicyServiceImpl policyService; + private PolicyService policyService; @Autowired - private IotCloudServiceImpl iotCloudService; + private IotCloudService iotCloudService; @Autowired private UserBuilder userBuilder; @@ -131,8 +127,10 @@ public class ReportApiTest { @After public void after() { - reportService.deleteAll(); - deviceService.deleteAll(); + reportService.removeAll(); + deviceService.removeAll(); + + // userService.removeAll(); iotCloudService.deleteAllUsers(); } diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java index 41a47ae..50489f0 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java @@ -1,14 +1,12 @@ package com.samsung.servermq.iotivity; -import com.samsung.servermq.iotivity.extractor.PostDataExtractor; +import java.util.List; + import org.apache.log4j.Logger; import org.iotivity.cloud.mqserver.topic.Topic; import org.iotivity.cloud.mqserver.topic.TopicManager; -import java.util.Arrays; -import java.util.List; - -import static java.lang.String.format; +import com.samsung.servermq.iotivity.extractor.PostDataExtractor; public class MessageQueueListener { @@ -22,7 +20,7 @@ public class MessageQueueListener { private PostDataExtractor extractor; private String listenerName; - public MessageQueueListener(String topicName, + public MessageQueueListener(String topicName, PostDataExtractor extractor, String listenerName, String zookeperHost, String kafkaHost) { log.debug("Created " + listenerName); @@ -43,14 +41,14 @@ public class MessageQueueListener { } - public List getMessages() { - List messages = kafkaConsumer.getMessages(); - for (byte[] message : messages) { - log.debug(format("%s get message: %s", getListenerName(), Arrays.toString(message))); - extractor.extract(message); - } - return messages; - } + public List getMessages() { + List messages = kafkaConsumer.getMessages(); + for (byte[] message : messages) { + log.debug(getListenerName() + " get message: " + (new String(message))); + extractor.extract(message); + } + return messages; + } public KafkaConsumerWrapper getKafkaConsumer() { return kafkaConsumer; @@ -99,7 +97,7 @@ public class MessageQueueListener { public void setExtractor(PostDataExtractor extractor) { this.extractor = extractor; } - - + + }