loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Protobuf-Schema] Namespace updates (#11115)

Browse Source 
* [Protobuf-Schema] Namespace updates

* [Protobuf-Schema] Petstore sample updated
This commit is contained in:
Tomáš Čermák 2021-12-17 03:12:11 +01:00 committed by GitHub
parent ebb69147a5
commit 9b65513bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
apiTemplateFiles.put("api.mustache", ".proto");
embeddedTemplateDir = templateDir = "protobuf-schema";
hideGenerationTimestamp = Boolean.TRUE;
modelPackage = "messages";
modelPackage = "models";
apiPackage = "services";
defaultIncludes = new HashSet<>(
@ -167,12 +167,20 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
apiDocTemplateFiles.clear(); // TODO: add api doc template
modelDocTemplateFiles.clear(); // TODO: add model doc template
modelPackage = "models";
apiPackage = "services";
if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
}
else {
additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
}
if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
}
if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
}
if (additionalProperties.containsKey(this.NUMBERED_FIELD_NUMBER_LIST)) {
this.numberedFieldNumberList = convertPropertyToBooleanAndWriteBack(NUMBERED_FIELD_NUMBER_LIST);

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

@ -1,7 +1,7 @@
{{>partial_header}}
syntax = "proto3";
package {{{packageName}}};
package {{#lambda.lowercase}}{{{packageName}}}.{{{apiPackage}}}.{{{classname}}};{{/lambda.lowercase}}
import "google/protobuf/empty.proto";
{{#imports}}

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

@ -1,7 +1,7 @@
{{>partial_header}}
syntax = "proto3";
package {{{packageName}}};
package {{#lambda.lowercase}}{{{packageName}}};{{/lambda.lowercase}}
{{#imports}}
{{#import}}

2
modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto
View File

@ -10,7 +10,7 @@
syntax = "proto3";
package ;
package openapitools;
import public "models/lizard_all_of.proto";
import public "models/snake_all_of.proto";

2
samples/config/petstore/protobuf-schema/services/pet_service.proto
View File

@ -10,7 +10,7 @@
syntax = "proto3";
package petstore;
package petstore.services.petservice;
import "google/protobuf/empty.proto";
import public "models/api_response.proto";

2
samples/config/petstore/protobuf-schema/services/store_service.proto
View File

@ -10,7 +10,7 @@
syntax = "proto3";
package petstore;
package petstore.services.storeservice;
import "google/protobuf/empty.proto";
import public "models/order.proto";

2
samples/config/petstore/protobuf-schema/services/user_service.proto
View File

@ -10,7 +10,7 @@
syntax = "proto3";
package petstore;
package petstore.services.userservice;
import "google/protobuf/empty.proto";
import public "models/user.proto";