Added basic working sql queries

Author: JohannesRabauer

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>spring-data-eclipse-store-root</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

spring-data-eclipse-store-benchmark/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-benchmark</artifactId>

spring-data-eclipse-store-demo/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-demo</artifactId>

spring-data-eclipse-store-jpa/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-jpa</artifactId>

spring-data-eclipse-store/pom.xml

@@ -169,6 +169,20 @@
 			<groupId>com.googlecode.cqengine</groupId>
 			<artifactId>cqengine</artifactId>
 			<version>3.6.0</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>kryo</artifactId>
+					<groupId>com.esotericsoftware</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>kryo-serializers</artifactId>
+					<groupId>de.javakaffee</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>sqlite-jdbc</artifactId>
+					<groupId>org.xerial</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/HSqlQueryProvider.java

@@ -1,14 +1,24 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package software.xdev.spring.data.eclipse.store.repository.query;
 
-import java.lang.reflect.Method;
 import java.util.Objects;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.util.TypeInformation;
 
 import software.xdev.spring.data.eclipse.store.core.EntityListProvider;
 import software.xdev.spring.data.eclipse.store.repository.query.antlr.HSqlQueryExecutor;
@@ -17,35 +27,24 @@
 
 public class HSqlQueryProvider<T> implements RepositoryQuery
 {
-	private static final Logger LOG = LoggerFactory.getLogger(HSqlQueryProvider.class);
-	
-	// private final PartTree tree;
-	private final Parameters<?, ?> parameters;
-	private final EntityListProvider entityListProvider;
-	private final Class<T> domainClass;
-	private final TypeInformation<?> typeInformation;
-	private final WorkingCopier<T> copier;
-	private final QueryMethod queryMethod;
 	private final HSqlQueryExecutor executor;
 	private final String sqlValue;
+	private final QueryMethod queryMethod;
 
 	public HSqlQueryProvider(
 		final String sqlValue,
 		final QueryMethod queryMethod,
-		final Method method,
 		final Class<T> domainClass,
 		final EntityListProvider entityListProvider,
 		final WorkingCopier<T> copier
 	)
 	{
-		Objects.requireNonNull(method);
 		this.queryMethod = queryMethod;
-		this.domainClass = Objects.requireNonNull(domainClass);
-		this.entityListProvider = Objects.requireNonNull(entityListProvider);
-		this.typeInformation = TypeInformation.fromReturnTypeOf(method);
-		this.parameters = queryMethod.getParameters();
-		this.copier = Objects.requireNonNull(copier);
-		this.executor = new HSqlQueryExecutor(this.domainClass, this.entityListProvider);
+		this.executor = new HSqlQueryExecutor(
+			Objects.requireNonNull(domainClass),
+			Objects.requireNonNull(entityListProvider),
+			copier
+		);
 		this.sqlValue = sqlValue;
 	}
 
@@ -58,6 +57,6 @@ public Object execute(final Object[] parameters)
 	@Override
 	public QueryMethod getQueryMethod()
 	{
-		return null;
+		return this.queryMethod;
 	}
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/antlr/HSqlQueryExecutor.java

@@ -1,6 +1,24 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package software.xdev.spring.data.eclipse.store.repository.query.antlr;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
@@ -14,41 +32,45 @@
 
 import software.xdev.spring.data.eclipse.store.core.EntityListProvider;
 import software.xdev.spring.data.eclipse.store.repository.access.AccessHelper;
+import software.xdev.spring.data.eclipse.store.repository.support.copier.working.WorkingCopier;
 
 
 public class HSqlQueryExecutor<T>
 {
 	private final SQLParser<T> parser;
 	private final EntityListProvider entityListProvider;
 	private final Class<T> domainClass;
+	private final WorkingCopier<T> copier;
 
-	public HSqlQueryExecutor(final Class<T> domainClass, final EntityListProvider entityListProvider)
+	public HSqlQueryExecutor(
+		final Class<T> domainClass,
+		final EntityListProvider entityListProvider,
+		final WorkingCopier<T> copier)
 	{
 		this.domainClass = domainClass;
 		this.parser = SQLParser.forPojoWithAttributes(domainClass, this.createAttributes(domainClass));
 		this.entityListProvider = entityListProvider;
+		this.copier = copier;
 	}
 
-	public Object execute(final String sqlValue, final Object[] parameters)
+	public List<T> execute(final String sqlValue, final Object[] parameters)
 	{
 		final IndexedCollection<T> entities = new ConcurrentIndexedCollection<>();
 		entities.addAll(this.entityListProvider.getEntityProvider(this.domainClass).toCollection());
 		final String sqlStringWithReplacedValues = this.replacePlaceholders(sqlValue, parameters);
 		final ResultSet<T> retrieve = this.parser.retrieve(entities, sqlStringWithReplacedValues);
-		return retrieve.stream().toList();
+		final List<T> results = retrieve.stream().toList();
+		return this.copier.copy(results);
 	}
 
-	private String replacePlaceholders(String sqlValue, final Object[] parameters)
+	private String replacePlaceholders(final String sqlValue, final Object[] parameters)
 	{
+		String stringWithReplacedValues = sqlValue;
 		// Replace positional placeholders with actual parameter values
 		for(int i = 0; i < parameters.length; i++)
 		{
 			final String placeholder = "\\?" + (i + 1);
 			String value = parameters[i].toString();
-			if(parameters[i] instanceof String)
-			{
-				value = "'" + value + "'";
-			}
 			if(parameters[i] instanceof final Collection collection)
 			{
 				value =
@@ -57,9 +79,13 @@ private String replacePlaceholders(String sqlValue, final Object[] parameters)
 						.collect(Collectors.joining(", ", "(", ")"))
 						.toString();
 			}
-			sqlValue = sqlValue.replaceAll(placeholder, value);
+			if(parameters[i] instanceof final LocalDate localDate)
+			{
+				value = localDate.format(DateTimeFormatter.ofPattern("YYYY-MM-dd"));
+			}
+			stringWithReplacedValues = stringWithReplacedValues.replaceAll(placeholder, value);
 		}
-		return sqlValue;
+		return stringWithReplacedValues;
 	}
 
 	private <O> Map<String, ? extends Attribute<O, ?>> createAttributes(final Class<O> domainClass)

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreQueryLookupStrategy.java

@@ -76,8 +76,7 @@ public RepositoryQuery resolveQuery(
 			return this.createHSqlQueryProvider(
 				queryAnnotation.value(),
 				metadata.getDomainType(),
-				queryMethod,
-				method
+				queryMethod
 			);
 		}
 
@@ -121,14 +120,12 @@ private <T> RepositoryQuery createStringBasedEclipseStoreQueryProvider(
 	private <T> RepositoryQuery createHSqlQueryProvider(
 		final String sqlString,
 		final Class<T> domainType,
-		final QueryMethod queryMethod,
-		final Method method
+		final QueryMethod queryMethod
 	)
 	{
 		return new HSqlQueryProvider<>(
 			sqlString,
 			queryMethod,
-			method,
 			domainType,
 			this.storage,
 			this.workingCopierCreator.createWorkingCopier(domainType, this.storage)