Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lint warnings for protobuf GeneratedMessage.java

Browse Source 
Specifically this CL changes the [type variable names](https://engdoc.corp.google.com/eng/doc/devguide/java/style/index.md?cl=head#s5.2.8-type-variable-names) only.

PiperOrigin-RevId: 485323620
pull/10861/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 72b22edea2
commit 3c0f05c1fa
1 changed files with 181 additions and 181 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 362
      java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java

362
java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
Unescape View File

@ -520,8 +520,8 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Builder class for {@link GeneratedMessageV3}. */ /** Builder class for {@link GeneratedMessageV3}. */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public abstract static class Builder<BuilderType extends Builder<BuilderType>> public abstract static class Builder<BuilderT extends Builder<BuilderT>>
extends AbstractMessage.Builder<BuilderType> { extends AbstractMessage.Builder<BuilderT> {
private BuilderParent builderParent; private BuilderParent builderParent;
@ -583,8 +583,8 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
@Override @Override
public BuilderType clone() { public BuilderT clone() {
BuilderType builder = (BuilderType) getDefaultInstanceForType().newBuilderForType(); BuilderT builder = (BuilderT) getDefaultInstanceForType().newBuilderForType();
builder.mergeFrom(buildPartial()); builder.mergeFrom(buildPartial());
return builder; return builder;
} }
@ -594,10 +594,10 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
* builtin fields back to the initial values. * builtin fields back to the initial values.
*/ */
@Override @Override
public BuilderType clear() { public BuilderT clear() {
unknownFieldsOrBuilder = UnknownFieldSet.getDefaultInstance(); unknownFieldsOrBuilder = UnknownFieldSet.getDefaultInstance();
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
/** /**
@ -701,21 +701,21 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
@Override @Override
public BuilderType setField(final FieldDescriptor field, final Object value) { public BuilderT setField(final FieldDescriptor field, final Object value) {
internalGetFieldAccessorTable().getField(field).set(this, value); internalGetFieldAccessorTable().getField(field).set(this, value);
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
public BuilderType clearField(final FieldDescriptor field) { public BuilderT clearField(final FieldDescriptor field) {
internalGetFieldAccessorTable().getField(field).clear(this); internalGetFieldAccessorTable().getField(field).clear(this);
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
public BuilderType clearOneof(final OneofDescriptor oneof) { public BuilderT clearOneof(final OneofDescriptor oneof) {
internalGetFieldAccessorTable().getOneof(oneof).clear(this); internalGetFieldAccessorTable().getOneof(oneof).clear(this);
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
@ -729,51 +729,51 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
@Override @Override
public BuilderType setRepeatedField( public BuilderT setRepeatedField(
final FieldDescriptor field, final int index, final Object value) { final FieldDescriptor field, final int index, final Object value) {
internalGetFieldAccessorTable().getField(field).setRepeated(this, index, value); internalGetFieldAccessorTable().getField(field).setRepeated(this, index, value);
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
public BuilderType addRepeatedField(final FieldDescriptor field, final Object value) { public BuilderT addRepeatedField(final FieldDescriptor field, final Object value) {
internalGetFieldAccessorTable().getField(field).addRepeated(this, value); internalGetFieldAccessorTable().getField(field).addRepeated(this, value);
return (BuilderType) this; return (BuilderT) this;
} }
private BuilderType setUnknownFieldsInternal(final UnknownFieldSet unknownFields) { private BuilderT setUnknownFieldsInternal(final UnknownFieldSet unknownFields) {
unknownFieldsOrBuilder = unknownFields; unknownFieldsOrBuilder = unknownFields;
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
public BuilderType setUnknownFields(final UnknownFieldSet unknownFields) { public BuilderT setUnknownFields(final UnknownFieldSet unknownFields) {
return setUnknownFieldsInternal(unknownFields); return setUnknownFieldsInternal(unknownFields);
} }
/** /**
* This method is obsolete, but we must retain it for compatibility with older generated code. * This method is obsolete, but we must retain it for compatibility with older generated code.
*/ */
protected BuilderType setUnknownFieldsProto3(final UnknownFieldSet unknownFields) { protected BuilderT setUnknownFieldsProto3(final UnknownFieldSet unknownFields) {
return setUnknownFieldsInternal(unknownFields); return setUnknownFieldsInternal(unknownFields);
} }
@Override @Override
public BuilderType mergeUnknownFields(final UnknownFieldSet unknownFields) { public BuilderT mergeUnknownFields(final UnknownFieldSet unknownFields) {
if (UnknownFieldSet.getDefaultInstance().equals(unknownFields)) { if (UnknownFieldSet.getDefaultInstance().equals(unknownFields)) {
return (BuilderType) this; return (BuilderT) this;
} }
if (UnknownFieldSet.getDefaultInstance().equals(unknownFieldsOrBuilder)) { if (UnknownFieldSet.getDefaultInstance().equals(unknownFieldsOrBuilder)) {
unknownFieldsOrBuilder = unknownFields; unknownFieldsOrBuilder = unknownFields;
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
getUnknownFieldSetBuilder().mergeFrom(unknownFields); getUnknownFieldSetBuilder().mergeFrom(unknownFields);
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
@Override @Override
@ -919,49 +919,49 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
// Extensions-related stuff // Extensions-related stuff
/** Extends {@link MessageOrBuilder} with extension-related functions. */ /** Extends {@link MessageOrBuilder} with extension-related functions. */
public interface ExtendableMessageOrBuilder<MessageType extends ExtendableMessage> public interface ExtendableMessageOrBuilder<MessageT extends ExtendableMessage>
extends MessageOrBuilder { extends MessageOrBuilder {
// Re-define for return type covariance. // Re-define for return type covariance.
@Override @Override
Message getDefaultInstanceForType(); Message getDefaultInstanceForType();
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
<Type> boolean hasExtension(ExtensionLite<MessageType, Type> extension); <T> boolean hasExtension(ExtensionLite<MessageT, T> extension);
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
<Type> int getExtensionCount(ExtensionLite<MessageType, List<Type>> extension); <T> int getExtensionCount(ExtensionLite<MessageT, List<T>> extension);
/** Get the value of an extension. */ /** Get the value of an extension. */
<Type> Type getExtension(ExtensionLite<MessageType, Type> extension); <T> T getExtension(ExtensionLite<MessageT, T> extension);
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
<Type> Type getExtension(ExtensionLite<MessageType, List<Type>> extension, int index); <T> T getExtension(ExtensionLite<MessageT, List<T>> extension, int index);
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
<Type> boolean hasExtension( <T> boolean hasExtension(
Extension<MessageType, Type> extension); Extension<MessageT, T> extension);
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
<Type> boolean hasExtension( <T> boolean hasExtension(
GeneratedExtension<MessageType, Type> extension); GeneratedExtension<MessageT, T> extension);
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
<Type> int getExtensionCount( <T> int getExtensionCount(
Extension<MessageType, List<Type>> extension); Extension<MessageT, List<T>> extension);
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
<Type> int getExtensionCount( <T> int getExtensionCount(
GeneratedExtension<MessageType, List<Type>> extension); GeneratedExtension<MessageT, List<T>> extension);
/** Get the value of an extension. */ /** Get the value of an extension. */
<Type> Type getExtension( <T> T getExtension(
Extension<MessageType, Type> extension); Extension<MessageT, T> extension);
/** Get the value of an extension. */ /** Get the value of an extension. */
<Type> Type getExtension( <T> T getExtension(
GeneratedExtension<MessageType, Type> extension); GeneratedExtension<MessageT, T> extension);
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
<Type> Type getExtension( <T> T getExtension(
Extension<MessageType, List<Type>> extension, Extension<MessageT, List<T>> extension,
int index); int index);
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
<Type> Type getExtension( <T> T getExtension(
GeneratedExtension<MessageType, List<Type>> extension, GeneratedExtension<MessageT, List<T>> extension,
int index); int index);
} }
@ -997,8 +997,8 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
* *
* <p>See also {@link ExtendableBuilder}. * <p>See also {@link ExtendableBuilder}.
*/ */
public abstract static class ExtendableMessage<MessageType extends ExtendableMessage> public abstract static class ExtendableMessage<MessageT extends ExtendableMessage>
extends GeneratedMessageV3 implements ExtendableMessageOrBuilder<MessageType> { extends GeneratedMessageV3 implements ExtendableMessageOrBuilder<MessageT> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -1008,12 +1008,12 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
this.extensions = FieldSet.newFieldSet(); this.extensions = FieldSet.newFieldSet();
} }
protected ExtendableMessage(ExtendableBuilder<MessageType, ?> builder) { protected ExtendableMessage(ExtendableBuilder<MessageT, ?> builder) {
super(builder); super(builder);
this.extensions = builder.buildExtensions(); this.extensions = builder.buildExtensions();
} }
private void verifyExtensionContainingType(final Extension<MessageType, ?> extension) { private void verifyExtensionContainingType(final Extension<MessageT, ?> extension) {
if (extension.getDescriptor().getContainingType() != getDescriptorForType()) { if (extension.getDescriptor().getContainingType() != getDescriptorForType()) {
// This can only happen if someone uses unchecked operations. // This can only happen if someone uses unchecked operations.
throw new IllegalArgumentException( throw new IllegalArgumentException(
@ -1028,8 +1028,8 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) { public final <T> boolean hasExtension(final ExtensionLite<MessageT, T> extensionLite) {
Extension<MessageType, Type> extension = checkNotLite(extensionLite); Extension<MessageT, T> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
return extensions.hasField(extension.getDescriptor()); return extensions.hasField(extension.getDescriptor());
@ -1038,9 +1038,9 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final ExtensionLite<MessageType, List<Type>> extensionLite) { final ExtensionLite<MessageT, List<T>> extensionLite) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
final FieldDescriptor descriptor = extension.getDescriptor(); final FieldDescriptor descriptor = extension.getDescriptor();
@ -1050,83 +1050,83 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) { public final <T> T getExtension(final ExtensionLite<MessageT, T> extensionLite) {
Extension<MessageType, Type> extension = checkNotLite(extensionLite); Extension<MessageT, T> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
FieldDescriptor descriptor = extension.getDescriptor(); FieldDescriptor descriptor = extension.getDescriptor();
final Object value = extensions.getField(descriptor); final Object value = extensions.getField(descriptor);
if (value == null) { if (value == null) {
if (descriptor.isRepeated()) { if (descriptor.isRepeated()) {
return (Type) Collections.emptyList(); return (T) Collections.emptyList();
} else if (descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE) { } else if (descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
return (Type) extension.getMessageDefaultInstance(); return (T) extension.getMessageDefaultInstance();
} else { } else {
return (Type) extension.fromReflectionType(descriptor.getDefaultValue()); return (T) extension.fromReflectionType(descriptor.getDefaultValue());
} }
} else { } else {
return (Type) extension.fromReflectionType(value); return (T) extension.fromReflectionType(value);
} }
} }
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public final <Type> Type getExtension( public final <T> T getExtension(
final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) { final ExtensionLite<MessageT, List<T>> extensionLite, final int index) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
FieldDescriptor descriptor = extension.getDescriptor(); FieldDescriptor descriptor = extension.getDescriptor();
return (Type) return (T)
extension.singularFromReflectionType(extensions.getRepeatedField(descriptor, index)); extension.singularFromReflectionType(extensions.getRepeatedField(descriptor, index));
} }
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) { public final <T> boolean hasExtension(final Extension<MessageT, T> extension) {
return hasExtension((ExtensionLite<MessageType, Type>) extension); return hasExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
public final <Type> boolean hasExtension( public final <T> boolean hasExtension(
final GeneratedExtension<MessageType, Type> extension) { final GeneratedExtension<MessageT, T> extension) {
return hasExtension((ExtensionLite<MessageType, Type>) extension); return hasExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final Extension<MessageType, List<Type>> extension) { final Extension<MessageT, List<T>> extension) {
return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension); return getExtensionCount((ExtensionLite<MessageT, List<T>>) extension);
} }
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final GeneratedExtension<MessageType, List<Type>> extension) { final GeneratedExtension<MessageT, List<T>> extension) {
return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension); return getExtensionCount((ExtensionLite<MessageT, List<T>>) extension);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension(final Extension<MessageType, Type> extension) { public final <T> T getExtension(final Extension<MessageT, T> extension) {
return getExtension((ExtensionLite<MessageType, Type>) extension); return getExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final GeneratedExtension<MessageType, Type> extension) { final GeneratedExtension<MessageT, T> extension) {
return getExtension((ExtensionLite<MessageType, Type>) extension); return getExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final Extension<MessageType, List<Type>> extension, final int index) { final Extension<MessageT, List<T>> extension, final int index) {
return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index); return getExtension((ExtensionLite<MessageT, List<T>>) extension, index);
} }
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final GeneratedExtension<MessageType, List<Type>> extension, final int index) { final GeneratedExtension<MessageT, List<T>> extension, final int index) {
return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index); return getExtension((ExtensionLite<MessageT, List<T>>) extension, index);
} }
/** Called by subclasses to check if all extensions are initialized. */ /** Called by subclasses to check if all extensions are initialized. */
@ -1363,9 +1363,9 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public abstract static class ExtendableBuilder< public abstract static class ExtendableBuilder<
MessageType extends ExtendableMessage, MessageT extends ExtendableMessage,
BuilderType extends ExtendableBuilder<MessageType, BuilderType>> BuilderT extends ExtendableBuilder<MessageT, BuilderT>>
extends Builder<BuilderType> implements ExtendableMessageOrBuilder<MessageType> { extends Builder<BuilderT> implements ExtendableMessageOrBuilder<MessageT> {
private FieldSet.Builder<FieldDescriptor> extensions; private FieldSet.Builder<FieldDescriptor> extensions;
@ -1381,7 +1381,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
@Override @Override
public BuilderType clear() { public BuilderT clear() {
extensions = null; extensions = null;
return super.clear(); return super.clear();
} }
@ -1392,7 +1392,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
} }
private void verifyExtensionContainingType(final Extension<MessageType, ?> extension) { private void verifyExtensionContainingType(final Extension<MessageT, ?> extension) {
if (extension.getDescriptor().getContainingType() != getDescriptorForType()) { if (extension.getDescriptor().getContainingType() != getDescriptorForType()) {
// This can only happen if someone uses unchecked operations. // This can only happen if someone uses unchecked operations.
throw new IllegalArgumentException( throw new IllegalArgumentException(
@ -1406,8 +1406,8 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) { public final <T> boolean hasExtension(final ExtensionLite<MessageT, T> extensionLite) {
Extension<MessageType, Type> extension = checkNotLite(extensionLite); Extension<MessageT, T> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
return extensions == null ? false : extensions.hasField(extension.getDescriptor()); return extensions == null ? false : extensions.hasField(extension.getDescriptor());
@ -1415,9 +1415,9 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final ExtensionLite<MessageType, List<Type>> extensionLite) { final ExtensionLite<MessageT, List<T>> extensionLite) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
final FieldDescriptor descriptor = extension.getDescriptor(); final FieldDescriptor descriptor = extension.getDescriptor();
@ -1426,179 +1426,179 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) { public final <T> T getExtension(final ExtensionLite<MessageT, T> extensionLite) {
Extension<MessageType, Type> extension = checkNotLite(extensionLite); Extension<MessageT, T> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
FieldDescriptor descriptor = extension.getDescriptor(); FieldDescriptor descriptor = extension.getDescriptor();
final Object value = extensions == null ? null : extensions.getField(descriptor); final Object value = extensions == null ? null : extensions.getField(descriptor);
if (value == null) { if (value == null) {
if (descriptor.isRepeated()) { if (descriptor.isRepeated()) {
return (Type) Collections.emptyList(); return (T) Collections.emptyList();
} else if (descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE) { } else if (descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
return (Type) extension.getMessageDefaultInstance(); return (T) extension.getMessageDefaultInstance();
} else { } else {
return (Type) extension.fromReflectionType(descriptor.getDefaultValue()); return (T) extension.fromReflectionType(descriptor.getDefaultValue());
} }
} else { } else {
return (Type) extension.fromReflectionType(value); return (T) extension.fromReflectionType(value);
} }
} }
/** Get one element of a repeated extension. */ /** Get one element of a repeated extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) { final ExtensionLite<MessageT, List<T>> extensionLite, final int index) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
FieldDescriptor descriptor = extension.getDescriptor(); FieldDescriptor descriptor = extension.getDescriptor();
if (extensions == null) { if (extensions == null) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
return (Type) return (T)
extension.singularFromReflectionType(extensions.getRepeatedField(descriptor, index)); extension.singularFromReflectionType(extensions.getRepeatedField(descriptor, index));
} }
/** Set the value of an extension. */ /** Set the value of an extension. */
public final <Type> BuilderType setExtension( public final <T> BuilderT setExtension(
final ExtensionLite<MessageType, Type> extensionLite, final Type value) { final ExtensionLite<MessageT, T> extensionLite, final T value) {
Extension<MessageType, Type> extension = checkNotLite(extensionLite); Extension<MessageT, T> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
final FieldDescriptor descriptor = extension.getDescriptor(); final FieldDescriptor descriptor = extension.getDescriptor();
extensions.setField(descriptor, extension.toReflectionType(value)); extensions.setField(descriptor, extension.toReflectionType(value));
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
/** Set the value of one element of a repeated extension. */ /** Set the value of one element of a repeated extension. */
public final <Type> BuilderType setExtension( public final <T> BuilderT setExtension(
final ExtensionLite<MessageType, List<Type>> extensionLite, final ExtensionLite<MessageT, List<T>> extensionLite,
final int index, final int index,
final Type value) { final T value) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
final FieldDescriptor descriptor = extension.getDescriptor(); final FieldDescriptor descriptor = extension.getDescriptor();
extensions.setRepeatedField(descriptor, index, extension.singularToReflectionType(value)); extensions.setRepeatedField(descriptor, index, extension.singularToReflectionType(value));
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
/** Append a value to a repeated extension. */ /** Append a value to a repeated extension. */
public final <Type> BuilderType addExtension( public final <T> BuilderT addExtension(
final ExtensionLite<MessageType, List<Type>> extensionLite, final Type value) { final ExtensionLite<MessageT, List<T>> extensionLite, final T value) {
Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite); Extension<MessageT, List<T>> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
final FieldDescriptor descriptor = extension.getDescriptor(); final FieldDescriptor descriptor = extension.getDescriptor();
extensions.addRepeatedField(descriptor, extension.singularToReflectionType(value)); extensions.addRepeatedField(descriptor, extension.singularToReflectionType(value));
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
/** Clear an extension. */ /** Clear an extension. */
public final BuilderType clearExtension(final ExtensionLite<MessageType, ?> extensionLite) { public final BuilderT clearExtension(final ExtensionLite<MessageT, ?> extensionLite) {
Extension<MessageType, ?> extension = checkNotLite(extensionLite); Extension<MessageT, ?> extension = checkNotLite(extensionLite);
verifyExtensionContainingType(extension); verifyExtensionContainingType(extension);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
extensions.clearField(extension.getDescriptor()); extensions.clearField(extension.getDescriptor());
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} }
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) { public final <T> boolean hasExtension(final Extension<MessageT, T> extension) {
return hasExtension((ExtensionLite<MessageType, Type>) extension); return hasExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Check if a singular extension is present. */ /** Check if a singular extension is present. */
@Override @Override
public final <Type> boolean hasExtension( public final <T> boolean hasExtension(
final GeneratedExtension<MessageType, Type> extension) { final GeneratedExtension<MessageT, T> extension) {
return hasExtension((ExtensionLite<MessageType, Type>) extension); return hasExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final Extension<MessageType, List<Type>> extension) { final Extension<MessageT, List<T>> extension) {
return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension); return getExtensionCount((ExtensionLite<MessageT, List<T>>) extension);
} }
/** Get the number of elements in a repeated extension. */ /** Get the number of elements in a repeated extension. */
@Override @Override
public final <Type> int getExtensionCount( public final <T> int getExtensionCount(
final GeneratedExtension<MessageType, List<Type>> extension) { final GeneratedExtension<MessageT, List<T>> extension) {
return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension); return getExtensionCount((ExtensionLite<MessageT, List<T>>) extension);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension(final Extension<MessageType, Type> extension) { public final <T> T getExtension(final Extension<MessageT, T> extension) {
return getExtension((ExtensionLite<MessageType, Type>) extension); return getExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final GeneratedExtension<MessageType, Type> extension) { final GeneratedExtension<MessageT, T> extension) {
return getExtension((ExtensionLite<MessageType, Type>) extension); return getExtension((ExtensionLite<MessageT, T>) extension);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final Extension<MessageType, List<Type>> extension, final int index) { final Extension<MessageT, List<T>> extension, final int index) {
return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index); return getExtension((ExtensionLite<MessageT, List<T>>) extension, index);
} }
/** Get the value of an extension. */ /** Get the value of an extension. */
@Override @Override
public final <Type> Type getExtension( public final <T> T getExtension(
final GeneratedExtension<MessageType, List<Type>> extension, final int index) { final GeneratedExtension<MessageT, List<T>> extension, final int index) {
return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index); return getExtension((ExtensionLite<MessageT, List<T>>) extension, index);
} }
/** Set the value of an extension. */ /** Set the value of an extension. */
public final <Type> BuilderType setExtension( public final <T> BuilderT setExtension(
final Extension<MessageType, Type> extension, final Type value) { final Extension<MessageT, T> extension, final T value) {
return setExtension((ExtensionLite<MessageType, Type>) extension, value); return setExtension((ExtensionLite<MessageT, T>) extension, value);
} }
/** Set the value of an extension. */ /** Set the value of an extension. */
public <Type> BuilderType setExtension( public <T> BuilderT setExtension(
final GeneratedExtension<MessageType, Type> extension, final Type value) { final GeneratedExtension<MessageT, T> extension, final T value) {
return setExtension((ExtensionLite<MessageType, Type>) extension, value); return setExtension((ExtensionLite<MessageT, T>) extension, value);
} }
/** Set the value of one element of a repeated extension. */ /** Set the value of one element of a repeated extension. */
public final <Type> BuilderType setExtension( public final <T> BuilderT setExtension(
final Extension<MessageType, List<Type>> extension, final Extension<MessageT, List<T>> extension,
final int index, final Type value) { final int index, final T value) {
return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value); return setExtension((ExtensionLite<MessageT, List<T>>) extension, index, value);
} }
/** Set the value of one element of a repeated extension. */ /** Set the value of one element of a repeated extension. */
public <Type> BuilderType setExtension( public <T> BuilderT setExtension(
final GeneratedExtension<MessageType, List<Type>> extension, final GeneratedExtension<MessageT, List<T>> extension,
final int index, final Type value) { final int index, final T value) {
return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value); return setExtension((ExtensionLite<MessageT, List<T>>) extension, index, value);
} }
/** Append a value to a repeated extension. */ /** Append a value to a repeated extension. */
public final <Type> BuilderType addExtension( public final <T> BuilderT addExtension(
final Extension<MessageType, List<Type>> extension, final Type value) { final Extension<MessageT, List<T>> extension, final T value) {
return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value); return addExtension((ExtensionLite<MessageT, List<T>>) extension, value);
} }
/** Append a value to a repeated extension. */ /** Append a value to a repeated extension. */
public <Type> BuilderType addExtension( public <T> BuilderT addExtension(
final GeneratedExtension<MessageType, List<Type>> extension, final Type value) { final GeneratedExtension<MessageT, List<T>> extension, final T value) {
return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value); return addExtension((ExtensionLite<MessageT, List<T>>) extension, value);
} }
/** Clear an extension. */ /** Clear an extension. */
public final <Type> BuilderType clearExtension( public final <T> BuilderT clearExtension(
final Extension<MessageType, ?> extension) { final Extension<MessageT, ?> extension) {
return clearExtension((ExtensionLite<MessageType, ?>) extension); return clearExtension((ExtensionLite<MessageT, ?>) extension);
} }
/** Clear an extension. */ /** Clear an extension. */
public <Type> BuilderType clearExtension( public <T> BuilderT clearExtension(
final GeneratedExtension<MessageType, ?> extension) { final GeneratedExtension<MessageT, ?> extension) {
return clearExtension((ExtensionLite<MessageType, ?>) extension); return clearExtension((ExtensionLite<MessageT, ?>) extension);
} }
/** Called by subclasses to check if all extensions are initialized. */ /** Called by subclasses to check if all extensions are initialized. */
@ -1746,53 +1746,53 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
} }
@Override @Override
public BuilderType setField(final FieldDescriptor field, final Object value) { public BuilderT setField(final FieldDescriptor field, final Object value) {
if (field.isExtension()) { if (field.isExtension()) {
verifyContainingType(field); verifyContainingType(field);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
extensions.setField(field, value); extensions.setField(field, value);
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} else { } else {
return super.setField(field, value); return super.setField(field, value);
} }
} }
@Override @Override
public BuilderType clearField(final FieldDescriptor field) { public BuilderT clearField(final FieldDescriptor field) {
if (field.isExtension()) { if (field.isExtension()) {
verifyContainingType(field); verifyContainingType(field);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
extensions.clearField(field); extensions.clearField(field);
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} else { } else {
return super.clearField(field); return super.clearField(field);
} }
} }
@Override @Override
public BuilderType setRepeatedField( public BuilderT setRepeatedField(
final FieldDescriptor field, final int index, final Object value) { final FieldDescriptor field, final int index, final Object value) {
if (field.isExtension()) { if (field.isExtension()) {
verifyContainingType(field); verifyContainingType(field);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
extensions.setRepeatedField(field, index, value); extensions.setRepeatedField(field, index, value);
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} else { } else {
return super.setRepeatedField(field, index, value); return super.setRepeatedField(field, index, value);
} }
} }
@Override @Override
public BuilderType addRepeatedField(final FieldDescriptor field, final Object value) { public BuilderT addRepeatedField(final FieldDescriptor field, final Object value) {
if (field.isExtension()) { if (field.isExtension()) {
verifyContainingType(field); verifyContainingType(field);
ensureExtensionsIsMutable(); ensureExtensionsIsMutable();
extensions.addRepeatedField(field, value); extensions.addRepeatedField(field, value);
onChanged(); onChanged();
return (BuilderType) this; return (BuilderT) this;
} else { } else {
return super.addRepeatedField(field, value); return super.addRepeatedField(field, value);
} }
@ -3141,13 +3141,13 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
/** /**
* Checks that the {@link Extension} is non-Lite and returns it as a {@link GeneratedExtension}. * Checks that the {@link Extension} is non-Lite and returns it as a {@link GeneratedExtension}.
*/ */
private static <MessageType extends ExtendableMessage<MessageType>, T> private static <MessageT extends ExtendableMessage<MessageT>, T>
Extension<MessageType, T> checkNotLite(ExtensionLite<MessageType, T> extension) { Extension<MessageT, T> checkNotLite(ExtensionLite<MessageT, T> extension) {
if (extension.isLite()) { if (extension.isLite()) {
throw new IllegalArgumentException("Expected non-lite extension."); throw new IllegalArgumentException("Expected non-lite extension.");
} }
return (Extension<MessageType, T>) extension; return (Extension<MessageT, T>) extension;
} }
protected static boolean isStringEmpty(final Object value) { protected static boolean isStringEmpty(final Object value) {

Write Preview
Loading…
Cancel
Save