Skip to content

Commit d0d946e

Browse files
carl-mastrangelocarl-mastrangelo
committed
new name
1 parent c4e8b1f commit d0d946e

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎core/src/main/java/io/grpc/inprocess/InProcessServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
package io.grpc.inprocess;
3333

34+
import io.grpc.internal.InternalServer;
3435
import io.grpc.internal.ServerListener;
3536
import io.grpc.internal.ServerTransportListener;
36-
import io.grpc.internal.TransportServer;
3737

3838
import java.io.IOException;
3939
import java.util.concurrent.ConcurrentHashMap;
@@ -42,7 +42,7 @@
4242
import javax.annotation.concurrent.ThreadSafe;
4343

4444
@ThreadSafe
45-
class InProcessServer implements TransportServer {
45+
class InProcessServer implements InternalServer {
4646
private static final ConcurrentMap<String, InProcessServer> registry
4747
= new ConcurrentHashMap<String, InProcessServer>();
4848

‎core/src/main/java/io/grpc/internal/AbstractServerImplBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public final T compressorRegistry(CompressorRegistry registry) {
138138

139139
@Override
140140
public ServerImpl build() {
141-
io.grpc.internal.TransportServer transportServer = buildTransportServer();
141+
io.grpc.internal.InternalServer transportServer = buildTransportServer();
142142
return new ServerImpl(executor, registry, transportServer, Context.ROOT,
143143
firstNonNull(decompressorRegistry, DecompressorRegistry.getDefaultInstance()),
144144
firstNonNull(compressorRegistry, CompressorRegistry.getDefaultInstance()));
@@ -150,7 +150,7 @@ public ServerImpl build() {
150150
* used by normal users.
151151
*/
152152
@Internal
153-
protected abstract io.grpc.internal.TransportServer buildTransportServer();
153+
protected abstract io.grpc.internal.InternalServer buildTransportServer();
154154

155155
private T thisT() {
156156
@SuppressWarnings("unchecked")

core/src/main/java/io/grpc/internal/TransportServer.java renamed to core/src/main/java/io/grpc/internal/InternalServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* that {@code accept()}s new connections.
4141
*/
4242
@ThreadSafe
43-
public interface TransportServer {
43+
public interface InternalServer {
4444
/**
4545
* Starts transport. Implementations must not call {@code listener} until after {@code start()}
4646
* returns. The method only returns after it has done the equivalent of bind()ing, so it will be

‎core/src/main/java/io/grpc/internal/ServerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public final class ServerImpl extends io.grpc.Server {
8585
private boolean shutdown;
8686
private boolean terminated;
8787
/** Service encapsulating something similar to an accept() socket. */
88-
private final TransportServer transportServer;
88+
private final InternalServer transportServer;
8989
private final Object lock = new Object();
9090
private boolean transportServerTerminated;
9191
/** {@code transportServer} and services encapsulating something similar to a TCP connection. */
@@ -103,7 +103,7 @@ public final class ServerImpl extends io.grpc.Server {
103103
* @param executor to call methods on behalf of remote clients
104104
* @param registry of methods to expose to remote clients.
105105
*/
106-
ServerImpl(Executor executor, HandlerRegistry registry, TransportServer transportServer,
106+
ServerImpl(Executor executor, HandlerRegistry registry, InternalServer transportServer,
107107
Context rootContext, DecompressorRegistry decompressorRegistry,
108108
CompressorRegistry compressorRegistry) {
109109
this.executor = executor;

‎core/src/main/java/io/grpc/internal/ServerListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public interface ServerListener {
4747

4848
/**
4949
* The server is shutting down. No new transports will be processed, but existing transports may
50-
* continue. Shutdown is only caused by a call to {@link TransportServer#shutdown()}. All
50+
* continue. Shutdown is only caused by a call to {@link InternalServer#shutdown()}. All
5151
* resources have been released.
5252
*/
5353
void serverShutdown();

‎core/src/test/java/io/grpc/inprocess/InProcessTransportTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
package io.grpc.inprocess;
3333

34+
import io.grpc.internal.InternalServer;
3435
import io.grpc.internal.ManagedClientTransport;
35-
import io.grpc.internal.TransportServer;
3636
import io.grpc.internal.testing.AbstractTransportTest;
3737

3838
import org.junit.runner.RunWith;
@@ -44,7 +44,7 @@ public class InProcessTransportTest extends AbstractTransportTest {
4444
private static final String transportName = "perfect-for-testing";
4545

4646
@Override
47-
protected TransportServer newServer() {
47+
protected InternalServer newServer() {
4848
return new InProcessServer(transportName);
4949
}
5050

‎core/src/test/java/io/grpc/internal/ServerImplTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ public void run() {
576576
return barrier;
577577
}
578578

579-
private static class SimpleServer implements io.grpc.internal.TransportServer {
579+
private static class SimpleServer implements io.grpc.internal.InternalServer {
580580
ServerListener listener;
581581

582582
@Override

‎netty/src/main/java/io/grpc/netty/NettyServer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import static io.netty.channel.ChannelOption.SO_BACKLOG;
3636
import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
3737

38+
import io.grpc.internal.InternalServer;
3839
import io.grpc.internal.ServerListener;
3940
import io.grpc.internal.SharedResourceHolder;
40-
import io.grpc.internal.TransportServer;
4141
import io.netty.bootstrap.ServerBootstrap;
4242
import io.netty.channel.Channel;
4343
import io.netty.channel.ChannelFuture;
@@ -60,8 +60,8 @@
6060
/**
6161
* Netty-based server implementation.
6262
*/
63-
class NettyServer implements TransportServer {
64-
private static final Logger log = Logger.getLogger(TransportServer.class.getName());
63+
class NettyServer implements InternalServer {
64+
private static final Logger log = Logger.getLogger(InternalServer.class.getName());
6565

6666
private final SocketAddress address;
6767
private final Class<? extends ServerChannel> channelType;

‎netty/src/test/java/io/grpc/netty/NettyTransportTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
package io.grpc.netty;
3333

3434
import io.grpc.internal.ClientTransportFactory;
35+
import io.grpc.internal.InternalServer;
3536
import io.grpc.internal.ManagedClientTransport;
36-
import io.grpc.internal.TransportServer;
3737
import io.grpc.internal.testing.AbstractTransportTest;
3838
import io.grpc.testing.TestUtils;
3939

@@ -65,7 +65,7 @@ public void releaseClientFactory() {
6565
}
6666

6767
@Override
68-
protected TransportServer newServer() {
68+
protected InternalServer newServer() {
6969
return NettyServerBuilder
7070
.forPort(SERVER_PORT)
7171
.flowControlWindow(65 * 1024)

‎testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
import io.grpc.internal.ClientStream;
5959
import io.grpc.internal.ClientStreamListener;
6060
import io.grpc.internal.ClientTransport;
61+
import io.grpc.internal.InternalServer;
6162
import io.grpc.internal.ManagedClientTransport;
6263
import io.grpc.internal.ServerListener;
6364
import io.grpc.internal.ServerStream;
6465
import io.grpc.internal.ServerStreamListener;
6566
import io.grpc.internal.ServerTransport;
6667
import io.grpc.internal.ServerTransportListener;
67-
import io.grpc.internal.TransportServer;
6868

6969
import org.junit.After;
7070
import org.junit.Before;
@@ -99,7 +99,7 @@ public abstract class AbstractTransportTest {
9999
* returned instance should be new and yet be accessible by new client transports. This
100100
* effectively means that each instance should listen on the same port, or similar.
101101
*/
102-
protected abstract TransportServer newServer();
102+
protected abstract InternalServer newServer();
103103

104104
/**
105105
* Returns a new transport that when started will be able to connect to the server.
@@ -111,7 +111,7 @@ public abstract class AbstractTransportTest {
111111
* {@code serverListener}, otherwise tearDown() can't wait for shutdown which can put following
112112
* tests in an indeterminate state.
113113
*/
114-
private TransportServer server;
114+
private InternalServer server;
115115
private ServerTransport serverTransport;
116116
private ManagedClientTransport client;
117117
private MethodDescriptor<String, String> methodDescriptor = MethodDescriptor.create(
@@ -215,7 +215,7 @@ public void clientStartAndStopOnceConnected() throws Exception {
215215
public void serverAlreadyListening() throws Exception {
216216
client = null;
217217
server.start(serverListener);
218-
TransportServer server2 = newServer();
218+
InternalServer server2 = newServer();
219219
thrown.expect(IOException.class);
220220
server2.start(new MockServerListener());
221221
}

0 commit comments

Comments
 (0)