Updating build.

o19s · Nov 10, 2024 · b97648a · b97648a
1 parent 64707ae
commit b97648a
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 29 deletions.
diff --git a/opensearch-search-quality-evaluation-plugin/build.gradle b/opensearch-search-quality-evaluation-plugin/build.gradle
@@ -22,9 +22,6 @@ ext {
 group = 'org.opensearch'
 version = "${evalVersion}"
 
-sourceCompatibility = 17
-targetCompatibility = 17
-
 // disabling some unnecessary validations for this plugin
 testingConventions.enabled = false
 forbiddenApis.ignoreFailures = true

diff --git a/...on-plugin/src/main/java/org/opensearch/eval/judgments/clickmodel/coec/CoecClickModel.java b/...on-plugin/src/main/java/org/opensearch/eval/judgments/clickmodel/coec/CoecClickModel.java
@@ -179,32 +179,59 @@ private Map<String, Set<ClickthroughRate>> getClickthroughRate(final int maxRank
         // TODO: Use maxRank in place of the hardcoded 20.
         // TODO: Allow for a time period and for a specific application.
 
-        final String query = """
-              {
-                "bool": {
-                  "should": [
-                    {
-                      "term": {
-                        "action_name": "click"
-                      }
-                    },
-                    {
-                      "term": {
-                        "action_name": "view"
-                      }
-                    }
-                  ],
-                  "must": [
-                    {
-                      "range": {
-                        "event_attributes.position.index": {
-                          "lte": 20
-                        }
-                      }
-                    }
-                  ]
-                }
-              }""";
+        /**
+         * {
+         *                 "bool": {
+         *                   "should": [
+         *                     {
+         *                       "term": {
+         *                         "action_name": "click"
+         *                       }
+         *                     },
+         *                     {
+         *                       "term": {
+         *                         "action_name": "view"
+         *                       }
+         *                     }
+         *                   ],
+         *                   "must": [
+         *                     {
+         *                       "range": {
+         *                         "event_attributes.position.index": {
+         *                           "lte": 20
+         *                         }
+         *                       }
+         *                     }
+         *                   ]
+         *                 }
+         *               }
+         */
+
+        final String query = "{\n" +
+                "                \"bool\": {\n" +
+                "                  \"should\": [\n" +
+                "                    {\n" +
+                "                      \"term\": {\n" +
+                "                        \"action_name\": \"click\"\n" +
+                "                      }\n" +
+                "                    },\n" +
+                "                    {\n" +
+                "                      \"term\": {\n" +
+                "                        \"action_name\": \"view\"\n" +
+                "                      }\n" +
+                "                    }\n" +
+                "                  ],\n" +
+                "                  \"must\": [\n" +
+                "                    {\n" +
+                "                      \"range\": {\n" +
+                "                        \"event_attributes.position.index\": {\n" +
+                "                          \"lte\": 20\n" +
+                "                        }\n" +
+                "                      }\n" +
+                "                    }\n" +
+                "                  ]\n" +
+                "                }\n" +
+                "              }";
 
         final BoolQueryBuilder queryBuilder = new BoolQueryBuilder().must(new WrapperQueryBuilder(query));
         final SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(queryBuilder).size(1000);