Merge pull request ScorpioBroker#559 from ScorpioBroker/bugfix-554

ScorpioBroker#554 fix. Users need to use double quotes (") around URLs or links in…
IndustryFusion · May 16, 2024 · fbca9a6 · fbca9a6
2 parents 07b5c49 + 0d82ae3
commit fbca9a6
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/terms/QQueryTerm.java b/Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/terms/QQueryTerm.java
@@ -184,7 +184,13 @@ public boolean calculate(Map<String, Object> entity, String attribute, String op
 
         boolean finalReturnValue = false;
 //        if (!attribute.matches(URI) && attribute.contains(".")) {
-        String[] splittedAttrib = attribute.split("[\\[\\].]");
+        String[] splitByDot = splitByDotOutsideQuotes(attribute);
+//        String[] splittedAttrib = attribute.split("[\\[\\]]");
+        List<String> splittedAttrib = new ArrayList<>();
+        for(String item:splitByDot){
+            String[] tmp = item.split("[\\[\\]]");
+            splittedAttrib.addAll(Arrays.asList(tmp));
+        }
         List<String> doNotExpandAttrs = new ArrayList<>();
         if(jsonKeys != null && !jsonKeys.isEmpty()){
             for (String jsonkey : jsonKeys) {
@@ -207,7 +213,7 @@ public boolean calculate(Map<String, Object> entity, String attribute, String op
             return true;
         }
 
-        operant = operant != null ? operant.replace("\"", "") : null;
+        operant = operant.replace("\"", "");
         for (String item : expandedAttrib) {
             if (TIME_PROPS.contains(item)) {
                 try {
@@ -867,7 +873,35 @@ public boolean equals(Object obj, boolean ignoreKids) {
     public boolean equals(Object obj) {
         return equals(obj, false);
     }
+    public static String[] splitByDotOutsideQuotes(String input) {
+        List<String> parts = new ArrayList<>();
+        StringBuilder currentPart = new StringBuilder();
+        boolean insideQuotes = false;
+
+        for (int i = 0; i < input.length(); i++) {
+            char ch = input.charAt(i);
+
+            if (ch == '\"') {
+                // Toggle the insideQuotes flag when encountering a quote character
+                insideQuotes = !insideQuotes;
+                currentPart.append(ch);
+            } else if (ch == '.' && !insideQuotes) {
+                // Split at dots outside of quotes
+                parts.add(currentPart.toString());
+                currentPart.setLength(0); // Clear the current part
+            } else {
+                // Add other characters to the current part
+                currentPart.append(ch);
+            }
+        }
 
+        // Add the last part to the list if it exists
+        if (!currentPart.isEmpty()) {
+            parts.add(currentPart.toString());
+        }
+        parts.replaceAll(s -> s.replace("\"", ""));
+        return parts.toArray(new String[0]);
+    }
     private int getAttribQuery(StringBuilder result, int dollarCount, Tuple tuple) {
         result.append("ENTITY ? $");
         result.append(dollarCount);
@@ -876,8 +910,12 @@ private int getAttribQuery(StringBuilder result, int dollarCount, Tuple tuple) {
         if (splitted.length > 1) {
             splitted[1] = splitted[1].substring(0, splitted[1].length() - 1);
         }
-        String[] subAttribPath = splitted.length == 1 ? null : splitted[1].split("\\.");
-        String[] attribPath = splitted[0].split("\\.");
+
+//        String[] subAttribPath = splitted.length == 1 ? null : splitted[1].split("\\.");
+//        String[] attribPath = splitted[0].split("\\.");
+        String[] subAttribPath = splitted.length == 1 ? null : splitByDotOutsideQuotes(splitted[1]);
+        String[] attribPath = splitByDotOutsideQuotes(splitted[0]);
+        operant = operant.replaceAll("\"","");
         String attribName = linkHeaders.expandIri(attribPath[0], false, true, null, null);
         if (attribName.equals("@id")) {
             result.append(" AND entity ->> $");

diff --git a/...Manager/src/main/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryController.java b/...Manager/src/main/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryController.java
@@ -193,7 +193,8 @@ public Uni<RestResponse<Object>> query(HttpServerRequest request, @QueryParam("i
             if (index != -1) {
                 uri = uri.substring(0, index);
             }
-            q = uri.replaceAll("\"","");
+			q=uri;
+//            q = uri.replaceAll("\"","");
         } else {
 			q = null;
 		}