normalized dotted fields queried to es

eclipse · Jul 20, 2023 · 44806ac · 44806ac
1 parent 57737d2
commit 44806ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ta/src/main/java/org/eclipse/kapua/app/console/module/data/server/GwtDataServiceImpl.java b/...ta/src/main/java/org/eclipse/kapua/app/console/module/data/server/GwtDataServiceImpl.java
@@ -464,7 +464,7 @@ private PagingLoadResult<GwtMessage> findMessages(PagingLoadConfig loadConfig, S
         if (headers != null) {
             OrPredicate metricsPredicate = DATASTORE_PREDICATE_FACTORY.newOrPredicate();
             for (GwtHeader header : headers) {
-                metricsPredicate.getPredicates().add(DATASTORE_PREDICATE_FACTORY.newExistsPredicate(String.format(MessageSchema.MESSAGE_METRICS + ".%s", header.getName())));
+                metricsPredicate.getPredicates().add(DATASTORE_PREDICATE_FACTORY.newMetricExistsPredicate(header.getName(), null));
             }
             andPredicate.getPredicates().add(metricsPredicate);
         }

diff --git a/...pse/kapua/service/datastore/internal/model/query/predicate/MetricExistsPredicateImpl.java b/...pse/kapua/service/datastore/internal/model/query/predicate/MetricExistsPredicateImpl.java
@@ -67,7 +67,7 @@ public ObjectNode toSerializedMap() throws MappingException {
 
         fieldNameSb.append(MessageField.METRICS.field())
                 .append(".")
-                .append(getName());
+                .append(DatastoreUtils.normalizeMetricName(getName()));
 
         if (getType() != null) {
             fieldNameSb.append(".")

diff --git a/...g/eclipse/kapua/service/datastore/internal/model/query/predicate/MetricPredicateImpl.java b/...g/eclipse/kapua/service/datastore/internal/model/query/predicate/MetricPredicateImpl.java
@@ -86,7 +86,7 @@ public ObjectNode toSerializedMap() throws MappingException {
         termNode.set(
                 getField().field()
                         .concat(".")
-                        .concat(getName())
+                        .concat(DatastoreUtils.normalizeMetricName(getName()))
                         .concat(".")
                         .concat(DatastoreUtils.getClientMetricFromAcronym(getType().getSimpleName().toLowerCase())),
                 valuesNode);