From 4b88de8f39833fed2880cb62259bb8fe8fa81bd7 Mon Sep 17 00:00:00 2001 From: Daniel Zhang Date: Wed, 25 Dec 2024 21:11:09 +0800 Subject: [PATCH 1/4] refactor(flowable): remove unnecessary inheritance from FlowableBufferTimedFlushable The class no longer requires inheritance from FlowableBufferTimedFlushable as its functionality is redundant. Simplified the class hierarchy for better maintainability. --- .../internal/flowable/FlowableBufferTimedFlushable.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/client/src/main/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushable.java b/client/src/main/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushable.java index c487d8980be..431f89cc770 100644 --- a/client/src/main/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushable.java +++ b/client/src/main/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushable.java @@ -35,8 +35,7 @@ * @param the output value type * @see FlowableBufferTimed */ -public final class FlowableBufferTimedFlushable> extends Flowable - implements FlowableTransformer { +public final class FlowableBufferTimedFlushable> extends Flowable { final Publisher source; final Publisher flusher; @@ -67,11 +66,6 @@ public FlowableBufferTimedFlushable(Publisher source, this.restartTimerOnMaxSize = true; } - @Override - public @NonNull Publisher apply(@NonNull final Flowable upstream) { - return new FlowableBufferTimedFlushable<>(upstream, flusher, timeskip, unit, maxSize, scheduler, bufferSupplier); - } - @Override protected void subscribeActual(@NonNull final Subscriber subscriber) { Scheduler.Worker w = scheduler.createWorker(); From 327b86062001417b7dd27e88aec31a6d995aabe6 Mon Sep 17 00:00:00 2001 From: Daniel Zhang Date: Thu, 9 Jan 2025 13:33:43 +0800 Subject: [PATCH 2/4] refactor(flowable): remove unnecessary inheritance from FlowableBufferTimedFlushable Add CHANGELOG.md for the refactoring. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 921759e2fd1..17dab655624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - [Generated REST API Documentation](https://docs.influxdata.com/influxdb/v2/api/v1-compatibility/#operation/PostQueryV1) - [Influx 1.1 query compatibility](https://docs.influxdata.com/influxdb/latest/reference/api/influxdb-1x/query/) - See the updated InfluxQLExample +- [#794](https://github.com/influxdata/influxdb-client-java/issues/794): Delete unnecessary inheritance of FlowableBufferTimedFlushable. ### Bug Fixes From ad83f3177e3d8b90af82e0eacba6ab8a5e61e7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Thu, 9 Jan 2025 14:50:46 +0100 Subject: [PATCH 3/4] docs: Update CHANGELOG.md --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17dab655624..a8c5c7a9c20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ⚠️ Important Notice: Starting from this release, we won’t be listing every dependency change in our changelog. This helps us maintain the project faster and focus on important features for our InfluxDB client. +### Bug Fixes + +1. [#794](https://github.com/influxdata/influxdb-client-java/issues/794): Delete unnecessary inheritance of `FlowableBufferTimedFlushable`. + ## 7.2.0 [2024-08-12] ### Features @@ -24,8 +28,7 @@ - [Generated REST API Documentation](https://docs.influxdata.com/influxdb/v2/api/v1-compatibility/#operation/PostQueryV1) - [Influx 1.1 query compatibility](https://docs.influxdata.com/influxdb/latest/reference/api/influxdb-1x/query/) - See the updated InfluxQLExample -- [#794](https://github.com/influxdata/influxdb-client-java/issues/794): Delete unnecessary inheritance of FlowableBufferTimedFlushable. - + ### Bug Fixes 1. [#744](https://github.com/influxdata/influxdb-client-java/issues/744) following an `InfluxQLQueryAPI.query()` call, empty results from the server no longer result in a `null` result value. From 50589b18e98a380be8db451f4f4c188e5d72d6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Thu, 9 Jan 2025 14:52:00 +0100 Subject: [PATCH 4/4] docs: Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8c5c7a9c20..89ab1f5389d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ - [Generated REST API Documentation](https://docs.influxdata.com/influxdb/v2/api/v1-compatibility/#operation/PostQueryV1) - [Influx 1.1 query compatibility](https://docs.influxdata.com/influxdb/latest/reference/api/influxdb-1x/query/) - See the updated InfluxQLExample - + ### Bug Fixes 1. [#744](https://github.com/influxdata/influxdb-client-java/issues/744) following an `InfluxQLQueryAPI.query()` call, empty results from the server no longer result in a `null` result value.