aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am afaf74ce: Merge "Fix repeated field merging semantics."Max Cai2013-10-166-37/+193
|\ | | | | | | | | * commit 'afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc': Fix repeated field merging semantics.
| * Merge "Fix repeated field merging semantics."Max Cai2013-10-166-37/+193
| |\
| | * Fix repeated field merging semantics.Max Cai2013-10-156-37/+193
| |/ | | | | | | | | | | | | | | | | | | The public doc states that repeated fields are simply concatenated and doesn't impose a different semantics for packed fields. This CL fixes this for packed fields and adds tests covering all cases. Also fixed a bit of missed null-repeated-field treatments. Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2
* | am 63e819ad: Merge "Protect against null repeated fields."Max Cai2013-10-155-21/+78
|\ \ | |/ | | | | | | * commit '63e819adbb4d2d8215f5d3d8297dc50bf2fe3329': Protect against null repeated fields.
| * Merge "Protect against null repeated fields."Max Cai2013-10-155-21/+78
| |\
| | * Protect against null repeated fields.Brian Duff2013-10-145-21/+78
| |/ | | | | | | | | | | | | | | | | There's no distinction between a repeated field being null and being empty. In both cases, nothing is sent on the wire. Clients might for whatever reason inadvertently set a repeated field to null, so protect against that and treat it just as if the field was empty. Change-Id: Ic3846f7f2189d6cfff6f8ef3ca217daecc3c8be7
* | am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into ↵Max Cai2013-10-150-0/+0
|\ \ | | | | | | | | | | | | | | | tomerge * commit 'c85806baedfc98ad5759a990b35ea5b5f1ac4edb':
| * \ Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomergeMax Cai2013-10-1125-104/+1410
| |\ \
* | \ \ am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."Max Cai2013-10-114-14/+18
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * commit '39cee9f1f5cd513a53ac5100eb208ed431f99af0': Remove all field initializers and let ctor call clear().
| * | Merge "Remove all field initializers and let ctor call clear()."Max Cai2013-10-114-14/+18
| |\ \
| | * | Remove all field initializers and let ctor call clear().Max Cai2013-10-114-14/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The field initializers have basically caused the compiled <init> method to inline the whole clear() method, which means if ProGuard is not used or failed to inline or remove clear(), there are two big chunks of code that do the same thing. So why not just call clear() from the ctor. Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0
* | | am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"Ulas Kirazci2013-10-101-3/+51
|\ \ \ | |/ / | | | | | | | | | * commit 'cbb08132821cb56f4e6c5e5f8a0b32f51879782a': Add missing README parts for enum_style and in-repo usage
| * | Merge "Add missing README parts for enum_style and in-repo usage"Ulas Kirazci2013-10-101-3/+51
| |\ \
| | * | Add missing README parts for enum_style and in-repo usageMax Cai2013-10-101-3/+51
| |/ / | | | | | | | | | Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73
* | | am c4a1b547: Merge "Add reftypes field generator option."Ulas Kirazci2013-10-099-29/+287
|\ \ \ | |/ / | | | | | | | | | * commit 'c4a1b547c91178d79f5d2cc2e00b8be922c22fe8': Add reftypes field generator option.
| * | Merge "Add reftypes field generator option."Ulas Kirazci2013-10-099-29/+287
| |\ \
| | * | Add reftypes field generator option.Brian Duff2013-10-079-29/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
* | | | am 44cbb06c: Merge "Fix some indenting issues with set__() function"Wink Saville2013-10-091-10/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '44cbb06c725fbba00464bba9f19dc0ea295406b1': Fix some indenting issues with set__() function
| * | | 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
* | | am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields ↵Ulas Kirazci2013-10-043-2/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | are enabled." * commit '9827c718c45cfa1744a3b0f8fc27dac9cd415603': Fix roundtrip failure with groups when unknown fields are enabled.
| * | 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
* | | am 44dc2f1e: Merge "Implement enum_style=java option."Ulas Kirazci2013-09-288-23/+195
|\ \ \ | |/ / | | | | | | | | | * commit '44dc2f1eaead8d95d3f5a4f80f9da87852053bfb': Implement enum_style=java option.
| * | Merge "Implement enum_style=java option."Ulas Kirazci2013-09-288-23/+195
| |\ \
| | * | Implement enum_style=java option.Max Cai2013-09-258-23/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 0d035e9b: Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2815-63/+719
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0d035e9b3485d26df106ff9118705d8476466674': Accessor style for optional fields.
| * | | Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2815-63/+719
| |\ \ \ | | |/ /
| | * | Accessor style for optional fields.Max Cai2013-09-2315-63/+719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am cc652daa: Merge "Add some bitfield helper methods from 2.4"Ulas Kirazci2013-09-242-0/+102
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cc652daaec7fc6ebf8b12d361444364da257988b': Add some bitfield helper methods from 2.4
| * | | 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
* | | | am 9e6afdf9: Merge "Add two codegen parameters to nano."Ulas Kirazci2013-09-242-2/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9e6afdf96f98259f89aad66367954a247b3e7817': Add two codegen parameters to nano.
| * | | 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 commit '11c3b27d' into fix-mcWink Saville2013-08-131-1/+19
|\ \ \ | |/ / | | / | |/ |/| | | | | * commit '11c3b27d': Add a Gradle build file for the protobuf libraries. Change-Id: Id785093c51eb423576292994a98d42efbbc3fddb
| * Merge "Add a Gradle build file for the protobuf libraries."Wink Saville2013-08-131-0/+68
| |\
| | * Add a Gradle build file for the protobuf libraries.Adam Metcalf2013-08-081-0/+68
| |/ | | | | | | | | | | Has two configurations: micro and nano. Change-Id: I009f956e11cf13694738743a757438ebf181b340
* | am ece98e5f: Merge "Fix checkbuild targets, remove ↵Wink Saville2013-08-081-2/+2
|\ \ | |/ | | | | | | | | | | unittest_enum_mulitplejava_nano.proto." * commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e': Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
| * 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
* | am e7b778b9: Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0827-497/+718
|\ \ | |/ | | | | | | * commit 'e7b778b99f607460ed9ea88a13ec91164cda8537': Fix outer classname for javamicro/javanano.
| * Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0727-497/+718
| |\
| | * Fix outer classname for javamicro/javanano.Max Cai2013-08-0527-497/+718
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | am 87c8e31b: Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
|\ \ \ | |/ / | | | | | | | | | * commit '87c8e31b8c0baa78f979863a9ed10654a1cdca1f': Fixed packed repeated serialization.
| * | 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
* | | am be47f55e: Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
|\ \ \ | |/ / | | | | | | | | | * commit 'be47f55e2f93df84abb55759e49cf381d2745cc5': Add an option to inspect "has" state upon parse.
| * | Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
| |\ \ | | |/ | |/|
| | * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-2910-31/+273
| |/ | | | | | | | | | | If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
generated by cgit v1.1 at 2025-01-10 14:10:13 +0000