Trivial refactoring: rename factory methods
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
index 5cb4110..82a19db 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
@@ -44,7 +44,7 @@
* @return the {@link Partition} instance
* @since 4.0.0
*/
- static <T> Partition<Tuple2<T, Long>> newInstance(List<Tuple2<T, Long>> listWithIndex) {
+ static <T> Partition<Tuple2<T, Long>> of(List<Tuple2<T, Long>> listWithIndex) {
return new PartitionImpl<>(listWithIndex);
}
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
index e13e106..eb0629f 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
@@ -583,7 +583,7 @@
final Queryable<Tuple2<?, Partition<Tuple2<T, Long>>>> q =
from(listWithIndex)
.groupBy(windowDefinition.partitionBy().compose(Tuple2::getV1))
- .select((e, x) -> Tuple.tuple(e.getV1(), Partition.newInstance(e.getV2().toList())));
+ .select((e, x) -> Tuple.tuple(e.getV1(), Partition.of(e.getV2().toList())));
if (q instanceof QueryableCollection) {
((QueryableCollection) q).makeReusable();
}
@@ -599,10 +599,10 @@
final SortedPartitionCacheKey<T> sortedPartitionCacheKey = new SortedPartitionCacheKey<>(partition, orderId);
Partition<Tuple2<T, Long>> sortedPartition = sortedPartitionCache.computeIfAbsent(
sortedPartitionCacheKey,
- sortedPartitionId -> Partition.newInstance(partition.orderBy(composeOrders(windowDefinition)).toList())
+ sortedPartitionId -> Partition.of(partition.orderBy(composeOrders(windowDefinition)).toList())
);
- return Window.newInstance(currentRecord, sortedPartition, windowDefinition);
+ return Window.of(currentRecord, sortedPartition, windowDefinition);
}
private static class PartitionCacheKey {
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Window.java b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Window.java
index dfcd00f..aa7a063 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Window.java
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Window.java
@@ -48,7 +48,7 @@
* @return the {@link Window} instance
* @since 4.0.0
*/
- static <T, U extends Comparable<? super U>> Window<T> newInstance(Tuple2<T, Long> currentRecord, Partition<Tuple2<T, Long>> partition, WindowDefinition<T, U> windowDefinition) {
+ static <T, U extends Comparable<? super U>> Window<T> of(Tuple2<T, Long> currentRecord, Partition<Tuple2<T, Long>> partition, WindowDefinition<T, U> windowDefinition) {
final List<Order<? super T, ? extends U>> orderList = windowDefinition.orderBy();
Order<? super T, ? extends U> order;
if (null != orderList && 1 == orderList.size()) {
