From ca1960c2bfab0184509b632534bf687c56d54021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20Kriegler?= <post@rene-kriegler.com>
Date: Wed, 21 Dec 2022 14:26:32 +0100
Subject: [PATCH] Updating json-path #44

---
 pom.xml                                       | 13 ++++
 .../querqy/elasticsearch/query/Rewriter.java  |  2 +-
 .../SimpleCommonRulesRewriterFactoryTest.java | 61 +++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ddd8d5b..20b8953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <mockito.version>2.27.0</mockito.version>
         <spatial4j.version>0.8</spatial4j.version>
         <jts.version>1.19.0</jts.version>
+        <json-path.version>2.7.0</json-path.version>
 
         <querqy.lucene.version>5.5.lucene900.1</querqy.lucene.version>
         <es.major.version>8</es.major.version>
@@ -71,6 +72,18 @@
             <groupId>org.querqy</groupId>
             <artifactId>querqy-lucene</artifactId>
             <version>${querqy.lucene.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.jayway.jsonpath</groupId>
+                    <artifactId>json-path</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>${json-path.version}</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/querqy/elasticsearch/query/Rewriter.java b/src/main/java/querqy/elasticsearch/query/Rewriter.java
index f05ccac..367b238 100644
--- a/src/main/java/querqy/elasticsearch/query/Rewriter.java
+++ b/src/main/java/querqy/elasticsearch/query/Rewriter.java
@@ -104,7 +104,7 @@ public Map<String, Object> getParams() {
         return params;
     }
 
-    public void setParams(Map<String, Object> params) {
+    public void setParams(final Map<String, Object> params) {
         this.params = params;
     }
 
diff --git a/src/test/java/querqy/elasticsearch/rewriter/SimpleCommonRulesRewriterFactoryTest.java b/src/test/java/querqy/elasticsearch/rewriter/SimpleCommonRulesRewriterFactoryTest.java
index 995e305..10d0eee 100644
--- a/src/test/java/querqy/elasticsearch/rewriter/SimpleCommonRulesRewriterFactoryTest.java
+++ b/src/test/java/querqy/elasticsearch/rewriter/SimpleCommonRulesRewriterFactoryTest.java
@@ -69,5 +69,66 @@ public void testBooleanInput() throws ExecutionException, InterruptedException {
 
     }
 
+    public void testRuleSelectionCriteria() throws ExecutionException, InterruptedException {
+        indexDocs(
+                doc("id", "1", "field1", "a"),
+                doc("id", "2", "field1", "c")
+        );
+
+        final Map<String, Object> content = new HashMap<>();
+        content.put("class", SimpleCommonRulesRewriterFactory.class.getName());
+
+        final Map<String, Object> config = new HashMap<>();
+        config.put("allowBooleanInput", true);
+        config.put("rules", "a=>\nSYNONYM: c\n@lang:\"l1\"");
+        content.put("config", config);
+
+        final PutRewriterRequest request = new PutRewriterRequest("common_rules", content);
+
+        client().execute(PutRewriterAction.INSTANCE, request).get();
+
+        QuerqyQueryBuilder querqyQuery = new QuerqyQueryBuilder(getInstanceFromNode(QuerqyProcessor.class));
+
+        final Map<String, Object> criteria = new HashMap<>();
+        criteria.put("filter", "$[?(@.lang == 'l1')]");
+        final Map<String, Object> params = new HashMap<>();
+        params.put("criteria", criteria);
+
+        final Rewriter rewriter = new Rewriter("common_rules");
+        rewriter.setParams(params);
+
+        querqyQuery.setRewriters(singletonList(rewriter));
+        querqyQuery.setMatchingQuery(new MatchingQuery("a"));
+        querqyQuery.setMinimumShouldMatch("1");
+        querqyQuery.setQueryFieldsAndBoostings(singletonList("field1"));
+
+        SearchRequestBuilder searchRequestBuilder = client().prepareSearch(getIndexName());
+        searchRequestBuilder.setQuery(querqyQuery);
+
+        SearchResponse response = client().search(searchRequestBuilder.request()).get();
+        SearchHits hits = response.getHits();
+
+        assertEquals(2L, hits.getTotalHits().value);
+
+
+        querqyQuery = new QuerqyQueryBuilder(getInstanceFromNode(QuerqyProcessor.class));
+        criteria.put("filter", "$[?(@.lang == 'l2')]");
+
+        querqyQuery.setRewriters(singletonList(rewriter));
+        querqyQuery.setMatchingQuery(new MatchingQuery("a"));
+        querqyQuery.setMinimumShouldMatch("1");
+        querqyQuery.setQueryFieldsAndBoostings(singletonList("field1"));
+
+        searchRequestBuilder = client().prepareSearch(getIndexName());
+        searchRequestBuilder.setQuery(querqyQuery);
+
+        response = client().search(searchRequestBuilder.request()).get();
+        hits = response.getHits();
+
+        assertEquals(1L, hits.getTotalHits().value);
+
+
+
+    }
 
 }
\ No newline at end of file