From 9313e445bdc6e0232c2a519e79193d728a66be4f Mon Sep 17 00:00:00 2001
From: Thorsten Marx <t.marx@eggheads.de>
Date: Mon, 1 Jul 2024 11:47:00 +0200
Subject: [PATCH] #217 refactor sonar issues

---
 .../main/java/com/github/thmarx/cms/filesystem/MetaData.java  | 4 ++--
 .../thmarx/cms/filesystem/metadata/memory/MemoryMetaData.java | 4 ++--
 .../thmarx/cms/filesystem/metadata/memory/MemoryQuery.java    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java
index 1ca54790..664a094c 100644
--- a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java
+++ b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java
@@ -60,6 +60,6 @@ public enum Type {
 
 	Map<String, ContentNode> getTree();
 	
-	<T> ContentQuery<T> query(final BiFunction<ContentNode, Integer, T> nodeMapper);
-	<T> ContentQuery<T> query(final String startURI, final BiFunction<ContentNode, Integer, T> nodeMapper);
+	<Q> ContentQuery<Q> query(final BiFunction<ContentNode, Integer, Q> nodeMapper);
+	<Q> ContentQuery<Q> query(final String startURI, final BiFunction<ContentNode, Integer, Q> nodeMapper);
 }
diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryMetaData.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryMetaData.java
index f08501ee..da2e82ec 100644
--- a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryMetaData.java
+++ b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryMetaData.java
@@ -84,7 +84,7 @@ public void close() throws IOException {
 	
 	@Override
 	public <T> ContentQuery<T> query(final BiFunction<ContentNode, Integer, T> nodeMapper) {
-		return new MemoryQuery(new ArrayList<>(nodes.values()), nodeMapper);
+		return new MemoryQuery<T>(new ArrayList<>(nodes.values()), nodeMapper);
 	}
 
 	@Override
@@ -99,7 +99,7 @@ public <T> ContentQuery<T> query(final String startURI, final BiFunction<Content
 
 		var filtered = getNodes().values().stream().filter(node -> node.uri().startsWith(uri)).toList();
 
-		return new MemoryQuery(filtered, nodeMapper);
+		return new MemoryQuery<T>(filtered, nodeMapper);
 	}
 
 	
diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryQuery.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryQuery.java
index 72c1525e..fe4043e2 100644
--- a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryQuery.java
+++ b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/metadata/memory/MemoryQuery.java
@@ -43,7 +43,7 @@
  * @author t.marx
  * @param <T>
  */
-public class MemoryQuery<T extends ContentNode> extends ExtendableQuery<T> {
+public class MemoryQuery<T> extends ExtendableQuery<T> {
 
 	private QueryContext<T> context;
 
@@ -191,7 +191,7 @@ public Map<Object, List<ContentNode>> groupby(final String field) {
 		return QueryUtil.groupby(context.getNodes(), field);
 	}
 
-	public static record Sort<T extends ContentNode>(String field, QueryContext context) implements ContentQuery.Sort<T> {
+	public static record Sort<T>(String field, QueryContext context) implements ContentQuery.Sort<T> {
 
 		public MemoryQuery<T> asc() {
 			return new MemoryQuery(sorted(context, field, true));