From 200d7b5eb17521c3b0754e7027e003a201673011 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sat, 23 Jul 2022 22:13:17 +0200
Subject: [PATCH] Code cleanup

---
 .../it/cavallium/dbengine/client/Hits.java    | 29 ++-----------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/main/java/it/cavallium/dbengine/client/Hits.java b/src/main/java/it/cavallium/dbengine/client/Hits.java
index 03be35a..684a403 100644
--- a/src/main/java/it/cavallium/dbengine/client/Hits.java
+++ b/src/main/java/it/cavallium/dbengine/client/Hits.java
@@ -42,7 +42,7 @@ public class Hits<T> extends SimpleResource implements DiscardingCloseable {
 		return result -> {
 			var hitsToTransform = result.results()
 					.map(hit -> new LazyHitEntry<>(Mono.just(hit.key()), valueGetter.get(hit.key()), hit.score()));
-			return new MappedHits<>(hitsToTransform, result.totalHitsCount(), result);
+			return Hits.withResource(hitsToTransform, result.totalHitsCount(), result);
 		};
 	}
 
@@ -66,7 +66,7 @@ public class Hits<T> extends SimpleResource implements DiscardingCloseable {
 					return new LazyHitEntry<>(keyMono, valMono, score);
 				}, keysFlux, valuesFlux, scoresFlux);
 
-				return new MappedHits<>(transformedFlux, result.totalHitsCount(), result);
+				return Hits.withResource(transformedFlux, result.totalHitsCount(), result);
 			} catch (Throwable t) {
 				result.close();
 				throw t;
@@ -101,31 +101,6 @@ public class Hits<T> extends SimpleResource implements DiscardingCloseable {
 	protected void onClose() {
 	}
 
-	private static sealed class MappedHits<U> extends Hits<U> {
-
-		private final Hits<?> parent;
-
-		public MappedHits(Flux<U> hits,
-				TotalHitsCount count,
-				Hits<?> parent) {
-			super(hits, count);
-			this.parent = parent;
-		}
-
-		@Override
-		protected void onClose() {
-			parent.close();
-			super.onClose();
-		}
-	}
-
-	private static final class MappedLuceneHits<U> extends MappedHits<U> implements LuceneCloseable {
-
-		public MappedLuceneHits(Flux<U> hits, TotalHitsCount count, Hits<?> parent) {
-			super(hits, count, parent);
-		}
-	}
-
 	public static final class LuceneHits<U> extends Hits<U> implements LuceneCloseable {
 
 		private final LuceneCloseable resource;