community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from hasuniea/master

Browse Source 
fixed code issues
This commit is contained in:
Hasunie 2016-05-23 15:11:15 +05:30
commit df6f420d6e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/event/impl/EventServiceImpl.java
View File

@ -50,7 +50,8 @@ public class EventServiceImpl implements EventService {
Message message = new Message(); Message message = new Message();
MediaType responseMediaType = AndroidAPIUtils.getResponseMediaType(acceptHeader); MediaType responseMediaType = AndroidAPIUtils.getResponseMediaType(acceptHeader);
Object payload[] = {eventBeanWrapper.getDeviceIdentifier(), eventBeanWrapper.getPayload(), eventBeanWrapper.getType()}; Object payload[] = {eventBeanWrapper.getDeviceIdentifier(), eventBeanWrapper.getPayload(),
eventBeanWrapper.getType()};
try { try {
if (AndroidAPIUtils.getEventPublisherService().publishEvent( if (AndroidAPIUtils.getEventPublisherService().publishEvent(
EVENT_STREAM_DEFINITION, "1.0.0", new Object[0], new Object[0], payload)) { EVENT_STREAM_DEFINITION, "1.0.0", new Object[0], new Object[0], payload)) {
@ -64,7 +65,7 @@ public class EventServiceImpl implements EventService {
} catch (DataPublisherConfigurationException e) { } catch (DataPublisherConfigurationException e) {
String msg = "Error occurred while publishing the events from Android agent."; String msg = "Error occurred while publishing the events from Android agent.";
log.error(msg, e); log.error(msg, e);
throw new AndroidAgentException(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).type(responseMediaType).build();
} }
} }
@ -94,7 +95,7 @@ public class EventServiceImpl implements EventService {
String msg = "Error occurred while getting published events for specific " + String msg = "Error occurred while getting published events for specific " +
"Device: " + deviceId + "."; "Device: " + deviceId + ".";
log.error(msg, e); log.error(msg, e);
throw new AndroidAgentException(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).type(responseMediaType).build();
} }
} }
@ -128,7 +129,7 @@ public class EventServiceImpl implements EventService {
String msg = "Error occurred while getting published events for specific " + String msg = "Error occurred while getting published events for specific " +
"Device: " + deviceId + " on given Date."; "Device: " + deviceId + " on given Date.";
log.error(msg, e); log.error(msg, e);
throw new AndroidAgentException(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).type(responseMediaType).build();
} }
} }
@ -148,8 +149,8 @@ public class EventServiceImpl implements EventService {
try { try {
deviceStates = AndroidAPIUtils.getAllEventsForDevice(EVENT_STREAM_DEFINITION, query); deviceStates = AndroidAPIUtils.getAllEventsForDevice(EVENT_STREAM_DEFINITION, query);
if (deviceStates == null) { if (deviceStates == null) {
message. message.setResponseCode("No any alerts are published for given Device: " +
setResponseCode("No any alerts are published on given date for given Device: " + deviceId + "."); "" + deviceId + " on specific date.");
return Response.status(Response.Status.OK).entity(message).build(); return Response.status(Response.Status.OK).entity(message).build();
} else { } else {
@ -157,9 +158,9 @@ public class EventServiceImpl implements EventService {
} }
} catch (AnalyticsException e) { } catch (AnalyticsException e) {
String msg = "Error occurred while getting published events for specific " + String msg = "Error occurred while getting published events for specific " +
"Device: " + deviceId + "og given device Type."; "Device: " + deviceId + "and given device Type.";
log.error(msg, e); log.error(msg, e);
throw new AndroidAgentException(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).type(responseMediaType).build();
} }
} }