get rid of public ServerImpl

grpc · Aug 13, 2018 · ef44f10 · ef44f10
1 parent 2b60ccb
commit ef44f10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -114,16 +114,14 @@ public final class ServerImpl extends io.grpc.Server implements Instrumented<Ser
   private final Channelz channelz;
   private final CallTracer serverCallTracer;
 
-  private ServerListener serverListener;
-
   /**
    * Construct a server.
    *
    * @param builder builder with configuration for server
    * @param transportServer transport server that will create new incoming transports
    * @param rootContext context that callbacks for new RPCs should be derived from
    */
-  public ServerImpl(
+  ServerImpl(
       AbstractServerImplBuilder<?> builder,
       InternalServer transportServer,
       Context rootContext) {
@@ -162,26 +160,13 @@ public ServerImpl start() throws IOException {
       checkState(!started, "Already started");
       checkState(!shutdown, "Shutting down");
       // Start and wait for any port to actually be bound.
-      serverListener = new ServerListenerImpl();
-      transportServer.start(serverListener);
+      transportServer.start(new ServerListenerImpl());
       executor = Preconditions.checkNotNull(executorPool.getObject(), "executor");
       started = true;
       return this;
     }
   }
 
-  /**
-   * Returns the ServerListener that the server started with. Never null.
-   *
-   * @throws IllegalStateException if called before {@line #start()} is done.
-   */
-  public ServerListener getServerListener() {
-    synchronized (lock) {
-      checkState(started, "Not started");
-    }
-    return serverListener;
-  }
-
   @Override
   public int getPort() {
     synchronized (lock) {

diff --git a/servlet/src/main/java/io/grpc/servlet/ServerBuilder.java b/servlet/src/main/java/io/grpc/servlet/ServerBuilder.java
@@ -29,7 +29,6 @@
 import io.grpc.internal.Instrumented;
 import io.grpc.internal.InternalServer;
 import io.grpc.internal.LogId;
-import io.grpc.internal.ServerImpl;
 import io.grpc.internal.ServerListener;
 import io.grpc.internal.ServerTransport;
 import io.grpc.internal.ServerTransportListener;
@@ -50,6 +49,7 @@ public final class ServerBuilder extends AbstractServerImplBuilder<ServerBuilder
   private ScheduledExecutorService scheduledExecutorService;
   private boolean internalCaller;
   private boolean usingCustomScheduler;
+  private ServerListener serverListener;
 
   /**
    * Builds a gRPC server that can run as a servlet.
@@ -69,10 +69,9 @@ public Server build() {
   }
 
   ServerTransportListener buildAndStart() {
-    ServerImpl server;
     try {
       internalCaller = true;
-      server = (ServerImpl) build().start();
+      build().start();
       internalCaller = false;
     } catch (IOException e) {
       // actually this should never happen
@@ -88,12 +87,14 @@ ServerTransportListener buildAndStart() {
     // container does.
     ServerTransportImpl serverTransport =
         new ServerTransportImpl(scheduledExecutorService, usingCustomScheduler);
-    return server.getServerListener().transportCreated(serverTransport);
+    return serverListener.transportCreated(serverTransport);
   }
 
   @Override
   protected InternalServer buildTransportServer(List<Factory> streamTracerFactories) {
-    return new InternalServerImpl();
+    InternalServerImpl internalServer = new InternalServerImpl();
+    serverListener = internalServer.serverListener;
+    return internalServer;
   }
 
   @Override