aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2011-05-04 06:15:22 +0000
committerliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2011-05-04 06:15:22 +0000
commit02d7015ba8e146c0f3539072e200ca3ea68409da (patch)
treed7c3e57c096587555fd4800db9dc2eefe55b77bc /java
parent5c24564811c08772d090305be36fae82d8f12bbe (diff)
downloadprotobuf-02d7015ba8e146c0f3539072e200ca3ea68409da.tar.gz
protobuf-02d7015ba8e146c0f3539072e200ca3ea68409da.tar.bz2
protobuf-02d7015ba8e146c0f3539072e200ca3ea68409da.zip
Allow String to be used as message names.
Diffstat (limited to 'java')
-rw-r--r--java/src/test/java/com/google/protobuf/test_bad_identifiers.proto20
1 files changed, 20 insertions, 0 deletions
diff --git a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
index 499f099f..9610e9d5 100644
--- a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
+++ b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
@@ -64,6 +64,26 @@ message Object {
optional int32 object = 1;
}
+message String {
+ optional string string = 1;
+}
+
+message Integer {
+ optional int32 integer = 1;
+}
+
+message Long {
+ optional int32 long = 1;
+}
+
+message Float {
+ optional float float = 1;
+}
+
+message Double {
+ optional double double = 1;
+}
+
service TestConflictingMethodNames {
rpc Override(TestMessage) returns (TestMessage);
}