Fixed tenant filter in elasticsearch

EinsamHauer · Jan 25, 2022 · 9fde21f · 9fde21f
1 parent 96e5ce2
commit 9fde21f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>net.iponweb.disthene.reader</groupId>
     <artifactId>disthene-reader</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <name>disthene-reader</name>
     <url>http://maven.apache.org</url>
 
@@ -84,17 +84,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/net/iponweb/disthene/reader/service/index/IndexService.java b/src/main/java/net/iponweb/disthene/reader/service/index/IndexService.java
@@ -65,9 +65,9 @@ private List<String> getPathsFromRegExs(String tenant, List<String> regExs, bool
 
             BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery()
                     .must(QueryBuilders.regexpQuery("path.keyword", regEx))
-                    .must(QueryBuilders.termQuery("tenant", tenant));
+                    .filter(QueryBuilders.termQuery("tenant.keyword", tenant));
 
-            if (leaf) queryBuilder.must(QueryBuilders.termQuery("leaf", true));
+            if (leaf) queryBuilder.filter(QueryBuilders.termQuery("leaf", true));
 
             SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
                     .fetchSource("path", null)
@@ -137,7 +137,7 @@ public String getPathsAsJsonArray(String tenant, String wildcard) throws TooMuch
 
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery()
                 .must(QueryBuilders.regexpQuery("path.keyword", regEx))
-                .must(QueryBuilders.termQuery("tenant", tenant));
+                .filter(QueryBuilders.termQuery("tenant.keyword", tenant));
 
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
                 .query(queryBuilder);