Consider supporting Pageable for String query

src/main/java/org/springframework/data/reindexer/repository/query/ProjectingResultIterator.java

@@ -0,0 +1,184 @@
+/*
+ * Copyright 2022 evgeniycheban
+ *
+ * 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 org.springframework.data.reindexer.repository.query;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import ru.rt.restream.reindexer.AggregationResult;
+import ru.rt.restream.reindexer.AggregationResult.Facet;
+import ru.rt.restream.reindexer.Query;
+import ru.rt.restream.reindexer.ResultIterator;
+import ru.rt.restream.reindexer.util.BeanPropertyUtils;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.model.PreferredConstructorDiscoverer;
+import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.util.ReflectionUtils;
+import org.springframework.util.Assert;
+
+/**
+ * For internal use only, as this contract is likely to change.
+ *
+ * @author Evgeniy Cheban
+ */
+final class ProjectingResultIterator implements ResultIterator<Object> {
+
+	private static final Map<Class<?>, Constructor<?>> cache = new ConcurrentHashMap<>();
+
+	private final ResultIterator<?> delegate;
+
+	private final ReturnedType projectionType;
+
+	private final AggregationResult aggregationFacet;
+
+	private final Map<String, Set<String>> distinctAggregationResults;
+
+	private final ConversionService conversionService = DefaultConversionService.getSharedInstance();
+
+	private int aggregationPosition;
+
+	ProjectingResultIterator(Query<?> query, ReturnedType projectionType) {
+		this(query.execute(), projectionType);
+	}
+
+	ProjectingResultIterator(ResultIterator<?> delegate, ReturnedType projectionType) {
+		this.delegate = delegate;
+		this.projectionType = projectionType;
+		this.aggregationFacet = getAggregationFacet();
+		this.distinctAggregationResults = getDistinctAggregationResults();
+	}
+
+	@Override
+	public long getTotalCount() {
+		return this.delegate.getTotalCount();
+	}
+
+	@Override
+	public long size() {
+		return this.delegate.size();
+	}
+
+	@Override
+	public List<AggregationResult> aggResults() {
+		return this.delegate.aggResults();
+	}
+
+	@Override
+	public void close() {
+		this.delegate.close();
+	}
+
+	@Override
+	public boolean hasNext() {
+		return this.delegate.hasNext() || this.aggregationFacet != null && this.aggregationPosition < this.aggregationFacet.getFacets().size();
+	}
+
+	@Override
+	public Object next() {
+		if (this.aggregationFacet != null && !this.distinctAggregationResults.isEmpty()) {
+			Object item = null;
+			Object[] arguments = null;
+			List<String> fields = this.aggregationFacet.getFields();
+			if (this.projectionType.needsCustomConstruction() && !this.projectionType.getReturnedType().isInterface()) {
+				arguments = new Object[fields.size()];
+			}
+			else {
+				try {
+					item = this.projectionType.getDomainType().getDeclaredConstructor().newInstance();
+				}
+				catch (NoSuchMethodException | InvocationTargetException |
+					   InstantiationException | IllegalAccessException e) {
+					throw new RuntimeException(e);
+				}
+			}
+			for (int i = 0; i < fields.size(); i++) {
+				String field = fields.get(i);
+				Facet facet = this.aggregationFacet.getFacets().get(this.aggregationPosition);
+				if (i < facet.getValues().size() && this.distinctAggregationResults.get(field).remove(facet.getValues().get(i))) {
+					Object value = this.conversionService.convert(facet.getValues().get(i), ReflectionUtils.findRequiredField(this.projectionType.getDomainType(), field).getType());
+					if (arguments != null) {
+						arguments[i] = value;
+					}
+					else {
+						BeanPropertyUtils.setProperty(item, field, value);
+					}
+				}
+				else {
+					this.aggregationPosition++;
+					return null;
+				}
+			}
+			this.aggregationPosition++;
+			if (item != null) {
+				return item;
+			}
+			return constructTargetObject(arguments);
+		}
+		Object item = this.delegate.next();
+		if (this.projectionType.needsCustomConstruction() && !this.projectionType.getReturnedType().isInterface()) {
+			List<String> properties = this.projectionType.getInputProperties();
+			Object[] values = new Object[properties.size()];
+			for (int i = 0; i < properties.size(); i++) {
+				values[i] = BeanPropertyUtils.getProperty(item, properties.get(i));
+			}
+			return constructTargetObject(values);
+		}
+		return item;
+	}
+
+	private Object constructTargetObject(Object[] values) {
+		Constructor<?> constructor = cache.computeIfAbsent(this.projectionType.getReturnedType(), (type) -> {
+			PreferredConstructor<?, ?> preferredConstructor = PreferredConstructorDiscoverer.discover(type);
+			Assert.state(preferredConstructor != null, () -> "No preferred constructor found for " + type);
+			return preferredConstructor.getConstructor();
+		});
+		try {
+			return constructor.newInstance(values);
+		}
+		catch (InvocationTargetException | InstantiationException |
+			   IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private Map<String, Set<String>> getDistinctAggregationResults() {
+		Map<String, Set<String>> result = new HashMap<>();
+		for (AggregationResult aggregationResult : aggResults()) {
+			if ("distinct".equals(aggregationResult.getType())) {
+				result.put(aggregationResult.getFields().get(0), new HashSet<>(aggregationResult.getDistincts()));
+			}
+		}
+		return result;
+	}
+
+	private AggregationResult getAggregationFacet() {
+		for (AggregationResult aggregationResult : aggResults()) {
+			if ("facet".equals(aggregationResult.getType())) {
+				return aggregationResult;
+			}
+		}
+		return null;
+	}
+}

src/main/java/org/springframework/data/reindexer/repository/query/ReindexerParameterAccessor.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 evgeniycheban
+ *
+ * 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 org.springframework.data.reindexer.repository.query;
+
+import org.springframework.data.repository.query.Parameters;
+import org.springframework.data.repository.query.ParametersParameterAccessor;
+
+/**
+ * For internal use only, as this contract is likely to change.
+ *
+ * @author Evgeniy Cheban
+ */
+final class ReindexerParameterAccessor extends ParametersParameterAccessor {
+
+	/**
+	 * Creates a new {@link ParametersParameterAccessor}.
+	 *
+	 * @param parameters must not be {@literal null}.
+	 * @param values must not be {@literal null}.
+	 */
+	ReindexerParameterAccessor(Parameters<?, ?> parameters, Object[] values) {
+		super(parameters, values);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Object[] getValues() {
+		return super.getValues();
+	}
+}

src/main/java/org/springframework/data/reindexer/repository/query/ReindexerQueryCreator.java

@@ -174,9 +174,6 @@ protected Query<?> complete(Query<?> criteria, Sort sort) {
 				}
 				criteria.aggregateFacet(this.returnedType.getInputProperties().toArray(String[]::new));
 			}
-			else {
-				criteria.aggregateDistinct(this.entityInformation.getIdFieldName());
-			}
 		}
 		if (this.returnedType.needsCustomConstruction()) {
 			criteria.select(this.returnedType.getInputProperties().toArray(String[]::new));
@@ -214,7 +211,7 @@ else if (this.tree.isExistsProjection()) {
 		return criteria;
 	}
 
-	private int getOffsetAsInteger(Pageable pageable) {
+	static int getOffsetAsInteger(Pageable pageable) {
 		if (pageable.getOffset() > Integer.MAX_VALUE) {
 			throw new InvalidDataAccessApiUsageException("Page offset exceeds Integer.MAX_VALUE (" + Integer.MAX_VALUE + ")");
 		}

src/main/java/org/springframework/data/reindexer/repository/query/ReindexerQueryMethod.java

@@ -130,7 +130,8 @@ public String getQuery() {
 	 *
 	 * @return true, if the query is for UPDATE
 	 */
-	public boolean isUpdateQuery() {
+	@Override
+	public boolean isModifyingQuery() {
 		Query query = this.queryAnnotationExtractor.get();
 		return query.update();
 	}