From 82b43d1f41d6c374ebdd942dd86602736c2218e8 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Mon, 18 Jul 2016 10:36:04 -0700 Subject: [PATCH] Remove Java deterministic API. Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c --- CHANGES.txt | 5 +---- .../src/main/java/com/google/protobuf/CodedOutputStream.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5c73be15371d..04fa418efe60 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,6 @@ 2016-07-15 version 3.0.0-beta-4 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript) 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 serialized to the same bytes. This allows applications like MapReduce to group equal messages based on the serialized bytes. The deterministic @@ -36,9 +36,6 @@ * Various performance optimizations. 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 hashCode() methods are generated by default. * Added a new JSON printer option "omittingInsignificantWhitespace" to produce diff --git a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java index 4f5a9b770e5b..e5515285de94 100644 --- a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java +++ b/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java @@ -173,7 +173,7 @@ public static CodedOutputStream newInstance(ByteBuffer byteBuffer) { * maps are sorted on the lexicographical order of the UTF8 encoded keys. * */ - public final void useDeterministicSerialization() { + void useDeterministicSerialization() { serializationDeterministic = true; }