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

all: update Error Prone to 2.3.2 

This will allow enabling Error Prone on JDK 10+ (after
updating the net.ltgt.errorprone plugin), and is also a
prerequisite to that plugin update.

Also remove net.ltgt.apt plugin, as Gradle has native
support for annotationProcessor.
This commit is contained in:
Thomas Broyer 2018-10-19 22:08:36 +02:00 committed by Eric Anderson
parent 9aaf29c5e6
commit 183e1f6735
29 changed files with 102 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
alts/src/test/java/io/grpc/alts/internal/FakeTsiHandshaker.java
View File

@ -172,6 +172,7 @@ public class FakeTsiHandshaker implements TsiHandshaker {
ByteBuffer messageBytes = frameParser.getRawFrame();
int offset = AltsFraming.getFramingOverhead();
int length = messageBytes.limit() - offset;
@SuppressWarnings("ByteBufferBackingArray") // ByteBuffer is created using allocate()
String message = new String(messageBytes.array(), offset, length, UTF_8);
logger.log(Level.FINE, "Read message: {0}", message);

17
benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java
View File

@ -76,6 +76,7 @@ public class AsyncServer {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
@SuppressWarnings("CatchAndPrintStackTrace")
public void run() {
try {
System.out.println("QPS Server shutting down");
@ -110,14 +111,14 @@ public class AsyncServer {
Class.forName("io.netty.channel.epoll.EpollServerSocketChannel");
boss =
(EventLoopGroup)
(groupClass
groupClass
.getConstructor(int.class, ThreadFactory.class)
.newInstance(1, tf));
.newInstance(1, tf);
worker =
(EventLoopGroup)
(groupClass
groupClass
.getConstructor(int.class, ThreadFactory.class)
.newInstance(0, tf));
.newInstance(0, tf);
channelType = channelClass;
break;
} catch (Exception e) {
@ -133,14 +134,14 @@ public class AsyncServer {
Class.forName("io.netty.channel.epoll.EpollServerDomainSocketChannel");
boss =
(EventLoopGroup)
(groupClass
groupClass
.getConstructor(int.class, ThreadFactory.class)
.newInstance(1, tf));
.newInstance(1, tf);
worker =
(EventLoopGroup)
(groupClass
groupClass
.getConstructor(int.class, ThreadFactory.class)
.newInstance(0, tf));
.newInstance(0, tf);
channelType = channelClass;
break;
} catch (Exception e) {

6
build.gradle
View File

@ -8,7 +8,6 @@ buildscript {
classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.5'
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.13'
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.5'
}
@ -30,13 +29,12 @@ subprojects {
if (!JavaVersion.current().isJava10Compatible() &&
rootProject.properties.get('errorProne', true)) {
apply plugin: "net.ltgt.errorprone"
apply plugin: "net.ltgt.apt"
dependencies {
// The ErrorProne plugin defaults to the latest, which would break our
// build if error prone releases a new version with a new check
errorprone 'com.google.errorprone:error_prone_core:2.2.0'
apt 'com.google.guava:guava-beta-checker:1.0'
errorprone 'com.google.errorprone:error_prone_core:2.3.2'
annotationProcessor 'com.google.guava:guava-beta-checker:1.0'
}
} else {
// Remove per-project error-prone checker config

5
core/src/main/java/io/grpc/Metadata.java
View File

@ -667,8 +667,9 @@ public final class Metadata {
/**
* Returns true if the two objects are both Keys, and their names match (case insensitive).
*/
@SuppressWarnings("EqualsGetClass")
@Override
public boolean equals(Object o) {
public final boolean equals(Object o) {
if (this == o) {
return true;
}
@ -680,7 +681,7 @@ public final class Metadata {
}
@Override
public int hashCode() {
public final int hashCode() {
return name.hashCode();
}

2
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -261,7 +261,7 @@ public final class GrpcUtil {
* in-use state of a transport.
*/
public static boolean shouldBeCountedForInUse(CallOptions callOptions) {
return !(Boolean.TRUE.equals(callOptions.getOption(CALL_OPTIONS_RPC_OWNED_BY_BALANCER)));
return !Boolean.TRUE.equals(callOptions.getOption(CALL_OPTIONS_RPC_OWNED_BY_BALANCER));
}
/**

16
core/src/test/java/io/grpc/MetadataTest.java
View File

@ -77,7 +77,7 @@ public class MetadataTest {
Fish cat = new Fish("cat");
Metadata metadata = new Metadata();
assertEquals(null, metadata.get(KEY));
assertNull(metadata.get(KEY));
metadata.put(KEY, lance);
assertEquals(Arrays.asList(lance), Lists.newArrayList(metadata.getAll(KEY)));
assertEquals(lance, metadata.get(KEY));
@ -99,8 +99,8 @@ public class MetadataTest {
assertEquals(Arrays.asList(lance, lance), Lists.newArrayList(metadata.getAll(KEY)));
assertEquals(Arrays.asList(lance, lance), Lists.newArrayList(metadata.removeAll(KEY)));
assertEquals(null, metadata.getAll(KEY));
assertEquals(null, metadata.get(KEY));
assertNull(metadata.getAll(KEY));
assertNull(metadata.get(KEY));
}
@Test
@ -110,16 +110,16 @@ public class MetadataTest {
metadata.put(KEY, lance);
metadata.discardAll(KEY);
assertEquals(null, metadata.getAll(KEY));
assertEquals(null, metadata.get(KEY));
assertNull(metadata.getAll(KEY));
assertNull(metadata.get(KEY));
}
@Test
public void discardAll_empty() {
Metadata metadata = new Metadata();
metadata.discardAll(KEY);
assertEquals(null, metadata.getAll(KEY));
assertEquals(null, metadata.get(KEY));
assertNull(metadata.getAll(KEY));
assertNull(metadata.get(KEY));
}
@Test
@ -334,7 +334,7 @@ public class MetadataTest {
}
}
private static class Fish {
private static final class Fish {
private String name;
private Fish(String name) {

19
core/src/test/java/io/grpc/ServerServiceDefinitionTest.java
View File

@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import org.junit.Rule;
@ -44,9 +45,9 @@ public class ServerServiceDefinitionTest {
.setFullMethodName(MethodDescriptor.generateFullMethodName(serviceName, "method2"))
.build();
private ServerCallHandler<String, Integer> methodHandler1
= new NoopServerCallHandler<String, Integer>();
= new NoopServerCallHandler<>();
private ServerCallHandler<String, Integer> methodHandler2
= new NoopServerCallHandler<String, Integer>();
= new NoopServerCallHandler<>();
private ServerMethodDefinition<String, Integer> methodDef1
= ServerMethodDefinition.create(method1, methodHandler1);
private ServerMethodDefinition<String, Integer> methodDef2
@ -61,7 +62,7 @@ public class ServerServiceDefinitionTest {
.build();
assertSame(sd, ssd.getServiceDescriptor());
assertEquals(Collections.<MethodDescriptor<?, ?>>emptyList(),
ssd.getServiceDescriptor().getMethods());
new ArrayList<>(ssd.getServiceDescriptor().getMethods()));
}
@Test
@ -128,17 +129,17 @@ public class ServerServiceDefinitionTest {
.build();
assertEquals(serviceName, ssd.getServiceDescriptor().getName());
HashSet<MethodDescriptor<?, ?>> goldenMethods = new HashSet<MethodDescriptor<?, ?>>();
HashSet<MethodDescriptor<?, ?>> goldenMethods = new HashSet<>();
goldenMethods.add(method1);
goldenMethods.add(method2);
assertEquals(goldenMethods,
new HashSet<MethodDescriptor<?, ?>>(ssd.getServiceDescriptor().getMethods()));
new HashSet<>(ssd.getServiceDescriptor().getMethods()));
HashSet<ServerMethodDefinition<?, ?>> goldenMethodDefs
= new HashSet<ServerMethodDefinition<?, ?>>();
= new HashSet<>();
goldenMethodDefs.add(methodDef1);
goldenMethodDefs.add(methodDef2);
assertEquals(goldenMethodDefs, new HashSet<ServerMethodDefinition<?, ?>>(ssd.getMethods()));
assertEquals(goldenMethodDefs, new HashSet<>(ssd.getMethods()));
}
@Test
@ -146,9 +147,9 @@ public class ServerServiceDefinitionTest {
ServerServiceDefinition ssd = ServerServiceDefinition.builder(serviceName)
.build();
assertEquals(Collections.<MethodDescriptor<?, ?>>emptyList(),
ssd.getServiceDescriptor().getMethods());
new ArrayList<>(ssd.getServiceDescriptor().getMethods()));
assertEquals(Collections.<ServerMethodDefinition<?, ?>>emptySet(),
new HashSet<ServerMethodDefinition<?, ?>>(ssd.getMethods()));
new HashSet<>(ssd.getMethods()));
}
private static class NoopServerCallHandler<ReqT, RespT>

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

@ -60,7 +60,7 @@ public class ServiceDescriptorTest {
thrown.expect(NullPointerException.class);
thrown.expectMessage("method");
new ServiceDescriptor("name", (Collections.<MethodDescriptor<?, ?>>singletonList(null)));
new ServiceDescriptor("name", Collections.<MethodDescriptor<?, ?>>singletonList(null));
}
@Test

1
core/src/test/java/io/grpc/internal/DelayedClientTransportTest.java
View File

@ -479,6 +479,7 @@ public class DelayedClientTransportTest {
doAnswer(new Answer<PickResult>() {
@Override
@SuppressWarnings("CatchAndPrintStackTrace")
public PickResult answer(InvocationOnMock invocation) throws Throwable {
if (nextPickShouldWait.compareAndSet(true, false)) {
try {

5
core/src/test/java/io/grpc/internal/ServerCallImplTest.java
View File

@ -35,7 +35,6 @@ import io.grpc.CompressorRegistry;
import io.grpc.Context;
import io.grpc.DecompressorRegistry;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.ServerStats.Builder;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.MethodDescriptor.Marshaller;
@ -106,7 +105,7 @@ public class ServerCallImplTest {
private void callTracer0(Status status) {
CallTracer tracer = CallTracer.getDefaultFactory().create();
Builder beforeBuilder = new Builder();
ServerStats.Builder beforeBuilder = new ServerStats.Builder();
tracer.updateBuilder(beforeBuilder);
ServerStats before = beforeBuilder.build();
assertEquals(0, before.callsStarted);
@ -122,7 +121,7 @@ public class ServerCallImplTest {
// end: required boilerplate
call.close(status, new Metadata());
Builder afterBuilder = new Builder();
ServerStats.Builder afterBuilder = new ServerStats.Builder();
tracer.updateBuilder(afterBuilder);
ServerStats after = afterBuilder.build();
assertEquals(1, after.callsStarted);

2
grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java
View File

@ -163,7 +163,7 @@ final class GrpclbState {
}
void handleSubchannelState(Subchannel subchannel, ConnectivityStateInfo newState) {
if (newState.getState() == SHUTDOWN || !(subchannels.values().contains(subchannel))) {
if (newState.getState() == SHUTDOWN || !subchannels.values().contains(subchannel)) {
return;
}
if (newState.getState() == IDLE) {

7
interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
View File

@ -862,10 +862,7 @@ public abstract class AbstractInteropTest {
StreamObserver<StreamingOutputCallRequest> requestStream = asyncStub.halfDuplexCall(recorder);
final int numRequests = 10;
List<StreamingOutputCallRequest> requests =
new ArrayList<>(numRequests);
for (int ix = numRequests; ix > 0; --ix) {
requests.add(request);
requestStream.onNext(request);
}
requestStream.onCompleted();
@ -1029,11 +1026,7 @@ public abstract class AbstractInteropTest {
stub.fullDuplexCall(recorder);
final int numRequests = 10;
List<StreamingOutputCallRequest> requests =
new ArrayList<>(numRequests);
for (int ix = numRequests; ix > 0; --ix) {
requests.add(request);
requestStream.onNext(request);
}
requestStream.onCompleted();

1
interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
View File

@ -55,6 +55,7 @@ public class TestServiceClient {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
@SuppressWarnings("CatchAndPrintStackTrace")
public void run() {
System.out.println("Shutting down");
try {

1
interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
View File

@ -245,6 +245,7 @@ public class TestServiceImpl extends TestServiceGrpc.TestServiceImplBase {
private Throwable failure;
private Runnable dispatchTask = new Runnable() {
@Override
@SuppressWarnings("CatchAndPrintStackTrace")
public void run() {
try {

1
interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java
View File

@ -48,6 +48,7 @@ public class TestServiceServer {
.addShutdownHook(
new Thread() {
@Override
@SuppressWarnings("CatchAndPrintStackTrace")
public void run() {
try {
System.out.println("Shutting down");

4
interop-testing/src/test/java/io/grpc/testing/integration/NettyFlowControlTest.java
View File

@ -131,7 +131,7 @@ public class NettyFlowControlTest {
private void doTest(int bandwidth, int latency) throws InterruptedException {
int streamSize = 1 * 1024 * 1024;
long expectedWindow = (latency * (bandwidth / TimeUnit.SECONDS.toMillis(1)));
long expectedWindow = latency * (bandwidth / TimeUnit.SECONDS.toMillis(1));
TestServiceGrpc.TestServiceStub stub = TestServiceGrpc.newStub(channel);
StreamingOutputCallRequest.Builder builder = StreamingOutputCallRequest.newBuilder()
@ -147,7 +147,7 @@ public class NettyFlowControlTest {
int lastWindow = observer.waitFor();
// deal with cases that either don't cause a window update or hit max window
expectedWindow = Math.min(MAX_WINDOW, (Math.max(expectedWindow, REGULAR_WINDOW)));
expectedWindow = Math.min(MAX_WINDOW, Math.max(expectedWindow, REGULAR_WINDOW));
// Range looks large, but this allows for only one extra/missed window update
// (one extra update causes a 2x difference and one missed update causes a .5x difference)

45
netty/src/jmh/java/io/grpc/netty/InboundHeadersBenchmark.java
View File

@ -18,7 +18,6 @@ package io.grpc.netty;
import static io.grpc.netty.Utils.CONTENT_TYPE_HEADER;
import static io.grpc.netty.Utils.TE_TRAILERS;
import static io.netty.util.AsciiString.of;
import io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2RequestHeaders;
import io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2ResponseHeaders;
@ -53,33 +52,33 @@ public class InboundHeadersBenchmark {
private static void setupRequestHeaders() {
requestHeaders = new AsciiString[18];
int i = 0;
requestHeaders[i++] = of(":method");
requestHeaders[i++] = of("POST");
requestHeaders[i++] = of(":scheme");
requestHeaders[i++] = of("http");
requestHeaders[i++] = of(":path");
requestHeaders[i++] = of("/google.pubsub.v2.PublisherService/CreateTopic");
requestHeaders[i++] = of(":authority");
requestHeaders[i++] = of("pubsub.googleapis.com");
requestHeaders[i++] = of("te");
requestHeaders[i++] = of("trailers");
requestHeaders[i++] = of("grpc-timeout");
requestHeaders[i++] = of("1S");
requestHeaders[i++] = of("content-type");
requestHeaders[i++] = of("application/grpc+proto");
requestHeaders[i++] = of("grpc-encoding");
requestHeaders[i++] = of("gzip");
requestHeaders[i++] = of("authorization");
requestHeaders[i] = of("Bearer y235.wef315yfh138vh31hv93hv8h3v");
requestHeaders[i++] = AsciiString.of(":method");
requestHeaders[i++] = AsciiString.of("POST");
requestHeaders[i++] = AsciiString.of(":scheme");
requestHeaders[i++] = AsciiString.of("http");
requestHeaders[i++] = AsciiString.of(":path");
requestHeaders[i++] = AsciiString.of("/google.pubsub.v2.PublisherService/CreateTopic");
requestHeaders[i++] = AsciiString.of(":authority");
requestHeaders[i++] = AsciiString.of("pubsub.googleapis.com");
requestHeaders[i++] = AsciiString.of("te");
requestHeaders[i++] = AsciiString.of("trailers");
requestHeaders[i++] = AsciiString.of("grpc-timeout");
requestHeaders[i++] = AsciiString.of("1S");
requestHeaders[i++] = AsciiString.of("content-type");
requestHeaders[i++] = AsciiString.of("application/grpc+proto");
requestHeaders[i++] = AsciiString.of("grpc-encoding");
requestHeaders[i++] = AsciiString.of("gzip");
requestHeaders[i++] = AsciiString.of("authorization");
requestHeaders[i] = AsciiString.of("Bearer y235.wef315yfh138vh31hv93hv8h3v");
}
private static void setupResponseHeaders() {
responseHeaders = new AsciiString[4];
int i = 0;
responseHeaders[i++] = of(":status");
responseHeaders[i++] = of("200");
responseHeaders[i++] = of("grpc-encoding");
responseHeaders[i] = of("gzip");
responseHeaders[i++] = AsciiString.of(":status");
responseHeaders[i++] = AsciiString.of("200");
responseHeaders[i++] = AsciiString.of("grpc-encoding");
responseHeaders[i] = AsciiString.of("gzip");
}
/**

2
netty/src/main/java/io/grpc/netty/CancelServerStreamCommand.java
View File

@ -24,7 +24,7 @@ import io.grpc.Status;
/**
* Command sent from a Netty server stream to the handler to cancel the stream.
*/
class CancelServerStreamCommand extends WriteQueue.AbstractQueuedCommand {
final class CancelServerStreamCommand extends WriteQueue.AbstractQueuedCommand {
private final NettyServerStream.TransportState stream;
private final Status reason;

4
netty/src/main/java/io/grpc/netty/NettyServerHandler.java
View File

@ -365,7 +365,7 @@ class NettyServerHandler extends AbstractNettyHandler {
private void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers)
throws Http2Exception {
if (!teWarningLogged && !TE_TRAILERS.equals(headers.get(TE_HEADER))) {
if (!teWarningLogged && !TE_TRAILERS.contentEquals(headers.get(TE_HEADER))) {
logger.warning(String.format("Expected header TE: %s, but %s is received. This means "
+ "some intermediate proxy may not support trailers",
TE_TRAILERS, headers.get(TE_HEADER)));
@ -405,7 +405,7 @@ class NettyServerHandler extends AbstractNettyHandler {
return;
}
if (!HTTP_METHOD.equals(headers.method())) {
if (!HTTP_METHOD.contentEquals(headers.method())) {
respondWithHttpError(ctx, streamId, 405, Status.Code.INTERNAL,
String.format("Method '%s' is not supported", headers.method()));
return;

2
netty/src/main/java/io/grpc/netty/SendGrpcFrameCommand.java
View File

@ -25,7 +25,7 @@ import io.netty.channel.ChannelPromise;
/**
* Command sent from the transport to the Netty channel to send a GRPC frame to the remote endpoint.
*/
class SendGrpcFrameCommand extends DefaultByteBufHolder implements WriteQueue.QueuedCommand {
final class SendGrpcFrameCommand extends DefaultByteBufHolder implements WriteQueue.QueuedCommand {
private final StreamIdHolder stream;
private final boolean endStream;

2
netty/src/main/java/io/grpc/netty/SendResponseHeadersCommand.java
View File

@ -24,7 +24,7 @@ import io.netty.handler.codec.http2.Http2Headers;
/**
* Command sent from the transport to the Netty channel to send response headers to the client.
*/
class SendResponseHeadersCommand extends WriteQueue.AbstractQueuedCommand {
final class SendResponseHeadersCommand extends WriteQueue.AbstractQueuedCommand {
private final StreamIdHolder stream;
private final Http2Headers headers;
private final Status status;

1
netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java
View File

@ -42,6 +42,7 @@ import org.junit.runners.JUnit4;
* Tests for {@link GrpcHttp2HeadersUtils}.
*/
@RunWith(JUnit4.class)
@SuppressWarnings({ "BadImport", "UndefinedEquals" }) // AsciiString.of and AsciiString.equals
public class GrpcHttp2HeadersUtilsTest {
private static final SensitivityDetector NEVER_SENSITIVE = new SensitivityDetector() {

1
netty/src/test/java/io/grpc/netty/GrpcHttp2InboundHeadersTest.java
View File

@ -36,6 +36,7 @@ import org.junit.runners.JUnit4;
* Tests for {@link GrpcHttp2RequestHeaders} and {@link GrpcHttp2ResponseHeaders}.
*/
@RunWith(JUnit4.class)
@SuppressWarnings({ "BadImport", "UndefinedEquals" }) // AsciiString.of and AsciiString.equals
public class GrpcHttp2InboundHeadersTest {
@Test

1
netty/src/test/java/io/grpc/netty/UtilsTest.java
View File

@ -107,6 +107,7 @@ public class UtilsTest {
}
@Test
@SuppressWarnings("UndefinedEquals") // AsciiString.equals
public void convertServerHeaders_sanitizes() {
Metadata metaData = new Metadata();

3
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View File

@ -358,6 +358,8 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
Preconditions.checkNotNull(method, "method");
Preconditions.checkNotNull(headers, "headers");
StatsTraceContext statsTraceCtx = StatsTraceContext.newClientContext(callOptions, headers);
// FIXME: it is likely wrong to pass the transportTracer here as it'll exit the lock's scope
synchronized (lock) { // to make @GuardedBy linter happy
return new OkHttpClientStream(
method,
headers,
@ -373,6 +375,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
transportTracer,
callOptions);
}
}
@GuardedBy("lock")
void streamReadyToStart(OkHttpClientStream clientStream) {

14
okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/OkHostnameVerifier.java vendored
View File

@ -168,13 +168,13 @@ public final class OkHostnameVerifier implements HostnameVerifier {
private boolean verifyHostName(String hostName, String pattern) {
// Basic sanity checks
// Check length == 0 instead of .isEmpty() to support Java 5.
if ((hostName == null) || (hostName.length() == 0) || (hostName.startsWith("."))
|| (hostName.endsWith(".."))) {
if (hostName == null || hostName.length() == 0 || hostName.startsWith(".")
|| hostName.endsWith("..")) {
// Invalid domain name
return false;
}
if ((pattern == null) || (pattern.length() == 0) || (pattern.startsWith("."))
|| (pattern.endsWith(".."))) {
if (pattern == null || pattern.length() == 0 || pattern.startsWith(".")
|| pattern.endsWith("..")) {
// Invalid pattern/domain name
return false;
}
@ -215,7 +215,7 @@ public final class OkHostnameVerifier implements HostnameVerifier {
// sub.test.example.com.
// 3. Wildcard patterns for single-label domain names are not permitted.
if ((!pattern.startsWith("*.")) || (pattern.indexOf('*', 1) != -1)) {
if (!pattern.startsWith("*.") || pattern.indexOf('*', 1) != -1) {
// Asterisk (*) is only permitted in the left-most domain name label and must be the only
// character in that label
return false;
@ -243,8 +243,8 @@ public final class OkHostnameVerifier implements HostnameVerifier {
// Check that asterisk did not match across domain name labels.
int suffixStartIndexInHostName = hostName.length() - suffix.length();
if ((suffixStartIndexInHostName > 0)
&& (hostName.lastIndexOf('.', suffixStartIndexInHostName - 1) != -1)) {
if (suffixStartIndexInHostName > 0
&& hostName.lastIndexOf('.', suffixStartIndexInHostName - 1) != -1) {
// Asterisk is matching across domain name labels -- not permitted.
return false;
}

3
services/src/main/java/io/grpc/services/BinlogHelper.java
View File

@ -57,7 +57,6 @@ import io.grpc.binarylog.v1.Address.Type;
import io.grpc.binarylog.v1.GrpcLogEntry;
import io.grpc.binarylog.v1.GrpcLogEntry.EventType;
import io.grpc.binarylog.v1.Message;
import io.grpc.binarylog.v1.Message.Builder;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@ -255,7 +254,7 @@ final class BinlogHelper {
if (marshaller != BYTEARRAY_MARSHALLER) {
throw new IllegalStateException("Expected the BinaryLog's ByteArrayMarshaller");
}
MaybeTruncated<Builder> pair = createMessageProto((byte[]) message, maxMessageBytes);
MaybeTruncated<Message.Builder> pair = createMessageProto((byte[]) message, maxMessageBytes);
GrpcLogEntry.Builder entryBuilder = newTimestampedBuilder()
.setSequenceIdWithinCall(seq)
.setType(eventType)

3
services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
View File

@ -58,7 +58,6 @@ import io.grpc.channelz.v1.Server;
import io.grpc.channelz.v1.ServerData;
import io.grpc.channelz.v1.ServerRef;
import io.grpc.channelz.v1.Socket;
import io.grpc.channelz.v1.Socket.Builder;
import io.grpc.channelz.v1.SocketData;
import io.grpc.channelz.v1.SocketOption;
import io.grpc.channelz.v1.SocketOptionLinger;
@ -174,7 +173,7 @@ final class ChannelzProtoUtil {
static Socket toSocket(InternalInstrumented<SocketStats> obj) {
SocketStats socketStats = getFuture(obj.getStats());
Builder builder = Socket.newBuilder()
Socket.Builder builder = Socket.newBuilder()
.setRef(toSocketRef(obj))
.setLocal(toAddress(socketStats.local));
if (socketStats.security != null) {

4
services/src/test/java/io/grpc/protobuf/services/ProtoReflectionServiceTest.java
View File

@ -66,9 +66,9 @@ public class ProtoReflectionServiceTest {
private MutableHandlerRegistry handlerRegistry = new MutableHandlerRegistry();
private BindableService reflectionService;
private ServerServiceDefinition dynamicService =
(new DynamicServiceGrpc.DynamicServiceImplBase() {}).bindService();
new DynamicServiceGrpc.DynamicServiceImplBase() {}.bindService();
private ServerServiceDefinition anotherDynamicService =
(new AnotherDynamicServiceGrpc.AnotherDynamicServiceImplBase() {}).bindService();
new AnotherDynamicServiceGrpc.AnotherDynamicServiceImplBase() {}.bindService();
private Server server;
private ManagedChannel channel;
private ServerReflectionGrpc.ServerReflectionStub stub;