diff --git a/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java index 76e985aae7..46d8b4208a 100644 --- a/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java @@ -58,7 +58,7 @@ public Mono> listComment(CommentQuery commentQuery) { commentQuery.toPageRequest()) .flatMap(comments -> Flux.fromStream(comments.get() .map(this::toListedComment)) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(list -> new ListResult<>(comments.getPage(), comments.getSize(), comments.getTotal(), list) diff --git a/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java index 54687b9292..f867af0ce4 100644 --- a/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java @@ -166,7 +166,7 @@ public Mono> list(ReplyQuery query) { return client.listBy(Reply.class, query.toListOptions(), query.toPageRequest()) .flatMap(list -> Flux.fromStream(list.get() .map(this::toListedReply)) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(listedReplies -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), listedReplies)) diff --git a/application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java index b8a12c0f04..1e456ff649 100644 --- a/application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java @@ -77,7 +77,7 @@ public Mono> listPost(PostQuery query) { ) .flatMap(listResult -> Flux.fromStream(listResult.get()) .map(this::getListedPost) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(listedPosts -> new ListResult<>(listResult.getPage(), listResult.getSize(), listResult.getTotal(), listedPosts) @@ -175,7 +175,7 @@ private Flux listContributors(List usernames) { return Flux.empty(); } return Flux.fromIterable(usernames) - .concatMap(userService::getUserOrGhost) + .flatMapSequential(userService::getUserOrGhost) .map(user -> { Contributor contributor = new Contributor(); contributor.setName(user.getMetadata().getName()); diff --git a/application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java b/application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java index 868ca69dfc..9e9abeea94 100644 --- a/application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java @@ -88,7 +88,7 @@ public Flux listSnapshots(String pageName) { public Mono> list(SinglePageQuery query) { return client.listBy(SinglePage.class, query.toListOptions(), query.toPageRequest()) .flatMap(listResult -> Flux.fromStream(listResult.get().map(this::getListedSinglePage)) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(listedSinglePages -> new ListResult<>( listResult.getPage(), diff --git a/application/src/main/java/run/halo/app/plugin/PluginServiceImpl.java b/application/src/main/java/run/halo/app/plugin/PluginServiceImpl.java index 25383e89d4..c1b303fb6a 100644 --- a/application/src/main/java/run/halo/app/plugin/PluginServiceImpl.java +++ b/application/src/main/java/run/halo/app/plugin/PluginServiceImpl.java @@ -247,7 +247,7 @@ public Flux uglifyJsBundle() { }); var body = Flux.fromIterable(startedPlugins) .sort(Comparator.comparing(PluginWrapper::getPluginId)) - .concatMap(pluginWrapper -> { + .flatMapSequential(pluginWrapper -> { var pluginId = pluginWrapper.getPluginId(); return Mono.fromSupplier( () -> BundleResourceUtils.getJsBundleResource( @@ -274,7 +274,7 @@ public Flux uglifyJsBundle() { public Flux uglifyCssBundle() { return Flux.fromIterable(pluginManager.getStartedPlugins()) .sort(Comparator.comparing(PluginWrapper::getPluginId)) - .concatMap(pluginWrapper -> { + .flatMapSequential(pluginWrapper -> { var pluginId = pluginWrapper.getPluginId(); var dataBufferFactory = DefaultDataBufferFactory.sharedInstance; return Mono.fromSupplier(() -> BundleResourceUtils.getJsBundleResource( diff --git a/application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java b/application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java index e6c162879d..42b833e16d 100644 --- a/application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java +++ b/application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java @@ -86,10 +86,10 @@ private Flux getEnabledExtensions(String epdName, } var extensions = getExtensions(extensionPoint).cache(); return Flux.fromIterable(extensionDefNames) - .concatMap(extensionDefName -> + .flatMapSequential(extensionDefName -> client.fetch(ExtensionDefinition.class, extensionDefName) ) - .concatMap(extensionDef -> { + .flatMapSequential(extensionDef -> { var className = extensionDef.getSpec().getClassName(); return extensions.filter( extension -> Objects.equals(extension.getClass().getName(), diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java index be5f9e91f1..f8ea39a850 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java @@ -86,7 +86,7 @@ public Mono> list(Ref ref, PageRequest pageParam) { return client.listBy(Comment.class, listOptions, pageRequest) .flatMap(listResult -> Flux.fromStream(listResult.get()) .map(this::toCommentVo) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(commentVos -> new ListResult<>(listResult.getPage(), listResult.getSize(), @@ -102,7 +102,7 @@ public Mono> list(Ref ref, PageRequest pageParam) { public Mono> convertToWithReplyVo(ListResult comments, int replySize) { return Flux.fromIterable(comments.getItems()) - .concatMap(commentVo -> { + .flatMapSequential(commentVo -> { var commentName = commentVo.getMetadata().getName(); return listReply(commentName, 1, replySize) .map(replyList -> CommentWithReplyVo.from(commentVo) @@ -135,7 +135,7 @@ public Mono> listReply(String commentName, PageRequest pageP .orElse(PageRequestImpl.ofSize(0)); return client.listBy(Reply.class, listOptions, pageRequest) .flatMap(list -> Flux.fromStream(list.get().map(this::toReplyVo)) - .concatMap(Function.identity()) + .flatMapSequential(Function.identity()) .collectList() .map(replyVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java index 0f0649a04c..d01abc4b36 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java @@ -33,6 +33,6 @@ public Flux getContributors(List names) { return Flux.empty(); } return Flux.fromIterable(names) - .concatMap(this::getContributor); + .flatMapSequential(this::getContributor); } } diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java index 2e2b5950c4..95be322a6d 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java @@ -291,7 +291,7 @@ public Mono> archives(Integer page, Integer size, Stri public Flux listAll() { return postPredicateResolver.getListOptions() .flatMapMany(listOptions -> client.listAll(Post.class, listOptions, defaultSort())) - .concatMap(postPublicQueryService::convertToListedVo); + .flatMapSequential(postPublicQueryService::convertToListedVo); } static int pageNullSafe(Integer page) { diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/PostPublicQueryServiceImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/PostPublicQueryServiceImpl.java index 201444d2cc..16f6464f99 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/PostPublicQueryServiceImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/PostPublicQueryServiceImpl.java @@ -67,7 +67,7 @@ public Mono> list(ListOptions queryOptions, PageRequest }) .flatMap(listOptions -> client.listBy(Post.class, listOptions, page)) .flatMap(list -> Flux.fromStream(list.get()) - .concatMap(post -> convertToListedVo(post) + .flatMapSequential(post -> convertToListedVo(post) .flatMap(postVo -> populateStats(postVo) .doOnNext(postVo::setStats).thenReturn(postVo) ) diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/SinglePageConversionServiceImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/SinglePageConversionServiceImpl.java index a7e497a097..a2038d4cd5 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/SinglePageConversionServiceImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/SinglePageConversionServiceImpl.java @@ -140,7 +140,7 @@ public Mono> listBy(ListOptions listOptions, return client.listBy(SinglePage.class, rewroteListOptions, rewrotePageRequest) .flatMap(list -> Flux.fromStream(list.get()) - .concatMap(this::convertToListedVo) + .flatMapSequential(this::convertToListedVo) .collectList() .map(pageVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), pageVos) diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java index 0f6a135a2b..6fd0583865 100644 --- a/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java @@ -48,7 +48,7 @@ public Mono getByName(String name) { @Override public Flux getByNames(List names) { return Flux.fromIterable(names) - .concatMap(this::getByName); + .flatMapSequential(this::getByName); } @Override