Internal Changes

PiperOrigin-RevId: 901371705

Author: l46kok

common/internal/BUILD.bazel

@@ -128,11 +128,6 @@ cel_android_library(
     exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
 )
 
-java_library(
-    name = "proto_java_qualified_names",
-    exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
-)
-
 java_library(
     name = "proto_time_utils",
     exports = ["//common/src/main/java/dev/cel/common/internal:proto_time_utils"],

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

@@ -153,7 +153,6 @@ java_library(
     tags = [
     ],
     deps = [
-        ":proto_java_qualified_names",
         ":reflection_util",
         "//common/annotations",
         "@maven//:com_google_guava_guava",
@@ -396,18 +395,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "proto_java_qualified_names",
-    srcs = ["ProtoJavaQualifiedNames.java"],
-    tags = [
-    ],
-    deps = [
-        "//common/annotations",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
-    ],
-)
-
 java_library(
     name = "reflection_util",
     srcs = ["ReflectionUtil.java"],

common/src/main/java/dev/cel/common/internal/DefaultInstanceMessageFactory.java

@@ -15,6 +15,7 @@
 package dev.cel.common.internal;
 
 import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.GeneratorNames;
 import com.google.protobuf.Message;
 import com.google.protobuf.MessageLite;
 import dev.cel.common.annotations.Internal;
@@ -45,9 +46,7 @@ public static DefaultInstanceMessageFactory getInstance() {
   public Optional<Message> getPrototype(Descriptor descriptor) {
     MessageLite defaultInstance =
         DefaultInstanceMessageLiteFactory.getInstance()
-            .getPrototype(
-                descriptor.getFullName(),
-                ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor))
+            .getPrototype(descriptor.getFullName(), GeneratorNames.getBytecodeClassName(descriptor))
             .orElse(null);
     if (defaultInstance == null) {
       return Optional.empty();

common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

@@ -21,7 +21,6 @@ java_binary(
         ":java_file_generator",
         ":proto_descriptor_collector",
         "//common:cel_descriptor_util",
-        "//common/internal:proto_java_qualified_names",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:info_picocli_picocli",
@@ -50,7 +49,6 @@ java_library(
         ":cel_lite_descriptor",
         ":debug_printer",
         ":lite_descriptor_codegen_metadata",
-        "//common/internal:proto_java_qualified_names",
         "//common/internal:well_known_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",

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

@@ -23,8 +23,8 @@
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FileDescriptor;
 import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.GeneratorNames;
 import dev.cel.common.CelDescriptorUtil;
-import dev.cel.common.internal.ProtoJavaQualifiedNames;
 import dev.cel.protobuf.JavaFileGenerator.GeneratedClass;
 import dev.cel.protobuf.JavaFileGenerator.JavaFileGeneratorOption;
 import java.io.File;
@@ -117,7 +117,7 @@ public Integer call() throws Exception {
 
   private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
       FileDescriptor targetFileDescriptor) throws Exception {
-    String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
+    String javaPackageName = GeneratorNames.getFileJavaPackage(targetFileDescriptor.toProto());
     String javaClassName;
 
     List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();

protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

@@ -22,7 +22,7 @@
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor.JavaType;
 import com.google.protobuf.Descriptors.FileDescriptor;
-import dev.cel.common.internal.ProtoJavaQualifiedNames;
+import com.google.protobuf.GeneratorNames;
 import dev.cel.common.internal.WellKnownProto;
 import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
 import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
@@ -93,8 +93,7 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor d
       // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
       if (!messageDescriptor.getOptions().getMapEntry()) {
         String sanitizedJavaClassName =
-            ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
-                .replace('$', '.');
+            GeneratorNames.getBytecodeClassName(messageDescriptor).replace('$', '.');
         descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
       }
 

protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

@@ -45,3 +45,8 @@ java_library(
     name = "expr_value_utils",
     exports = ["//testing/src/main/java/dev/cel/testing/utils:expr_value_utils"],
 )
+
+java_library(
+    name = "proto_descriptor_utils",
+    exports = ["//testing/src/main/java/dev/cel/testing/utils:proto_descriptor_utils"],
+)

testing/BUILD.bazel

@@ -93,18 +93,17 @@ java_library(
         "//bundle:environment_yaml_parser",
         "//common:cel_ast",
         "//common:cel_descriptor_util",
+        "//common:cel_descriptors",
         "//common:compiler_common",
         "//common:options",
         "//common:proto_ast",
-        "//common/internal:default_instance_message_factory",
         "//policy",
         "//policy:compiler_factory",
         "//policy:parser",
         "//policy:parser_factory",
         "//policy:validation_exception",
         "//runtime",
         "//testing:expr_value_utils",
-        "//testing/testrunner:proto_descriptor_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -166,10 +165,11 @@ java_library(
         "//:auto_value",
         "//bundle:cel",
         "//common:cel_descriptor_util",
+        "//common:cel_descriptors",
         "//common:options",
         "//policy:parser",
         "//runtime",
-        "//testing/testrunner:proto_descriptor_utils",
+        "//testing:proto_descriptor_utils",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -182,8 +182,7 @@ java_library(
     tags = [
     ],
     deps = [
-        "//common/internal:default_instance_message_factory",
-        "//testing/testrunner:proto_descriptor_utils",
+        "//common:cel_descriptors",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
@@ -212,8 +211,10 @@ java_library(
         "//:java_truth",
         "//bundle:cel",
         "//common:cel_ast",
+        "//common:cel_descriptors",
         "//runtime",
         "//testing:expr_value_utils",
+        "//testing:proto_descriptor_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_truth_extensions_truth_proto_extension",
@@ -229,7 +230,9 @@ java_library(
         ":cel_test_suite",
         ":cel_test_suite_exception",
         ":registry_utils",
+        "//common:cel_descriptors",
         "//common/annotations",
+        "//testing:proto_descriptor_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/test:suite_java_proto",
         "@maven//:com_google_guava_guava",

testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel

@@ -25,6 +25,7 @@
 import dev.cel.bundle.Cel;
 import dev.cel.bundle.CelFactory;
 import dev.cel.common.CelDescriptorUtil;
+import dev.cel.common.CelDescriptors;
 import dev.cel.common.CelOptions;
 import dev.cel.policy.CelPolicyParser;
 import dev.cel.runtime.CelLateFunctionBindings;
@@ -125,6 +126,20 @@ public interface BindingTransformer {
 
   abstract ImmutableSet<FileDescriptor> fileTypes();
 
+  @Memoized
+  public Optional<CelDescriptors> celDescriptors() {
+    if (fileDescriptorSetPath().isPresent()) {
+      try {
+        return Optional.of(
+            ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath().get()));
+      } catch (IOException e) {
+        throw new IllegalStateException(
+            "Failed to load descriptors from path: " + fileDescriptorSetPath().get(), e);
+      }
+    }
+    return Optional.empty();
+  }
+
   @Memoized
   public Optional<TypeRegistry> typeRegistry() {
     if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
@@ -136,15 +151,8 @@ public Optional<TypeRegistry> typeRegistry() {
           CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
               .messageTypeDescriptors());
     }
-    if (fileDescriptorSetPath().isPresent()) {
-      try {
-        builder.add(
-            ProtoDescriptorUtils.getAllDescriptorsFromJvm(fileDescriptorSetPath().get())
-                .messageTypeDescriptors());
-      } catch (IOException e) {
-        throw new IllegalStateException(
-            "Failed to load descriptors from path: " + fileDescriptorSetPath().get(), e);
-      }
+    if (celDescriptors().isPresent()) {
+      builder.add(celDescriptors().get().messageTypeDescriptors());
     }
     return Optional.of(builder.build());
   }