Move XFCC_CONTEXT_KEY to XForwardedClientCert class

Author: rmichela

grpc-contrib/src/main/java/com/salesforce/grpc/contrib/xfcc/XForwardedClientCert.java

@@ -7,6 +7,8 @@
 
 package com.salesforce.grpc.contrib.xfcc;
 
+import io.grpc.Context;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -15,6 +17,11 @@
  * clients or proxies that a request has flowed through, on its way from the client to the server.
  */
 public class XForwardedClientCert {
+    /**
+     * The metadata key used to access any present {@link XForwardedClientCert} objects.
+     */
+    public static final Context.Key<List<XForwardedClientCert>> XFCC_CONTEXT_KEY = Context.key("x-forwarded-client-cert");
+
     private String by = "";
     private String hash = "";
     private String san = "";

grpc-contrib/src/main/java/com/salesforce/grpc/contrib/xfcc/XfccServerInterceptor.java

@@ -21,11 +21,6 @@
  * @see <a href="https://github.com/linkerd/linkerd/issues/1153">Linkerd XFCC Header</a>
  */
 public class XfccServerInterceptor implements ServerInterceptor {
-    /**
-     * The metadata key used to access any present {@link XForwardedClientCert} objects.
-     */
-    public static final Context.Key<List<XForwardedClientCert>> XFCC_CONTEXT_KEY = Context.key("x-forwarded-client-cert");
-
     private static final Metadata.Key<List<XForwardedClientCert>> XFCC_METADATA_KEY = Metadata.Key.of("x-forwarded-client-cert", new XfccMarshaller());
 
     @Override
@@ -37,7 +32,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, Re
                 xfccs.addAll(value);
             }
 
-            Context xfccContext = Context.current().withValue(XFCC_CONTEXT_KEY, xfccs);
+            Context xfccContext = Context.current().withValue(XForwardedClientCert.XFCC_CONTEXT_KEY, xfccs);
             return Contexts.interceptCall(xfccContext, call, headers, next);
         } else {
             return next.startCall(call, headers);

grpc-contrib/src/test/java/com/salesforce/grpc/contrib/xfcc/XfccServerInterceptorTest.java

@@ -33,7 +33,7 @@ public void endToEndTest() {
         GreeterGrpc.GreeterImplBase svc = new GreeterGrpc.GreeterImplBase() {
             @Override
             public void sayHello(HelloRequest request, StreamObserver<HelloResponse> responseObserver) {
-                certs.set(XfccServerInterceptor.XFCC_CONTEXT_KEY.get());
+                certs.set(XForwardedClientCert.XFCC_CONTEXT_KEY.get());
 
                 responseObserver.onNext(HelloResponse.newBuilder().setMessage("Hello " + request.getName()).build());
                 responseObserver.onCompleted();
@@ -65,7 +65,7 @@ public void endToEndTestMultiple() {
         GreeterGrpc.GreeterImplBase svc = new GreeterGrpc.GreeterImplBase() {
             @Override
             public void sayHello(HelloRequest request, StreamObserver<HelloResponse> responseObserver) {
-                certs.set(XfccServerInterceptor.XFCC_CONTEXT_KEY.get());
+                certs.set(XForwardedClientCert.XFCC_CONTEXT_KEY.get());
 
                 responseObserver.onNext(HelloResponse.newBuilder().setMessage("Hello " + request.getName()).build());
                 responseObserver.onCompleted();