Fix handling of optional dependencies in java generator.

mkruskal-google · mkruskal-google · commit 892e0d526e94 · 2025-09-10T13:00:58.000-07:00
Java reflection is used to fail smoothly when the extensions aren't
found in the classpath.

PiperOrigin-RevId: 805477788
diff --git a/java/core/src/test/java/com/google/protobuf/ImportOptionTest.java b/java/core/src/test/java/com/google/protobuf/ImportOptionTest.java
@@ -26,6 +26,7 @@ public void testImportOption() throws Exception {
     UnknownFieldSet unknownFieldsMessage = messageDescriptor.getOptions().getUnknownFields();
     UnknownFieldSet unknownFieldsField = fieldDescriptor.getOptions().getUnknownFields();
 
+    // Using the extension ensures UnittestCustomOptions is linked in and referenced
     assertThat(fileDescriptor.getOptions().getExtension(UnittestCustomOptions.fileOpt1))
         .isEqualTo(1);
     assertThat(messageDescriptor.getOptions().getExtension(UnittestCustomOptions.messageOpt1))
@@ -34,7 +35,7 @@ public void testImportOption() throws Exception {
         .isEqualTo(3);
 
     // TODO: Since `option_deps` are treated as `deps` in Bazel 7, the unknown
-    // fields are not empty.  Once we drop Bazel 7 support we can test that these are filled with
+    // fields will be empty.  Once we drop Bazel 7 support we can test that these are filled with
     // unknown fields.
     assertThat(unknownFieldsFile.asMap().size()).isAtMost(1);
     assertThat(unknownFieldsMessage.asMap().size()).isAtMost(1);
