Merge pull request #872 from poorva1209/bug_856

Bug 856
GRIDAPPSD · Mar 18, 2019 · 9bd4547 · 9bd4547
2 parents bfe8884 + 6c49c2f
commit 9bd4547
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/gov.pnnl.goss.gridappsd/bnd.bnd b/gov.pnnl.goss.gridappsd/bnd.bnd
@@ -32,8 +32,8 @@
 	blazegraph.cim2glm;version=8.0,\
 	httpclient,\
 	com.bigdata.rdf,\
-        proven-client;version=0.2.1,\
-        proven-message;version=0.2
+    proven-client;version=0.2.1,\
+    proven-message;version=0.3
 
 -plugin org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug
 

diff --git a/gov.pnnl.goss.gridappsd/gridappsd.api.bnd b/gov.pnnl.goss.gridappsd/gridappsd.api.bnd
@@ -1,4 +1,5 @@
 Bundle-Version: 1.0.0.${tstamp}
 Export-Package: \
 	gov.pnnl.goss.gridappsd.api,\
-	gov.pnnl.goss.gridappsd.dto
+	gov.pnnl.goss.gridappsd.dto
+Private-Package: gov.pnnl.goss.gridappsd.data.conversion
diff --git a/gov.pnnl.goss.gridappsd/run.bnd.bndrun b/gov.pnnl.goss.gridappsd/run.bnd.bndrun
@@ -78,7 +78,7 @@
 	org.eclipse.jetty.aggregate.jetty-all-server;version=7.6.9,\
 	javax.servlet-api,\
 	com.bigdata.rdf,\
-	proven-message;version=0.2,\
+	proven-message;version=0.3,\
 	proven-client;version=0.2.1,\
 	javax.ws.rs-api,\
 	org.apache.commons.codec,\

diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestTimeseriesData.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestTimeseriesData.java
@@ -56,8 +56,8 @@ public static RequestTimeseriesData parse(String jsonString){
 		Gson  gson = new Gson();
 		RequestTimeseriesData obj = gson.fromJson(jsonString, RequestTimeseriesData.class);
 		if(obj.queryMeasurement==RequestType.PROVEN_MEASUREMENT)
-			if(obj.queryFilter==null || !obj.queryFilter.containsKey("hasSimulationId"))
-				throw new JsonSyntaxException("Expected filter hasSimulationId not found.");
+			if(obj.queryFilter==null || !obj.queryFilter.containsKey("simulation_id"))
+				throw new JsonSyntaxException("Expected filter simulation_id not found.");
 		return obj;
 	}