From c9ad901ce63cea3576ca25e3cde6776359b7721f Mon Sep 17 00:00:00 2001 From: Aleexender Date: Fri, 18 Apr 2025 17:20:02 +0900 Subject: [PATCH 1/3] change to ternary return in Mono class Signed-off-by: Aleexender --- .../java/reactor/core/publisher/Mono.java | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/reactor-core/src/main/java/reactor/core/publisher/Mono.java b/reactor-core/src/main/java/reactor/core/publisher/Mono.java index 4c1df5d815..7f6ae14ed2 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/Mono.java +++ b/reactor-core/src/main/java/reactor/core/publisher/Mono.java @@ -3132,10 +3132,9 @@ public final Flux expand(Function * @return a filtered {@link Mono} */ public final Mono filter(final Predicate tester) { - if (this instanceof Fuseable) { - return onAssembly(new MonoFilterFuseable<>(this, tester)); - } - return onAssembly(new MonoFilter<>(this, tester)); + return onAssembly(this instanceof Fuseable + ? new MonoFilterFuseable<>(this, tester) + : new MonoFilter<>(this, tester)); } /** @@ -3291,10 +3290,9 @@ public final Mono hasElement() { * @return a transformed {@link Mono} */ public final Mono handle(BiConsumer> handler) { - if (this instanceof Fuseable) { - return onAssembly(new MonoHandleFuseable<>(this, handler)); - } - return onAssembly(new MonoHandle<>(this, handler)); + return (this instanceof Fuseable) + ? onAssembly(new MonoHandleFuseable<>(this, handler)) + : onAssembly(new MonoHandle<>(this, handler)); } /** @@ -3418,10 +3416,9 @@ public final Mono log(@Nullable String category, SignalLogger log = new SignalLogger<>(this, category, level, showOperatorLine, options); - if (this instanceof Fuseable) { - return onAssembly(new MonoLogFuseable<>(this, log)); - } - return onAssembly(new MonoLog<>(this, log)); + return (this instanceof Fuseable) + ? onAssembly(new MonoLogFuseable<>(this, log)) + : onAssembly(new MonoLog<>(this, log)); } @@ -3468,10 +3465,9 @@ public final Mono log(Logger logger, s -> logger, options); - if (this instanceof Fuseable) { - return onAssembly(new MonoLogFuseable<>(this, log)); - } - return onAssembly(new MonoLog<>(this, log)); + return (this instanceof Fuseable) + ? onAssembly(new MonoLogFuseable<>(this, log)) + : onAssembly(new MonoLog<>(this, log)); } /** @@ -3486,10 +3482,9 @@ public final Mono log(Logger logger, * @return a new {@link Mono} */ public final Mono map(Function mapper) { - if (this instanceof Fuseable) { - return onAssembly(new MonoMapFuseable<>(this, mapper)); - } - return onAssembly(new MonoMap<>(this, mapper)); + return (this instanceof Fuseable) + ? onAssembly(new MonoMapFuseable<>(this, mapper)) + : onAssembly(new MonoMap<>(this, mapper)); } /** @@ -3574,11 +3569,10 @@ public final Mono metrics() { if (!Metrics.isInstrumentationAvailable()) { return this; } - - if (this instanceof Fuseable) { - return onAssembly(new MonoMetricsFuseable<>(this)); - } - return onAssembly(new MonoMetrics<>(this)); + + return (this instanceof Fuseable) + ? onAssembly(new MonoMetricsFuseable<>(this)) + : onAssembly(new MonoMetrics<>(this)); } /** From c1dc366f2d3f1548ea8fa007ea200a37d0867be0 Mon Sep 17 00:00:00 2001 From: Aleexender Date: Fri, 18 Apr 2025 17:20:20 +0900 Subject: [PATCH 2/3] change ternary return in FluxBuffer class Signed-off-by: Aleexender --- .../main/java/reactor/core/publisher/FluxBuffer.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java index a979f85d3e..69f598bc07 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java @@ -69,15 +69,9 @@ final class FluxBuffer> extends InternalFluxO @Override public CoreSubscriber subscribeOrReturn(CoreSubscriber actual) { - if (size == skip) { - return new BufferExactSubscriber<>(actual, size, bufferSupplier); - } - else if (skip > size) { - return new BufferSkipSubscriber<>(actual, size, skip, bufferSupplier); - } - else { - return new BufferOverlappingSubscriber<>(actual, size, skip, bufferSupplier); - } + return (size == skip) ? new BufferExactSubscriber<>(actual, size, bufferSupplier) : + (skip > size) ? new BufferSkipSubscriber<>(actual, size, skip, bufferSupplier) : + new BufferOverlappingSubscriber<>(actual, size, skip, bufferSupplier); } @Override From e9139e39b05a3d87aaf5f34d8fb2f9b680f5c48c Mon Sep 17 00:00:00 2001 From: Aleexender Date: Fri, 18 Apr 2025 17:31:05 +0900 Subject: [PATCH 3/3] ./gradlew spotlessApply submit Signed-off-by: Aleexender --- .../src/main/java/reactor/core/publisher/FluxBuffer.java | 2 +- reactor-core/src/main/java/reactor/core/publisher/Mono.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java index 69f598bc07..4f73654e78 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2024 VMware Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2016-2025 VMware Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/reactor-core/src/main/java/reactor/core/publisher/Mono.java b/reactor-core/src/main/java/reactor/core/publisher/Mono.java index 7f6ae14ed2..3b97e0a299 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/Mono.java +++ b/reactor-core/src/main/java/reactor/core/publisher/Mono.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2024 VMware Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2016-2025 VMware Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.