diff options
| author | Max Cai <maxtroy@google.com> | 2013-07-29 17:20:50 +0100 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2013-08-05 21:54:58 +0100 |
| commit | 624c448fbef20a1a2fad2289f622b468c25763d1 (patch) | |
| tree | 70294971235a3e23aea495f7b3c2ea39cbfedb66 /java/pom.xml | |
| parent | be47f55e2f93df84abb55759e49cf381d2745cc5 (diff) | |
| download | external_protobuf-624c448fbef20a1a2fad2289f622b468c25763d1.zip external_protobuf-624c448fbef20a1a2fad2289f622b468c25763d1.tar.gz external_protobuf-624c448fbef20a1a2fad2289f622b468c25763d1.tar.bz2 | |
Fix outer classname for javamicro/javanano.
- File class name is defined as the java_outer_classname option value
or the file name ToCamelCase; never the single message's ClassName.
- File-scope enums are translated to constants in the file class,
regardless of java_multiple_files.
- If java_multiple_files=true, and file's class name equals a message's
class name, no error. This is done by detecting that the outer class
is not needed and skipping the outer class codegen and clash checks.
Note: there is a disparity between java[lite] and the previous
java{micr|nan}o: when generating code for a single-message proto, the
outer class is omitted by java{micr|nan}o if the file does not have
java_outer_classname. This change makes java{micr|nan}o align with
java[lite] codegen and create the outer class, but will print some
info to warn of potential change of code.
- Also fixed the "is_own_file" detection and made all parseX() methods
static. Previously, all messages in a java_multiple_files=true file
are (incorrectly) considered to be in their own files, including
nested messages, causing them to become inner classes (instance-
bound) and forcing the parseX() methods to lose the static modifier.
- This change supersedes c/60164 and c/60086, which causes javanano to
put enum values into enum shell classes if java_multiple_files=true.
We now always use the parent class to host the enum values. A future
change will add a command line option to provide more flexibility.
- Elaborated in java/README.txt.
Change-Id: I684932f90e0a028ef37c662b221def5ffa202439
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml index 7970f72..bf5f666 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -127,7 +127,9 @@ <arg value="../src/google/protobuf/unittest_stringutf8_micro.proto" /> <arg value="../src/google/protobuf/unittest_recursive_micro.proto" /> <arg value="../src/google/protobuf/unittest_import_micro.proto" /> + <arg value="../src/google/protobuf/unittest_single_micro.proto" /> <arg value="../src/google/protobuf/unittest_multiple_micro.proto" /> + <arg value="../src/google/protobuf/unittest_multiple_nameclash_micro.proto" /> </exec> <!-- java nano --> <exec executable="../src/protoc"> @@ -139,8 +141,9 @@ <arg value="../src/google/protobuf/unittest_stringutf8_nano.proto" /> <arg value="../src/google/protobuf/unittest_recursive_nano.proto" /> <arg value="../src/google/protobuf/unittest_import_nano.proto" /> - <arg value="../src/google/protobuf/unittest_enum_multiplejava_nano.proto" /> + <arg value="../src/google/protobuf/unittest_single_nano.proto" /> <arg value="../src/google/protobuf/unittest_multiple_nano.proto" /> + <arg value="../src/google/protobuf/unittest_multiple_nameclash_nano.proto" /> </exec> <exec executable="../src/protoc"> <arg value="--javanano_out=store_unknown_fields=true:target/generated-test-sources" /> |