(0));
return data;
}
diff --git a/edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/impl/AbstractDataPluginFactory.java b/edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/impl/AbstractDataPluginFactory.java
index 032b19389c..2e196f1c6f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/impl/AbstractDataPluginFactory.java
+++ b/edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/impl/AbstractDataPluginFactory.java
@@ -47,11 +47,13 @@ import com.raytheon.uf.common.time.TimeRange;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 17, 2013 bsteffen Initial creation
- * Feb 14, 2013 1614 bsteffen Refactor data access framework to use
- * single request.
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 17, 2013 bsteffen Initial creation
+ * Feb 14, 2013 1614 bsteffen Refactor data access framework to use
+ * single request.
+ * Nov 26, 2013 2537 bsteffen Fix NPEs for dataTimes and timeRange requests.
+ *
*
*
*
@@ -215,7 +217,7 @@ public abstract class AbstractDataPluginFactory
String[] dataTimeStrings = new String[dataTimes.length];
int index = 0;
for (DataTime dataTime : dataTimes) {
- dataTimeStrings[index] = dataTime.toString();
+ dataTimeStrings[index] = String.valueOf(dataTime);
++index;
}
requestConstraint.setConstraintValueList(dataTimeStrings);
@@ -237,13 +239,15 @@ public abstract class AbstractDataPluginFactory
TimeRange timeRange) {
DbQueryRequest dbQueryRequest = this.buildDbQueryRequest(request);
/* Add the TimeRange Constraint */
- RequestConstraint requestConstraint = new RequestConstraint();
- requestConstraint.setConstraintType(ConstraintType.BETWEEN);
- String[] dateTimeStrings = new String[] {
- timeRange.getStart().toString(), timeRange.getEnd().toString() };
- requestConstraint.setBetweenValueList(dateTimeStrings);
- dbQueryRequest.addConstraint(FIELD_DATATIME, requestConstraint);
-
+ if (timeRange != null) {
+ RequestConstraint requestConstraint = new RequestConstraint();
+ requestConstraint.setConstraintType(ConstraintType.BETWEEN);
+ String[] dateTimeStrings = new String[] {
+ timeRange.getStart().toString(),
+ timeRange.getEnd().toString() };
+ requestConstraint.setBetweenValueList(dateTimeStrings);
+ dbQueryRequest.addConstraint(FIELD_DATATIME, requestConstraint);
+ }
return dbQueryRequest;
}
diff --git a/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/PointDataServerRequest.java b/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/PointDataServerRequest.java
index 652422d4be..506b21d939 100644
--- a/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/PointDataServerRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/PointDataServerRequest.java
@@ -23,7 +23,6 @@ package com.raytheon.uf.common.pointdata;
import java.util.Map;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
-import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.common.serialization.comm.IServerRequest;
@@ -34,9 +33,11 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Feb 16, 2011 #8070 ekladstrup Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Feb 16, 2011 8070 ekladstrup Initial creation
+ * Nov 26, 2013 2537 bsteffen Move common constants here.
+ *
*
*
*
@@ -44,8 +45,15 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest;
* @version 1.0
*/
@DynamicSerialize
-public class PointDataServerRequest implements IServerRequest,
- ISerializableObject {
+public class PointDataServerRequest implements IServerRequest {
+
+ public static final String REQUEST_PARAMETERS_KEY = "requestedParameters";
+
+ public static final String REQUEST_MODE_KEY = "mode";
+
+ public static final String REQUEST_MODE_2D = "select2d";
+
+ public static final String REQUEST_MODE_PARAMETERS = "getParameters";
// the information needed for a PointDataQuery object
@DynamicSerializeElement
diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java
index 932369eb2d..0c6ac93ef8 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java
@@ -60,16 +60,20 @@ import com.raytheon.uf.common.serialization.SerializationException;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 12, 2008 #1448 chammack Initial creation
- * Jun 17, 2010 #5091 njensen Optimized primitive arrays
- * Mar 01, 2011 njensen Restructured deserializeArray()
- * Sep 14, 2012 #1169 djohnson Add ability to write another object into the stream directly.
- * Sep 28, 2012 #1195 djohnson Add ability to specify adapter at field level.
- * Nov 02, 2012 1302 djohnson No more field level adapters.
- * Apr 25, 2013 1954 bsteffen Size Collections better.
- * Jul 23, 2013 2215 njensen Updated for thrift 0.9.0
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Aug 12, 2008 1448 chammack Initial creation
+ * Jun 17, 2010 5091 njensen Optimized primitive arrays
+ * Mar 01, 2011 njensen Restructured deserializeArray()
+ * Sep 14, 2012 1169 djohnson Add ability to write another object into
+ * the stream directly.
+ * Sep 28, 2012 1195 djohnson Add ability to specify adapter at field
+ * level.
+ * Nov 02, 2012 1302 djohnson No more field level adapters.
+ * Apr 25, 2013 1954 bsteffen Size Collections better.
+ * Jul 23, 2013 2215 njensen Updated for thrift 0.9.0
+ * Nov 26, 2013 2537 bsteffen Add support for void type lists which are
+ * sometimes created by python.
*
*
*
@@ -1183,6 +1187,29 @@ public class ThriftSerializationContext extends BaseSerializationContext {
}
return list;
}
+ case TType.VOID:
+ if (listFieldClazz == null || listFieldClazz.isArray()) {
+ Object[] array = new Object[innerList.size];
+ protocol.readListEnd();
+ return array;
+ } else {
+ // this is a List but due to the encoded element type
+ // we can safely assume it's all nulls
+ List list = null;
+ if (listFieldClazz != null) {
+ if (!listFieldClazz.isInterface()
+ && List.class.isAssignableFrom(listFieldClazz)) {
+ list = (List) listFieldClazz.newInstance();
+ }
+ }
+ if (list == null) {
+ list = new ArrayList(innerList.size);
+ }
+ for (int i = 0; i < innerList.size; i++) {
+ list.add(null);
+ }
+ return list;
+ }
default:
if (listFieldClazz != null && listFieldClazz.isArray()) {
// Slower catch-all implementation
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataServerRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataServerRequestHandler.java
index 276fd45950..9efc391620 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataServerRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataServerRequestHandler.java
@@ -34,11 +34,12 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Feb 16, 2011 8070 ekladstrup Initial creation
- * Aug 09, 2011 9696 gzhou add handle for request from nativeLib
- * May 15, 2013 1869 bsteffen Remove DataURI column from ldadmesonet.
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Feb 16, 2011 8070 ekladstrup Initial creation
+ * Aug 09, 2011 9696 gzhou add handle for request from nativeLib
+ * May 15, 2013 1869 bsteffen Remove DataURI column from ldadmesonet.
+ * Nov 26, 2013 2537 bsteffen Use constants in the request class.
*
*
*
@@ -78,19 +79,21 @@ public class PointDataServerRequestHandler implements
// get mode
String mode = "";
- constraint = map.get("mode");
+ constraint = map.get(PointDataServerRequest.REQUEST_MODE_KEY);
if (constraint != null) {
mode = constraint.getConstraintValue();
- map.remove("mode");
+ map.remove(PointDataServerRequest.REQUEST_MODE_KEY);
}
// create PointDataQuery
PointDataQuery query = new PointDataQuery(pluginName);
// find requested parameters if applicable
- if (map.containsKey("requestedParameters")) {
- String params = map.get("requestedParameters").getConstraintValue();
- map.remove("requestedParameters");
+ if (map.containsKey(PointDataServerRequest.REQUEST_PARAMETERS_KEY)) {
+ String params = map.get(
+ PointDataServerRequest.REQUEST_PARAMETERS_KEY)
+ .getConstraintValue();
+ map.remove(PointDataServerRequest.REQUEST_PARAMETERS_KEY);
query.setParameters(params);
}
@@ -103,7 +106,7 @@ public class PointDataServerRequestHandler implements
}
// check if requestAllLevels should be called or only specific levels
- if (mode.equals("select2d")) {
+ if (mode.equals(PointDataServerRequest.REQUEST_MODE_2D)) {
query.requestAllLevels();
} else if (mode.equals("selectSpecific")) {
query.requestSpecificLevel(levelParameter, levelValues);
@@ -111,7 +114,7 @@ public class PointDataServerRequestHandler implements
// perform action based on mode
PointDataContainer container = null;
- if (mode.equals("getParameters")) {
+ if (mode.equals(PointDataServerRequest.REQUEST_MODE_PARAMETERS)) {
return query.getAvailableParameters();
} else {
container = query.execute();