Move ConcatenatedListView to common/internal

Author: l46kok

common/internal/BUILD.bazel

@@ -147,3 +147,8 @@ cel_android_library(
     name = "date_time_helpers_android",
     exports = ["//common/src/main/java/dev/cel/common/internal:date_time_helpers_android"],
 )
+
+java_library(
+    name = "concatenated_list_view",
+    exports = ["//common/src/main/java/dev/cel/common/internal:concatenated_list_view"],
+)

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -461,3 +461,10 @@ cel_android_library(
         "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
+
+java_library(
+    name = "concatenated_list_view",
+    srcs = ["ConcatenatedListView.java"],
+    deps = ["//common/annotations"],
+    # used_by_android
+)

…ev/cel/runtime/ConcatenatedListView.java …ommon/internal/ConcatenatedListView.javaruntime/src/main/java/dev/cel/runtime/ConcatenatedListView.java renamed to common/src/main/java/dev/cel/common/internal/ConcatenatedListView.java runtime/src/main/java/dev/cel/runtime/ConcatenatedListView.java renamed to common/src/main/java/dev/cel/common/internal/ConcatenatedListView.java

@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package dev.cel.runtime;
+package dev.cel.common.internal;
 
+import dev.cel.common.annotations.Internal;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,15 +29,16 @@
  *
  * <p>This does not support any of the standard list operations from {@link java.util.List}.
  */
-final class ConcatenatedListView<E> extends AbstractList<E> {
+@Internal
+public final class ConcatenatedListView<E> extends AbstractList<E> {
   private final List<List<? extends E>> sourceLists;
   private int totalSize = 0;
 
   ConcatenatedListView() {
     this.sourceLists = new ArrayList<>();
   }
 
-  ConcatenatedListView(Collection<? extends E> collection) {
+  public ConcatenatedListView(Collection<? extends E> collection) {
     this();
     addAll(collection);
   }

runtime/src/main/java/dev/cel/runtime/BUILD.bazel

@@ -303,7 +303,6 @@ java_library(
     deps = [
         ":accumulated_unknowns",
         ":base",
-        ":concatenated_list_view",
         ":evaluation_exception",
         ":evaluation_exception_builder",
         ":evaluation_listener",
@@ -323,6 +322,7 @@ java_library(
         "//common:runtime_exception",
         "//common/annotations",
         "//common/ast",
+        "//common/internal:concatenated_list_view",
         "//common/types",
         "//common/types:type_providers",
         "//common/values:cel_byte_string",
@@ -341,7 +341,6 @@ cel_android_library(
     deps = [
         ":accumulated_unknowns_android",
         ":base_android",
-        ":concatenated_list_view",
         ":evaluation_exception",
         ":evaluation_exception_builder",
         ":evaluation_listener_android",
@@ -361,6 +360,7 @@ cel_android_library(
         "//common:runtime_exception",
         "//common/annotations",
         "//common/ast:ast_android",
+        "//common/internal:concatenated_list_view",
         "//common/types:type_providers_android",
         "//common/types:types_android",
         "//common/values:cel_byte_string",
@@ -436,11 +436,11 @@ cel_android_library(
     tags = [
     ],
     deps = [
-        ":concatenated_list_view",
         "//common:error_codes",
         "//common:options",
         "//common:runtime_exception",
         "//common/annotations",
+        "//common/internal:concatenated_list_view",
         "//common/internal:converter",
         "//common/values:values_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -459,11 +459,11 @@ java_library(
     tags = [
     ],
     deps = [
-        ":concatenated_list_view",
         "//common:error_codes",
         "//common:options",
         "//common:runtime_exception",
         "//common/annotations",
+        "//common/internal:concatenated_list_view",
         "//common/internal:converter",
         "//common/values",
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -1185,13 +1185,6 @@ cel_android_library(
     ],
 )
 
-java_library(
-    name = "concatenated_list_view",
-    srcs = ["ConcatenatedListView.java"],
-    # used_by_android
-    visibility = ["//visibility:private"],
-)
-
 java_library(
     name = "accumulated_unknowns",
     srcs = ["AccumulatedUnknowns.java"],
@@ -1209,5 +1202,5 @@ cel_android_library(
     deps = [
         ":unknown_attributes_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
-    ]
+    ],
 )

runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

@@ -937,14 +937,14 @@ private IntermediateResult maybeAdaptToListView(IntermediateResult accuValue) {
         return accuValue;
       }
 
-      ConcatenatedListView<Object> lv =
-          new ConcatenatedListView<>((List<Object>) accuValue.value());
+      dev.cel.common.internal.ConcatenatedListView<Object> lv =
+          new dev.cel.common.internal.ConcatenatedListView<>((List<Object>) accuValue.value());
       return IntermediateResult.create(lv);
     }
 
     @SuppressWarnings("unchecked") // All type-erased elements are object compatible
     private IntermediateResult maybeAdaptViewToList(IntermediateResult accuValue) {
-      if ((accuValue.value() instanceof ConcatenatedListView)) {
+      if ((accuValue.value() instanceof dev.cel.common.internal.ConcatenatedListView)) {
         // Materialize view back into a list to facilitate O(1) lookups.
         List<Object> copiedList = new ArrayList<>((List<Object>) accuValue.value());
 

runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

@@ -96,7 +96,7 @@ public static boolean matches(String string, String regexp, CelOptions celOption
 
   /** Concatenates two lists into a new list. */
   public static <E> List<E> concat(List<E> first, List<E> second) {
-    if (first instanceof ConcatenatedListView) {
+    if (first instanceof dev.cel.common.internal.ConcatenatedListView) {
       // Comprehensions use a more efficient list view for performing O(1) concatenation
       first.addAll(second);
       return first;

runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel

@@ -257,6 +257,7 @@ java_library(
     deps = [
         ":attribute",
         ":cel_value_interpretable",
+        "//common/internal:concatenated_list_view",
         "//common/values",
         "//common/values:cel_value",
         "//common/values:cel_value_provider",

runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java

@@ -5,7 +5,7 @@
 import dev.cel.common.values.IntValue;
 import dev.cel.common.values.ListValue;
 import dev.cel.runtime.CelEvaluationException;
-import dev.cel.runtime.ConcatenatedListView;
+import dev.cel.common.internal.ConcatenatedListView;
 import dev.cel.runtime.GlobalResolver;
 import java.util.Collection;
 import java.util.Iterator;

runtime/src/test/java/dev/cel/runtime/planner/BUILD.bazel

@@ -17,6 +17,7 @@ java_library(
         "//:java_truth",
         "//bundle:cel",
         "//common:cel_ast",
+        "//common:cel_descriptor_util",
         "//common:cel_descriptors",
         "//common:cel_exception",
         "//common:cel_source",