Skip to content

chore: make rx support a little nicer and upgrade grpc #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2021
Merged

chore: make rx support a little nicer and upgrade grpc #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grpc-client-rx-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ plugins {

dependencies {
api("io.reactivex.rxjava3:rxjava:3.0.6")
api("io.grpc:grpc-stub:1.35.0")
api("io.grpc:grpc-stub:1.36.0")
api(project(":grpc-context-utils"))
implementation("io.grpc:grpc-context:1.35.0")
implementation("io.grpc:grpc-context:1.36.0")

testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
testImplementation("org.mockito:mockito-core:3.5.11")
Expand Down
2 changes: 1 addition & 1 deletion grpc-client-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
// End Logging

// grpc
implementation("io.grpc:grpc-core:1.35.0")
implementation("io.grpc:grpc-core:1.36.0")
constraints {
implementation("com.google.guava:guava:30.0-jre") {
because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415")
Expand Down
2 changes: 1 addition & 1 deletion grpc-context-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tasks.test {

dependencies {
// grpc
implementation("io.grpc:grpc-core:1.35.0")
implementation("io.grpc:grpc-core:1.36.0")
constraints {
implementation("com.google.guava:guava:30.0-jre") {
because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415")
Expand Down
11 changes: 8 additions & 3 deletions grpc-server-rx-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ plugins {

dependencies {
api("io.reactivex.rxjava3:rxjava:3.0.6")
api("io.grpc:grpc-stub:1.35.0")
api("io.grpc:grpc-stub:1.36.0")

annotationProcessor("org.projectlombok:lombok:1.18.18")
compileOnly("org.projectlombok:lombok:1.18.18")

implementation("org.slf4j:slf4j-api:1.7.30")

constraints {
implementation("com.google.guava:guava:30.0-jre") {
implementation("com.google.guava:guava:30.1-jre") {
because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415")
}
}

testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
testImplementation("org.mockito:mockito-core:3.5.11")
testImplementation("org.mockito:mockito-junit-jupiter:3.5.11")
Expand Down
14 changes: 12 additions & 2 deletions ...ils/src/main/java/org/hypertrace/core/grpcutils/server/rx/ServerCallStreamRxObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
package org.hypertrace.core.grpcutils.server.rx;

import io.grpc.stub.ServerCallStreamObserver;
import io.grpc.stub.StreamObserver;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.CompletableObserver;
import io.reactivex.rxjava3.core.MaybeObserver;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.core.SingleObserver;
import io.reactivex.rxjava3.observers.DefaultObserver;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class ServerCallStreamRxObserver<T> extends DefaultObserver<T>
implements Observer<T>, MaybeObserver<T>, SingleObserver<T>, CompletableObserver {

private final ServerCallStreamObserver<T> serverCallStreamObserver;

public ServerCallStreamRxObserver(ServerCallStreamObserver<T> serverCallStreamObserver) {
this.serverCallStreamObserver = serverCallStreamObserver;
/**
* Requires a ServerCallStreamObserver which a grpc server implementation will provide (but not
* specify)
*
* @param serverCallStreamObserver
*/
public ServerCallStreamRxObserver(StreamObserver<T> serverCallStreamObserver) {
this.serverCallStreamObserver = (ServerCallStreamObserver<T>) serverCallStreamObserver;
}

@Override
Expand All @@ -35,6 +44,7 @@ public void onNext(@NonNull T value) {

@Override
public void onError(@NonNull Throwable throwable) {
log.error("Returning error", throwable);
this.serverCallStreamObserver.onError(throwable);
}

Expand Down
2 changes: 1 addition & 1 deletion grpc-server-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
// End Logging

// grpc
implementation("io.grpc:grpc-core:1.35.0")
implementation("io.grpc:grpc-core:1.36.0")
constraints {
implementation("com.google.guava:guava:30.0-jre") {
because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415")
Expand Down