From 0486af6a8867003a8d58507ee066bded7982793e Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Thu, 14 Jan 2016 11:12:53 -0800 Subject: [PATCH] Raise method visibility in Channel Providers --- .../main/java/io/grpc/netty/NettyChannelProvider.java | 10 +++++----- .../java/io/grpc/okhttp/OkHttpChannelProvider.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/netty/src/main/java/io/grpc/netty/NettyChannelProvider.java b/netty/src/main/java/io/grpc/netty/NettyChannelProvider.java index 2b13b6e56b..beb14c8f6a 100644 --- a/netty/src/main/java/io/grpc/netty/NettyChannelProvider.java +++ b/netty/src/main/java/io/grpc/netty/NettyChannelProvider.java @@ -36,24 +36,24 @@ import io.grpc.ManagedChannelProvider; /** Provider for {@link NettyChannelBuilder} instances. */ @Internal -public class NettyChannelProvider extends ManagedChannelProvider { +public final class NettyChannelProvider extends ManagedChannelProvider { @Override - protected boolean isAvailable() { + public boolean isAvailable() { return true; } @Override - protected int priority() { + public int priority() { return 5; } @Override - protected NettyChannelBuilder builderForAddress(String name, int port) { + public NettyChannelBuilder builderForAddress(String name, int port) { return NettyChannelBuilder.forAddress(name, port); } @Override - protected NettyChannelBuilder builderForTarget(String target) { + public NettyChannelBuilder builderForTarget(String target) { return NettyChannelBuilder.forTarget(target); } } diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelProvider.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelProvider.java index 5e37eb5bb4..d713712c0e 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelProvider.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelProvider.java @@ -36,24 +36,24 @@ import io.grpc.ManagedChannelProvider; /** Provider for {@link OkHttpChannelBuilder} instances. */ @Internal -public class OkHttpChannelProvider extends ManagedChannelProvider { +public final class OkHttpChannelProvider extends ManagedChannelProvider { @Override - protected boolean isAvailable() { + public boolean isAvailable() { return true; } @Override - protected int priority() { + public int priority() { return isAndroid() ? 8 : 3; } @Override - protected OkHttpChannelBuilder builderForAddress(String name, int port) { + public OkHttpChannelBuilder builderForAddress(String name, int port) { return OkHttpChannelBuilder.forAddress(name, port); } @Override - protected OkHttpChannelBuilder builderForTarget(String target) { + public OkHttpChannelBuilder builderForTarget(String target) { return OkHttpChannelBuilder.forTarget(target); } }