Merge pull request #3635 from KIT-IBPT/issue-3632

Avoid deprecated from and to parameters for ES range queries

Author: shroffk

services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogSearchUtil.java

@@ -11,6 +11,7 @@
 import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
+import co.elastic.clients.json.JsonData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -237,8 +238,9 @@ public static List<AlarmLogMessage> search(ElasticsearchClient client,
                     Query.of(q -> q
                             .range(RangeQuery.of(r -> r
                                             .field("message_time")
-                                            .from(formatter.format(finalFromInstant))
-                                            .to(formatter.format(finalToInstant))
+                                            .gte(JsonData.of(finalFromInstant.toEpochMilli()))
+                                            .lte(JsonData.of(finalToInstant.toEpochMilli()))
+                                            .format("epoch_millis")
                                     )
                             )
                     )

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java

@@ -16,6 +16,7 @@
 import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
+import co.elastic.clients.json.JsonData;
 import org.phoebus.applications.saveandrestore.model.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -240,8 +241,9 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
                 DisMaxQuery.Builder temporalQuery = new DisMaxQuery.Builder();
                 RangeQuery.Builder rangeQuery = new RangeQuery.Builder();
                 // Add a query based on the created time
-                rangeQuery.field("node.lastModified").from(Long.toString(1000 * start.toEpochSecond()))
-                        .to(Long.toString(1000 * end.toEpochSecond()));
+                rangeQuery.field("node.lastModified").gte(JsonData.of(start.toEpochSecond()))
+                        .lte(JsonData.of(end.toEpochSecond()))
+                        .format("epoch_second");
                 NestedQuery nestedQuery = NestedQuery.of(n1 -> n1.path("node").query(rangeQuery.build()._toQuery()));
                 temporalQuery.queries(nestedQuery._toQuery());
                 boolQueryBuilder.must(temporalQuery.build()._toQuery());