History log of /external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
21a20ad7bd239b9120a5426f4a793bc9c213558f 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
b0575e93e4c39dec69365b850088a1eb7f82c5b3 04-Jun-2016 Tamas Berghammer <tberghammer@google.com> Update from protobuf v2.6.1 to protobuf 3.0.0-beta-3

This change just copies the upstream code into the repository without
fixing the Android.mk or fixing the possible cmpile errors. All of those
will be fixed with foloowup CLs.

Bug: b/28974522
Change-Id: I79fb3966dbef85915965692fa6ab14dc611ed9ea
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
a8261e510af46b7c045ee7a4cc9ac732783b2ab4 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
30d873bd66f50a6021de5d44d7ee5b8a809b0524 11-Feb-2015 Jeff Davidson <jpd@google.com> Generate @IntDef annotations for nanoproto enums.

@IntDef is a support library annotation which allows build tools to
determine the valid set of values for a given integer field when that
field is intended to be restricted like an enum. This avoids the
overhead of enums while still allowing for compile-time type checking
in most circumstances.

Change-Id: Iee02e0b49a8e069f6456572f538e0a0d301fdfd5
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
bcf45045f229edab8c2589c1f561e7b7495a763b 01-Oct-2014 Brian Duff <bduff@google.com> Add clone() method support for nano.

Upstreamed from Another Place (cr/57247854).

Change-Id: I2aaf59544c0f5ae21a51891d8a5eeda1dc722c90
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
339478eea8a7889d1c086d216f72fa63c1b5307d 30-Sep-2014 Brian Duff <bduff@google.com> Adds a primitive enum mode for reftypes.

This is a compatibility shim.

Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
d888895a3b5cf764856d3a94ed526bf9994c1800 15-Jan-2014 Max Cai <maxtroy@google.com> Add validation when parsing enum fields.

Invalid values from the wire are silently ignored.
Unlike full/lite, the invalid values are not stored into the
unknown fields, because there's no way to get them out from
Nano's unknown fields without a matching Extension.

Edited README and slightly moved it towards a standalone
section for Nano, independent of the Micro section.

Change-Id: I2c1eb07f4d6d8f3aea242b8ddd95b9c966f3f177
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
f84177299a76759be1eb925093b059aef246fc0e 10-Jan-2014 Max Cai <maxtroy@google.com> Don't serialize required fields whose 'has' flags are unset.

Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
5cc242074f189837b38e7768b57ccfb0bca258df 09-Oct-2013 Max Cai <maxtroy@google.com> Avoid class initializers to help ProGuard.

Class initializers prevent ProGuard from inlining any methods
because it thinks the class initializer may have side effects.
This is true for static methods, but instance methods can still
be inlined, because to have an instance you will have touched
the class and any class initializers would have run. But
ProGuard only starts inlining instance methods of classes with
class initializers from v4.11b6, and Android uses v4.4 now.

This change tries to avoid the class initializers as much as
possible, by delaying the initialization of the empty array and
some fields' saved defaults until when they're needed. However,
if the message hosts any extensions, they must be public static
final and therefore introducing the class initializer. In that
case we won't bother with lazy initialization.

Change-Id: I00d8296f6eb0023112b93ee135cdb28dbd52b0b8
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
fea3fd5cb6ff88b51da60b1f33004944d93a9fce 13-Nov-2013 Max Cai <maxtroy@google.com> Align with main: two ways of parsing repeated packable fields.

It is a requirement for parsing code to handle packed and unpacked
forms on the wire for repeated packable fields. This change aligns
the javanano's behavior with the java's.

Bonus: optimize array length calculation when parsing repeated
fixed-size-element-type fields.

Bonus 2: lose "xMemoizedSerializedSize" for repeated enum fields,
and make the serialized size calculation match that for repeated
int32 fields.

Change-Id: I8a06103d9290234adb46b0971b5ed155544fe86a
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
ccc48faf20dbf3b3cddcffe78d198876d543529b 16-Oct-2013 Brian Duff <bduff@google.com> Implement hashCode() and equals() behind a generator option.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
b15a1b379f896e371ca3375bdf51dd4a9a0268af 16-Oct-2013 Max Cai <maxtroy@google.com> Feature request: set() and clear() accessors return this

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
286271f75aa6ff1f3746379b77d6dc55415baa16 14-Oct-2013 Max Cai <maxtroy@google.com> Make generated code more aligned with Google Java style.

- 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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
334a7d1117a576bc6010c14677fb6444639c1dda 15-Oct-2013 Max Cai <maxtroy@google.com> Fix repeated field merging semantics.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
e03e9f4b5774c0ffe04140d83bbdb532863b1720 09-Oct-2013 Brian Duff <bduff@google.com> Protect against null repeated fields.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
5ae438cf71487d5bc8cb5c0d0e637f976734d110 11-Oct-2013 Max Cai <maxtroy@google.com> Remove all field initializers and let ctor call clear().

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
0b8579237336f221711a0aac42400eb31a58fed3 01-Oct-2013 Brian Duff <bduff@google.com> Add reftypes field generator option.

This option generates fields as reference types, and serializes
based on nullness.

Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5
Signed-off-by: Brian Duff <bduff@google.com>
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
e74fe623e115237968a3de1143d7cdb4df710858 20-Sep-2013 Max Cai <maxtroy@google.com> Accessor style for optional fields.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
35d9fd84ff1d9ecdb91156b757cc9fdcc3f25249 01-Apr-2013 Ulas Kirazci <ulas@google.com> Add an option to inspect "has" state upon parse.

If has is set, also always serialize.

Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
f4e01452f159ae6b53f5edd25fa647ca2919ae10 18-Jul-2013 Tom Chao <chaot@google.com> Update nano to serialize java keywords properly.

Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
710ca66fdd31db8f3920b122292bdc3250d5aada 08-Apr-2013 Ficus Kirkpatrick <ficus@android.com> Don't use Arrays.copyOf in generated code.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
0f1c4eb967517e21701a3b425d115baff5d15b4f 04-Apr-2013 Ulas Kirazci <ulas@google.com> Prevent conflicts between local and proto variable names.

Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
64d8d8f89050c5ada85341f967af391f4716a7cb 15-Mar-2013 Ulas Kirazci <ulas@google.com> Nano protobufs.

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
/external/protobuf/src/google/protobuf/compiler/javanano/javanano_enum_field.cc