protocolbuffers · TeBoring · Aug 7, 2015 · Jul 28, 2015 · Jul 28, 2015 · Jul 29, 2015
diff --git a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
@@ -40,10 +40,10 @@
 import com.google.protobuf.nano.NanoReferenceTypesCompat;
 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 com.google.protobuf.nano.testext.nano.Extensions;
+import com.google.protobuf.nano.testext.nano.Extensions.AnotherMessage;
+import com.google.protobuf.nano.testext.nano.Extensions.MessageWithGroup;
+import com.google.protobuf.nano.testimport.nano.UnittestImportNano;
 
 import junit.framework.TestCase;
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/map_test.proto b/javanano/src/test/java/com/google/protobuf/nano/map_test.proto
@@ -32,7 +32,7 @@ syntax = "proto3";
 
 package map_test;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "MapTestProto";
 
 message TestMap {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoAccessorsOuterClass";
 
 message TestNanoAccessors {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 enum FileScopeEnumMultiple {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "EnumClassNanos";
 
 enum FileScopeEnum {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
@@ -1,6 +1,6 @@
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "EnumValidity";
 
 enum E {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoHasOuterClass";
 
 message TestAllTypesNanoHas {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "MultipleNameClashNano";
 option java_multiple_files = true;
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto
@@ -34,7 +34,7 @@ package protobuf_unittest_import;
 
 import "google/protobuf/nano/unittest_import_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 enum FileScopeEnum {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
@@ -34,7 +34,7 @@ package protobuf_unittest;
 
 import "google/protobuf/nano/unittest_import_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoOuterClass";
 
 // Same as TestAllTypes but with the nano runtime.

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto
@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestRecursiveNano";
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
@@ -1,6 +1,6 @@
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoReferenceTypes";
 
 message TestAllTypesNano {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto
@@ -34,7 +34,7 @@ package protobuf_unittest;
 
 import "google/protobuf/nano/unittest_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 // A container message for testing the merging of repeated fields at a

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoRepeatedPackables";
 
 enum Enum {

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto
@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestSimpleNano";
 

diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto
@@ -32,7 +32,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 message SingleMessageNano {
 }
diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto
@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestStringutf8Nano";
 

diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc
@@ -67,8 +67,15 @@ void UpdateParamsRecursively(Params& params,
       file->name(), file->options().java_outer_classname());
   }
   if (file->options().has_java_package()) {
+    string result = file->options().java_package();
+    if (!file->options().javanano_use_deprecated_package()) {
+      if (!result.empty()) {
+        result += ".";
+      }
+      result += "nano";
+    }
     params.set_java_package(
-      file->name(), file->options().java_package());
+      file->name(), result);
   }
   if (file->options().has_java_multiple_files()) {
     params.set_java_multiple_files(

diff --git a/src/google/protobuf/compiler/javanano/javanano_helpers.cc b/src/google/protobuf/compiler/javanano/javanano_helpers.cc
@@ -200,6 +200,14 @@ string FileJavaPackage(const Params& params, const FileDescriptor* file) {
       if (!result.empty()) result += '.';
       result += file->package();
     }
+
+    if (!file->options().javanano_use_deprecated_package()) {
+      if (!result.empty()) {
+        result += ".";
+      }
+      result += "nano";
+    }
+
     return result;
   }
 }