Issue #532:

- replace subDocTypeFields -> parentDocTypeField - remove getChildren method invoke
smclab · Jul 26, 2023 · 825cc40 · 825cc40
1 parent 15c5ce9
commit 825cc40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/core/app/datasource/src/main/java/io/openk9/datasource/searcher/BaseSearchService.java b/core/app/datasource/src/main/java/io/openk9/datasource/searcher/BaseSearchService.java
@@ -32,7 +32,6 @@
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
-import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.common.io.stream.OutputStreamStreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -148,7 +147,7 @@ protected void customizeCriteriaBuilder(
 
 		docTypeFetch
 			.fetch(DocType_.docTypeFields, JoinType.LEFT)
-			.fetch(DocTypeField_.subDocTypeFields, JoinType.LEFT);
+			.fetch(DocTypeField_.parentDocTypeField, JoinType.LEFT);
 
 		expressions.add(
 			criteriaBuilder.equal(

diff --git a/core/app/datasource/src/main/java/io/openk9/datasource/searcher/util/Utils.java b/core/app/datasource/src/main/java/io/openk9/datasource/searcher/util/Utils.java
@@ -66,16 +66,9 @@ public static Stream<DocTypeField> getDocTypeFieldsAndChildrenFrom(DocType docTy
 			return Stream.empty();
 		}
 
-		Stream.Builder<DocTypeField> builder = Stream.builder();
-
-		for (DocTypeField docTypeField : docType.getDocTypeFields()) {
-			builder.accept(docTypeField);
-			for (DocTypeField docTypeFieldAndChild : docTypeField.getChildren()) {
-				builder.accept(docTypeFieldAndChild);
-			}
-		}
-
-		return builder.build();
+		return docType
+			.getDocTypeFields()
+			.stream();
 
 	}