summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-07-15 15:15:28 +0100
committerMax Cai <maxtroy@google.com>2014-07-15 15:38:04 +0100
commit11f883e185a2ea6fd6d0b19520e9f0f004e90e5c (patch)
tree75205c505646c352b6cd21a73869d8f1d0dc3572 /java
parentdaf638399bd42122306786e8062f392ddace4363 (diff)
downloadexternal_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.zip
external_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.tar.gz
external_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.tar.bz2
Fix access around unknownFieldData.
Instead of publishing its class I chose to encapsulate the troublesome references in equals()/hashCode() in the generated code into superclass methods in ExtendableMessageNano. Changed a couple of java packages in the test suite to catch this issue easier in the future. Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
Diffstat (limited to 'java')
-rw-r--r--java/pom.xml2
-rw-r--r--java/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java4
-rw-r--r--java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java25
-rw-r--r--java/src/test/java/com/google/protobuf/NanoTest.java8
4 files changed, 32 insertions, 7 deletions
diff --git a/java/pom.xml b/java/pom.xml
index 0a29f31..d263bec 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -134,7 +134,7 @@
<!-- java nano -->
<exec executable="../src/protoc">
<arg value="--javanano_out=
- java_package = google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano,
+ java_package = google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano.testimport,
java_outer_classname = google/protobuf/unittest_import_nano.proto|UnittestImportNano,
generate_equals = true
:target/generated-test-sources" />
diff --git a/java/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java b/java/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
index 7092485..4b53607 100644
--- a/java/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
+++ b/java/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
@@ -32,10 +32,10 @@ package com.google.protobuf.nano;
import android.os.Parcel;
-import com.google.protobuf.nano.Extensions.ContainerMessage;
-import com.google.protobuf.nano.Extensions.ExtendableMessage;
import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano;
import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano.NestedMessage;
+import com.google.protobuf.nano.testext.Extensions.ContainerMessage;
+import com.google.protobuf.nano.testext.Extensions.ExtendableMessage;
import junit.framework.TestCase;
diff --git a/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java b/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
index a0c2731..5984d35 100644
--- a/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
+++ b/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
@@ -147,4 +147,29 @@ public abstract class ExtendableMessageNano<M extends ExtendableMessageNano<M>>
field.addUnknownField(unknownField);
return true;
}
+
+ /**
+ * Returns whether the stored unknown field data in this message is equivalent to that in the
+ * other message.
+ *
+ * @param other the other message.
+ * @return whether the two sets of unknown field data are equal.
+ */
+ protected final boolean unknownFieldDataEquals(M other) {
+ if (unknownFieldData == null || unknownFieldData.isEmpty()) {
+ return other.unknownFieldData == null || other.unknownFieldData.isEmpty();
+ } else {
+ return unknownFieldData.equals(other.unknownFieldData);
+ }
+ }
+
+ /**
+ * Computes the hashcode representing the unknown field data stored in this message.
+ *
+ * @return the hashcode for the unknown field data.
+ */
+ protected final int unknownFieldDataHashCode() {
+ return (unknownFieldData == null || unknownFieldData.isEmpty()
+ ? 0 : unknownFieldData.hashCode());
+ }
}
diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java
index 93c9dc4..e831c52 100644
--- a/java/src/test/java/com/google/protobuf/NanoTest.java
+++ b/java/src/test/java/com/google/protobuf/NanoTest.java
@@ -35,9 +35,6 @@ import com.google.protobuf.nano.EnumClassNanoMultiple;
import com.google.protobuf.nano.EnumClassNanos;
import com.google.protobuf.nano.EnumValidity;
import com.google.protobuf.nano.EnumValidityAccessors;
-import com.google.protobuf.nano.Extensions;
-import com.google.protobuf.nano.Extensions.AnotherMessage;
-import com.google.protobuf.nano.Extensions.MessageWithGroup;
import com.google.protobuf.nano.FileScopeEnumMultiple;
import com.google.protobuf.nano.FileScopeEnumRefNano;
import com.google.protobuf.nano.InternalNano;
@@ -57,11 +54,14 @@ import com.google.protobuf.nano.PackedExtensions;
import com.google.protobuf.nano.RepeatedExtensions;
import com.google.protobuf.nano.SingularExtensions;
import com.google.protobuf.nano.TestRepeatedMergeNano;
-import com.google.protobuf.nano.UnittestImportNano;
import com.google.protobuf.nano.UnittestMultipleNano;
import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano;
import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano;
import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano;
+import com.google.protobuf.nano.testext.Extensions;
+import com.google.protobuf.nano.testext.Extensions.AnotherMessage;
+import com.google.protobuf.nano.testext.Extensions.MessageWithGroup;
+import com.google.protobuf.nano.testimport.UnittestImportNano;
import junit.framework.TestCase;