diff options
author | Xiao Hang <rocking@google.com> | 2015-07-29 15:12:10 -0700 |
---|---|---|
committer | Xiao Hang <rocking@google.com> | 2015-08-04 14:30:39 -0700 |
commit | ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a (patch) | |
tree | ff110a2a652a0bf29be8c9edfcb7dec151bfe7c7 /javanano/src | |
parent | 801e92007fd6eac3fa5b4c386ba54089393680c7 (diff) | |
parent | c3e6493aa43241688a307162f3417c176f3c0d4f (diff) | |
download | protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.tar.gz protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.tar.bz2 protobuf-ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a.zip |
Merge branch 'master' of https://github.com/zsurocking/protobuf
Diffstat (limited to 'javanano/src')
20 files changed, 28 insertions, 28 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java index 87deb00b..debf7c0a 100644 --- a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java +++ b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java @@ -30,20 +30,20 @@ package com.google.protobuf.nano; -import com.google.protobuf.nano.MapTestProto.nano.TestMap; +import com.google.protobuf.nano.MapTestProto.TestMap; import com.google.protobuf.nano.CodedOutputByteBufferNano; -import com.google.protobuf.nano.MapTestProto.nano.TestMap.MessageValue; +import com.google.protobuf.nano.MapTestProto.TestMap.MessageValue; import com.google.protobuf.nano.NanoAccessorsOuterClass.TestNanoAccessors; import com.google.protobuf.nano.NanoHasOuterClass.TestAllTypesNanoHas; import com.google.protobuf.nano.NanoOuterClass.TestAllTypesNano; -import com.google.protobuf.nano.UnittestRecursiveNano.nano.RecursiveMessageNano; +import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano; import com.google.protobuf.nano.NanoReferenceTypesCompat; -import com.google.protobuf.nano.UnittestSimpleNano.nano.SimpleMessageNano; -import com.google.protobuf.nano.UnittestSingleNano.nano.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.UnittestSimpleNano.SimpleMessageNano; +import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano; +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 index f72833ad..51498a49 100644 --- 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 index 6e5a40f6..6511e470 100644 --- 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 index e6246bb1..958e1f17 100644 --- 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 index 33a86225..3a1e07f6 100644 --- 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 index f7f57427..c0da8b42 100644 --- 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 index 7d47682d..3b7a004c 100644 --- 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 index 6d4b5dfb..e533c65b 100644 --- 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 index 589754e7..8b2d9658 100644 --- 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 index bda1a6ef..fe7d1794 100644 --- 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 index 9db2d3e3..b31c4399 100644 --- 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 index 9dbf0de4..406ab774 100644 --- 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 index efaf5269..3fff24c0 100644 --- 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 index 69d05834..29b944f0 100644 --- 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 index 2b246150..82eb8d11 100644 --- 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 index 9bfc3ad1..ef4e2d2f 100644 --- 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 index a7ca7527..96af8856 100644 --- 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 index 48333aba..25786cc2 100644 --- 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 index 025428d8..7de30c87 100644 --- 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 index 21bd8c0c..bbd677cf 100644 --- 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"; |