Add option to preserve unknown fields.

talpr · Dec 3, 2017 · a677f96 · a677f96
1 parent 2a0d61d
commit a677f96
Show file tree

Hide file tree

Showing 28 changed files with 408 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 
 ## [Unreleased](https://github.com/scalapb/ScalaPB/tree/HEAD)
+- Update to protobuf-java 3.5.0
+- Added file-level option to preserve unknown fields in generated classes.
+
+## [v0.6.7](https://github.com/scalapb/ScalaPB/tree/v0.6.6) (2017-11-23)
+[Full Changelog](https://github.com/scalapb/ScalaPB/compare/v0.6.0...v0.6.7)
 - GeneratedMessageCompanion: add `nestedMessagesCompanions` and Add
 - Added base class GeneratedFileObject that will be the base class for the
   singleton object generated for each proto file.

diff --git a/compiler-plugin/src/main/java/scalapb/options/compiler/Scalapb.java b/compiler-plugin/src/main/java/scalapb/options/compiler/Scalapb.java
diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/DescriptorPimps.scala b/compiler-plugin/src/main/scala/scalapb/compiler/DescriptorPimps.scala
@@ -300,6 +300,12 @@ trait DescriptorPimps {
 
     def isValueClass: Boolean = messageOptions.getExtendsList.asScala.exists(valueClassNames)
 
+    // In protobuf 3.5.0 all messages preserve unknown fields. We make an exception for value classes
+    // since they must have an exactly one val.
+    def preservesUnknownFields = (
+      message.isExtendable || message.getFile.scalaOptions.getPreserveUnknownFields
+      ) && !isValueClass
+
     def baseClasses: Seq[String] = {
       val specialMixins = message.getFullName match {
         case "google.protobuf.Any" => Seq("_root_.scalapb.AnyMethods")