Omaha #4009 Improved error handling for bad/incomplete DAF requests

Change-Id: I947f8097f5d8981286023ca6acbde8517581abf0

Former-commit-id: 455f7d8cd4f42e2c1611029ca6c7d5e8d1b5997b
This commit is contained in:
Mark Peters 2015-02-03 17:36:54 -06:00
parent 47234a3757
commit 6063e7c892

View file

@ -23,12 +23,10 @@ import java.sql.Timestamp;
import java.util.Map; import java.util.Map;
import com.raytheon.uf.common.dataaccess.IDataRequest; 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.exception.TimeAgnosticDataException;
import com.raytheon.uf.common.dataaccess.geom.IGeometryData; import com.raytheon.uf.common.dataaccess.geom.IGeometryData;
import com.raytheon.uf.common.dataaccess.impl.AbstractGeometryDatabaseFactory; import com.raytheon.uf.common.dataaccess.impl.AbstractGeometryDatabaseFactory;
import com.raytheon.uf.common.dataaccess.impl.FactoryUtil; 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.BinOffset;
import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange; import com.raytheon.uf.common.time.TimeRange;
@ -55,6 +53,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
* Mar 03, 2014 2673 bsteffen Add ability to query only ref times. * Mar 03, 2014 2673 bsteffen Add ability to query only ref times.
* Jul 14, 2014 3184 njensen Overrode getAvailableLevels() * Jul 14, 2014 3184 njensen Overrode getAvailableLevels()
* Jul 30, 2014 3184 njensen Added optional identifiers * Jul 30, 2014 3184 njensen Added optional identifiers
* Feb 03, 2015 4009 mapeters Moved getAvailableLevels() override to super
* *
* </pre> * </pre>
* *
@ -196,10 +195,4 @@ public class HydroGeometryFactory extends AbstractGeometryDatabaseFactory {
return "select lid from location;"; return "select lid from location;";
} }
@Override
public Level[] getAvailableLevels(IDataRequest request) {
throw new IncompatibleRequestException(request.getDatatype()
+ " data does not support the concept of levels");
}
} }