Parcourir la source

Remove Java deterministic API.

Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
Feng Xiao il y a 9 ans
Parent
commit
82b43d1f41

+ 1 - 4
CHANGES.txt

@@ -1,6 +1,6 @@
 2016-07-15 version 3.0.0-beta-4 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript)
 2016-07-15 version 3.0.0-beta-4 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript)
   General
   General
-  * Added a deterministic serialization API for C++ and Java. The deterministic
+  * Added a deterministic serialization API for C++. The deterministic
     serialization guarantees that given a binary, equal messages will be
     serialization guarantees that given a binary, equal messages will be
     serialized to the same bytes. This allows applications like MapReduce to
     serialized to the same bytes. This allows applications like MapReduce to
     group equal messages based on the serialized bytes. The deterministic
     group equal messages based on the serialized bytes. The deterministic
@@ -36,9 +36,6 @@
   * Various performance optimizations.
   * Various performance optimizations.
 
 
   Java (beta)
   Java (beta)
-  * Introduced a deterministic serialization API in
-    CodedOutputStream#useDeterministicSerialization(). See the notes about
-    deterministic serialization in the General section.
   * File option "java_generate_equals_and_hash" is now deprecated. equals() and
   * File option "java_generate_equals_and_hash" is now deprecated. equals() and
     hashCode() methods are generated by default.
     hashCode() methods are generated by default.
   * Added a new JSON printer option "omittingInsignificantWhitespace" to produce
   * Added a new JSON printer option "omittingInsignificantWhitespace" to produce

+ 1 - 1
java/core/src/main/java/com/google/protobuf/CodedOutputStream.java

@@ -173,7 +173,7 @@ public abstract class CodedOutputStream extends ByteOutput {
    *     maps are sorted on the lexicographical order of the UTF8 encoded keys.
    *     maps are sorted on the lexicographical order of the UTF8 encoded keys.
    * </ul>
    * </ul>
    */
    */
-  public final void useDeterministicSerialization() {
+  void useDeterministicSerialization() {
     serializationDeterministic = true;
     serializationDeterministic = true;
   }
   }