internal changes

PiperOrigin-RevId: 891900837

Author: protobuf-github-bot

java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java

@@ -494,7 +494,8 @@ void parseLengthPrefixedMessageSetItem(
     } else {
       extensions.setField(
           extensionInfo.descriptor,
-          new LazyField(extensionInfo.defaultInstance, extensionRegistry, reader.readBytes()));
+          new LazyField(
+              extensionInfo.defaultInstance, extensionRegistry, reader.readBytes()));
     }
   }
 

java/core/src/main/java/com/google/protobuf/FieldSet.java

@@ -273,12 +273,6 @@ public Object getField(final T descriptor) {
     return o;
   }
 
-  /** Returns true if the field is a lazy field and it is corrupted. */
-  boolean lazyFieldCorrupted(final T descriptor) {
-    Object o = fields.get(descriptor);
-    return o instanceof LazyField && ((LazyField) o).isCorrupted();
-  }
-
   /**
    * Useful for implementing {@link Message.Builder#setField(Descriptors.FieldDescriptor,Object)}.
    */
@@ -838,7 +832,8 @@ private int getMessageSetSerializedSize(final Map.Entry<T, Object> entry) {
         && !descriptor.isRepeated()
         && !descriptor.isPacked()) {
       if (value instanceof LazyField) {
-        return ((LazyField) value).computeMessageSetExtensionSize(entry.getKey().getNumber());
+        return ((LazyField) value)
+            .computeMessageSetExtensionSize(entry.getKey().getNumber());
       } else {
         return CodedOutputStream.computeMessageSetExtensionSize(
             entry.getKey().getNumber(), (MessageLite) value);

java/core/src/main/java/com/google/protobuf/MessageReflection.java

@@ -1377,7 +1377,8 @@ private static void mergeMessageSetExtensionFromBytes(
       target.setField(field, value);
     } else {
       // Use LazyField to load MessageSet lazily.
-      LazyField lazyField = new LazyField(extension.defaultInstance, extensionRegistry, rawBytes);
+      LazyField lazyField =
+          new LazyField(extension.defaultInstance, extensionRegistry, rawBytes);
       target.setField(field, lazyField);
     }
   }

java/core/src/test/java/com/google/protobuf/InternalLazyFieldTest.java

@@ -0,0 +1,134 @@
+package com.google.protobuf;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import proto2_unittest.UnittestProto.TestAllExtensions;
+import proto2_unittest.UnittestProto.TestAllTypes;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class LazyFieldTest {
+
+  private static final ExtensionRegistryLite EXTENSION_REGISTRY = TestUtil.getExtensionRegistry();
+
+  @Test
+  public void testGetValue() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(lazyField.getValue()).isEqualTo(message);
+  }
+
+  @Test
+  public void testGetValueContainingExtensions() {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(lazyField.getValue()).isEqualTo(message);
+  }
+
+  @Test
+  public void testGetValueMemoized() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    MessageLite lazyFieldMessage1 = lazyField.getValue();
+    MessageLite lazyFieldMessage2 = lazyField.getValue();
+
+    assertThat(lazyFieldMessage1).isEqualTo(message);
+    assertThat(lazyFieldMessage1).isSameInstanceAs(lazyFieldMessage2);
+  }
+
+  @Test
+  public void testGetValueOnInvalidData_defaultInstance() {
+    LazyField lazyField =
+        new LazyField(
+            TestAllTypes.getDefaultInstance(),
+            EXTENSION_REGISTRY,
+            ByteString.copyFromUtf8("invalid"));
+
+    assertThat(lazyField.getValue()).isEqualTo(TestAllTypes.getDefaultInstance());
+  }
+
+  @Test
+  public void testGetSerializedSize() {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(message.getSerializedSize()).isEqualTo(lazyField.getSerializedSize());
+  }
+
+  @Test
+  public void testGetSerializedSizeContainingExtensions() {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(lazyField.getSerializedSize()).isEqualTo(message.getSerializedSize());
+  }
+
+  @Test
+  public void testGetByteString() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(lazyField.toByteString()).isEqualTo(message.toByteString());
+  }
+
+  @Test
+  public void testGetByteStringContainingExtensions() {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+
+    assertThat(lazyField.toByteString()).isEqualTo(message.toByteString());
+  }
+
+  @Test
+  public void testGetByteStringMemoized() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    ByteString lazyFieldByteString1 = lazyField.toByteString();
+    ByteString lazyFieldByteString2 = lazyField.toByteString();
+
+    assertThat(lazyFieldByteString1).isEqualTo(message.toByteString());
+    assertThat(lazyFieldByteString1).isSameInstanceAs(lazyFieldByteString2);
+  }
+
+  @Test
+  public void testHashCode() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
+    var unused = lazyField.getValue();
+    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
+  }
+
+  @Test
+  public void testHashCodeContainingExtensions() throws Exception {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
+    var unused = lazyField.getValue();
+    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
+  }
+
+  @Test
+  public void testEqualsObject() {
+    MessageLite message = TestUtil.getAllSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    assertThat(lazyField).isEqualTo(message);
+  }
+
+  @Test
+  @SuppressWarnings("TruthIncompatibleType")
+  public void testEqualsObjectContainingExtensions() throws Exception {
+    TestAllExtensions message = TestUtil.getAllExtensionsSet();
+    LazyField lazyField = createLazyFieldWithBytesFromMessage(message);
+    assertThat(lazyField).isEqualTo(message);
+  }
+
+  private LazyField createLazyFieldWithBytesFromMessage(MessageLite message) {
+    return new LazyField(
+        message.getDefaultInstanceForType(), EXTENSION_REGISTRY, message.toByteString());
+  }
+}