| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| |
|
|
|
|
|
|
|
|
|
| |
This CL implements the 'optional_field_style=accessors' option.
All optional fields will now be 1 Java field and 1 bit in a shared
bitfield behind get/set/has/clear accessor methods. The setter
performs null check for reference types (Strings and byte[]s).
Also decentralized the clear code generation.
Change-Id: I60ac78329e352e76c2f8139fba1f292383080ad3
|
| |
|
|
| |
Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
enum_style = c | java: 'c' to put the enum member int constants
at the parent scope; 'java' to create uninstantiatable shell
classes at the parent scope and put the int constants inside.
optional_field_style = default | accessors: 'default' to create
one public mutable field per optional proto field; 'accessors'
to encapsulate the generated fields behind get, set, has and
clear accessors.
This CL only contains parsing code for these two parameters.
Change-Id: Iec0c3b0f30af8eb7db328e790664306bc90be089
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
| |\ \
| |/
|/| |
|
| | |
| |
| |
| |
| |
| |
| | |
Remove buggy memoization. Memoization also is too fragile for the api
because the repeated field is public.
Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
|
| |/
|
|
|
|
| |
If has is set, also always serialize.
Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Imported source files may have different values for the 'java_multiple_files'
option to the main source file's. Whether the fully qualified Java name of an
entity should include the outer class name depends on the flag value in the
file defining the referenced entity, not the main file. This CL loads the
flag values from the main and all transitively imported files into the params,
and generates the fully qualified Java names accordingly.
If the generator option 'java_multiple_files' is set, its value overrides any
in-file values in all source/imported files. This is because this generator
option is typically used on either none or all source files.
Change-Id: Id6a4a42426d68961dc669487d38f35530deb7d8e
|
| |
|
|
|
|
|
|
| |
Adds support for default values of NaN, infinity and negative
infinity for floats and doubles in both the nano and micro
java compiler.
Change-Id: Ibc43e5ebb073e51d9a8181f3aa23b72e10015dca
|
| |
|
|
| |
Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
You can now do:
MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes);
without having to cast the message returned from mergeFrom.
Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
|
| | |
| |
| |
| |
| |
| | |
Nano extension sources were missing.
Change-Id: Ic3278edae2db5e41e5aa2e7d58e0daa8e29f20b7
|
| |/
|
|
|
|
|
| |
javanano_extension needed to be added to the Makefile.{am,in} in
addition to the Android.mk file.
Change-Id: I8b917fd72d1dec13e64b3c3d13bd204c83f31402
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
You can use the processor option store_unknown_fields to switch
this support on:
aprotoc --javanano_out=store_unknown_fields=true:/tmp/out
A separate option for extensions isn't required. Support
for unknown fields must be turned on to allow storing and
retrieving extensions, because they are just stored as
unknown fields. If unknown fields are switched on, extension
related code will be generated when a proto message includes
an extension range, or an extension is encountered.
By default, store_unknown_fields is false. No additional
code is generated, and the generator will error out if protos
contain extension ranges or extensions.
Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
|
| |
|
|
|
|
|
|
|
| |
When the java_multiple_files option is on, enums are placed in java
class files based on the name of the original enum type. This fixes
field references to such enum values to point to the correct class
name when setting the default.
Change-Id: I51a2e251c0d0ab1e45a182ba849d314232a74bac
|
| |
|
|
|
|
|
| |
for enums when java_multiple_files=true.
Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7
Signed-off-by: Brian Duff <bduff@google.com>
|
| |
|
|
|
|
|
| |
It didn't appear until API 9 and is thus incompatible with Froyo.
Instead, allocate a new array and System.arraycopy inline.
Change-Id: I2e1cd07a4a762ef8edd5ec06ceaa1d38b302823d
|
| |
|
|
|
|
|
| |
Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.
Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Like micro protobufs except:
- No setter/getter/hazzer functions.
- Has state is not available. Outputs all fields != their default.
- CodedInputStream can only take byte[] (not InputStream).
- Repeated fields are in arrays, not ArrayList or Vector.
- Unset messages/groups are null, not "defaultInstance()".
- Required fields are always serialized.
To use:
- Link libprotobuf-java-2.3.0-nano runtime.
- Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* @SuppressWarnings("hiding") for field names that are reused in inner
classes.
* @Override for methods defined in com.google.protobuf.micro.MessageMicro
* Removed unnecessary type casting
* Only throw exception from writeTo when there are fields to write.
This removes over 1,000 warnings from the Play client.
Change-Id: I9049c94f1e6aec5e5547898defc03c8d379c3c10
|
| |
|
|
|
|
|
|
|
|
|
| |
Removed use of StringUtf8Micro and instead use an extra byte array
instance variable directly in the class. This allows the list returned
for repeated strings to be a String instead of a StringUtf8Micro
making the class compatible with existing code.
Removed PerfTimer.java which isn't used.
Change-Id: Ie6acfb40f98f59a48c1a795d86f715078f9611f5
|
| |
|
|
|
|
|
| |
I was not properly constructing the enum class name if
there was a period in the protobuf package name.
Change-Id: I71e51d9745702fa89841ad714282afe8b42a3425
|
| |
|
|
|
|
| |
See README.android for additional information.
Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
|
| |
|
|
|
|
|
| |
This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.
Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
|
| |
|
|
|
|
| |
See README.android for additional information.
Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
|
| |
|
|
|
|
|
|
| |
This is the contents of protobuf-2.2.0a.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list and
is the base code for the javamicro code generator.
Change-Id: Ie9a0440a824d615086445b6636944484b3155afa
|
| | |
|
| | |
|
| |
|
|
| |
This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
|
| |
|
|
|
|
| |
* Added IntMap that uses Hashtable for larger keys
* Chagned to use IntMap to allow larger tags
* Changed to use autoboxing for int/longs.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
