xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #5703 - Allow null or empty requestedSiteIDs for GetSiteTimeZoneInfoRequest.

Browse source 
Change-Id: I28c20262490de322ea0801245ca5e303f4f479af

Former-commit-id: 4cdbafd82b0eb075f1dda31c4ed660f5f4e2c812
This commit is contained in:
David Gillingham 2016-06-17 11:14:01 -05:00
parent 06b430a2c7
commit 23a84aa5c7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetSiteTimeZoneInfoRequestHandler.java
View file

@ -19,6 +19,7 @@
**/ **/
package com.raytheon.edex.plugin.gfe.server.handler; package com.raytheon.edex.plugin.gfe.server.handler;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -29,6 +30,7 @@ import com.raytheon.edex.plugin.gfe.server.IFPServer;
import com.raytheon.uf.common.dataplugin.gfe.request.GetSiteTimeZoneInfoRequest; import com.raytheon.uf.common.dataplugin.gfe.request.GetSiteTimeZoneInfoRequest;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse; import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
import com.raytheon.uf.common.serialization.comm.IRequestHandler; import com.raytheon.uf.common.serialization.comm.IRequestHandler;
import com.raytheon.uf.common.util.CollectionUtil;
/** /**
* Returns the time zones associated with the given sites. The site must be * Returns the time zones associated with the given sites. The site must be
@ -43,6 +45,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
* Jan 19, 2011 dgilling Initial creation * Jan 19, 2011 dgilling Initial creation
* Feb 26, 2015 #4128 dgilling Switch to IFPServer.getActiveSites(). * Feb 26, 2015 #4128 dgilling Switch to IFPServer.getActiveSites().
* Nov 17, 2015 #5129 dgilling Support changes to GetSiteTimeZoneInfoRequest. * Nov 17, 2015 #5129 dgilling Support changes to GetSiteTimeZoneInfoRequest.
* Jun 17, 2016 #5703 dgilling Allow null or empty requestedSiteIDs.
* *
* </pre> * </pre>
* *
@ -53,13 +56,6 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
public class GetSiteTimeZoneInfoRequestHandler implements public class GetSiteTimeZoneInfoRequestHandler implements
IRequestHandler<GetSiteTimeZoneInfoRequest> { IRequestHandler<GetSiteTimeZoneInfoRequest> {
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.serialization.comm.IRequestHandler#handleRequest
* (com.raytheon.uf.common.serialization.comm.IServerRequest)
*/
@Override @Override
public ServerResponse<Map<String, String>> handleRequest( public ServerResponse<Map<String, String>> handleRequest(
GetSiteTimeZoneInfoRequest request) throws Exception { GetSiteTimeZoneInfoRequest request) throws Exception {
@ -67,8 +63,12 @@ public class GetSiteTimeZoneInfoRequestHandler implements
Map<String, String> siteWithTimeZone = new HashMap<String, String>(); Map<String, String> siteWithTimeZone = new HashMap<String, String>();
Set<String> activeSites = IFPServer.getActiveSites(); Set<String> activeSites = IFPServer.getActiveSites();
Collection<String> requestedSites = request.getRequestedSiteIDs();
if (CollectionUtil.isNullOrEmpty(requestedSites)) {
requestedSites = activeSites;
}
for (String site : request.getRequestedSiteIDs()) { for (String site : requestedSites) {
if (activeSites.contains(site)) { if (activeSites.contains(site)) {
siteWithTimeZone.put(site, IFPServerConfigManager siteWithTimeZone.put(site, IFPServerConfigManager
.getServerConfig(site).getTimeZones().get(0)); .getServerConfig(site).getTimeZones().get(0));