Merge "Issue #1501 Route notification requests to datadelivery." into 13.2.1_delivery
Former-commit-id:84b6f0217f
[formerly84b6f0217f
[formerly 9fb35681ebe6d17679cd26cc86a53aeb357bcd3b]] Former-commit-id:26e72198b7
Former-commit-id:821572355e
This commit is contained in:
commit
c3cfb16075
1 changed files with 9 additions and 8 deletions
|
@ -9,13 +9,13 @@ import com.raytheon.uf.common.datadelivery.event.notification.DeleteNotification
|
||||||
import com.raytheon.uf.common.datadelivery.event.notification.DeleteNotificationResponse;
|
import com.raytheon.uf.common.datadelivery.event.notification.DeleteNotificationResponse;
|
||||||
import com.raytheon.uf.common.datadelivery.event.notification.GetNotificationRequest;
|
import com.raytheon.uf.common.datadelivery.event.notification.GetNotificationRequest;
|
||||||
import com.raytheon.uf.common.datadelivery.event.notification.NotificationRecord;
|
import com.raytheon.uf.common.datadelivery.event.notification.NotificationRecord;
|
||||||
|
import com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants;
|
||||||
|
import com.raytheon.uf.common.serialization.comm.RequestRouter;
|
||||||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||||
import com.raytheon.uf.common.status.UFStatus;
|
import com.raytheon.uf.common.status.UFStatus;
|
||||||
import com.raytheon.uf.viz.core.exception.VizException;
|
|
||||||
import com.raytheon.uf.viz.core.notification.INotificationObserver;
|
import com.raytheon.uf.viz.core.notification.INotificationObserver;
|
||||||
import com.raytheon.uf.viz.core.notification.NotificationException;
|
import com.raytheon.uf.viz.core.notification.NotificationException;
|
||||||
import com.raytheon.uf.viz.core.notification.NotificationMessage;
|
import com.raytheon.uf.viz.core.notification.NotificationMessage;
|
||||||
import com.raytheon.uf.viz.core.requests.ThriftClient;
|
|
||||||
import com.raytheon.uf.viz.datadelivery.notification.xml.MessageLoadXML;
|
import com.raytheon.uf.viz.datadelivery.notification.xml.MessageLoadXML;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -29,6 +29,7 @@ import com.raytheon.uf.viz.datadelivery.notification.xml.MessageLoadXML;
|
||||||
* Date Ticket# Engineer Description
|
* Date Ticket# Engineer Description
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* Mar 12, 2012 jsanchez Initial creation
|
* Mar 12, 2012 jsanchez Initial creation
|
||||||
|
* Jan 22, 2013 1501 djohnson Route requests to datadelivery.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -115,10 +116,10 @@ public class NotificationHandler implements INotificationObserver {
|
||||||
request.setUsername(username);
|
request.setUsername(username);
|
||||||
request.setHours(hours);
|
request.setHours(hours);
|
||||||
request.setMaxResults(maxResults);
|
request.setMaxResults(maxResults);
|
||||||
ArrayList<NotificationRecord> response = (ArrayList<NotificationRecord>) ThriftClient
|
ArrayList<NotificationRecord> response = (ArrayList<NotificationRecord>) RequestRouter
|
||||||
.sendRequest(request);
|
.route(request, DataDeliveryConstants.DATA_DELIVERY_SERVER);
|
||||||
return response;
|
return response;
|
||||||
} catch (VizException e) {
|
} catch (Exception e) {
|
||||||
statusHandler.error(
|
statusHandler.error(
|
||||||
"Error trying to retrieve notifications from database", e);
|
"Error trying to retrieve notifications from database", e);
|
||||||
}
|
}
|
||||||
|
@ -139,10 +140,10 @@ public class NotificationHandler implements INotificationObserver {
|
||||||
try {
|
try {
|
||||||
DeleteNotificationRequest request = new DeleteNotificationRequest();
|
DeleteNotificationRequest request = new DeleteNotificationRequest();
|
||||||
request.setIds(ids);
|
request.setIds(ids);
|
||||||
DeleteNotificationResponse response = (DeleteNotificationResponse) ThriftClient
|
DeleteNotificationResponse response = (DeleteNotificationResponse) RequestRouter
|
||||||
.sendRequest(request);
|
.route(request, DataDeliveryConstants.DATA_DELIVERY_SERVER);
|
||||||
rowsDeleted = response.getRowsDeleted();
|
rowsDeleted = response.getRowsDeleted();
|
||||||
} catch (VizException e) {
|
} catch (Exception e) {
|
||||||
statusHandler.error(
|
statusHandler.error(
|
||||||
"Error trying to delete notification(s) from database", e);
|
"Error trying to delete notification(s) from database", e);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue