Internal change.

PiperOrigin-RevId: 697399144
pull/19279/head
cpovirk 2 months ago committed by Copybara-Service
parent 1dee726c56
commit 30aac4bfbe
  1. 17
      csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
  2. 3
      java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
  3. 3
      java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
  4. 9
      java/core/src/main/java/com/google/protobuf/ByteString.java
  5. 3
      java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
  6. 3
      java/core/src/main/java/com/google/protobuf/FieldSet.java
  7. 3
      java/core/src/main/java/com/google/protobuf/FloatArrayList.java
  8. 3
      java/core/src/main/java/com/google/protobuf/IntArrayList.java
  9. 3
      java/core/src/main/java/com/google/protobuf/Internal.java
  10. 3
      java/core/src/main/java/com/google/protobuf/LazyField.java
  11. 3
      java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
  12. 3
      java/core/src/main/java/com/google/protobuf/LongArrayList.java
  13. 15
      java/core/src/main/java/com/google/protobuf/MapField.java
  14. 3
      java/core/src/main/java/com/google/protobuf/MapFieldBuilder.java
  15. 7
      java/core/src/main/java/com/google/protobuf/MapFieldLite.java
  16. 3
      java/core/src/main/java/com/google/protobuf/Message.java
  17. 3
      java/core/src/main/java/com/google/protobuf/RopeByteString.java
  18. 10
      java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
  19. 3
      java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
  20. 6
      java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
  21. 3
      java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java

@ -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";
}

@ -38,7 +38,8 @@ abstract class AbstractProtobufList<E> extends AbstractList<E> implements Protob
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (o == this) {
return true;
}

@ -68,7 +68,8 @@ final class BooleanArrayList extends AbstractProtobufList<Boolean>
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -929,7 +929,8 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
// 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 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
// 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 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
}
@Override
public boolean equals(Object other) {
public boolean equals(
Object other) {
if (other == this) {
return true;
}

@ -67,7 +67,8 @@ final class DoubleArrayList extends AbstractProtobufList<Double>
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -127,7 +127,8 @@ final class FieldSet<T extends FieldSet.FieldDescriptorLite<T>> {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -67,7 +67,8 @@ final class FloatArrayList extends AbstractProtobufList<Float>
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -67,7 +67,8 @@ final class IntArrayList extends AbstractProtobufList<Integer>
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -555,7 +555,8 @@ public final class Internal {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (o == this) {
return true;
}

@ -50,7 +50,8 @@ public class LazyField extends LazyFieldLite {
}
@Override
public boolean equals(Object obj) {
public boolean equals(
Object obj) {
return getValue().equals(obj);
}

@ -110,7 +110,8 @@ public class LazyFieldLite {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -67,7 +67,8 @@ final class LongArrayList extends AbstractProtobufList<Long>
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -183,7 +183,8 @@ public class MapField<K, V> extends MapFieldReflectionAccessor implements Mutabi
@SuppressWarnings("unchecked")
@Override
public boolean equals(Object object) {
public boolean equals(
Object object) {
if (!(object instanceof MapField)) {
return false;
}
@ -338,7 +339,8 @@ public class MapField<K, V> extends MapFieldReflectionAccessor implements Mutabi
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
return delegate.equals(o);
}
@ -434,7 +436,8 @@ public class MapField<K, V> extends MapFieldReflectionAccessor implements Mutabi
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
return delegate.equals(o);
}
@ -531,7 +534,8 @@ public class MapField<K, V> extends MapFieldReflectionAccessor implements Mutabi
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
return delegate.equals(o);
}
@ -573,7 +577,8 @@ public class MapField<K, V> extends MapFieldReflectionAccessor implements Mutabi
}
@Override
public boolean equals(Object obj) {
public boolean equals(
Object obj) {
return delegate.equals(obj);
}

@ -166,7 +166,8 @@ public class MapFieldBuilder<
@SuppressWarnings("unchecked")
@Override
public boolean equals(Object object) {
public boolean equals(
Object object) {
if (!(object instanceof MapFieldBuilder)) {
return false;
}

@ -97,7 +97,9 @@ public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
}
}
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 @@ public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
/** 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);
}

@ -41,7 +41,8 @@ public interface Message extends MessageLite, MessageOrBuilder {
* @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

@ -477,7 +477,8 @@ final class RopeByteString extends ByteString {
// equals() and hashCode()
@Override
public boolean equals(Object other) {
public boolean equals(
Object other) {
if (other == this) {
return true;
}

@ -417,7 +417,8 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (o == this) {
return true;
}
@ -439,7 +440,9 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
}
/** 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 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (this == o) {
return true;
}

@ -59,7 +59,8 @@ public final class TextFormatParseLocation {
}
@Override
public boolean equals(Object o) {
public boolean equals(
Object o) {
if (o == this) {
return true;
}

@ -66,7 +66,8 @@ public final class UnknownFieldSet implements MessageLite {
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 @@ public final class UnknownFieldSet implements MessageLite {
}
@Override
public boolean equals(Object other) {
public boolean equals(
Object other) {
if (this == other) {
return true;
}

@ -299,7 +299,8 @@ public final class UnknownFieldSetLite {
}
@Override
public boolean equals(Object obj) {
public boolean equals(
Object obj) {
if (this == obj) {
return true;
}

Loading…
Cancel
Save