Skip to content

Commit 8680f26

Browse files
vsilaevvsilaev
committed
Relax type restrictions in Promises.partitioned + preparing next release
1 parent 137ea7b commit 8680f26

File tree

6 files changed

+62
-55
lines changed

6 files changed

+62
-55
lines changed

‎.classpath

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<classpath>
33
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
44
<attributes>
5+
<attribute name="test" value="true"/>
56
<attribute name="optional" value="true"/>
67
<attribute name="maven.pomderived" value="true"/>
78
</attributes>
@@ -17,7 +18,7 @@
1718
<attribute name="maven.pomderived" value="true"/>
1819
</attributes>
1920
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 12">
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12">
2122
<attributes>
2223
<attribute name="module" value="true"/>
2324
<attribute name="maven.pomderived" value="true"/>
@@ -28,5 +29,11 @@
2829
<attribute name="maven.pomderived" value="true"/>
2930
</attributes>
3031
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
33+
<attributes>
34+
<attribute name="test" value="true"/>
35+
<attribute name="maven.pomderived" value="true"/>
36+
</attributes>
37+
</classpathentry>
3138
<classpathentry kind="output" path="target/classes"/>
3239
</classpath>

‎.settings/org.eclipse.jdt.core.prefs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=12
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=12
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
14-
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
15-
org.eclipse.jdt.core.compiler.release=disabled
16-
org.eclipse.jdt.core.compiler.source=1.8
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
15+
org.eclipse.jdt.core.compiler.release=enabled
16+
org.eclipse.jdt.core.compiler.source=12

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate/net.tascalate.concurrent.svg)](https://search.maven.org/artifact/net.tascalate/net.tascalate.concurrent/0.9.6/jar) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-concurrent.svg)](https://github.com/vsilaev/tascalate-concurrent/releases/tag/0.9.6) [![license](https://img.shields.io/github/license/vsilaev/tascalate-concurrent.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
1+
[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate/net.tascalate.concurrent.svg)](https://search.maven.org/artifact/net.tascalate/net.tascalate.concurrent/0.9.7/jar) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-concurrent.svg)](https://github.com/vsilaev/tascalate-concurrent/releases/tag/0.9.7) [![license](https://img.shields.io/github/license/vsilaev/tascalate-concurrent.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
22
# tascalate-concurrent
33
The library provides an implementation of the [CompletionStage](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionStage.html) interface and related classes these are designed to support long-running blocking tasks (typically, I/O bound). This functionality augments the sole Java 8 built-in implementation, [CompletableFuture](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html), that is primarily supports computational tasks. Also, the library helps with numerous asynchronous programing challenges like handling timeouts, retry/poll functionality, orchestrating results of multiple concurrent computations and similar.
44

@@ -12,7 +12,7 @@ New name:
1212
<dependency>
1313
<groupId>net.tascalate</groupId>
1414
<artifactId>net.tascalate.concurrent</artifactId>
15-
<version>0.9.6</version> <!-- Any version above 0.8.0, the latest one is recommended -->
15+
<version>0.9.7</version> <!-- Any version above 0.8.0, the latest one is recommended -->
1616
</dependency>
1717
```
1818
Old Name
@@ -38,7 +38,7 @@ To use a library you have to add a single Maven dependency
3838
<dependency>
3939
<groupId>net.tascalate</groupId>
4040
<artifactId>net.tascalate.concurrent</artifactId>
41-
<version>0.9.6</version>
41+
<version>0.9.7</version>
4242
</dependency>
4343
```
4444
# What is inside?

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.tascalate</groupId>
88
<artifactId>net.tascalate.concurrent</artifactId>
9-
<version>0.9.6</version>
9+
<version>0.9.7</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Tascalate Concurrent</name>

‎src/main/java/net/tascalate/concurrent/PromiseOperations.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ public static <T, F extends Promise<T>> Function<F, F> peek(Consumer<? super F>
9494
return p -> unwrap(Promises.tryComposeEx(p.dependent(PromiseOrigin.ALL), fn));
9595
}
9696

97-
public static <T, A, R> Function<Promise<Iterable<T>>, Promise<R>>
97+
public static <S, T, A, R> Function<Promise<Iterable<S>>, Promise<R>>
9898
partitionedItems(int batchSize,
99-
Function<? super T, CompletionStage<? extends T>> spawner,
99+
Function<? super S, CompletionStage<? extends T>> spawner,
100100
Collector<T, A, R> downstream) {
101101

102102
return p -> p.dependent()
@@ -105,9 +105,9 @@ public static <T, F extends Promise<T>> Function<F, F> peek(Consumer<? super F>
105105
.unwrap();
106106
}
107107

108-
public static <T, A, R> Function<Promise<Iterable<T>>, Promise<R>>
108+
public static <S, T, A, R> Function<Promise<Iterable<S>>, Promise<R>>
109109
partitionedItems(int batchSize,
110-
Function<? super T, CompletionStage<? extends T>> spawner,
110+
Function<? super S, CompletionStage<? extends T>> spawner,
111111
Collector<T, A, R> downstream,
112112
Executor downstreamExecutor) {
113113

@@ -117,9 +117,9 @@ public static <T, F extends Promise<T>> Function<F, F> peek(Consumer<? super F>
117117
.unwrap();
118118
}
119119

120-
public static <T, A, R> Function<Promise<Stream<T>>, Promise<R>>
120+
public static <S, T, A, R> Function<Promise<Stream<S>>, Promise<R>>
121121
partitionedStream(int batchSize,
122-
Function<? super T, CompletionStage<? extends T>> spawner,
122+
Function<? super S, CompletionStage<? extends T>> spawner,
123123
Collector<T, A, R> downstream) {
124124

125125
return p -> p.dependent()
@@ -128,9 +128,9 @@ public static <T, F extends Promise<T>> Function<F, F> peek(Consumer<? super F>
128128
.unwrap();
129129
}
130130

131-
public static <T, A, R> Function<Promise<Stream<T>>, Promise<R>>
131+
public static <S, T, A, R> Function<Promise<Stream<S>>, Promise<R>>
132132
partitionedStream(int batchSize,
133-
Function<? super T, CompletionStage<? extends T>> spawner,
133+
Function<? super S, CompletionStage<? extends T>> spawner,
134134
Collector<T, A, R> downstream,
135135
Executor downstreamExecutor) {
136136

‎src/main/java/net/tascalate/concurrent/Promises.java

+37-37
Original file line numberDiff line numberDiff line change
@@ -253,41 +253,41 @@ public static <T, R extends AsyncCloseable> Promise<T> tryComposeEx(Promise<R> p
253253
});
254254
}
255255

256-
public static <T, A, R> Promise<R> partitioned(Iterable<? extends T> values,
257-
int batchSize,
258-
Function<? super T, CompletionStage<? extends T>> spawner,
259-
Collector<T, A, R> downstream) {
256+
public static <S, T, A, R> Promise<R> partitioned(Iterable<? extends S> values,
257+
int batchSize,
258+
Function<? super S, CompletionStage<? extends T>> spawner,
259+
Collector<T, A, R> downstream) {
260260
return partitioned1(values.iterator(), null, batchSize, spawner, downstream);
261261
}
262262

263-
public static <T, A, R> Promise<R> partitioned(Iterable<? extends T> values,
264-
int batchSize,
265-
Function<? super T, CompletionStage<? extends T>> spawner,
266-
Collector<T, A, R> downstream,
267-
Executor downstreamExecutor) {
263+
public static <S, T, A, R> Promise<R> partitioned(Iterable<? extends S> values,
264+
int batchSize,
265+
Function<? super S, CompletionStage<? extends T>> spawner,
266+
Collector<T, A, R> downstream,
267+
Executor downstreamExecutor) {
268268
return partitioned2(values.iterator(), null, batchSize, spawner, downstream, downstreamExecutor);
269269
}
270270

271-
public static <T, A, R> Promise<R> partitioned(Stream<? extends T> values,
272-
int batchSize,
273-
Function<? super T, CompletionStage<? extends T>> spawner,
274-
Collector<T, A, R> downstream) {
271+
public static <S, T, A, R> Promise<R> partitioned(Stream<? extends S> values,
272+
int batchSize,
273+
Function<? super S, CompletionStage<? extends T>> spawner,
274+
Collector<T, A, R> downstream) {
275275
return partitioned1(values.iterator(), values, batchSize, spawner, downstream);
276276
}
277277

278-
public static <T, A, R> Promise<R> partitioned(Stream<? extends T> values,
279-
int batchSize,
280-
Function<? super T, CompletionStage<? extends T>> spawner,
281-
Collector<T, A, R> downstream,
282-
Executor downstreamExecutor) {
278+
public static <S, T, A, R> Promise<R> partitioned(Stream<? extends S> values,
279+
int batchSize,
280+
Function<? super S, CompletionStage<? extends T>> spawner,
281+
Collector<T, A, R> downstream,
282+
Executor downstreamExecutor) {
283283
return partitioned2(values.iterator(), values, batchSize, spawner, downstream, downstreamExecutor);
284284
}
285285

286-
private static <T, A, R> Promise<R> partitioned1(Iterator<? extends T> values,
287-
Object source,
288-
int batchSize,
289-
Function<? super T, CompletionStage<? extends T>> spawner,
290-
Collector<T, A, R> downstream) {
286+
private static <S, T, A, R> Promise<R> partitioned1(Iterator<? extends S> values,
287+
Object source,
288+
int batchSize,
289+
Function<? super S, CompletionStage<? extends T>> spawner,
290+
Collector<T, A, R> downstream) {
291291
return
292292
parallelStep1(values, batchSize, spawner, downstream)
293293
.dependent()
@@ -296,12 +296,12 @@ private static <T, A, R> Promise<R> partitioned1(Iterator<? extends T> values,
296296
.unwrap();
297297
}
298298

299-
private static <T, A, R> Promise<R> partitioned2(Iterator<? extends T> values,
300-
Object source,
301-
int batchSize,
302-
Function<? super T, CompletionStage<? extends T>> spawner,
303-
Collector<T, A, R> downstream,
304-
Executor downstreamExecutor) {
299+
private static <S, T, A, R> Promise<R> partitioned2(Iterator<? extends S> values,
300+
Object source,
301+
int batchSize,
302+
Function<? super S, CompletionStage<? extends T>> spawner,
303+
Collector<T, A, R> downstream,
304+
Executor downstreamExecutor) {
305305
return
306306
parallelStep2(values, batchSize, spawner, downstream, downstreamExecutor)
307307
.dependent()
@@ -310,13 +310,13 @@ private static <T, A, R> Promise<R> partitioned2(Iterator<? extends T> values,
310310
.unwrap();
311311
}
312312

313-
private static <T, A, R> Promise<IndexedStep<A>> parallelStep1(
314-
Iterator<? extends T> values, int batchSize,
315-
Function<? super T, CompletionStage<? extends T>> spawner,
313+
private static <S, T, A, R> Promise<IndexedStep<A>> parallelStep1(
314+
Iterator<? extends S> values, int batchSize,
315+
Function<? super S, CompletionStage<? extends T>> spawner,
316316
Collector<T, A, R> downstream) {
317317

318318
return loop(new IndexedStep<>(), step -> step.initial() || values.hasNext(), step -> {
319-
List<T> valuesBatch = drainBatch(values, batchSize);
319+
List<S> valuesBatch = drainBatch(values, batchSize);
320320
if (valuesBatch.isEmpty()) {
321321
// Over
322322
return Promises.success(step.initial() ? step.next(downstream.supplier().get()) : step);
@@ -336,14 +336,14 @@ private static <T, A, R> Promise<IndexedStep<A>> parallelStep1(
336336
});
337337
}
338338

339-
private static <T, A, R> Promise<IndexedStep<A>> parallelStep2(
340-
Iterator<? extends T> values, int batchSize,
341-
Function<? super T, CompletionStage<? extends T>> spawner,
339+
private static <S, T, A, R> Promise<IndexedStep<A>> parallelStep2(
340+
Iterator<? extends S> values, int batchSize,
341+
Function<? super S, CompletionStage<? extends T>> spawner,
342342
Collector<T, A, R> downstream,
343343
Executor downstreamExecutor) {
344344

345345
return loop(new IndexedStep<>(), step -> step.initial() || values.hasNext(), step -> {
346-
List<T> valuesBatch = drainBatch(values, batchSize);
346+
List<S> valuesBatch = drainBatch(values, batchSize);
347347
if (valuesBatch.isEmpty()) {
348348
// Over
349349
return step.initial() ?

0 commit comments

Comments
 (0)