From 1d1f02c49674c3a773ba368b7f61da8b2d8e4b5b Mon Sep 17 00:00:00 2001 From: Houssein Date: Thu, 8 Jun 2023 16:42:52 -0400 Subject: [PATCH 1/3] fix: in StreamService streamId was never set , with this change StreamServiceInternal returns it to StreamService --- src/main/java/com/coveo/pushapiclient/StreamService.java | 4 ++-- .../java/com/coveo/pushapiclient/StreamServiceInternal.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/coveo/pushapiclient/StreamService.java b/src/main/java/com/coveo/pushapiclient/StreamService.java index b9212e20..2a39658d 100644 --- a/src/main/java/com/coveo/pushapiclient/StreamService.java +++ b/src/main/java/com/coveo/pushapiclient/StreamService.java @@ -7,7 +7,7 @@ import com.google.gson.Gson; // TODO: LENS-851 - Make public -class StreamService { +public class StreamService { private final StreamEnabledSource source; private final PlatformClient platformClient; private StreamServiceInternal service; @@ -72,7 +72,7 @@ public StreamService(StreamEnabledSource source) { * @throws IOException */ public void add(DocumentBuilder document) throws IOException, InterruptedException { - this.service.add(document); + this.streamId = this.service.add(document); } /** diff --git a/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java b/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java index 81f47c85..7968daab 100644 --- a/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java +++ b/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java @@ -21,11 +21,12 @@ public StreamServiceInternal(StreamEnabledSource source, DocumentUploadQueue que this.platformClient = platformClient; } - public void add(DocumentBuilder document) throws IOException, InterruptedException { + public String add(DocumentBuilder document) throws IOException, InterruptedException { if (this.streamId == null) { this.streamId = this.getStreamId(); } queue.add(document); + return this.streamId; } public HttpResponse close() throws IOException, InterruptedException, NoOpenStreamException { From 88cf18118bd6763a49d40f95f8651495f2633e0e Mon Sep 17 00:00:00 2001 From: Houssein Date: Thu, 8 Jun 2023 16:44:59 -0400 Subject: [PATCH 2/3] remove public modifier --- src/main/java/com/coveo/pushapiclient/StreamService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/coveo/pushapiclient/StreamService.java b/src/main/java/com/coveo/pushapiclient/StreamService.java index 2a39658d..adef53ab 100644 --- a/src/main/java/com/coveo/pushapiclient/StreamService.java +++ b/src/main/java/com/coveo/pushapiclient/StreamService.java @@ -7,7 +7,7 @@ import com.google.gson.Gson; // TODO: LENS-851 - Make public -public class StreamService { +class StreamService { private final StreamEnabledSource source; private final PlatformClient platformClient; private StreamServiceInternal service; From fc22d214953f754037852c0fca910a4ce477ce1e Mon Sep 17 00:00:00 2001 From: Houssein Date: Fri, 9 Jun 2023 14:05:09 -0400 Subject: [PATCH 3/3] apply code format --- src/main/java/com/coveo/pushapiclient/StreamService.java | 1 - src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/com/coveo/pushapiclient/StreamService.java b/src/main/java/com/coveo/pushapiclient/StreamService.java index 5bfa9321..51ec841b 100644 --- a/src/main/java/com/coveo/pushapiclient/StreamService.java +++ b/src/main/java/com/coveo/pushapiclient/StreamService.java @@ -72,7 +72,6 @@ public void add(DocumentBuilder document) throws IOException, InterruptedExcepti this.streamId = this.service.add(document); } - /** * Sends any buffered documents and closes the stream. diff --git a/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java b/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java index 1b739b97..e5579752 100644 --- a/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java +++ b/src/main/java/com/coveo/pushapiclient/StreamServiceInternal.java @@ -27,7 +27,6 @@ public String add(DocumentBuilder document) throws IOException, InterruptedExcep return this.streamId; } - public HttpResponse close() throws IOException, InterruptedException, NoOpenStreamException { if (this.streamId == null) {