Skip to content

Commit 06e7597

Browse files
authored
Merge pull request #3187 from square/bquenaudon.2024-11-26.apiprotos
Promote google/protobuf/api.proto as a runtime proto
2 parents 8686b3e + a9e7316 commit 06e7597

File tree

5 files changed

+480
-2
lines changed

5 files changed

+480
-2
lines changed

wire-compiler/src/test/java/com/squareup/wire/schema/WireRunTest.kt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,6 +1811,14 @@ class WireRunTest {
18111811
|message Any {}
18121812
""".trimMargin(),
18131813
)
1814+
fs.add(
1815+
"google/src/main/proto/google/protobuf/api.proto",
1816+
"""
1817+
|syntax = "proto2";
1818+
|package google.protobuf;
1819+
|message Api {}
1820+
""".trimMargin(),
1821+
)
18141822
fs.add(
18151823
"google/src/main/proto/google/protobuf/duration.proto",
18161824
"""
@@ -1827,6 +1835,14 @@ class WireRunTest {
18271835
|message Empty {}
18281836
""".trimMargin(),
18291837
)
1838+
fs.add(
1839+
"google/src/main/proto/google/protobuf/source_context.proto",
1840+
"""
1841+
|syntax = "proto2";
1842+
|package google.protobuf;
1843+
|message SourceContext {}
1844+
""".trimMargin(),
1845+
)
18301846
fs.add(
18311847
"google/src/main/proto/google/protobuf/struct.proto",
18321848
"""
@@ -1843,6 +1859,14 @@ class WireRunTest {
18431859
|message Timestamp {}
18441860
""".trimMargin(),
18451861
)
1862+
fs.add(
1863+
"google/src/main/proto/google/protobuf/type.proto",
1864+
"""
1865+
|syntax = "proto2";
1866+
|package google.protobuf;
1867+
|message Type {}
1868+
""".trimMargin(),
1869+
)
18461870
fs.add(
18471871
"google/src/main/proto/google/protobuf/wrappers.proto",
18481872
"""

wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/CoreLoader.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,29 @@ fun isWireRuntimeProto(location: Location): Boolean {
3333
/** Returns true if [path] is bundled in the wire runtime. */
3434
fun isWireRuntimeProto(path: String): Boolean {
3535
return path == ANY_PROTO ||
36+
path == API_PROTO ||
3637
path == DESCRIPTOR_PROTO ||
3738
path == DURATION_PROTO ||
3839
path == EMPTY_PROTO ||
40+
path == SOURCE_CONTEXT_PROTO ||
3941
path == STRUCT_PROTO ||
4042
path == TIMESTAMP_PROTO ||
41-
path == WRAPPERS_PROTO ||
42-
path == WIRE_EXTENSIONS_PROTO
43+
path == TYPE_PROTO ||
44+
path == WIRE_EXTENSIONS_PROTO ||
45+
path == WRAPPERS_PROTO
4346
}
4447

4548
internal const val DESCRIPTOR_PROTO = "google/protobuf/descriptor.proto"
4649
internal const val WIRE_EXTENSIONS_PROTO = "wire/extensions.proto"
4750

4851
private const val ANY_PROTO = "google/protobuf/any.proto"
52+
private const val API_PROTO = "google/protobuf/api.proto"
4953
private const val DURATION_PROTO = "google/protobuf/duration.proto"
5054
private const val EMPTY_PROTO = "google/protobuf/empty.proto"
55+
private const val SOURCE_CONTEXT_PROTO = "google/protobuf/source_context.proto"
5156
private const val STRUCT_PROTO = "google/protobuf/struct.proto"
5257
private const val TIMESTAMP_PROTO = "google/protobuf/timestamp.proto"
58+
private const val TYPE_PROTO = "google/protobuf/type.proto"
5359
private const val WRAPPERS_PROTO = "google/protobuf/wrappers.proto"
5460

5561
/** A special base directory used for Wire's built-in .proto files. */
Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
// Protocol Buffers - Google's data interchange format
2+
// Copyright 2008 Google Inc. All rights reserved.
3+
// https://developers.google.com/protocol-buffers/
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are
7+
// met:
8+
//
9+
// * Redistributions of source code must retain the above copyright
10+
// notice, this list of conditions and the following disclaimer.
11+
// * Redistributions in binary form must reproduce the above
12+
// copyright notice, this list of conditions and the following disclaimer
13+
// in the documentation and/or other materials provided with the
14+
// distribution.
15+
// * Neither the name of Google Inc. nor the names of its
16+
// contributors may be used to endorse or promote products derived from
17+
// this software without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
// (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.
30+
31+
syntax = "proto3";
32+
33+
package google.protobuf;
34+
35+
import "google/protobuf/source_context.proto";
36+
import "google/protobuf/type.proto";
37+
38+
option java_package = "com.google.protobuf";
39+
option java_outer_classname = "ApiProto";
40+
option java_multiple_files = true;
41+
option objc_class_prefix = "GPB";
42+
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
43+
option go_package = "google.golang.org/protobuf/types/known/apipb";
44+
45+
// Api is a light-weight descriptor for an API Interface.
46+
//
47+
// Interfaces are also described as "protocol buffer services" in some contexts,
48+
// such as by the "service" keyword in a .proto file, but they are different
49+
// from API Services, which represent a concrete implementation of an interface
50+
// as opposed to simply a description of methods and bindings. They are also
51+
// sometimes simply referred to as "APIs" in other contexts, such as the name of
52+
// this message itself. See https://cloud.google.com/apis/design/glossary for
53+
// detailed terminology.
54+
message Api {
55+
// The fully qualified name of this interface, including package name
56+
// followed by the interface's simple name.
57+
string name = 1;
58+
59+
// The methods of this interface, in unspecified order.
60+
repeated Method methods = 2;
61+
62+
// Any metadata attached to the interface.
63+
repeated Option options = 3;
64+
65+
// A version string for this interface. If specified, must have the form
66+
// `major-version.minor-version`, as in `1.10`. If the minor version is
67+
// omitted, it defaults to zero. If the entire version field is empty, the
68+
// major version is derived from the package name, as outlined below. If the
69+
// field is not empty, the version in the package name will be verified to be
70+
// consistent with what is provided here.
71+
//
72+
// The versioning schema uses [semantic
73+
// versioning](http://semver.org) where the major version number
74+
// indicates a breaking change and the minor version an additive,
75+
// non-breaking change. Both version numbers are signals to users
76+
// what to expect from different versions, and should be carefully
77+
// chosen based on the product plan.
78+
//
79+
// The major version is also reflected in the package name of the
80+
// interface, which must end in `v<major-version>`, as in
81+
// `google.feature.v1`. For major versions 0 and 1, the suffix can
82+
// be omitted. Zero major versions must only be used for
83+
// experimental, non-GA interfaces.
84+
//
85+
string version = 4;
86+
87+
// Source context for the protocol buffer service represented by this
88+
// message.
89+
SourceContext source_context = 5;
90+
91+
// Included interfaces. See [Mixin][].
92+
repeated Mixin mixins = 6;
93+
94+
// The source syntax of the service.
95+
Syntax syntax = 7;
96+
}
97+
98+
// Method represents a method of an API interface.
99+
message Method {
100+
// The simple name of this method.
101+
string name = 1;
102+
103+
// A URL of the input message type.
104+
string request_type_url = 2;
105+
106+
// If true, the request is streamed.
107+
bool request_streaming = 3;
108+
109+
// The URL of the output message type.
110+
string response_type_url = 4;
111+
112+
// If true, the response is streamed.
113+
bool response_streaming = 5;
114+
115+
// Any metadata attached to the method.
116+
repeated Option options = 6;
117+
118+
// The source syntax of this method.
119+
Syntax syntax = 7;
120+
}
121+
122+
// Declares an API Interface to be included in this interface. The including
123+
// interface must redeclare all the methods from the included interface, but
124+
// documentation and options are inherited as follows:
125+
//
126+
// - If after comment and whitespace stripping, the documentation
127+
// string of the redeclared method is empty, it will be inherited
128+
// from the original method.
129+
//
130+
// - Each annotation belonging to the service config (http,
131+
// visibility) which is not set in the redeclared method will be
132+
// inherited.
133+
//
134+
// - If an http annotation is inherited, the path pattern will be
135+
// modified as follows. Any version prefix will be replaced by the
136+
// version of the including interface plus the [root][] path if
137+
// specified.
138+
//
139+
// Example of a simple mixin:
140+
//
141+
// package google.acl.v1;
142+
// service AccessControl {
143+
// // Get the underlying ACL object.
144+
// rpc GetAcl(GetAclRequest) returns (Acl) {
145+
// option (google.api.http).get = "/v1/{resource=**}:getAcl";
146+
// }
147+
// }
148+
//
149+
// package google.storage.v2;
150+
// service Storage {
151+
// rpc GetAcl(GetAclRequest) returns (Acl);
152+
//
153+
// // Get a data record.
154+
// rpc GetData(GetDataRequest) returns (Data) {
155+
// option (google.api.http).get = "/v2/{resource=**}";
156+
// }
157+
// }
158+
//
159+
// Example of a mixin configuration:
160+
//
161+
// apis:
162+
// - name: google.storage.v2.Storage
163+
// mixins:
164+
// - name: google.acl.v1.AccessControl
165+
//
166+
// The mixin construct implies that all methods in `AccessControl` are
167+
// also declared with same name and request/response types in
168+
// `Storage`. A documentation generator or annotation processor will
169+
// see the effective `Storage.GetAcl` method after inheriting
170+
// documentation and annotations as follows:
171+
//
172+
// service Storage {
173+
// // Get the underlying ACL object.
174+
// rpc GetAcl(GetAclRequest) returns (Acl) {
175+
// option (google.api.http).get = "/v2/{resource=**}:getAcl";
176+
// }
177+
// ...
178+
// }
179+
//
180+
// Note how the version in the path pattern changed from `v1` to `v2`.
181+
//
182+
// If the `root` field in the mixin is specified, it should be a
183+
// relative path under which inherited HTTP paths are placed. Example:
184+
//
185+
// apis:
186+
// - name: google.storage.v2.Storage
187+
// mixins:
188+
// - name: google.acl.v1.AccessControl
189+
// root: acls
190+
//
191+
// This implies the following inherited HTTP annotation:
192+
//
193+
// service Storage {
194+
// // Get the underlying ACL object.
195+
// rpc GetAcl(GetAclRequest) returns (Acl) {
196+
// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
197+
// }
198+
// ...
199+
// }
200+
message Mixin {
201+
// The fully qualified name of the interface which is included.
202+
string name = 1;
203+
204+
// If non-empty specifies a path under which inherited HTTP paths
205+
// are rooted.
206+
string root = 2;
207+
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Protocol Buffers - Google's data interchange format
2+
// Copyright 2008 Google Inc. All rights reserved.
3+
// https://developers.google.com/protocol-buffers/
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are
7+
// met:
8+
//
9+
// * Redistributions of source code must retain the above copyright
10+
// notice, this list of conditions and the following disclaimer.
11+
// * Redistributions in binary form must reproduce the above
12+
// copyright notice, this list of conditions and the following disclaimer
13+
// in the documentation and/or other materials provided with the
14+
// distribution.
15+
// * Neither the name of Google Inc. nor the names of its
16+
// contributors may be used to endorse or promote products derived from
17+
// this software without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
// (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.
30+
31+
syntax = "proto3";
32+
33+
package google.protobuf;
34+
35+
option java_package = "com.google.protobuf";
36+
option java_outer_classname = "SourceContextProto";
37+
option java_multiple_files = true;
38+
option objc_class_prefix = "GPB";
39+
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
40+
option go_package = "google.golang.org/protobuf/types/known/sourcecontextpb";
41+
42+
// `SourceContext` represents information about the source of a
43+
// protobuf element, like the file in which it is defined.
44+
message SourceContext {
45+
// The path-qualified name of the .proto file that contained the associated
46+
// protobuf element. For example: `"google/protobuf/source_context.proto"`.
47+
string file_name = 1;
48+
}

0 commit comments

Comments
 (0)