Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: third_party/protobuf/objectivec/Tests/unittest_deprecated_file.proto

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2016 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/
4 // 3 //
5 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
7 // met: 6 // met:
8 // 7 //
9 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
11 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 11 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 12 // in the documentation and/or other materials provided with the
14 // distribution. 13 // distribution.
15 // * Neither the name of Google Inc. nor the names of its 14 // * Neither the name of Google Inc. nor the names of its
16 // contributors may be used to endorse or promote products derived from 15 // contributors may be used to endorse or promote products derived from
17 // this software without specific prior written permission. 16 // this software without specific prior written permission.
18 // 17 //
19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 29
31 syntax = "proto2"; 30 syntax = "proto2";
32 31
33 option java_package = "com.google.apps.jspb.proto"; 32 package protobuf_deprecated_file;
34 option java_multiple_files = true; 33 option objc_class_prefix = "FileDep";
35 34
36 package jspb.test; 35 //
36 // This file is like unittest_deprecated.proto, but does NOT use message, enum,
37 // enum value, or field level deprecation; instead it uses the file level option
38 // to mark everything.
39 //
40 // The source generated from this file needs to be inspect to confirm it has
41 // all of the expected annotations. It also will be compiled into the unittest
42 // and that compile should be clean without errors.
43 //
44 option deprecated = true;
37 45
38 message TestExtensionsMessage { 46 // Message to catch the deprecation.
39 optional int32 intfield = 1; 47 message Msg1 {
40 extensions 100 to max; 48 extensions 100 to max;
49
50 optional string string_field = 1;
41 } 51 }
42 52
43 message ExtensionMessage { 53 // Mix of extension field types to catch the deprecation.
44 extend TestExtensionsMessage { 54 extend Msg1 {
45 optional ExtensionMessage ext_field = 100; 55 optional string string_ext_field = 101;
46 } 56 optional int32 int_ext_field = 102;
47 optional string ext1 = 1; 57 repeated fixed32 fixed_ext_field = 103;
58 optional Msg1 msg_ext_field = 104;
48 } 59 }
49 60
50 // Floating extensions are only supported when generating a _lib.js library. 61 // Mix of extension field types (scoped to a message) to catch the deprecation.
51 extend TestExtensionsMessage { 62 message Msg1A {
52 optional ExtensionMessage floating_msg_field = 101; 63 extend Msg1 {
53 optional string floating_str_field = 102; 64 optional string string_ext2_field = 201;
65 optional int32 int_ext2_field = 202;
66 repeated fixed32 fixed_ext2_field = 203;
67 optional Msg1 msg_ext2_field = 204;
68 }
54 } 69 }
70
71 // Enum to catch the deprecation.
72 enum Enum1 {
73 ENUM1_ONE = 1;
74 ENUM1_TWO = 2;
75 ENUM1_THREE = 3;
76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698