From e7cd2299c4fb13459cd319a2add2b3c2ebae025c Mon Sep 17 00:00:00 2001 From: ZhenLian Date: Fri, 17 Jul 2020 19:46:51 -0700 Subject: [PATCH] xds: change package name for CEL lib (#7235) --- .../java/io/grpc/xds/internal/rbac/engine/cel/Activation.java | 2 +- .../io/grpc/xds/internal/rbac/engine/cel/DefaultDispatcher.java | 2 +- .../grpc/xds/internal/rbac/engine/cel/DefaultInterpreter.java | 2 +- .../xds/internal/rbac/engine/cel/DescriptorMessageProvider.java | 2 +- .../java/io/grpc/xds/internal/rbac/engine/cel/Dispatcher.java | 2 +- .../io/grpc/xds/internal/rbac/engine/cel/Interpretable.java | 2 +- .../java/io/grpc/xds/internal/rbac/engine/cel/Interpreter.java | 2 +- .../grpc/xds/internal/rbac/engine/cel/InterpreterException.java | 2 +- .../java/io/grpc/xds/internal/rbac/engine/cel/Metadata.java | 2 +- .../grpc/xds/internal/rbac/engine/cel/RuntimeTypeProvider.java | 2 +- .../io/grpc/xds/internal/rbac/engine/cel/CelInterfaceTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Activation.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Activation.java index 28b99a411c..6e306f8f86 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Activation.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Activation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultDispatcher.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultDispatcher.java index 452dd3ab86..6b90784e1b 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultDispatcher.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultDispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import java.lang.String; import java.util.List; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultInterpreter.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultInterpreter.java index e9c9625efc..4d33c28b7f 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultInterpreter.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DefaultInterpreter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import com.google.api.expr.v1alpha1.Expr; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DescriptorMessageProvider.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DescriptorMessageProvider.java index a060b04143..66025a84f8 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DescriptorMessageProvider.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/DescriptorMessageProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import com.google.protobuf.Descriptors.Descriptor; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Dispatcher.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Dispatcher.java index 30227d948a..9e1536b79a 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Dispatcher.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Dispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import java.util.List; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpretable.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpretable.java index 3a823d3a18..49c102ff49 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpretable.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpretable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; /** * Represent an expression which can be interpreted repeatedly using a given activation. diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpreter.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpreter.java index 6e85d63d50..919bbe2f45 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpreter.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Interpreter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import com.google.api.expr.v1alpha1.Expr; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/InterpreterException.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/InterpreterException.java index f2d9c219c3..e1768a984d 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/InterpreterException.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/InterpreterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import java.lang.Exception; import javax.annotation.Nullable; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Metadata.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Metadata.java index 48b32ac1bd..e4e961b065 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Metadata.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/Metadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import java.lang.String; diff --git a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/RuntimeTypeProvider.java b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/RuntimeTypeProvider.java index 7683756f15..fbddb29ef4 100644 --- a/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/RuntimeTypeProvider.java +++ b/xds/src/main/java/io/grpc/xds/internal/rbac/engine/cel/RuntimeTypeProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; /** * The {@code RuntimeTypeProvider} is a combination of the MessageProvider diff --git a/xds/src/test/java/io/grpc/xds/internal/rbac/engine/cel/CelInterfaceTest.java b/xds/src/test/java/io/grpc/xds/internal/rbac/engine/cel/CelInterfaceTest.java index 7bfb2e9b73..194955d714 100644 --- a/xds/src/test/java/io/grpc/xds/internal/rbac/engine/cel/CelInterfaceTest.java +++ b/xds/src/test/java/io/grpc/xds/internal/rbac/engine/cel/CelInterfaceTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.xds.internal.cel; +package io.grpc.xds.internal.rbac.engine.cel; import static com.google.common.truth.Truth.assertThat;