Merge pull request #251 from ScorpioBroker/tqf

Fixed temporal query issue.
ScorpioBroker · Nov 2, 2021 · cba71de · cba71de
2 parents ab494a5 + 1fd291f
commit cba71de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ger/src/main/java/eu/neclab/ngsildbroker/historymanager/controller/HistoryController.java b/...ger/src/main/java/eu/neclab/ngsildbroker/historymanager/controller/HistoryController.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 
@@ -155,10 +155,11 @@ public ResponseEntity<byte[]> retrieveTemporalEntityById(HttpServletRequest requ
 			logger.debug("entityId : " + entityId);
 			if (params != null && !Validator.validate(params))
 				throw new ResponseException(ErrorType.BadRequestData);
-
-			QueryParams qp = paramsResolver.getQueryParamsFromUriQuery(request.getParameterMap(),
+			Map<String,String[]> queryParam = new HashMap<>(request.getParameterMap());
+			String[] entityArray = new String[] {entityId};
+			queryParam.put(NGSIConstants.QUERY_PARAMETER_ID, entityArray);
+			QueryParams qp = paramsResolver.getQueryParamsFromUriQuery(queryParam,
 					HttpUtils.parseLinkHeader(request, NGSIConstants.HEADER_REL_LDCONTEXT), true);
-			qp.getEntities().get(0).put(NGSIConstants.JSON_LD_ID, entityId);
 			logger.trace("retrieveTemporalEntityById :: completed");
 			QueryHistoryEntitiesRequest req = new QueryHistoryEntitiesRequest(HttpUtils.getHeaders(request), qp);
 			List<String> queryResult = historyDAO.query(req.getQp()).getActualDataString();

diff --git a/...oryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/repository/HistoryDAO.java b/...oryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/repository/HistoryDAO.java
@@ -45,7 +45,7 @@ protected String translateNgsildQueryToSql(QueryParams qp) throws ResponseExcept
 		String sqlWhereGeoquery = "";
 		String sqlWhere = "";
 		List<Map<String, String>> entities = qp.getEntities();
-		if (entities != null) {
+		if (entities != null && entities.size() > 0) {
 			for (Map<String, String> entityInfo : entities) {
 				fullSqlWhere.append("(");
 				for (Entry<String, String> entry : entityInfo.entrySet()) {