Skip to content

chore: move interceptors into new folder #449

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

Closed
anitarua wants to merge 1 commit into from
Closed

chore: move interceptors into new folder #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions momento-sdk/src/main/java/momento/sdk/LeaderboardGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 1 addition & 0 deletions momento-sdk/src/main/java/momento/sdk/ScsControlGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 3 additions & 0 deletions momento-sdk/src/main/java/momento/sdk/ScsDataGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions momento-sdk/src/main/java/momento/sdk/ScsTokenGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions momento-sdk/src/main/java/momento/sdk/ScsTopicGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions momento-sdk/src/main/java/momento/sdk/StorageControlGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 1 addition & 0 deletions momento-sdk/src/main/java/momento/sdk/StorageDataGrpcStubsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...omento/sdk/GrpcMiddlewareInterceptor.java → ...terceptors/GrpcMiddlewareInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package momento.sdk;
package momento.sdk.interceptors;

import com.google.protobuf.Message;
import io.grpc.CallOptions;
Expand All @@ -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<MiddlewareRequestHandler> middlewareHandlers;
private final Logger logger = LoggerFactory.getLogger(GrpcMiddlewareInterceptor.class);
Expand Down
4 changes: 2 additions & 2 deletions ...a/momento/sdk/RetryClientInterceptor.java → .../interceptors/RetryClientInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package momento.sdk;
package momento.sdk.interceptors;

import io.grpc.CallOptions;
import io.grpc.Channel;
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...va/momento/sdk/UserHeaderInterceptor.java → ...k/interceptors/UserHeaderInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package momento.sdk;
package momento.sdk.interceptors;

import static io.grpc.Metadata.ASCII_STRING_MARSHALLER;

Expand All @@ -12,15 +12,15 @@
import java.util.Collections;
import java.util.Map;

final class UserHeaderInterceptor implements ClientInterceptor {
public final class UserHeaderInterceptor implements ClientInterceptor {

private static final Metadata.Key<String> AUTH_HEADER_KEY =
Metadata.Key.of("authorization", ASCII_STRING_MARSHALLER);
private static final Metadata.Key<String> SDK_AGENT_KEY =
Metadata.Key.of("agent", ASCII_STRING_MARSHALLER);
private static final Metadata.Key<String> RUNTIME_VERSION_KEY =
Metadata.Key.of("runtime-version", ASCII_STRING_MARSHALLER);
static final Metadata.Key<String> READ_CONCERN =
public static final Metadata.Key<String> READ_CONCERN =
Metadata.Key.of("read-concern", ASCII_STRING_MARSHALLER);

private final Map<Metadata.Key<String>, String> extraHeaders;
Expand All @@ -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<Metadata.Key<String>, String> extraHeaders) {
tokenValue = token;
sdkVersion =
Expand Down
Loading