aboutsummaryrefslogtreecommitdiffstats
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Implement hashCode() and equals() behind a generator option.Brian Duff2013-10-2513-57/+456
| | | | | | | | | | | | | | | | The option is only called 'generate_equals' because: - equals() is the main thing; hashCode() is there only to complement equals(); - it's shorter; - toString() should not be included in this option because it's more for debugging and it's more likely to stop ProGuard from working well. Also shortened the "has bit" expression; was ((bitField & mask) == mask), now ((bitField & mask) != 0). Both the Java code and the bytecode are slightly shorter. Change-Id: Ic309a08a60883bf454eb6612679aa99611620e76
* Feature request: set() and clear() accessors return thisMax Cai2013-10-163-17/+27
| | | | | | | | | | | | Also pre-inlines set() and has() in serialization code. This could theoretically help ProGuard: the message class size is usually large, and because of this only, it may refuse to inline an accessor into the serialization code, and as a result keeps the accessor intact. Chances are, after pre-inlining all accessor calls within the message class, those accessors become unused or single-use, so there are more reasons for ProGuard to inline and then remove them. Change-Id: I57decbe0b2533c1be21439de0aad15f49c7024dd
* Make generated code more aligned with Google Java style.Max Cai2013-10-166-55/+78
| | | | | | | | | | | | | | - Blank line after opening a message class (but not an enum interface). - Let all code blocks insert blank lines before themselves. This applies to 'package' statement, all message classes, enum classes or constant groups, extensions, bitfields, proto fields (one block per field; i.e. accessors don't have blank lines among them), and basic MessageNano methods. In this case we don't need to guess what the next block is and create blank lines for it. - Fixed some newline/indent errors. - Only one SuppressWarnings("hiding") per file. Change-Id: I865f52ad4fb6ea3b3a98b97ac9d78d19fc46c858
* Fix repeated field merging semantics.Max Cai2013-10-154-33/+95
| | | | | | | | | | 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
* Protect against null repeated fields.Brian Duff2013-10-143-18/+25
| | | | | | | | | 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
* 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
* Merge "Add reftypes field generator option."Ulas Kirazci2013-10-096-10/+167
|\
| * Add reftypes field generator option.Brian Duff2013-10-076-10/+167
| | | | | | | | | | | | | | | | This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
* | 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
* Fix roundtrip failure with groups when unknown fields are enabled.Nicholas Seckar2013-10-041-0/+6
| | | | | | | | | | | | | | | | 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
* Implement enum_style=java option.Max Cai2013-09-255-19/+161
| | | | | | | | | | 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
* Accessor style for optional fields.Max Cai2013-09-2312-56/+525
| | | | | | | | | | | 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
* Add some bitfield helper methods from 2.4Max Cai2013-09-202-0/+102
| | | | Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e
* 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 outer classname for javamicro/javanano."Wink Saville2013-08-0723-405/+384
|\
| * Fix outer classname for javamicro/javanano.Max Cai2013-08-0523-405/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-312-30/+29
|\ \ | |/ |/|
| * Fixed packed repeated serialization.Ulas Kirazci2013-07-312-30/+29
| | | | | | | | | | | | | | Remove buggy memoization. Memoization also is too fragile for the api because the repeated field is public. Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
* | Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-297-31/+161
|/ | | | | | If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
* Per-file java_multiple_files flag.Max Cai2013-07-2513-41/+193
| | | | | | | | | | | | | | | 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
* Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-235-8/+103
| | | | | | | | 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
* Update nano to serialize java keywords properly.Tom Chao2013-07-199-11/+66
| | | | Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
* Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-081-1/+1
| | | | | | | | | | You can now do: MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes); without having to cast the message returned from mergeFrom. Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
* Nano support for extensions and unknown fields.Brian Duff2013-06-247-21/+308
| | | | | | | | | | | | | | | | | | | | 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
* 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
* Fix javanano compiler generating uncompileable java code. This happenedBrian Duff2013-06-052-0/+64
| | | | | | | for enums when java_multiple_files=true. Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7 Signed-off-by: Brian Duff <bduff@google.com>
* Don't use Arrays.copyOf in generated code.Ficus Kirkpatrick2013-04-083-4/+20
| | | | | | | 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
* Prevent conflicts between local and proto variable names.Ulas Kirazci2013-04-038-118/+68
| | | | | | | Prefix access to proto variable names with "this.". Also remove unused GenerateMergingCode. Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
* Nano protobufs.Ulas Kirazci2013-04-0125-0/+3717
| | | | | | | | | | | | | | | | | | 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
* Generate "modern" java to reduce warningsAndy Stadler2012-06-271-4/+20
| | | | | | | | | | | | * @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
* Changed speed optimization for strings.Wink Saville2010-06-071-66/+82
| | | | | | | | | | | 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
* Fix bug in generating enum class name.Wink Saville2010-06-021-11/+24
| | | | | | | I was not properly constructing the enum class name if there was a period in the protobuf package name. Change-Id: I71e51d9745702fa89841ad714282afe8b42a3425
* Add support for Java micro protobuf's to protobuf-2.3.0.Wink Saville2010-05-2925-0/+4163
| | | | | | See README.android for additional information. Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
* Add protobuf 2.3.0 sourcesWink Saville2010-05-29143-6550/+10536
| | | | | | | This is the contents of protobuf-2.3.0.tar.bz2 from http://code.google.com/p/protobuf/downloads/list. Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
* Add support for Java micro protobuf's to protobuf-2.2.0a.Wink Saville2010-05-2825-0/+4163
| | | | | | See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
* Add protobuf 2.2.0a sourcesWink Saville2010-05-27174-0/+82558
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
generated by cgit v1.1 at 2024-06-12 03:05:03 +0000