Skip to content

s2a: don't use reflection to load token manager. #11590

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 3 commits into from
Oct 3, 2024
Merged

s2a: don't use reflection to load token manager. #11590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63d49f9
don't use reflection to load token manager.
rmehta19 Oct 2, 2024
44b2a93
Merge branch 'master' into s2a-access-token
rmehta19 Oct 2, 2024
53bd306
fix bazel build.
rmehta19 Oct 2, 2024
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
31 changes: 5 additions & 26 deletions s2a/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,13 @@ java_library(
)

java_library(
name = "token_fetcher",
srcs = ["src/main/java/io/grpc/s2a/internal/handshaker/tokenmanager/TokenFetcher.java"],
deps = [
":s2a_identity",
],
)

java_library(
name = "access_token_manager",
srcs = [
"src/main/java/io/grpc/s2a/internal/handshaker/tokenmanager/AccessTokenManager.java",
],
name = "token_manager",
srcs = glob([
"src/main/java/io/grpc/s2a/internal/handshaker/tokenmanager/*.java",
]),
deps = [
":s2a_identity",
":token_fetcher",
artifact("com.google.code.findbugs:jsr305"),
],
)

java_library(
name = "single_token_fetcher",
Copy link
Member

@ejona86 ejona86 Oct 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I understand more of what was going on here, now. You were thinking people didn't have to depend on certain targets. In OSS, they must get all-or-nothing of a particular Java package, and they get everything per-project (aka artifact, aka jar. So grpc-java/s2a folder here).

SingleTokenFetcher has so very, very little code and no dependencies. So it doesn't make sense to split it out into a separate package+project/artifact.

srcs = [
"src/main/java/io/grpc/s2a/internal/handshaker/tokenmanager/SingleTokenFetcher.java",
],
deps = [
":s2a_identity",
":token_fetcher",
artifact("com.google.guava:guava"),
],
)
Expand All @@ -77,13 +57,12 @@ java_library(
"src/main/java/io/grpc/s2a/internal/handshaker/SslContextFactory.java",
],
deps = [
":access_token_manager",
":token_manager",
":common_java_proto",
":s2a_channel_pool",
":s2a_identity",
":s2a_java_proto",
":s2a_java_grpc_proto",
":single_token_fetcher",
"//api",
"//core:internal",
"//netty",
Expand Down
15 changes: 2 additions & 13 deletions s2a/src/main/java/io/grpc/s2a/internal/handshaker/tokenmanager/AccessTokenManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package io.grpc.s2a.internal.handshaker.tokenmanager;

import io.grpc.s2a.internal.handshaker.S2AIdentity;
import java.lang.reflect.Method;
import java.util.Optional;
import javax.annotation.concurrent.ThreadSafe;

Expand All @@ -28,19 +27,9 @@ public final class AccessTokenManager {

/** Creates an {@code AccessTokenManager} based on the environment where the application runs. */
public static Optional<AccessTokenManager> create() {
Optional<?> tokenFetcher;
try {
Class<?> singleTokenFetcherClass =
Class.forName("io.grpc.s2a.internal.handshaker.tokenmanager.SingleTokenFetcher");
Method createTokenFetcher = singleTokenFetcherClass.getMethod("create");
tokenFetcher = (Optional) createTokenFetcher.invoke(null);
} catch (ClassNotFoundException e) {
tokenFetcher = Optional.empty();
} catch (ReflectiveOperationException e) {
throw new LinkageError(e.getMessage(), e);
}
Optional<TokenFetcher> tokenFetcher = SingleTokenFetcher.create();
return tokenFetcher.isPresent()
? Optional.of(new AccessTokenManager((TokenFetcher) tokenFetcher.get()))
? Optional.of(new AccessTokenManager(tokenFetcher.get()))
: Optional.empty();
}

Expand Down