grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: fix minor lint warnings

This commit is contained in:
Carl Mastrangelo 2017-07-17 17:21:07 -07:00 committed by GitHub
parent e14fc404f0
commit 84fce477c2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/io/grpc/internal/DnsNameResolver.java
View File

@ -57,7 +57,7 @@ final class DnsNameResolver extends NameResolver {
private static final Logger logger = Logger.getLogger(DnsNameResolver.class.getName()); private static final Logger logger = Logger.getLogger(DnsNameResolver.class.getName());
private static final boolean isJndiAvailable = jndiAvailable(); private static final boolean JNDI_AVAILABLE = jndiAvailable();
@VisibleForTesting @VisibleForTesting
static boolean enableJndi = false; static boolean enableJndi = false;
@ -224,7 +224,7 @@ final class DnsNameResolver extends NameResolver {
private DelegateResolver pickDelegateResolver() { private DelegateResolver pickDelegateResolver() {
JdkResolver jdkResolver = new JdkResolver(); JdkResolver jdkResolver = new JdkResolver();
if (isJndiAvailable && enableJndi) { if (JNDI_AVAILABLE && enableJndi) {
return new CompositeResolver(jdkResolver, new JndiResolver()); return new CompositeResolver(jdkResolver, new JndiResolver());
} }
return jdkResolver; return jdkResolver;

10
core/src/test/java/io/grpc/AttributesTest.java
View File

@ -26,7 +26,7 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link Attributes}. */ /** Unit tests for {@link Attributes}. */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class AttributesTest { public class AttributesTest {
private static Attributes.Key<String> YOLO_KEY = Attributes.Key.of("yolo"); private static final Attributes.Key<String> YOLO_KEY = Attributes.Key.of("yolo");
@Test @Test
public void buildAttributes() { public void buildAttributes() {
@ -38,10 +38,10 @@ public class AttributesTest {
@Test @Test
public void duplicates() { public void duplicates() {
Attributes attrs = Attributes.newBuilder() Attributes attrs = Attributes.newBuilder()
.set(YOLO_KEY, "To be?") .set(YOLO_KEY, "To be?")
.set(YOLO_KEY, "Or not to be?") .set(YOLO_KEY, "Or not to be?")
.set(Attributes.Key.of("yolo"), "I'm not a duplicate") .set(Attributes.Key.of("yolo"), "I'm not a duplicate")
.build(); .build();
assertSame("Or not to be?", attrs.get(YOLO_KEY)); assertSame("Or not to be?", attrs.get(YOLO_KEY));
assertEquals(2, attrs.keys().size()); assertEquals(2, attrs.keys().size());
} }

2
core/src/test/java/io/grpc/IntegerMarshaller.java
View File

@ -20,7 +20,7 @@ import java.io.InputStream;
/** Marshalls decimal-encoded integers. */ /** Marshalls decimal-encoded integers. */
public class IntegerMarshaller implements MethodDescriptor.Marshaller<Integer> { public class IntegerMarshaller implements MethodDescriptor.Marshaller<Integer> {
public static IntegerMarshaller INSTANCE = new IntegerMarshaller(); public static final IntegerMarshaller INSTANCE = new IntegerMarshaller();
@Override @Override
public InputStream stream(Integer value) { public InputStream stream(Integer value) {

6
examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java
View File

@ -34,15 +34,15 @@ public class CustomHeaderServer {
private static final Logger logger = Logger.getLogger(CustomHeaderServer.class.getName()); private static final Logger logger = Logger.getLogger(CustomHeaderServer.class.getName());
/* The port on which the server should run */ /* The port on which the server should run */
private static final int port = 50051; private static final int PORT = 50051;
private Server server; private Server server;
private void start() throws IOException { private void start() throws IOException {
server = ServerBuilder.forPort(port) server = ServerBuilder.forPort(PORT)
.addService(ServerInterceptors.intercept(new GreeterImpl(), new HeaderServerInterceptor())) .addService(ServerInterceptors.intercept(new GreeterImpl(), new HeaderServerInterceptor()))
.build() .build()
.start(); .start();
logger.info("Server started, listening on " + port); logger.info("Server started, listening on " + PORT);
Runtime.getRuntime().addShutdownHook(new Thread() { Runtime.getRuntime().addShutdownHook(new Thread() {
@Override @Override
public void run() { public void run() {