reschke commented on code in PR #2487: URL: https://github.com/apache/jackrabbit-oak/pull/2487#discussion_r2317811173
########## oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java: ########## @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.util.concurrent.Futures; -import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.jackrabbit.guava.common.util.concurrent.SettableFuture; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.apache.jackrabbit.oak.commons.concurrent.FutureUtils; Review Comment: shouldn't this go into `internal.concurrent` as well? ########## oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/FutureUtils.java: ########## @@ -0,0 +1,60 @@ +/* Review Comment: -> internal.concurrent? ########## oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/FutureUtils.java: ########## @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.jackrabbit.oak.commons.concurrent; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + +/** + * Utils methods for {@link CompletableFuture} + */ +public class FutureUtils { + + private FutureUtils() { + // no instance for you + } + + /** + * Returns a {@link CompletableFuture} that completes when all of the given futures complete. + * <p> + * The resulting list contains the results of each input future, or {@code null} for any future that completed exceptionally. + * This mimics Guava's {@code Futures.successfulAsList} behavior. Review Comment: that comment will fail when Guava is out of the classpath ########## oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/concurrent/package-info.java: ########## @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.0.0") +@Version("1.0.1") Review Comment: do we need this change? ########## oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/FutureUtils.java: ########## @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.jackrabbit.oak.commons.concurrent; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + +/** + * Utils methods for {@link CompletableFuture} + */ +public class FutureUtils { + + private FutureUtils() { + // no instance for you + } + + /** + * Returns a {@link CompletableFuture} that completes when all of the given futures complete. + * <p> + * The resulting list contains the results of each input future, or {@code null} for any future that completed exceptionally. + * This mimics Guava's {@code Futures.successfulAsList} behavior. + * + * @param futures the list of CompletableFutures to aggregate + * @param <T> the result type + * @return a CompletableFuture containing a list of results (or null for failed futures) + */ + public static <T> CompletableFuture<List<T>> successfulAsList(final List<CompletableFuture<T>> futures) { + + // need to handle each future case indivudually since if failed inside CompletableFuture.allOf(), + // it would throws an exception rather than returning null Review Comment: ```suggestion // it would throw an exception rather than returning null ``` ########## oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/FutureUtils.java: ########## @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.jackrabbit.oak.commons.concurrent; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + +/** + * Utils methods for {@link CompletableFuture} + */ +public class FutureUtils { + + private FutureUtils() { + // no instance for you + } + + /** + * Returns a {@link CompletableFuture} that completes when all of the given futures complete. + * <p> + * The resulting list contains the results of each input future, or {@code null} for any future that completed exceptionally. + * This mimics Guava's {@code Futures.successfulAsList} behavior. + * + * @param futures the list of CompletableFutures to aggregate + * @param <T> the result type + * @return a CompletableFuture containing a list of results (or null for failed futures) + */ + public static <T> CompletableFuture<List<T>> successfulAsList(final List<CompletableFuture<T>> futures) { + + // need to handle each future case indivudually since if failed inside CompletableFuture.allOf(), + // it would throws an exception rather than returning null + final List<CompletableFuture<T>> handled = futures.stream() Review Comment: magic :-) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: oak-dev-unsubscr...@jackrabbit.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
