From 2c8bb8a48016724e779ab4fbdba1a9a9a755d5b2 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 6 Feb 2021 15:53:10 +0100 Subject: [PATCH] Update lucene --- src/main/java/it/cavallium/dbengine/client/Indicizer.java | 2 +- .../java/it/cavallium/dbengine/client/LuceneIndex.java | 8 ++++++-- .../dbengine/database/collections/DatabaseEmpty.java | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/it/cavallium/dbengine/client/Indicizer.java b/src/main/java/it/cavallium/dbengine/client/Indicizer.java index 311e95b..76127a4 100644 --- a/src/main/java/it/cavallium/dbengine/client/Indicizer.java +++ b/src/main/java/it/cavallium/dbengine/client/Indicizer.java @@ -18,7 +18,7 @@ public abstract class Indicizer { public abstract @NotNull T getKey(String key); - public Flux>> getMoreLikeThisDocumentFields(U value) { + public Flux>> getMoreLikeThisDocumentFields(T key, U value) { return Flux.empty(); } } diff --git a/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java b/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java index 312cc5f..af79a35 100644 --- a/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java +++ b/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java @@ -110,9 +110,11 @@ public class LuceneIndex implements LLSnapshottable { * @return the collection has one or more flux */ public Mono> moreLikeThis(@Nullable CompositeSnapshot snapshot, + T key, U mltDocumentValue, int limit) { - Flux>> mltDocumentFields = indicizer.getMoreLikeThisDocumentFields(mltDocumentValue); + Flux>> mltDocumentFields + = indicizer.getMoreLikeThisDocumentFields(key, mltDocumentValue); return luceneIndex .moreLikeThis(resolveSnapshot(snapshot), mltDocumentFields, limit, indicizer.getKeyFieldName()) .map(llSearchResult -> this.transformLuceneResult(llSearchResult, MultiSort.topScore(), limit)); @@ -127,10 +129,12 @@ public class LuceneIndex implements LLSnapshottable { * @return the collection has one or more flux */ public Mono> moreLikeThisWithValues(@Nullable CompositeSnapshot snapshot, + T key, U mltDocumentValue, int limit, ValueGetter valueGetter) { - Flux>> mltDocumentFields = indicizer.getMoreLikeThisDocumentFields(mltDocumentValue); + Flux>> mltDocumentFields + = indicizer.getMoreLikeThisDocumentFields(key, mltDocumentValue); return luceneIndex .moreLikeThis(resolveSnapshot(snapshot), mltDocumentFields, limit, indicizer.getKeyFieldName()) .map(llSearchResult -> diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java index d6b5ddf..c73ce4a 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java @@ -35,6 +35,9 @@ public class DatabaseEmpty { public static final class Nothing { + @SuppressWarnings("InstantiationOfUtilityClass") + public static Nothing INSTANCE = new Nothing(); + private Nothing() { }