Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

#2638 removed health-guice library and other related dependencies #2720

Merged
merged 2 commits into from
Jan 31, 2022
Merged

#2638 removed health-guice library and other related dependencies #2720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61bcfe7
#2638 removed health-guice library and other related deprecated depen…
aravindanr Jan 25, 2022
9f8a7c5
removed references of HealthGrpc
aravindanr Jan 25, 2022
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
8 changes: 4 additions & 4 deletions contribs/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.130"
"locked": "1.12.146"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -184,7 +184,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.130"
"locked": "1.12.146"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -348,7 +348,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.130"
"locked": "1.12.146"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -527,7 +527,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.130"
"locked": "1.12.146"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down
24 changes: 0 additions & 24 deletions grpc-client/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -262,12 +256,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -436,12 +424,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -616,12 +598,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down
24 changes: 0 additions & 24 deletions grpc-server/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -265,12 +259,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -442,12 +430,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down Expand Up @@ -634,12 +616,6 @@
"com.netflix.conductor:conductor-grpc": {
"project": true
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "1.1.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
Expand Down
6 changes: 0 additions & 6 deletions grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,14 @@
import com.netflix.conductor.grpc.TaskServiceGrpc;
import com.netflix.conductor.grpc.WorkflowServiceGrpc;
import com.netflix.conductor.grpc.server.service.EventServiceImpl;
import com.netflix.conductor.grpc.server.service.HealthServiceImpl;
import com.netflix.conductor.grpc.server.service.MetadataServiceImpl;
import com.netflix.conductor.grpc.server.service.TaskServiceImpl;
import com.netflix.conductor.grpc.server.service.WorkflowServiceImpl;

import io.grpc.health.v1.HealthGrpc;

public class GRPCModule extends AbstractModule {

@Override
protected void configure() {

bind(HealthGrpc.HealthImplBase.class).to(HealthServiceImpl.class);

bind(EventServiceGrpc.EventServiceImplBase.class).to(EventServiceImpl.class);
bind(MetadataServiceGrpc.MetadataServiceImplBase.class).to(MetadataServiceImpl.class);
bind(TaskServiceGrpc.TaskServiceImplBase.class).to(TaskServiceImpl.class);
Expand Down
4 changes: 0 additions & 4 deletions grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
public class GRPCServerProvider implements Provider<Optional<GRPCServer>> {

private final GRPCServerConfiguration configuration;
private final BindableService healthServiceImpl;
private final BindableService eventServiceImpl;
private final BindableService metadataServiceImpl;
private final BindableService taskServiceImpl;
Expand All @@ -27,14 +26,12 @@ public class GRPCServerProvider implements Provider<Optional<GRPCServer>> {
@Inject
public GRPCServerProvider(
GRPCServerConfiguration grpcServerConfiguration,
HealthGrpc.HealthImplBase healthServiceImpl,
EventServiceGrpc.EventServiceImplBase eventServiceImpl,
MetadataServiceGrpc.MetadataServiceImplBase metadataServiceImpl,
TaskServiceGrpc.TaskServiceImplBase taskServiceImpl,
WorkflowServiceGrpc.WorkflowServiceImplBase workflowServiceImpl
) {
this.configuration = grpcServerConfiguration;
this.healthServiceImpl = healthServiceImpl;

this.eventServiceImpl = eventServiceImpl;
this.metadataServiceImpl = metadataServiceImpl;
Expand All @@ -51,7 +48,6 @@ public Optional<GRPCServer> get() {

private GRPCServer buildGRPCServer(GRPCServerConfiguration grpcServerConfiguration) {
ImmutableList.Builder<BindableService> services = ImmutableList.<BindableService>builder().add(
healthServiceImpl,
eventServiceImpl,
metadataServiceImpl,
taskServiceImpl,
Expand Down
44 changes: 0 additions & 44 deletions grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/HealthServiceImpl.java
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions ...server/src/test/java/com/netflix/conductor/grpc/server/service/HealthServiceImplTest.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions grpc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ dependencies {
compile "com.google.api.grpc:proto-google-common-protos:1.0.0"
compile "io.grpc:grpc-protobuf:${revGrpc}"
compile "io.grpc:grpc-stub:${revGrpc}"

compile "com.netflix.runtime:health-api:${revHealth}"
}

protobuf {
Expand Down
Loading