switch annotation org.checkerframework.checker.nullness.qual.Nullable to javax.annotation.Nullable (#4418)

MartinDai · web-flow · commit 62c90512cda6 · 2021-10-19T10:59:18.000+03:00
diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AkkaHttpClientAttributesExtractor
     extends HttpClientAttributesExtractor<HttpRequest, HttpResponse> {
@@ -35,13 +35,15 @@ protected List<String> requestHeader(HttpRequest httpRequest, String name) {
   }
 
   @Override
-  protected @Nullable Long requestContentLength(
+  @Nullable
+  protected Long requestContentLength(
       HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
     return null;
   }
 
   @Override
-  protected @Nullable Long requestContentLengthUncompressed(
+  @Nullable
+  protected Long requestContentLengthUncompressed(
       HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
     return null;
   }
@@ -52,13 +54,14 @@ protected Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse)
   }
 
   @Override
-  protected @Nullable Long responseContentLength(
-      HttpRequest httpRequest, HttpResponse httpResponse) {
+  @Nullable
+  protected Long responseContentLength(HttpRequest httpRequest, HttpResponse httpResponse) {
     return null;
   }
 
   @Override
-  protected @Nullable Long responseContentLengthUncompressed(
+  @Nullable
+  protected Long responseContentLengthUncompressed(
       HttpRequest httpRequest, HttpResponse httpResponse) {
     return null;
   }
diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java
@@ -9,7 +9,7 @@
 import akka.http.scaladsl.model.HttpResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AkkaHttpNetAttributesExtractor
     extends NetClientAttributesExtractor<HttpRequest, HttpResponse> {
@@ -29,7 +29,8 @@ public Integer peerPort(HttpRequest httpRequest, @Nullable HttpResponse httpResp
   }
 
   @Override
-  public @Nullable String peerIp(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
+  @Nullable
+  public String peerIp(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
     return null;
   }
 }
diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import scala.Option;
 
 class AkkaHttpServerAttributesExtractor
@@ -27,13 +27,14 @@ protected List<String> requestHeader(HttpRequest request, String name) {
   }
 
   @Override
-  protected @Nullable Long requestContentLength(
-      HttpRequest request, @Nullable HttpResponse httpResponse) {
+  @Nullable
+  protected Long requestContentLength(HttpRequest request, @Nullable HttpResponse httpResponse) {
     return null;
   }
 
   @Override
-  protected @Nullable Long requestContentLengthUncompressed(
+  @Nullable
+  protected Long requestContentLengthUncompressed(
       HttpRequest request, @Nullable HttpResponse httpResponse) {
     return null;
   }
@@ -44,13 +45,14 @@ protected Integer statusCode(HttpRequest request, HttpResponse httpResponse) {
   }
 
   @Override
-  protected @Nullable Long responseContentLength(HttpRequest request, HttpResponse httpResponse) {
+  @Nullable
+  protected Long responseContentLength(HttpRequest request, HttpResponse httpResponse) {
     return null;
   }
 
   @Override
-  protected @Nullable Long responseContentLengthUncompressed(
-      HttpRequest request, HttpResponse httpResponse) {
+  @Nullable
+  protected Long responseContentLengthUncompressed(HttpRequest request, HttpResponse httpResponse) {
     return null;
   }
 
@@ -76,7 +78,8 @@ protected String target(HttpRequest request) {
   }
 
   @Override
-  protected @Nullable String route(HttpRequest request) {
+  @Nullable
+  protected String route(HttpRequest request) {
     return null;
   }
 
@@ -86,7 +89,8 @@ protected String scheme(HttpRequest request) {
   }
 
   @Override
-  protected @Nullable String serverName(HttpRequest request, @Nullable HttpResponse httpResponse) {
+  @Nullable
+  protected String serverName(HttpRequest request, @Nullable HttpResponse httpResponse) {
     return null;
   }
 }
diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/ApiGatewayProxyAttributesExtractor.java
@@ -23,7 +23,7 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ApiGatewayProxyAttributesExtractor
     implements AttributesExtractor<AwsLambdaRequest, Object> {
diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java
@@ -16,7 +16,7 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AwsLambdaFunctionAttributesExtractor
     implements AttributesExtractor<AwsLambdaRequest, Object> {
diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/AwsLambdaFunctionInstrumenter.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/AwsLambdaFunctionInstrumenter.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.instrumentation.api.internal.ContextPropagationDebug;
 import io.opentelemetry.instrumentation.awslambda.v1_0.AwsLambdaRequest;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public class AwsLambdaFunctionInstrumenter {
 
diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/SqsEventAttributesExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/SqsEventAttributesExtractor.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class SqsEventAttributesExtractor implements AttributesExtractor<SQSEvent, Void> {
   @Override
diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/SqsMessageAttributesExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/SqsMessageAttributesExtractor.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class SqsMessageAttributesExtractor implements AttributesExtractor<SQSMessage, Void> {
   @Override
diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java
@@ -13,8 +13,8 @@
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import java.util.HashSet;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.bson.BsonValue;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class MongoAttributesExtractor implements AttributesExtractor<CommandStartedEvent, Void> {
   @Override
diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesExtractor.java
@@ -8,12 +8,13 @@
 import com.mongodb.event.CommandStartedEvent;
 import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesExtractor;
 import java.net.InetSocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class MongoNetAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<CommandStartedEvent, Void> {
   @Override
-  public @Nullable InetSocketAddress getAddress(CommandStartedEvent event, @Nullable Void unused) {
+  @Nullable
+  public InetSocketAddress getAddress(CommandStartedEvent event, @Nullable Void unused) {
     if (event.getConnectionDescription() != null
         && event.getConnectionDescription().getServerAddress() != null) {
       return event.getConnectionDescription().getServerAddress().getSocketAddress();
@@ -23,8 +24,8 @@ class MongoNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String transport(
-      CommandStartedEvent commandStartedEvent, @Nullable Void unused) {
+  @Nullable
+  public String transport(CommandStartedEvent commandStartedEvent, @Nullable Void unused) {
     return null;
   }
 }
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java
@@ -8,7 +8,7 @@
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 @AutoValue
 abstract class NettyClientRequestAndContexts {
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesExtractor.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesExtractor.java
@@ -10,14 +10,15 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 final class NettyHttpClientAttributesExtractor
     extends HttpClientAttributesExtractor<HttpRequestAndChannel, HttpResponse> {
 
   @Override
-  protected @Nullable String url(HttpRequestAndChannel requestAndChannel) {
+  @Nullable
+  protected String url(HttpRequestAndChannel requestAndChannel) {
     try {
       String hostHeader = getHost(requestAndChannel);
       String target = requestAndChannel.request().getUri();
@@ -58,13 +59,15 @@ protected List<String> requestHeader(HttpRequestAndChannel requestAndChannel, St
   }
 
   @Override
-  protected @Nullable Long requestContentLength(
+  @Nullable
+  protected Long requestContentLength(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long requestContentLengthUncompressed(
+  @Nullable
+  protected Long requestContentLengthUncompressed(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }
@@ -75,13 +78,15 @@ protected Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpRespon
   }
 
   @Override
-  protected @Nullable Long responseContentLength(
+  @Nullable
+  protected Long responseContentLength(
       HttpRequestAndChannel requestAndChannel, HttpResponse response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long responseContentLengthUncompressed(
+  @Nullable
+  protected Long responseContentLengthUncompressed(
       HttpRequestAndChannel requestAndChannel, HttpResponse response) {
     return null;
   }
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesExtractor.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesExtractor.java
@@ -9,14 +9,15 @@
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 final class NettyNetClientAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<HttpRequestAndChannel, HttpResponse> {
 
   @Override
-  public @Nullable InetSocketAddress getAddress(
+  @Nullable
+  public InetSocketAddress getAddress(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     SocketAddress address = requestAndChannel.channel().getRemoteAddress();
     if (address instanceof InetSocketAddress) {
@@ -26,7 +27,8 @@ final class NettyNetClientAttributesExtractor
   }
 
   @Override
-  public @Nullable String transport(
+  @Nullable
+  public String transport(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }
diff --git a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettyHttpClientAttributesExtractor.java b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettyHttpClientAttributesExtractor.java
@@ -12,7 +12,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class NettyHttpClientAttributesExtractor
     extends HttpClientAttributesExtractor<HttpRequestAndChannel, HttpResponse> {
@@ -33,7 +33,8 @@ private static Class<? extends ChannelHandler> getSslHandlerClass() {
   }
 
   @Override
-  protected @Nullable String url(HttpRequestAndChannel requestAndChannel) {
+  @Nullable
+  protected String url(HttpRequestAndChannel requestAndChannel) {
     try {
       String hostHeader = getHost(requestAndChannel);
       String target = requestAndChannel.request().getUri();
@@ -75,13 +76,15 @@ protected List<String> requestHeader(HttpRequestAndChannel requestAndChannel, St
   }
 
   @Override
-  protected @Nullable Long requestContentLength(
+  @Nullable
+  protected Long requestContentLength(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long requestContentLengthUncompressed(
+  @Nullable
+  protected Long requestContentLengthUncompressed(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }
@@ -92,13 +95,15 @@ protected Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpRespon
   }
 
   @Override
-  protected @Nullable Long responseContentLength(
+  @Nullable
+  protected Long responseContentLength(
       HttpRequestAndChannel requestAndChannel, HttpResponse response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long responseContentLengthUncompressed(
+  @Nullable
+  protected Long responseContentLengthUncompressed(
       HttpRequestAndChannel requestAndChannel, HttpResponse response) {
     return null;
   }
diff --git a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettyNetClientAttributesExtractor.java b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettyNetClientAttributesExtractor.java
@@ -10,13 +10,14 @@
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class NettyNetClientAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<HttpRequestAndChannel, HttpResponse> {
 
   @Override
-  public @Nullable InetSocketAddress getAddress(
+  @Nullable
+  public InetSocketAddress getAddress(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     SocketAddress address = requestAndChannel.channel().remoteAddress();
     if (address instanceof InetSocketAddress) {
@@ -26,7 +27,8 @@ final class NettyNetClientAttributesExtractor
   }
 
   @Override
-  public @Nullable String transport(
+  @Nullable
+  public String transport(
       HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) {
     return null;
   }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import akka.http.scaladsl.model.HttpResponse;`
`10`	`10`	`import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;`
`11`	`11`	`import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;`
`12`		`-import org.checkerframework.checker.nullness.qual.Nullable;`
	`12`	`+import javax.annotation.Nullable;`
`13`	`13`
`14`	`14`	`class AkkaHttpNetAttributesExtractor`
`15`	`15`	`extends NetClientAttributesExtractor<HttpRequest, HttpResponse> {`
`@@ -29,7 +29,8 @@ public Integer peerPort(HttpRequest httpRequest, @Nullable HttpResponse httpResp`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`		`- public @Nullable String peerIp(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {`
	`32`	`+ @Nullable`
	`33`	`+ public String peerIp(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {`
`33`	`34`	`return null;`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor;`
`11`	`11`	`import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;`
`12`	`12`	`import java.util.List;`
`13`		`-import org.checkerframework.checker.nullness.qual.Nullable;`
	`13`	`+import javax.annotation.Nullable;`
`14`	`14`	`import scala.Option;`
`15`	`15`
`16`	`16`	`class AkkaHttpServerAttributesExtractor`
`@@ -27,13 +27,14 @@ protected List<String> requestHeader(HttpRequest request, String name) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- protected @Nullable Long requestContentLength(`
`31`		`- HttpRequest request, @Nullable HttpResponse httpResponse) {`
	`30`	`+ @Nullable`
	`31`	`+ protected Long requestContentLength(HttpRequest request, @Nullable HttpResponse httpResponse) {`
`32`	`32`	`return null;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- protected @Nullable Long requestContentLengthUncompressed(`
	`36`	`+ @Nullable`
	`37`	`+ protected Long requestContentLengthUncompressed(`
`37`	`38`	`HttpRequest request, @Nullable HttpResponse httpResponse) {`
`38`	`39`	`return null;`
`39`	`40`	`}`
`@@ -44,13 +45,14 @@ protected Integer statusCode(HttpRequest request, HttpResponse httpResponse) {`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`@Override`
`47`		`- protected @Nullable Long responseContentLength(HttpRequest request, HttpResponse httpResponse) {`
	`48`	`+ @Nullable`
	`49`	`+ protected Long responseContentLength(HttpRequest request, HttpResponse httpResponse) {`
`48`	`50`	`return null;`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`@Override`
`52`		`- protected @Nullable Long responseContentLengthUncompressed(`
`53`		`- HttpRequest request, HttpResponse httpResponse) {`
	`54`	`+ @Nullable`
	`55`	`+ protected Long responseContentLengthUncompressed(HttpRequest request, HttpResponse httpResponse) {`
`54`	`56`	`return null;`
`55`	`57`	`}`
`56`	`58`
`@@ -76,7 +78,8 @@ protected String target(HttpRequest request) {`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`@Override`
`79`		`- protected @Nullable String route(HttpRequest request) {`
	`81`	`+ @Nullable`
	`82`	`+ protected String route(HttpRequest request) {`
`80`	`83`	`return null;`
`81`	`84`	`}`
`82`	`85`
`@@ -86,7 +89,8 @@ protected String scheme(HttpRequest request) {`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`@Override`
`89`		`- protected @Nullable String serverName(HttpRequest request, @Nullable HttpResponse httpResponse) {`
	`92`	`+ @Nullable`
	`93`	`+ protected String serverName(HttpRequest request, @Nullable HttpResponse httpResponse) {`
`90`	`94`	`return null;`
`91`	`95`	`}`
`92`	`96`	`}`