aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing README parts for enum_style and in-repo usageMax Cai2013-10-101-3/+51
| | | | Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73
* Merge "Add reftypes field generator option."Ulas Kirazci2013-10-098-29/+281
|\
| * Add reftypes field generator option.Brian Duff2013-10-078-29/+281
| | | | | | | | | | | | | | | | This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
* | Merge "Fix some indenting issues with set__() function"Wink Saville2013-10-091-10/+6
|\ \ | |/ |/|
| * Fix some indenting issues with set__() functionAndrew Flynn2013-10-081-10/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it looked like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) { throw new java.lang.NullPointerException(); } id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Now it looks like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) throw new java.lang.NullPointerException(); id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Change-Id: I2a9289b528f785c846210d558206d677aa13e9be
* Merge "Fix roundtrip failure with groups when unknown fields are enabled."Ulas Kirazci2013-10-043-2/+30
|\
| * Fix roundtrip failure with groups when unknown fields are enabled.Nicholas Seckar2013-10-043-2/+30
|/ | | | | | | | | | | | | | | | When parsing a group, the group's end tag should not be stored within the message's unknownFieldData. Not only does this waste space, it is also output the next time the group is serialized, resulting in two end tags for that group. The resulting bytes are not always a valid protocol buffer and may fail to parse. This change ensures that group end tags do not result in an unknownFieldData entry, and that messages with groups can be roundtripped without corruption. Change-Id: I240f858a7217a7652b756598c34aacad5dcc3363 Conflicts: java/src/test/java/com/google/protobuf/NanoTest.java
* Merge "Implement enum_style=java option."Ulas Kirazci2013-09-287-23/+187
|\
| * Implement enum_style=java option.Max Cai2013-09-257-23/+187
| | | | | | | | | | | | | | | | | | | | This javanano_out command line option creates a container interface at the normal place where the enum constants would reside, per enum definition. The java_multiple_files flag would now affect the file- scope enums with the shells. If the flag is true then file-scope container interfaces are created in their own files. Change-Id: Id52258fcff8d3dee9db8f3d8022147a811bf3565
* | Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2814-63/+713
|\|
| * Accessor style for optional fields.Max Cai2013-09-2314-63/+713
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add some bitfield helper methods from 2.4"Ulas Kirazci2013-09-242-0/+102
|\|
| * Add some bitfield helper methods from 2.4Max Cai2013-09-202-0/+102
| | | | | | | | Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e
* | Merge "Add two codegen parameters to nano."Ulas Kirazci2013-09-242-2/+30
|\|
| * Add two codegen parameters to nano.Max Cai2013-09-182-2/+30
|/ | | | | | | | | | | | | | | 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
* Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."Wink Saville2013-08-081-2/+2
|\
| * Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.Wink Saville2013-08-071-2/+2
|/ | | | Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
* Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0714-312/+462
|\
| * Fix outer classname for javamicro/javanano.Max Cai2013-08-0514-312/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
|\ \ | |/ |/|
| * Fixed packed repeated serialization.Ulas Kirazci2013-07-313-30/+48
| | | | | | | | | | | | | | Remove buggy memoization. Memoization also is too fragile for the api because the repeated field is public. Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
* | Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-299-31/+265
|\ \ | |/ |/|
| * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-299-31/+265
|/ | | | | | If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
* Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
|\
| * Add test for passing in proto params.Ulas Kirazci2013-07-252-1/+25
| | | | | | | | | | | | Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
* | Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-268-24/+117
|\ \ | |/ |/|
| * Per-file java_multiple_files flag.Max Cai2013-07-258-24/+117
|/ | | | | | | | | | | | | | | 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
* am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-234-4/+97
|\ | | | | | | | | * commit '19c4090eddf0eb4d65d1b41f283368c5e0f615a1': Allow NaN/+inf/-inf defaults in micro/nano.
| * Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-234-4/+97
| |\
| | * Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-234-4/+97
| |/ | | | | | | | | | | | | | | 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
* | am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
|\| | | | | | | | | * commit 'a400007ed570bbcc638c05c59727b3527238ec70': Add contribution instructions for nano.
| * Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| |\
| | * Add contribution instructions for nano.Ulas Kirazci2013-07-191-0/+18
| | | | | | | | | | | | Change-Id: Ie110d182a84258ab5bb3ba1f67c6ada6be476c7e
* | | am aad4b307: Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
|\| | | | | | | | | | | | | | * commit 'aad4b3074456fb1acec6e64596d5c18d716ac146': Update nano to serialize java keywords properly.
| * | Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| |\ \ | | |/ | |/|
| | * Update nano to serialize java keywords properly.Tom Chao2013-07-1910-11/+72
| |/ | | | | | | Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
* | am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without ↵Ulas Kirazci2013-07-093-4/+13
|\| | | | | | | | | | | | | casting." * commit '8cf17a8fbab128bda57c573e2ef7e0fafea39269': Make it possible to use MessageNano.mergeFrom without casting.
| * Merge "Make it possible to use MessageNano.mergeFrom without casting."Ulas Kirazci2013-07-093-4/+13
| |\
| | * Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-083-4/+13
| |/ | | | | | | | | | | | | | | | | | | You can now do: MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes); without having to cast the message returned from mergeFrom. Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
* | am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-090-0/+0
|\| | | | | | | | | * commit 'eda87c5cad8cf84768bcb31d4762c6ec35a6b87d': Fix vanilla make build.
* | am 728a8b78: Merge "Fix the build"Wink Saville2013-07-090-0/+0
|\| | | | | | | | | * commit '728a8b78917ded5ea0f3f9c331810aedcb5353f9': Fix the build
* | am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2514-25/+806
|\| | | | | | | | | * commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a': Nano support for extensions and unknown fields.
| * Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2514-25/+806
| |\
| | * Nano support for extensions and unknown fields.Brian Duff2013-06-2414-25/+806
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 9459b5c4: Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
|\| | | | | | | | | * commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac': Fix enum field references with java_multiple_files.
| * Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
| |\
| | * Fix enum field references with java_multiple_files.Brian Duff2013-06-072-4/+18
| |/ | | | | | | | | | | | | | | | | 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
* | am 6f59b383: Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
|\| | | | | | | | | * commit '6f59b38386c8ff883c8e9e0a76068fa07d95bfb1': Add toString() method to MessageNano.
| * Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
| |\
| | * Add toString() method to MessageNano.Andrew Flynn2013-06-043-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All of the real work for printing the proto is actually done in MessageNanoPrinter. - Uses reflection to find proto-defined fields and prints those. - Prints all fields, even defaults and nulls. - Also added a simple test to make sure it handles all proto types well. Tried not to make the test too brittle (but hey it's testing a toString() so how flexible can it be) Change-Id: I3e360ef8b0561041e010c1f3445ec45ecdcd2559
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 09:37:36 +0000