Removed dependency CodedOutputStream -> LazyFieldLite.

This is in line with the larger goal of making `CodedOutputStream` not depend on specific message representations, which `LazyFieldLite` is.

PiperOrigin-RevId: 793672999

Author: haberman

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

@@ -616,11 +616,13 @@ public static int computeByteBufferSize(final int fieldNumber, final ByteBuffer
   }
 
   /**
-   * Compute the number of bytes that would be needed to encode an embedded message in lazy field,
-   * including tag.
+   * Compute the number of bytes that would be needed to encode an embedded message in lazy
+   * field, including tag.
    */
+  @Deprecated
+  @InlineMe(replacement = "value.computeSize(fieldNumber)")
   public static int computeLazyFieldSize(final int fieldNumber, final LazyFieldLite value) {
-    return computeTagSize(fieldNumber) + computeLazyFieldSizeNoTag(value);
+    return value.computeSize(fieldNumber);
   }
 
   /**
@@ -653,14 +655,15 @@ public static int computeRawMessageSetExtensionSize(
   }
 
   /**
-   * Compute the number of bytes that would be needed to encode a lazily parsed MessageSet extension
-   * field to the stream. For historical reasons, the wire format differs from normal fields.
+   * Compute the number of bytes that would be needed to encode a lazily parsed MessageSet
+   * extension field to the stream. For historical reasons, the wire format differs from normal
+   * fields.
    */
+  @Deprecated
+  @InlineMe(replacement = "value.computeMessageSetExtensionSize(fieldNumber)")
   public static int computeLazyFieldMessageSetExtensionSize(
       final int fieldNumber, final LazyFieldLite value) {
-    return computeTagSize(WireFormat.MESSAGE_SET_ITEM) * 2
-        + computeUInt32Size(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber)
-        + computeLazyFieldSize(WireFormat.MESSAGE_SET_MESSAGE, value);
+    return value.computeMessageSetExtensionSize(fieldNumber);
   }
 
   // -----------------------------------------------------------------
@@ -814,12 +817,11 @@ public static int computeStringSizeNoTag(final String value) {
     return computeLengthDelimitedFieldSize(length);
   }
 
-  /**
-   * Compute the number of bytes that would be needed to encode an embedded message stored in lazy
-   * field.
-   */
+  /** Compute the number of bytes that would be needed to encode a {@code bytes} field. */
+  @Deprecated
+  @InlineMe(replacement = "value.computeSizeNoTag()")
   public static int computeLazyFieldSizeNoTag(final LazyFieldLite value) {
-    return computeLengthDelimitedFieldSize(value.getSerializedSize());
+    return value.computeSizeNoTag();
   }
 
   /** Compute the number of bytes that would be needed to encode a {@code bytes} field. */

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

@@ -837,8 +837,7 @@ private int getMessageSetSerializedSize(final Map.Entry<T, Object> entry) {
         && !descriptor.isRepeated()
         && !descriptor.isPacked()) {
       if (value instanceof LazyField) {
-        return CodedOutputStream.computeLazyFieldMessageSetExtensionSize(
-            entry.getKey().getNumber(), (LazyField) value);
+        return ((LazyField) value).computeMessageSetExtensionSize(entry.getKey().getNumber());
       } else {
         return CodedOutputStream.computeMessageSetExtensionSize(
             entry.getKey().getNumber(), (MessageLite) value);
@@ -921,7 +920,7 @@ static int computeElementSizeNoTag(final WireFormat.FieldType type, final Object
 
       case MESSAGE:
         if (value instanceof LazyField) {
-          return CodedOutputStream.computeLazyFieldSizeNoTag((LazyField) value);
+          return ((LazyField) value).computeSizeNoTag();
         } else {
           return CodedOutputStream.computeMessageSizeNoTag((MessageLite) value);
         }

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

@@ -366,6 +366,32 @@ public ByteString toByteString() {
     }
   }
 
+  /**
+   * Compute the number of bytes that would be needed to encode an embedded message stored in lazy
+   * field.
+   */
+  public int computeSizeNoTag() {
+    return CodedOutputStream.computeLengthDelimitedFieldSize(getSerializedSize());
+  }
+
+  /**
+   * Compute the number of bytes that would be needed to encode an embedded message in lazy field,
+   * including tag.
+   */
+  public int computeSize(final int fieldNumber) {
+    return CodedOutputStream.computeTagSize(fieldNumber) + computeSizeNoTag();
+  }
+
+  /**
+   * Compute the number of bytes that would be needed to encode a lazily parsed MessageSet extension
+   * field to the stream. For historical reasons, the wire format differs from normal fields.
+   */
+  public int computeMessageSetExtensionSize(final int fieldNumber) {
+    return CodedOutputStream.computeTagSize(WireFormat.MESSAGE_SET_ITEM) * 2
+        + CodedOutputStream.computeUInt32Size(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber)
+        + computeSize(WireFormat.MESSAGE_SET_MESSAGE);
+  }
+
   /** Writes this lazy field into a {@link Writer}. */
   void writeTo(Writer writer, int fieldNumber) throws IOException {
     if (memoizedBytes != null) {

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

@@ -646,7 +646,7 @@ static int computeSizeStringList(int fieldNumber, List<?> list) {
 
   static int computeSizeMessage(int fieldNumber, Object value, Schema<?> schema) {
     if (value instanceof LazyFieldLite) {
-      return CodedOutputStream.computeLazyFieldSize(fieldNumber, (LazyFieldLite) value);
+      return ((LazyFieldLite) value).computeSize(fieldNumber);
     } else {
       return computeMessageSize(fieldNumber, (AbstractMessageLite) value, schema);
     }
@@ -678,7 +678,7 @@ static int computeSizeMessageList(int fieldNumber, List<?> list) {
     for (int i = 0; i < length; i++) {
       Object value = list.get(i);
       if (value instanceof LazyFieldLite) {
-        size += CodedOutputStream.computeLazyFieldSizeNoTag((LazyFieldLite) value);
+        size += ((LazyFieldLite) value).computeSizeNoTag();
       } else {
         size += CodedOutputStream.computeMessageSizeNoTag((MessageLite) value);
       }
@@ -695,7 +695,7 @@ static int computeSizeMessageList(int fieldNumber, List<?> list, Schema<?> schem
     for (int i = 0; i < length; i++) {
       Object value = list.get(i);
       if (value instanceof LazyFieldLite) {
-        size += CodedOutputStream.computeLazyFieldSizeNoTag((LazyFieldLite) value);
+        size += ((LazyFieldLite) value).computeSizeNoTag();
       } else {
         size += computeMessageSizeNoTag((AbstractMessageLite) value, schema);
       }