Restore MatchContext and CelMatcherTestHelper additions for Unified Matcher

Author: shivaspeaks

xds/src/main/java/io/grpc/xds/internal/matcher/MatchContext.java

@@ -18,36 +18,52 @@
 
 import com.google.common.base.Preconditions;
 import io.grpc.Metadata;
+import javax.annotation.Nullable;
 
 public final class MatchContext {
   private final Metadata metadata;
+  @Nullable 
   private final String path;
+  @Nullable 
   private final String host;
+  @Nullable 
   private final String method;
+  @Nullable 
+  private final String id;
 
-  public MatchContext(Metadata metadata, String path,
-      String host, String method) {
+  public MatchContext(Metadata metadata, @Nullable String path,
+      @Nullable String host, @Nullable String method,
+      @Nullable String id) {
     this.metadata = Preconditions.checkNotNull(metadata, "metadata");
-    this.path = Preconditions.checkNotNull(path, "path");
-    this.host = Preconditions.checkNotNull(host, "host");
-    this.method = Preconditions.checkNotNull(method, "method");
+    this.path = path;
+    this.host = host;
+    this.method = method;
+    this.id = id;
   }
 
   public Metadata getMetadata() {
     return metadata;
   }
 
+  @Nullable
   public String getPath() {
     return path;
   }
 
+  @Nullable
   public String getHost() {
     return host;
   }
 
+  @Nullable
   public String getMethod() {
     return method;
   }
+  
+  @Nullable
+  public String getId() {
+    return id;
+  }
 
   public static Builder newBuilder() {
     return new Builder();
@@ -58,6 +74,7 @@ public static final class Builder {
     private String path;
     private String host;
     private String method;
+    private String id;
 
     public Builder setMetadata(Metadata metadata) {
       this.metadata = metadata;
@@ -79,8 +96,13 @@ public Builder setMethod(String method) {
       return this;
     }
 
+    public Builder setId(String id) {
+      this.id = id;
+      return this;
+    }
+
     public MatchContext build() {
-      return new MatchContext(metadata, path, host, method);
+      return new MatchContext(metadata, path, host, method, id);
     }
   }
 }

xds/src/test/java/io/grpc/xds/internal/matcher/CelMatcherTestHelper.java

@@ -54,6 +54,12 @@ public static CelAbstractSyntaxTree compileAst(String expression)
     return COMPILER.compile(expression).getAst();
   }
 
+  public static CelMatcher compile(String expression)
+      throws dev.cel.common.CelException {
+    CelAbstractSyntaxTree ast = COMPILER.compile(expression).getAst();
+    return CelMatcher.compile(ast);
+  }
+
   public static CelStringExtractor compileStringExtractor(String expression)
       throws dev.cel.common.CelException {
     CelAbstractSyntaxTree ast = COMPILER.compile(expression).getAst();