Skip to content

binder: Move BinderTransport's inner classes to the top level #12303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 21, 2025
Merged

binder: Move BinderTransport's inner classes to the top level #12303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b253754
Move BinderTransport's inner classes to the top level
jdcormie Aug 21, 2025
66c6e67
copyright headers
jdcormie Aug 21, 2025
2b43cc9
java format
jdcormie Aug 21, 2025
f0ee9be
undo a few places where the tool needlessly fully qualified the new c…
jdcormie Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions binder/src/androidTest/java/io/grpc/binder/internal/BinderClientTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public final class BinderClientTransportTest {
.build();

AndroidComponentAddress serverAddress;
BinderTransport.BinderClientTransport transport;
BinderClientTransport transport;
BlockingSecurityPolicy blockingSecurityPolicy = new BlockingSecurityPolicy();

private final ObjectPool<ScheduledExecutorService> executorServicePool =
Expand Down Expand Up @@ -178,7 +178,7 @@ public BinderClientTransportBuilder setPreAuthorizeServer(boolean preAuthorizeSe
return this;
}

public BinderTransport.BinderClientTransport build() {
public BinderClientTransport build() {
return factoryBuilder
.buildClientTransportFactory()
.newClientTransport(serverAddress, new ClientTransportOptions(), null);
Expand Down Expand Up @@ -502,8 +502,7 @@ public void testAsyncSecurityPolicyCancelledUponExternalTermination() throws Exc
}

private static void startAndAwaitReady(
BinderTransport.BinderClientTransport transport, TestTransportListener transportListener)
throws Exception {
BinderClientTransport transport, TestTransportListener transportListener) throws Exception {
transport.start(transportListener).run();
transportListener.awaitReady();
}
Expand Down
3 changes: 1 addition & 2 deletions binder/src/androidTest/java/io/grpc/binder/internal/BinderTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ protected ManagedClientTransport newClientTransport(InternalServer server) {
options.setEagAttributes(eagAttrs());
options.setChannelLogger(transportLogger());

return new BinderTransport.BinderClientTransport(
builder.buildClientTransportFactory(), addr, options);
return new BinderClientTransport(builder.buildClientTransportFactory(), addr, options);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions binder/src/main/java/io/grpc/binder/internal/ActiveTransportTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import io.grpc.internal.ServerTransportListener;

/**
* Tracks which {@link BinderTransport.BinderServerTransport} are currently active and allows
* invoking a {@link Runnable} only once all transports are terminated.
* Tracks which {@link BinderServerTransport} are currently active and allows invoking a {@link
* Runnable} only once all transports are terminated.
*/
final class ActiveTransportTracker implements ServerListener {
private final ServerListener delegate;
Expand Down
Loading