Skip to content

Commit 53979d7

Browse files
jsavelljsavell
committed
changes to support serviceUrl property and better SystemMonitorService logging
1 parent 89ce88e commit 53979d7

8 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎src/main/java/edu/tamu/app/controller/ServiceController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public ApiResponse getService(@ApiVariable Long id) {
5353
@Auth(role = "ROLE_SERVICE_MANAGER")
5454
@ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
5555
public ApiResponse createService(@ApiValidatedModel Service service) {
56-
service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList());
56+
service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(),service.getServiceUrl());
5757
simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findOne(service.getId())));
5858
return new ApiResponse(SUCCESS, service);
5959
}

‎src/main/java/edu/tamu/app/model/Service.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,14 @@ public Service() {
6060
setAliases(new ArrayList<String>());
6161
}
6262

63-
public Service(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList) {
63+
public Service(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl) {
6464
this();
6565
setName(name);
6666
setStatus(status);
6767
setIsAuto(isAuto);
6868
setIsPublic(isPublic);
6969
setOnShortList(onShortList);
70+
setServiceUrl(serviceUrl);
7071
}
7172

7273
public String getName() {

‎src/main/java/edu/tamu/app/model/repo/custom/ServiceRepoCustom.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
public interface ServiceRepoCustom {
77

8-
public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList);
8+
public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl);
99

1010
}

‎src/main/java/edu/tamu/app/model/repo/impl/ServiceRepoImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ServiceRepoImpl implements ServiceRepoCustom {
1313
ServiceRepo serviceRepo;
1414

1515
@Override
16-
public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList) {
17-
return serviceRepo.save(new Service(name, status, isAuto, isPublic, onShortList));
16+
public Service create(String name, Status status, Boolean isAuto, Boolean isPublic, Boolean onShortList, String serviceUrl) {
17+
return serviceRepo.save(new Service(name, status, isAuto, isPublic, onShortList, serviceUrl));
1818
}
1919
}

‎src/main/java/edu/tamu/app/service/SystemMonitorService.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,22 @@ public class SystemMonitorService implements MonitorService {
3939

4040
@Override
4141
public void updateAll() {
42+
logger.debug("Monitor Service is checking the status of the managed services");
4243
//get all monitor-able services from ServiceRepo
4344
serviceRepo.findByIsAuto(true).forEach(service -> {
4445
try {
4546
Status serviceStatus = getServiceStatus(service.getServiceUrl());
4647
//update the service status if it's changed
48+
logger.debug("The status reported by ["+service.getServiceUrl()+"] of ["+service.getName()+"] is: "+serviceStatus);
4749
if (serviceStatus != service.getStatus()) {
50+
logger.debug("Updating the status of ["+service.getName()+"] to: "+serviceStatus);
4851
service.setStatus(serviceStatus);
4952
serviceRepo.save(service);
5053
}
5154
} catch(MalformedURLException e) {
52-
logger.debug("Did not check the status of ["+service.getName()+"] due to a malformed URL");
55+
logger.error("Did not check the status of ["+service.getName()+"] due to a malformed URL: "+service.getServiceUrl());
5356
} catch(IOException e) {
54-
logger.debug("Attempt to check the status of ["+service.getName()+"] failed due to an IOException");
57+
logger.error("Attempt to check the status of ["+service.getName()+"] failed due to an IOException");
5558
}
5659
});
5760
}

‎src/test/java/controller/ServiceControllerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public class ServiceControllerTest {
4141
protected static final Boolean TEST_ON_SHORT_LIST = true;
4242
protected static final Boolean TEST_NOT_ON_SHORT_LIST = false;
4343

44-
protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
45-
protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST);
46-
protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST);
47-
protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST);
44+
protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
45+
protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST,null);
46+
protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST,null);
47+
protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST,null);
4848
protected static List<Service> mockServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE2,TEST_SERVICE3 }));
4949
protected static List<Service> mockPublicServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE3 }));
5050

@@ -65,7 +65,7 @@ public void setUp() {
6565
when(serviceRepo.findAll()).thenReturn(mockServiceList);
6666
when(serviceRepo.findByIsPublic(true)).thenReturn(mockPublicServiceList);
6767
when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
68-
when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class))).thenReturn(TEST_SERVICE1);
68+
when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class),null)).thenReturn(TEST_SERVICE1);
6969
when(serviceRepo.save(any(Service.class))).thenReturn(TEST_MODIFIED_SERVICE1);
7070
doNothing().when(serviceRepo).delete(any(Service.class));
7171
}

‎src/test/java/edu/tamu/app/model/NoteTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ private Note refreshNote(Note note) {
9797

9898
@Test
9999
public void testUpdateServices() {
100-
Service service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
101-
Service service2 = serviceRepo.create(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
100+
Service service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
101+
Service service2 = serviceRepo.create(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
102102
List<Service> serviceList1 = Arrays.asList(service1);
103103
List<Service> serviceList2 = Arrays.asList(service1, service2);
104104
Note note = noteRepo.create(TEST_NOTE_TITLE, testUser);

‎src/test/java/edu/tamu/app/model/ServiceTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,28 @@ public void setUp() {
5959
@Test
6060
public void testCreate() {
6161
long initalCount = serviceRepo.count();
62-
serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
62+
serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
6363
assertEquals("The number of Services did not increase by one", initalCount + 1, serviceRepo.count());
6464
}
6565

6666
@Test(expected = DataIntegrityViolationException.class)
6767
public void testNameNotNull() {
68-
serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
68+
serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
6969
}
7070

7171
@Test(expected = DataIntegrityViolationException.class)
7272
public void testStatusNotNull() {
73-
serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
73+
serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
7474
}
7575

7676
@Test(expected = ConstraintViolationException.class)
7777
public void testNameNotEmpty() {
78-
serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
78+
serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
7979
}
8080

8181
@Test
8282
public void testUpdateName() {
83-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
83+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
8484
service.setName(TEST_ALTERNATIVE_SERVICE_NAME);
8585
service = refreshService(service);
8686
assertEquals("Service name was not changed", TEST_ALTERNATIVE_SERVICE_NAME, service.getName());
@@ -93,7 +93,7 @@ private Service refreshService(Service service) {
9393

9494
@Test
9595
public void testUpdateAliases() {
96-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
96+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
9797
service.setAliases(TEST_SERVICE_ALIASES);
9898
service = refreshService(service);
9999
assertEquals("Service aliases not set", true, service.getAliases().contains("Alias 1"));
@@ -104,15 +104,15 @@ public void testUpdateAliases() {
104104

105105
@Test
106106
public void testUpdateStatus() {
107-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
107+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
108108
service.setStatus(TEST_ALTERNATIVE_SERVICE_STATUS);
109109
service = refreshService(service);
110110
assertEquals("Service status was not changed", TEST_ALTERNATIVE_SERVICE_STATUS, service.getStatus());
111111
}
112112

113113
@Test
114114
public void testUpdateServiceUrl() {
115-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
115+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
116116
service.setServiceUrl(TEST_SERVICE_URL);
117117
service = refreshService(service);
118118
assertEquals("Service status url was not changed", TEST_SERVICE_URL, service.getServiceUrl());
@@ -124,7 +124,7 @@ public void testUpdateNotes() {
124124
Note note2 = noteRepo.create(TEST_NOTE_TITLE2, testUser);
125125
List<Note> noteList1 = Arrays.asList(note1);
126126
List<Note> noteList2 = Arrays.asList(note1, note2);
127-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
127+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
128128
service.setNotes(noteList1);
129129
service = refreshService(service);
130130
assertEquals("Service notes did not contain the right number of notes", 1, service.getNotes().size());
@@ -138,7 +138,7 @@ public void testUpdateNotes() {
138138
@Test
139139
public void testDelete() {
140140
long initialCount = serviceRepo.count();
141-
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST);
141+
Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST,null);
142142
assertEquals("The service was not created", initialCount + 1, serviceRepo.count());
143143
serviceRepo.delete(service);
144144
assertEquals("The service was not deleted", initialCount, serviceRepo.count());

0 commit comments

Comments
 (0)