loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 12:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

protobuf import format (#20946)

Browse Source
This commit is contained in:
lucy66hw 2025-03-21 19:00:01 -07:00 committed by GitHub
parent f39675b41a
commit f3999109cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/configs/protobuf-schema-config.yaml
View File

@ -7,4 +7,8 @@ additionalProperties:
addJsonNameAnnotation: true
numberedFieldNumberList: true
startEnumsWithUnspecified: true
wrapComplexType: false
wrapComplexType: false
typeMappings:
object: "google.protobuf.Struct"
importMappings:
google.protobuf.Struct: "google/protobuf/struct"

4
bin/configs/protobuf-schema.yaml
View File

@ -4,3 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.ya
templateDir: modules/openapi-generator/src/main/resources/protobuf-schema
additionalProperties:
packageName: petstore
typeMappings:
object: "google.protobuf.Struct"
importMappings:
google.protobuf.Struct: "google/protobuf/struct"

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
View File

@ -912,7 +912,11 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
@Override
public String toModelImport(String name) {
return underscore(name);
if ("".equals(modelPackage())) {
return name;
} else {
return modelPackage() + "/" + underscore(name);
}
}
@Override

2
modules/openapi-generator/src/main/resources/protobuf-schema/api.mustache vendored
View File

@ -6,7 +6,7 @@ package {{#lambda.lowercase}}{{{packageName}}}.{{{apiPackage}}}.{{{classname}}};
import "google/protobuf/empty.proto";
{{#imports}}
{{#import}}
import public "{{{modelPackage}}}/{{{.}}}.proto";
import public "{{{import}}}.proto";
{{/import}}
{{/imports}}

2
modules/openapi-generator/src/main/resources/protobuf-schema/model.mustache vendored
View File

@ -5,7 +5,7 @@ package {{#lambda.lowercase}}{{{packageName}}};{{/lambda.lowercase}}
{{#imports}}
{{#import}}
import public "{{{modelPackage}}}/{{{import}}}.proto";
import public "{{{.}}}.proto";
{{/import}}
{{/imports}}

2
modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml
View File

@ -669,6 +669,8 @@ components:
complete:
type: boolean
default: false
meta:
type: object
xml:
name: Order
Category:

3
samples/config/petstore/protobuf-schema-config/models/order.proto
View File

@ -12,6 +12,7 @@ syntax = "proto3";
package petstore;
import public "google/protobuf/struct.proto";
message Order {
@ -35,4 +36,6 @@ message Order {
bool complete = 6;
google.protobuf.Struct meta = 7;
}

3
samples/config/petstore/protobuf-schema/models/order.proto
View File

@ -12,6 +12,7 @@ syntax = "proto3";
package petstore;
import public "google/protobuf/struct.proto";
message Order {
@ -34,4 +35,6 @@ message Order {
bool complete = 62574280;
google.protobuf.Struct meta = 3347973;
}