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

Merge "Omaha #3184 throw incompatible request exceptions when trying to get levels on FFMP or IHFS" into omaha_15.1.1

Browse source 
Former-commit-id: 0a24d7452f [formerly 95816d39509fa3499494b369ad09fb026c07108d]
Former-commit-id: 58628db2c5
This commit is contained in:
Richard Peter 2014-07-14 17:05:22 -05:00 • committed by Gerrit Code Review
commit 6eb299d022
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java
View file

@ -28,6 +28,7 @@ import javax.measure.unit.Unit;
import com.raytheon.uf.common.dataaccess.IDataRequest;
import com.raytheon.uf.common.dataaccess.exception.DataRetrievalException;
import com.raytheon.uf.common.dataaccess.exception.IncompatibleRequestException;
import com.raytheon.uf.common.dataaccess.geom.IGeometryData;
import com.raytheon.uf.common.dataaccess.impl.AbstractDataPluginFactory;
import com.raytheon.uf.common.dataaccess.impl.DefaultGeometryData;
@ -40,6 +41,7 @@ import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates.MODE;
import com.raytheon.uf.common.dataplugin.ffmp.HucLevelGeometriesFactory;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
@ -70,6 +72,7 @@ import com.vividsolutions.jts.geom.Geometry;
* May 1, 2014 3099 bkowal No longer use an empty pfaf list when the
* data request locationNames list is empty.
* Jun 24, 2014 3170 mnash Get the accumulated time if multiple times are requested
* Jul 14, 2014 3184 njensen Overrode getAvailableLevels()
*
* </pre>
*
@ -354,4 +357,10 @@ public class FFMPGeometryFactory extends AbstractDataPluginFactory {
return pfafList.toArray(new String[pfafList.size()]);
}
@Override
public Level[] getAvailableLevels(IDataRequest request) {
throw new IncompatibleRequestException(request.getDatatype()
+ " data does not support the concept of levels");
}
}

9
edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroGeometryFactory.java
View file

@ -23,10 +23,12 @@ import java.sql.Timestamp;
import java.util.Map;
import com.raytheon.uf.common.dataaccess.IDataRequest;
import com.raytheon.uf.common.dataaccess.exception.IncompatibleRequestException;
import com.raytheon.uf.common.dataaccess.exception.TimeAgnosticDataException;
import com.raytheon.uf.common.dataaccess.geom.IGeometryData;
import com.raytheon.uf.common.dataaccess.impl.AbstractGeometryDatabaseFactory;
import com.raytheon.uf.common.dataaccess.impl.FactoryUtil;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.time.BinOffset;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
@ -51,6 +53,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
* Feb 14, 2013 1614 bsteffen Refactor data access framework to use
* single request.
* Mar 03, 2014 2673 bsteffen Add ability to query only ref times.
* Jul 14, 2014 3184 njensen Overrode getAvailableLevels()
*
* </pre>
*
@ -194,4 +197,10 @@ public class HydroGeometryFactory extends AbstractGeometryDatabaseFactory {
protected String assembleGetAvailableLocationNames(IDataRequest request) {
return "select lid from location;";
}
@Override
public Level[] getAvailableLevels(IDataRequest request) {
throw new IncompatibleRequestException(request.getDatatype()
+ " data does not support the concept of levels");
}
}