From 5d2c2b111cf16112fbeb97e916f05500c585434b Mon Sep 17 00:00:00 2001 From: anitarua Date: Mon, 16 Jun 2025 16:10:29 -0700 Subject: [PATCH] chore: move interceptors into new folder --- .../java/momento/sdk/LeaderboardGrpcStubsManager.java | 1 + .../java/momento/sdk/ScsControlGrpcStubsManager.java | 1 + .../main/java/momento/sdk/ScsDataGrpcStubsManager.java | 3 +++ .../java/momento/sdk/ScsTokenGrpcStubsManager.java | 1 + .../java/momento/sdk/ScsTopicGrpcStubsManager.java | 2 ++ .../momento/sdk/StorageControlGrpcStubsManager.java | 1 + .../java/momento/sdk/StorageDataGrpcStubsManager.java | 1 + .../{ => interceptors}/GrpcMiddlewareInterceptor.java | 4 ++-- .../sdk/{ => interceptors}/RetryClientInterceptor.java | 4 ++-- .../sdk/{ => interceptors}/UserHeaderInterceptor.java | 10 +++++----- 10 files changed, 19 insertions(+), 9 deletions(-) rename momento-sdk/src/main/java/momento/sdk/{ => interceptors}/GrpcMiddlewareInterceptor.java (98%) rename momento-sdk/src/main/java/momento/sdk/{ => interceptors}/RetryClientInterceptor.java (98%) rename momento-sdk/src/main/java/momento/sdk/{ => interceptors}/UserHeaderInterceptor.java (89%) diff --git a/momento-sdk/src/main/java/momento/sdk/LeaderboardGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/LeaderboardGrpcStubsManager.java index 96f0e817..a2dae492 100644 --- a/momento-sdk/src/main/java/momento/sdk/LeaderboardGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/LeaderboardGrpcStubsManager.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import momento.sdk.auth.CredentialProvider; import momento.sdk.config.LeaderboardConfiguration; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; /** Manager responsible for GRPC channels and stubs for leaderboards. */ diff --git a/momento-sdk/src/main/java/momento/sdk/ScsControlGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/ScsControlGrpcStubsManager.java index dc4dc412..74f76c06 100644 --- a/momento-sdk/src/main/java/momento/sdk/ScsControlGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/ScsControlGrpcStubsManager.java @@ -12,6 +12,7 @@ import momento.sdk.auth.CredentialProvider; import momento.sdk.config.Configuration; import momento.sdk.config.transport.GrpcConfiguration; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; /** diff --git a/momento-sdk/src/main/java/momento/sdk/ScsDataGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/ScsDataGrpcStubsManager.java index 70145c22..9d147a6a 100644 --- a/momento-sdk/src/main/java/momento/sdk/ScsDataGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/ScsDataGrpcStubsManager.java @@ -33,6 +33,9 @@ import momento.sdk.config.middleware.Middleware; import momento.sdk.config.middleware.MiddlewareRequestHandlerContext; import momento.sdk.exceptions.ConnectionFailedException; +import momento.sdk.interceptors.GrpcMiddlewareInterceptor; +import momento.sdk.interceptors.RetryClientInterceptor; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/momento-sdk/src/main/java/momento/sdk/ScsTokenGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/ScsTokenGrpcStubsManager.java index acaf3333..6bcf7625 100644 --- a/momento-sdk/src/main/java/momento/sdk/ScsTokenGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/ScsTokenGrpcStubsManager.java @@ -10,6 +10,7 @@ import javax.annotation.Nonnull; import momento.sdk.auth.CredentialProvider; import momento.sdk.config.transport.GrpcConfiguration; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; import momento.token.TokenGrpc; diff --git a/momento-sdk/src/main/java/momento/sdk/ScsTopicGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/ScsTopicGrpcStubsManager.java index 484df6ef..9555cf8f 100644 --- a/momento-sdk/src/main/java/momento/sdk/ScsTopicGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/ScsTopicGrpcStubsManager.java @@ -21,6 +21,8 @@ import momento.sdk.config.middleware.MiddlewareRequestHandlerContext; import momento.sdk.exceptions.ClientSdkException; import momento.sdk.exceptions.MomentoErrorCode; +import momento.sdk.interceptors.GrpcMiddlewareInterceptor; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; // Helper class for bookkeeping the number of active concurrent subscriptions. diff --git a/momento-sdk/src/main/java/momento/sdk/StorageControlGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/StorageControlGrpcStubsManager.java index 57bab540..97b79d8c 100644 --- a/momento-sdk/src/main/java/momento/sdk/StorageControlGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/StorageControlGrpcStubsManager.java @@ -12,6 +12,7 @@ import momento.sdk.auth.CredentialProvider; import momento.sdk.config.StorageConfiguration; import momento.sdk.config.transport.storage.StorageGrpcConfiguration; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; /** diff --git a/momento-sdk/src/main/java/momento/sdk/StorageDataGrpcStubsManager.java b/momento-sdk/src/main/java/momento/sdk/StorageDataGrpcStubsManager.java index 572f1fb5..c0e5fd5e 100644 --- a/momento-sdk/src/main/java/momento/sdk/StorageDataGrpcStubsManager.java +++ b/momento-sdk/src/main/java/momento/sdk/StorageDataGrpcStubsManager.java @@ -20,6 +20,7 @@ import momento.sdk.auth.CredentialProvider; import momento.sdk.config.StorageConfiguration; import momento.sdk.exceptions.ConnectionFailedException; +import momento.sdk.interceptors.UserHeaderInterceptor; import momento.sdk.internal.GrpcChannelOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/momento-sdk/src/main/java/momento/sdk/GrpcMiddlewareInterceptor.java b/momento-sdk/src/main/java/momento/sdk/interceptors/GrpcMiddlewareInterceptor.java similarity index 98% rename from momento-sdk/src/main/java/momento/sdk/GrpcMiddlewareInterceptor.java rename to momento-sdk/src/main/java/momento/sdk/interceptors/GrpcMiddlewareInterceptor.java index 0334dde0..df6ad7c6 100644 --- a/momento-sdk/src/main/java/momento/sdk/GrpcMiddlewareInterceptor.java +++ b/momento-sdk/src/main/java/momento/sdk/interceptors/GrpcMiddlewareInterceptor.java @@ -1,4 +1,4 @@ -package momento.sdk; +package momento.sdk.interceptors; import com.google.protobuf.Message; import io.grpc.CallOptions; @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class GrpcMiddlewareInterceptor implements ClientInterceptor { +public final class GrpcMiddlewareInterceptor implements ClientInterceptor { private final List middlewareHandlers; private final Logger logger = LoggerFactory.getLogger(GrpcMiddlewareInterceptor.class); diff --git a/momento-sdk/src/main/java/momento/sdk/RetryClientInterceptor.java b/momento-sdk/src/main/java/momento/sdk/interceptors/RetryClientInterceptor.java similarity index 98% rename from momento-sdk/src/main/java/momento/sdk/RetryClientInterceptor.java rename to momento-sdk/src/main/java/momento/sdk/interceptors/RetryClientInterceptor.java index 8e494fc9..eeb61bc4 100644 --- a/momento-sdk/src/main/java/momento/sdk/RetryClientInterceptor.java +++ b/momento-sdk/src/main/java/momento/sdk/interceptors/RetryClientInterceptor.java @@ -1,4 +1,4 @@ -package momento.sdk; +package momento.sdk.interceptors; import io.grpc.CallOptions; import io.grpc.Channel; @@ -53,7 +53,7 @@ * @see RetryStrategy * @see RetryEligibilityStrategy */ -final class RetryClientInterceptor implements ClientInterceptor { +public final class RetryClientInterceptor implements ClientInterceptor { private final RetryStrategy retryStrategy; private final ScheduledExecutorService scheduler; diff --git a/momento-sdk/src/main/java/momento/sdk/UserHeaderInterceptor.java b/momento-sdk/src/main/java/momento/sdk/interceptors/UserHeaderInterceptor.java similarity index 89% rename from momento-sdk/src/main/java/momento/sdk/UserHeaderInterceptor.java rename to momento-sdk/src/main/java/momento/sdk/interceptors/UserHeaderInterceptor.java index 0c8fbccc..2dcee5fd 100644 --- a/momento-sdk/src/main/java/momento/sdk/UserHeaderInterceptor.java +++ b/momento-sdk/src/main/java/momento/sdk/interceptors/UserHeaderInterceptor.java @@ -1,4 +1,4 @@ -package momento.sdk; +package momento.sdk.interceptors; import static io.grpc.Metadata.ASCII_STRING_MARSHALLER; @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.Map; -final class UserHeaderInterceptor implements ClientInterceptor { +public final class UserHeaderInterceptor implements ClientInterceptor { private static final Metadata.Key AUTH_HEADER_KEY = Metadata.Key.of("authorization", ASCII_STRING_MARSHALLER); @@ -20,7 +20,7 @@ final class UserHeaderInterceptor implements ClientInterceptor { Metadata.Key.of("agent", ASCII_STRING_MARSHALLER); private static final Metadata.Key RUNTIME_VERSION_KEY = Metadata.Key.of("runtime-version", ASCII_STRING_MARSHALLER); - static final Metadata.Key READ_CONCERN = + public static final Metadata.Key READ_CONCERN = Metadata.Key.of("read-concern", ASCII_STRING_MARSHALLER); private final Map, String> extraHeaders; @@ -29,11 +29,11 @@ final class UserHeaderInterceptor implements ClientInterceptor { private final String runtimeVersion; private boolean isUserAgentSent = false; - UserHeaderInterceptor(String token, String clientType) { + public UserHeaderInterceptor(String token, String clientType) { this(token, clientType, Collections.emptyMap()); } - UserHeaderInterceptor( + public UserHeaderInterceptor( String token, String clientType, Map, String> extraHeaders) { tokenValue = token; sdkVersion =