Skip to content

P
protobuf
Commit 59e39cda authored by Max Cai's avatar Max Cai Committed by Android Git Automerger
Browse files
Options

am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" 

* commit 'cea499acf68b35921b956785c26c0e6f18c241c1':
  Nano: don't generate accessor methods for nested methods
parents f5b69590 482bf524
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 138 deletions
java/README.txt
View file @ 59e39cda
...@@ -507,9 +507,9 @@ optional_field_style={default,accessors,reftypes} (default: default) ...@@ -507,9 +507,9 @@ optional_field_style={default,accessors,reftypes} (default: default)
useful when you need to serialize a field with the default value, or check useful when you need to serialize a field with the default value, or check
if a field has been explicitly set to its default value from the wire. if a field has been explicitly set to its default value from the wire.
In the 'accessors' style, required fields are still translated to one In the 'accessors' style, required and nested message fields are still
public mutable Java field each, and repeated fields are still translated translated to one public mutable Java field each, repeated fields are still
to arrays. No accessors are generated for them. translated to arrays. No accessors are generated for them.
IMPORTANT: When using the 'accessors' style, ProGuard should always IMPORTANT: When using the 'accessors' style, ProGuard should always
be enabled with optimization (don't use -dontoptimize) and allowing be enabled with optimization (don't use -dontoptimize) and allowing
......
java/src/test/java/com/google/protobuf/NanoTest.java
View file @ 59e39cda
...@@ -2271,9 +2271,10 @@ public class NanoTest extends TestCase { ...@@ -2271,9 +2271,10 @@ public class NanoTest extends TestCase {
public void testNanoWithAccessorsBasic() throws Exception { public void testNanoWithAccessorsBasic() throws Exception {
TestNanoAccessors msg = new TestNanoAccessors(); TestNanoAccessors msg = new TestNanoAccessors();
// Makes sure required and repeated fields are still public fields // Makes sure required, repeated, and message fields are still public
msg.id = 3; msg.id = 3;
msg.repeatedBytes = new byte[2][3]; msg.repeatedBytes = new byte[2][3];
msg.optionalNestedMessage = null;
// Test accessors // Test accessors
assertEquals(0, msg.getOptionalInt32()); assertEquals(0, msg.getOptionalInt32());
...@@ -2295,10 +2296,6 @@ public class NanoTest extends TestCase { ...@@ -2295,10 +2296,6 @@ public class NanoTest extends TestCase {
msg.setOptionalString(null); msg.setOptionalString(null);
fail(); fail();
} catch (NullPointerException expected) {} } catch (NullPointerException expected) {}
try {
msg.setOptionalNestedMessage(null);
fail();
} catch (NullPointerException expected) {}
// Test has bit on bytes field with defaults and clear() re-clones the default array // Test has bit on bytes field with defaults and clear() re-clones the default array
assertFalse(msg.hasDefaultBytes()); assertFalse(msg.hasDefaultBytes());
...@@ -2352,8 +2349,8 @@ public class NanoTest extends TestCase { ...@@ -2352,8 +2349,8 @@ public class NanoTest extends TestCase {
assertFalse(msg.hasDefaultBytes()); assertFalse(msg.hasDefaultBytes());
assertFalse(msg.hasDefaultFloatNan()); assertFalse(msg.hasDefaultFloatNan());
assertFalse(msg.hasDefaultNestedEnum()); assertFalse(msg.hasDefaultNestedEnum());
msg.setOptionalNestedMessage(new TestNanoAccessors.NestedMessage()); msg.optionalNestedMessage = new TestNanoAccessors.NestedMessage();
msg.getOptionalNestedMessage().setBb(2); msg.optionalNestedMessage.setBb(2);
msg.setOptionalNestedEnum(TestNanoAccessors.BAZ); msg.setOptionalNestedEnum(TestNanoAccessors.BAZ);
msg.setDefaultInt32(msg.getDefaultInt32()); msg.setDefaultInt32(msg.getDefaultInt32());
} }
...@@ -2366,8 +2363,8 @@ public class NanoTest extends TestCase { ...@@ -2366,8 +2363,8 @@ public class NanoTest extends TestCase {
// Has fields true upon parse. // Has fields true upon parse.
TestNanoAccessors newMsg = TestNanoAccessors.parseFrom(result); TestNanoAccessors newMsg = TestNanoAccessors.parseFrom(result);
assertEquals(2, newMsg.getOptionalNestedMessage().getBb()); assertEquals(2, newMsg.optionalNestedMessage.getBb());
assertTrue(newMsg.getOptionalNestedMessage().hasBb()); assertTrue(newMsg.optionalNestedMessage.hasBb());
assertEquals(TestNanoAccessors.BAZ, newMsg.getOptionalNestedEnum()); assertEquals(TestNanoAccessors.BAZ, newMsg.getOptionalNestedEnum());
assertTrue(newMsg.hasOptionalNestedEnum()); assertTrue(newMsg.hasOptionalNestedEnum());
...@@ -2376,6 +2373,38 @@ public class NanoTest extends TestCase { ...@@ -2376,6 +2373,38 @@ public class NanoTest extends TestCase {
assertEquals(41, newMsg.getDefaultInt32()); assertEquals(41, newMsg.getDefaultInt32());
} }
public void testNanoWithAccessorsPublicFieldTypes() throws Exception {
TestNanoAccessors msg = new TestNanoAccessors();
assertNull(msg.optionalNestedMessage);
assertEquals(0, msg.id);
assertEquals(0, msg.repeatedNestedEnum.length);
TestNanoAccessors newMsg = TestNanoAccessors.parseFrom(MessageNano.toByteArray(msg));
assertNull(newMsg.optionalNestedMessage);
assertEquals(0, newMsg.id);
assertEquals(0, newMsg.repeatedNestedEnum.length);
TestNanoAccessors.NestedMessage nestedMessage = new TestNanoAccessors.NestedMessage();
nestedMessage.setBb(5);
newMsg.optionalNestedMessage = nestedMessage;
newMsg.id = -1;
newMsg.repeatedNestedEnum = new int[] { TestAllTypesNano.FOO };
TestNanoAccessors newMsg2 = TestNanoAccessors.parseFrom(MessageNano.toByteArray(newMsg));
assertEquals(nestedMessage.getBb(), newMsg2.optionalNestedMessage.getBb());
assertEquals(-1, newMsg2.id);
assertEquals(TestAllTypesNano.FOO, newMsg2.repeatedNestedEnum[0]);
newMsg2.optionalNestedMessage = null;
newMsg2.id = 0;
newMsg2.repeatedNestedEnum = null;
TestNanoAccessors newMsg3 = TestNanoAccessors.parseFrom(MessageNano.toByteArray(newMsg2));
assertNull(newMsg3.optionalNestedMessage);
assertEquals(0, newMsg3.id);
assertEquals(0, newMsg3.repeatedNestedEnum.length);
}
public void testNanoWithAccessorsSerialize() throws Exception { public void testNanoWithAccessorsSerialize() throws Exception {
TestNanoAccessors msg = new TestNanoAccessors(); TestNanoAccessors msg = new TestNanoAccessors();
msg.setOptionalInt32(msg.getOptionalInt32()); msg.setOptionalInt32(msg.getOptionalInt32());
...@@ -2383,7 +2412,7 @@ public class NanoTest extends TestCase { ...@@ -2383,7 +2412,7 @@ public class NanoTest extends TestCase {
msg.setOptionalBytes(msg.getOptionalBytes()); msg.setOptionalBytes(msg.getOptionalBytes());
TestNanoAccessors.NestedMessage nestedMessage = new TestNanoAccessors.NestedMessage(); TestNanoAccessors.NestedMessage nestedMessage = new TestNanoAccessors.NestedMessage();
nestedMessage.setBb(nestedMessage.getBb()); nestedMessage.setBb(nestedMessage.getBb());
msg.setOptionalNestedMessage(nestedMessage); msg.optionalNestedMessage = nestedMessage;
msg.setOptionalNestedEnum(msg.getOptionalNestedEnum()); msg.setOptionalNestedEnum(msg.getOptionalNestedEnum());
msg.setDefaultInt32(msg.getDefaultInt32()); msg.setDefaultInt32(msg.getDefaultInt32());
msg.setDefaultString(msg.getDefaultString()); msg.setDefaultString(msg.getDefaultString());
...@@ -2400,8 +2429,7 @@ public class NanoTest extends TestCase { ...@@ -2400,8 +2429,7 @@ public class NanoTest extends TestCase {
assertTrue(newMsg.hasOptionalInt32()); assertTrue(newMsg.hasOptionalInt32());
assertTrue(newMsg.hasOptionalString()); assertTrue(newMsg.hasOptionalString());
assertTrue(newMsg.hasOptionalBytes()); assertTrue(newMsg.hasOptionalBytes());
assertTrue(newMsg.hasOptionalNestedMessage()); assertTrue(newMsg.optionalNestedMessage.hasBb());
assertTrue(newMsg.getOptionalNestedMessage().hasBb());
assertTrue(newMsg.hasOptionalNestedEnum()); assertTrue(newMsg.hasOptionalNestedEnum());
assertTrue(newMsg.hasDefaultInt32()); assertTrue(newMsg.hasDefaultInt32());
assertTrue(newMsg.hasDefaultString()); assertTrue(newMsg.hasDefaultString());
...@@ -2411,7 +2439,7 @@ public class NanoTest extends TestCase { ...@@ -2411,7 +2439,7 @@ public class NanoTest extends TestCase {
assertEquals(0, newMsg.getOptionalInt32()); assertEquals(0, newMsg.getOptionalInt32());
assertEquals(0, newMsg.getOptionalString().length()); assertEquals(0, newMsg.getOptionalString().length());
assertEquals(0, newMsg.getOptionalBytes().length); assertEquals(0, newMsg.getOptionalBytes().length);
assertEquals(0, newMsg.getOptionalNestedMessage().getBb()); assertEquals(0, newMsg.optionalNestedMessage.getBb());
assertEquals(TestNanoAccessors.FOO, newMsg.getOptionalNestedEnum()); assertEquals(TestNanoAccessors.FOO, newMsg.getOptionalNestedEnum());
assertEquals(41, newMsg.getDefaultInt32()); assertEquals(41, newMsg.getDefaultInt32());
assertEquals("hello", newMsg.getDefaultString()); assertEquals("hello", newMsg.getDefaultString());
...@@ -2856,15 +2884,15 @@ public class NanoTest extends TestCase { ...@@ -2856,15 +2884,15 @@ public class NanoTest extends TestCase {
.setOptionalInt32(5) .setOptionalInt32(5)
.setOptionalString("Hello") .setOptionalString("Hello")
.setOptionalBytes(new byte[] {1, 2, 3}) .setOptionalBytes(new byte[] {1, 2, 3})
.setOptionalNestedMessage(new TestNanoAccessors.NestedMessage().setBb(27))
.setOptionalNestedEnum(TestNanoAccessors.BAR) .setOptionalNestedEnum(TestNanoAccessors.BAR)
.setDefaultFloatNan(1.0f); .setDefaultFloatNan(1.0f);
message.optionalNestedMessage = new TestNanoAccessors.NestedMessage().setBb(27);
message.repeatedInt32 = new int[] { 5, 6, 7, 8 }; message.repeatedInt32 = new int[] { 5, 6, 7, 8 };
message.repeatedString = new String[] { "One", "Two" }; message.repeatedString = new String[] { "One", "Two" };
message.repeatedBytes = new byte[][] { { 2, 7 }, { 2, 7 } }; message.repeatedBytes = new byte[][] { { 2, 7 }, { 2, 7 } };
message.repeatedNestedMessage = new TestNanoAccessors.NestedMessage[] { message.repeatedNestedMessage = new TestNanoAccessors.NestedMessage[] {
message.getOptionalNestedMessage(), message.optionalNestedMessage,
message.getOptionalNestedMessage() message.optionalNestedMessage
}; };
message.repeatedNestedEnum = new int[] { message.repeatedNestedEnum = new int[] {
TestAllTypesNano.BAR, TestAllTypesNano.BAR,
......
src/google/protobuf/compiler/javanano/javanano_field.cc
View file @ 59e39cda
...@@ -78,8 +78,9 @@ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor, const Params ...@@ -78,8 +78,9 @@ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor, const Params
FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field, FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field,
const Params &params, int* next_has_bit_index) { const Params &params, int* next_has_bit_index) {
JavaType java_type = GetJavaType(field);
if (field->is_repeated()) { if (field->is_repeated()) {
switch (GetJavaType(field)) { switch (java_type) {
case JAVATYPE_MESSAGE: case JAVATYPE_MESSAGE:
return new RepeatedMessageFieldGenerator(field, params); return new RepeatedMessageFieldGenerator(field, params);
case JAVATYPE_ENUM: case JAVATYPE_ENUM:
...@@ -87,14 +88,13 @@ FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field, ...@@ -87,14 +88,13 @@ FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field,
default: default:
return new RepeatedPrimitiveFieldGenerator(field, params); return new RepeatedPrimitiveFieldGenerator(field, params);
} }
} else if (params.optional_field_accessors() && field->is_optional()) { } else if (params.optional_field_accessors() && field->is_optional()
&& java_type != JAVATYPE_MESSAGE) {
// We need a has-bit for each primitive/enum field because their default // We need a has-bit for each primitive/enum field because their default
// values could be same as explicitly set values. But we don't need it // values could be same as explicitly set values. But we don't need it
// for a message field because they have no defaults and Nano uses 'null' // for a message field because they have no defaults and Nano uses 'null'
// for unset messages, which cannot be set explicitly. // for unset messages, which cannot be set explicitly.
switch (GetJavaType(field)) { switch (java_type) {
case JAVATYPE_MESSAGE:
return new AccessorMessageFieldGenerator(field, params);
case JAVATYPE_ENUM: case JAVATYPE_ENUM:
return new AccessorEnumFieldGenerator( return new AccessorEnumFieldGenerator(
field, params, (*next_has_bit_index)++); field, params, (*next_has_bit_index)++);
...@@ -103,7 +103,7 @@ FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field, ...@@ -103,7 +103,7 @@ FieldGenerator* FieldGeneratorMap::MakeGenerator(const FieldDescriptor* field,
field, params, (*next_has_bit_index)++); field, params, (*next_has_bit_index)++);
} }
} else { } else {
switch (GetJavaType(field)) { switch (java_type) {
case JAVATYPE_MESSAGE: case JAVATYPE_MESSAGE:
return new MessageFieldGenerator(field, params); return new MessageFieldGenerator(field, params);
case JAVATYPE_ENUM: case JAVATYPE_ENUM:
......
src/google/protobuf/compiler/javanano/javanano_message_field.cc
View file @ 59e39cda
...@@ -149,97 +149,6 @@ GenerateHashCodeCode(io::Printer* printer) const { ...@@ -149,97 +149,6 @@ GenerateHashCodeCode(io::Printer* printer) const {
// =================================================================== // ===================================================================
AccessorMessageFieldGenerator::
AccessorMessageFieldGenerator(
const FieldDescriptor* descriptor, const Params& params)
: FieldGenerator(params), descriptor_(descriptor) {
SetMessageVariables(params, descriptor, &variables_);
}
AccessorMessageFieldGenerator::~AccessorMessageFieldGenerator() {}
void AccessorMessageFieldGenerator::
GenerateMembers(io::Printer* printer) const {
printer->Print(variables_,
"private $type$ $name$_;\n"
"public $type$ get$capitalized_name$() {\n"
" return $name$_;\n"
"}\n"
"public $message_name$ set$capitalized_name$($type$ value) {\n"
" if (value == null) {\n"
" throw new java.lang.NullPointerException();\n"
" }\n"
" $name$_ = value;\n"
" return this;\n"
"}\n"
"public boolean has$capitalized_name$() {\n"
" return $name$_ != null;\n"
"}\n"
"public $message_name$ clear$capitalized_name$() {\n"
" $name$_ = null;\n"
" return this;"
"}\n");
}
void AccessorMessageFieldGenerator::
GenerateClearCode(io::Printer* printer) const {
printer->Print(variables_,
"$name$_ = null;\n");
}
void AccessorMessageFieldGenerator::
GenerateMergingCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($name$_ == null) {\n"
" $name$_ = new $type$();\n"
"}\n");
if (descriptor_->type() == FieldDescriptor::TYPE_GROUP) {
printer->Print(variables_,
"input.readGroup($name$_, $number$);\n");
} else {
printer->Print(variables_,
"input.readMessage($name$_);\n");
}
}
void AccessorMessageFieldGenerator::
GenerateSerializationCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($name$_ != null) {\n"
" output.write$group_or_message$($number$, $name$_);\n"
"}\n");
}
void AccessorMessageFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($name$_ != null) {\n"
" size += com.google.protobuf.nano.CodedOutputByteBufferNano\n"
" .compute$group_or_message$Size($number$, $name$_);\n"
"}\n");
}
void AccessorMessageFieldGenerator::
GenerateEqualsCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($name$_ == null) {\n"
" if (other.$name$_ != null) {\n"
" return false;\n"
" }\n"
"} else if (!$name$_.equals(other.$name$_)) {\n"
" return false;\n"
"}\n");
}
void AccessorMessageFieldGenerator::
GenerateHashCodeCode(io::Printer* printer) const {
printer->Print(variables_,
"result = 31 * result + ($name$_ == null ? 0 : $name$_.hashCode());\n");
}
// ===================================================================
RepeatedMessageFieldGenerator:: RepeatedMessageFieldGenerator::
RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor, const Params& params) RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor, const Params& params)
: FieldGenerator(params), descriptor_(descriptor) { : FieldGenerator(params), descriptor_(descriptor) {
......
src/google/protobuf/compiler/javanano/javanano_message_field.h
View file @ 59e39cda
...@@ -65,28 +65,6 @@ class MessageFieldGenerator : public FieldGenerator { ...@@ -65,28 +65,6 @@ class MessageFieldGenerator : public FieldGenerator {
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator); GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
}; };
class AccessorMessageFieldGenerator : public FieldGenerator {
public:
explicit AccessorMessageFieldGenerator(
const FieldDescriptor* descriptor, const Params& params);
~AccessorMessageFieldGenerator();
// implements FieldGenerator ---------------------------------------
void GenerateMembers(io::Printer* printer) const;
void GenerateClearCode(io::Printer* printer) const;
void GenerateMergingCode(io::Printer* printer) const;
void GenerateSerializationCode(io::Printer* printer) const;
void GenerateSerializedSizeCode(io::Printer* printer) const;
void GenerateEqualsCode(io::Printer* printer) const;
void GenerateHashCodeCode(io::Printer* printer) const;
private:
const FieldDescriptor* descriptor_;
map<string, string> variables_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(AccessorMessageFieldGenerator);
};
class RepeatedMessageFieldGenerator : public FieldGenerator { class RepeatedMessageFieldGenerator : public FieldGenerator {
public: public:
explicit RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor, explicit RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment