diff options
Diffstat (limited to 'java/src/main')
5 files changed, 9 insertions, 14 deletions
diff --git a/java/src/main/java/com/google/protobuf/AbstractMessage.java b/java/src/main/java/com/google/protobuf/AbstractMessage.java index b059bc98..fb416bdc 100644 --- a/java/src/main/java/com/google/protobuf/AbstractMessage.java +++ b/java/src/main/java/com/google/protobuf/AbstractMessage.java @@ -274,7 +274,6 @@ public abstract class AbstractMessage extends AbstractMessageLite * @param tag The tag, which should have already been read. * @return {@code true} unless the tag is an end-group tag. */ - @SuppressWarnings("unchecked") static boolean mergeFieldFrom( final CodedInputStream input, final UnknownFieldSet.Builder unknownFields, diff --git a/java/src/main/java/com/google/protobuf/AbstractMessageLite.java b/java/src/main/java/com/google/protobuf/AbstractMessageLite.java index 9210d853..77b27370 100644 --- a/java/src/main/java/com/google/protobuf/AbstractMessageLite.java +++ b/java/src/main/java/com/google/protobuf/AbstractMessageLite.java @@ -313,8 +313,7 @@ public abstract class AbstractMessageLite implements MessageLite { } } if (values instanceof Collection) { - @SuppressWarnings("unsafe") final - Collection<T> collection = (Collection<T>) values; + final Collection<T> collection = (Collection<T>) values; list.addAll(collection); } else { for (final T value : values) { diff --git a/java/src/main/java/com/google/protobuf/FieldSet.java b/java/src/main/java/com/google/protobuf/FieldSet.java index 93e55f29..bc1bb797 100644 --- a/java/src/main/java/com/google/protobuf/FieldSet.java +++ b/java/src/main/java/com/google/protobuf/FieldSet.java @@ -210,7 +210,7 @@ final class FieldSet<FieldDescriptorType extends if (value == null) { return 0; } else { - return ((List) value).size(); + return ((List<?>) value).size(); } } @@ -230,7 +230,7 @@ final class FieldSet<FieldDescriptorType extends if (value == null) { throw new IndexOutOfBoundsException(); } else { - return ((List) value).get(index); + return ((List<?>) value).get(index); } } @@ -564,7 +564,7 @@ final class FieldSet<FieldDescriptorType extends WireFormat.FieldType type = descriptor.getLiteType(); int number = descriptor.getNumber(); if (descriptor.isRepeated()) { - final List valueList = (List)value; + final List<?> valueList = (List<?>)value; if (descriptor.isPacked()) { output.writeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED); // Compute the total data size so the length can be written. @@ -692,7 +692,7 @@ final class FieldSet<FieldDescriptorType extends if (descriptor.isRepeated()) { if (descriptor.isPacked()) { int dataSize = 0; - for (final Object element : (List)value) { + for (final Object element : (List<?>)value) { dataSize += computeElementSizeNoTag(type, element); } return dataSize + @@ -700,7 +700,7 @@ final class FieldSet<FieldDescriptorType extends CodedOutputStream.computeRawVarint32Size(dataSize); } else { int size = 0; - for (final Object element : (List)value) { + for (final Object element : (List<?>)value) { size += computeElementSize(type, number, element); } return size; diff --git a/java/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/src/main/java/com/google/protobuf/GeneratedMessage.java index dba0ec83..5cff6fc6 100644 --- a/java/src/main/java/com/google/protobuf/GeneratedMessage.java +++ b/java/src/main/java/com/google/protobuf/GeneratedMessage.java @@ -75,7 +75,7 @@ public abstract class GeneratedMessage extends AbstractMessage { final Descriptor descriptor = internalGetFieldAccessorTable().descriptor; for (final FieldDescriptor field : descriptor.getFields()) { if (field.isRepeated()) { - final List value = (List) getField(field); + final List<?> value = (List<?>) getField(field); if (!value.isEmpty()) { result.put(field, value); } @@ -652,7 +652,6 @@ public abstract class GeneratedMessage extends AbstractMessage { final UnknownFieldSet.Builder unknownFields, final ExtensionRegistryLite extensionRegistry, final int tag) throws IOException { - final ExtendableMessage<MessageType> message = internalGetResult(); return AbstractMessage.Builder.mergeFieldFrom( input, unknownFields, extensionRegistry, this, tag); } @@ -821,7 +820,6 @@ public abstract class GeneratedMessage extends AbstractMessage { * If the extension is an embedded message or group, returns the default * instance of the message. */ - @SuppressWarnings("unchecked") public Message getMessageDefaultInstance() { return messageDefaultInstance; } @@ -1137,7 +1135,7 @@ public abstract class GeneratedMessage extends AbstractMessage { // 2) Insures that the caller cannot modify the list later on and // have the modifications be reflected in the message. clear(builder); - for (final Object element : (List) value) { + for (final Object element : (List<?>) value) { addRepeated(builder, element); } } diff --git a/java/src/main/java/com/google/protobuf/TextFormat.java b/java/src/main/java/com/google/protobuf/TextFormat.java index cb23f0c3..7ca2b4bf 100644 --- a/java/src/main/java/com/google/protobuf/TextFormat.java +++ b/java/src/main/java/com/google/protobuf/TextFormat.java @@ -144,7 +144,7 @@ public final class TextFormat { throws IOException { if (field.isRepeated()) { // Repeated field. Print each element. - for (final Object element : (List) value) { + for (final Object element : (List<?>) value) { printSingleField(field, element, generator); } } else { @@ -250,7 +250,6 @@ public final class TextFormat { throws IOException { for (final Map.Entry<Integer, UnknownFieldSet.Field> entry : unknownFields.asMap().entrySet()) { - final String prefix = entry.getKey().toString() + ": "; final UnknownFieldSet.Field field = entry.getValue(); for (final long value : field.getVarintList()) { |