Internal change.
PiperOrigin-RevId: 697399144
diff --git a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
deleted file mode 100644
index 208ce1f..0000000
--- a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-#endregion
-
-namespace Google.Protobuf.Reflection;
-
-internal sealed partial class FeatureSetDescriptor
-{
- // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
- private const string DefaultsBase64 =
- "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
-}
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java b/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
index 2b965af..ea86472 100644
--- a/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
+++ b/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
@@ -38,7 +38,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (o == this) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java b/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
index 3b8c727..f5435af 100644
--- a/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
+++ b/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
@@ -68,7 +68,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java
index 1903a4d..558d5a6 100644
--- a/java/core/src/main/java/com/google/protobuf/ByteString.java
+++ b/java/core/src/main/java/com/google/protobuf/ByteString.java
@@ -929,7 +929,8 @@
// equals() and hashCode()
@Override
- public abstract boolean equals(Object o);
+ public abstract boolean equals(
+ Object o);
/** Base class for leaf {@link ByteString}s (i.e. non-ropes). */
abstract static class LeafByteString extends ByteString {
@@ -1478,7 +1479,8 @@
// equals() and hashCode()
@Override
- public final boolean equals(Object other) {
+ public final boolean equals(
+ Object other) {
if (other == this) {
return true;
}
@@ -1816,7 +1818,8 @@
}
@Override
- public boolean equals(Object other) {
+ public boolean equals(
+ Object other) {
if (other == this) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java b/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
index 57d30d8..4198cd8 100644
--- a/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
+++ b/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
@@ -67,7 +67,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/FieldSet.java b/java/core/src/main/java/com/google/protobuf/FieldSet.java
index c81a1d1..adf92d3 100644
--- a/java/core/src/main/java/com/google/protobuf/FieldSet.java
+++ b/java/core/src/main/java/com/google/protobuf/FieldSet.java
@@ -127,7 +127,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/FloatArrayList.java b/java/core/src/main/java/com/google/protobuf/FloatArrayList.java
index 7cb35db..c705754 100644
--- a/java/core/src/main/java/com/google/protobuf/FloatArrayList.java
+++ b/java/core/src/main/java/com/google/protobuf/FloatArrayList.java
@@ -67,7 +67,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/IntArrayList.java b/java/core/src/main/java/com/google/protobuf/IntArrayList.java
index fe654e0..73e03a0 100644
--- a/java/core/src/main/java/com/google/protobuf/IntArrayList.java
+++ b/java/core/src/main/java/com/google/protobuf/IntArrayList.java
@@ -67,7 +67,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/Internal.java b/java/core/src/main/java/com/google/protobuf/Internal.java
index 07bec5e..d548cca 100644
--- a/java/core/src/main/java/com/google/protobuf/Internal.java
+++ b/java/core/src/main/java/com/google/protobuf/Internal.java
@@ -555,7 +555,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (o == this) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/LazyField.java b/java/core/src/main/java/com/google/protobuf/LazyField.java
index d7dddd9..5548a7f 100644
--- a/java/core/src/main/java/com/google/protobuf/LazyField.java
+++ b/java/core/src/main/java/com/google/protobuf/LazyField.java
@@ -50,7 +50,8 @@
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(
+ Object obj) {
return getValue().equals(obj);
}
diff --git a/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java b/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
index d52fc0a..1572fa2 100644
--- a/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
+++ b/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
@@ -110,7 +110,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/LongArrayList.java b/java/core/src/main/java/com/google/protobuf/LongArrayList.java
index f3c14a5..e4725c5 100644
--- a/java/core/src/main/java/com/google/protobuf/LongArrayList.java
+++ b/java/core/src/main/java/com/google/protobuf/LongArrayList.java
@@ -67,7 +67,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/MapField.java b/java/core/src/main/java/com/google/protobuf/MapField.java
index 81566a2..f65f4cf 100644
--- a/java/core/src/main/java/com/google/protobuf/MapField.java
+++ b/java/core/src/main/java/com/google/protobuf/MapField.java
@@ -183,7 +183,8 @@
@SuppressWarnings("unchecked")
@Override
- public boolean equals(Object object) {
+ public boolean equals(
+ Object object) {
if (!(object instanceof MapField)) {
return false;
}
@@ -338,7 +339,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
return delegate.equals(o);
}
@@ -434,7 +436,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
return delegate.equals(o);
}
@@ -531,7 +534,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
return delegate.equals(o);
}
@@ -573,7 +577,8 @@
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(
+ Object obj) {
return delegate.equals(obj);
}
diff --git a/java/core/src/main/java/com/google/protobuf/MapFieldBuilder.java b/java/core/src/main/java/com/google/protobuf/MapFieldBuilder.java
index 05a6d09..8569e99 100644
--- a/java/core/src/main/java/com/google/protobuf/MapFieldBuilder.java
+++ b/java/core/src/main/java/com/google/protobuf/MapFieldBuilder.java
@@ -166,7 +166,8 @@
@SuppressWarnings("unchecked")
@Override
- public boolean equals(Object object) {
+ public boolean equals(
+ Object object) {
if (!(object instanceof MapFieldBuilder)) {
return false;
}
diff --git a/java/core/src/main/java/com/google/protobuf/MapFieldLite.java b/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
index bc5704b..dd013ef 100644
--- a/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
+++ b/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
@@ -97,7 +97,9 @@
}
}
- private static boolean equals(Object a, Object b) {
+ private static boolean equals(
+ Object a,
+ Object b) {
if (a instanceof byte[] && b instanceof byte[]) {
return Arrays.equals((byte[]) a, (byte[]) b);
}
@@ -129,7 +131,8 @@
/** Checks whether two map fields are equal. */
@SuppressWarnings("unchecked")
@Override
- public boolean equals(Object object) {
+ public boolean equals(
+ Object object) {
return (object instanceof Map) && equals(this, (Map<K, V>) object);
}
diff --git a/java/core/src/main/java/com/google/protobuf/Message.java b/java/core/src/main/java/com/google/protobuf/Message.java
index 7fc8cd4..6b8649b 100644
--- a/java/core/src/main/java/com/google/protobuf/Message.java
+++ b/java/core/src/main/java/com/google/protobuf/Message.java
@@ -41,7 +41,8 @@
* @return {@code true} if the specified object is equal to this message
*/
@Override
- boolean equals(Object other);
+ boolean equals(
+ Object other);
/**
* Returns the hash code value for this message. The hash code of a message should mix the
diff --git a/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/java/core/src/main/java/com/google/protobuf/RopeByteString.java
index aa8c6e1..cfb26db 100644
--- a/java/core/src/main/java/com/google/protobuf/RopeByteString.java
+++ b/java/core/src/main/java/com/google/protobuf/RopeByteString.java
@@ -477,7 +477,8 @@
// equals() and hashCode()
@Override
- public boolean equals(Object other) {
+ public boolean equals(
+ Object other) {
if (other == this) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java b/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
index 1d5cddd..b7a1b8e 100644
--- a/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
+++ b/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
@@ -417,7 +417,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (o == this) {
return true;
}
@@ -439,7 +440,9 @@
}
/** equals() that handles null values. */
- private boolean equals(Object o1, Object o2) {
+ private boolean equals(
+ Object o1,
+ Object o2) {
return o1 == null ? o2 == null : o1.equals(o2);
}
}
@@ -609,7 +612,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (this == o) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java b/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
index 154efaa..a6469bf 100644
--- a/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
+++ b/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
@@ -59,7 +59,8 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
+ Object o) {
if (o == this) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java b/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
index 40fc625..b3acfda 100644
--- a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
+++ b/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
@@ -66,7 +66,8 @@
new UnknownFieldSet(new TreeMap<Integer, Field>());
@Override
- public boolean equals(Object other) {
+ public boolean equals(
+ Object other) {
if (this == other) {
return true;
}
@@ -739,7 +740,8 @@
}
@Override
- public boolean equals(Object other) {
+ public boolean equals(
+ Object other) {
if (this == other) {
return true;
}
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java b/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
index 36c9481..27f8bde 100644
--- a/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
+++ b/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
@@ -299,7 +299,8 @@
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(
+ Object obj) {
if (this == obj) {
return true;
}
