aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update MessageNano#toString() to return mostly valid TextFormat.Nicholas Seckar2013-11-153-40/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of toString is now aligned with that used by non-nano and C++ runtimes, with the exception of groups. Groups should be serialized using a camelized name (e.g. "FooBar" rather than "foo_bar") however the nano runtime does not have information on which fields are groups. Changes are: - bytes fields are output within double-quotes, non-printable characters are output as octal escape sequences (i.e. \NNN); - field identifiers are output in underscored format; - unset fields are not output (rather than printing "null"); - the type name of the root message is not output. With these changes the nano toString, normal toString, and C++'s DebugString all produce equivalent output when given the same message. (Provided that message uses no deprecated features.) Change-Id: Id4791d73822846db29344db9f7bc3781c3e183a6
* | Minimize method count for nanoproto.Tom Chao2013-11-112-2/+84
|/ | | | | | | | | | | - Migrates getCachedSize to the MessageNano parent class to save one method per message. - Create ExtendableMessageNano parent class for protos with extensions, this saves the getExtension and setExtension methods on the relevant messages. - getSerializedSize's default case (with no fields to serialize) also migrate to the parent class, which saves methods on empty messages. - Container classes become interfaces to save the constructor. Change-Id: I81f1a1b6d6a660096835e9df3ea20456655aab4a
* Allow for ref-type arrays containing null elements.Aurash Mahbod2013-11-051-2/+31
| | | | | | | | | | | | | | | | | | | Strip the null elements out before serializing the array. This is helpful in the cases where the user wants to construct an array of an inexact size for serialization. For example: User constructs array of size 5 because they anticipate adding more than 1 element before serialization. Only 3 get added, so the array looks like [Obj, Obj, Obj, null, null]. This would curently crash without this CL. All repeated fields of ref-type elements can contain null elements: repeated strings, repeated bytes, and repeated messages/groups. Change-Id: I117391c868c9a436536d70d6151780e9cc7e8227 Conflicts: src/google/protobuf/compiler/javanano/javanano_message_field.cc
* Implement hashCode() and equals() behind a generator option.Brian Duff2013-10-254-8/+459
| | | | | | | | | | | | | | | | 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-161-0/+6
| | | | | | | | | | | | 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
* Fix repeated field merging semantics.Max Cai2013-10-152-4/+98
| | | | | | | | | | 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-142-3/+53
| | | | | | | | | 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
* Add missing README parts for enum_style and in-repo usageMax Cai2013-10-101-3/+51
| | | | Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73
* Add reftypes field generator option.Brian Duff2013-10-073-19/+120
| | | | | | | | This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
* Fix roundtrip failure with groups when unknown fields are enabled.Nicholas Seckar2013-10-042-2/+24
| | | | | | | | | | | | | | | | 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-253-4/+34
| | | | | | | | | | 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-233-7/+194
| | | | | | | | | | | 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 "Fix outer classname for javamicro/javanano."Wink Saville2013-08-074-92/+334
|\
| * Fix outer classname for javamicro/javanano.Max Cai2013-08-054-92/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-311-0/+19
|\ \ | |/ |/|
| * Fixed packed repeated serialization.Ulas Kirazci2013-07-311-0/+19
| | | | | | | | | | | | | | 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-293-0/+112
|/ | | | | | If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
* Merge "Add test for passing in proto params."Ulas Kirazci2013-07-261-1/+2
|\
| * Add test for passing in proto params.Ulas Kirazci2013-07-251-1/+2
| | | | | | | | | | | | Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
* | Per-file java_multiple_files flag.Max Cai2013-07-253-2/+37
|/ | | | | | | | | | | | | | | 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-232-0/+38
| | | | | | | | 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
* 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
* | Update nano to serialize java keywords properly.Tom Chao2013-07-191-0/+6
|/ | | | Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
* Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-082-3/+12
| | | | | | | | | | 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-4/+503
| | | | | | | | | | | | | | | | | | | | 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
* 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
* | Fix javanano compiler generating uncompileable java code. This happenedBrian Duff2013-06-051-0/+1
|/ | | | | | | for enums when java_multiple_files=true. Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7 Signed-off-by: Brian Duff <bduff@google.com>
* Fix typos in protobuf readme.Matt Thrailkill2013-04-261-7/+7
| | | | | Change-Id: Ifa3c8674482ae9575df459a3e76e9f8b4a9296b5 Signed-off-by: Matt Thrailkill <mthrailkill@google.com>
* Nano protobufs.Ulas Kirazci2013-04-019-0/+4213
| | | | | | | | | | | | | | | | | | 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
* When computing Group and Message size use getSerializedSize.Wink Saville2012-06-111-2/+2
| | | | | Bug: 6589939 Change-Id: I3050a99b08edf48301314163d41ea6f8080ffcdb
* Fix bug in skipRawBytes if request is larger than buffer.Wink Saville2011-06-204-2/+95
| | | | | | | Original solution by Scott Barta this change adds tests and also fixes the same bug that was in CodedInputStream. Change-Id: Idb49691822b3f292c5092edc52db4e153e9da49a
* Remove vestigial references to StringUtf8Micro.Wink Saville2010-10-062-5/+3
| | | | Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
* Changed speed optimization for strings.Wink Saville2010-06-074-935/+32
| | | | | | | | | | | 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
* Add support for Java micro protobuf's to protobuf-2.3.0.Wink Saville2010-05-2911-0/+5611
| | | | | | See README.android for additional information. Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
* Add protobuf 2.3.0 sourcesWink Saville2010-05-2938-5795/+770
| | | | | | | 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-2811-1/+5611
| | | | | | See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
* Add protobuf 2.2.0a sourcesWink Saville2010-05-2745-0/+21192
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-05-16 06:01:28 +0000