You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ma...@apache.org on 2019/10/31 09:33:35 UTC
[servicecomb-toolkit] branch master updated (fa55b53 -> f5d63e2)
This is an automated email from the ASF dual-hosted git repository.
mabin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git.
from fa55b53 Merge pull request #36 from kakulisen/openapi-v3-dev
new f88356a Support generating SpringCloud project
new 4f1d84b add unit test
new 0f6bbbe support springcloud in toolkit-maven-plugin
new 716dee2 custom api package and model package
new 695dd35 fix some bug
new 970de3b same serviceId problem when ServiceType is all
new 3ae53d1 add license header
new 2838e30 fix test exception
new f5d63e2 Merge pull request #37 from kakulisen/springcloud
The 143 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README-ZH.md | 6 +
...java => AbstractConsumerDirectoryStrategy.java} | 39 ++--
...nerator.java => AbstractDirectoryStrategy.java} | 37 ++--
.../toolkit/codegen/AbstractJavaCodegenExt.java | 28 +++
...or.java => AbstractMultiDirectoryStrategy.java} | 41 ++--
...java => AbstractProviderDirectoryStrategy.java} | 25 +--
.../toolkit/codegen/ConsumerDirectoryStrategy.java | 25 +--
.../toolkit/codegen/DefaultDirectoryStrategy.java | 25 +--
...etaConstant.java => MicroServiceFramework.java} | 8 +-
.../toolkit/codegen/ProjectMetaConstant.java | 4 +
.../toolkit/codegen/ProviderDirectoryStrategy.java | 28 +--
.../toolkit/codegen/ServiceCombCodegen.java | 42 +---
...BasePathLambda.java => ShowBasePathLambda.java} | 16 +-
...iceCombCodegen.java => SpringCloudCodegen.java} | 211 +++++++--------------
.../SpringCloudConsumerDirectoryStrategy.java | 78 ++++++++
.../codegen/SpringCloudMultiDirectoryStrategy.java | 128 +++++++++++++
.../SpringCloudProviderDirectoryStrategy.java | 66 +++++++
.../org.openapitools.codegen.CodegenConfig | 3 +-
.../ServiceComb/consumer/apiConsumer.mustache | 2 +-
.../ServiceComb/consumer/microservice.mustache | 2 +-
.../ServiceComb/consumer/pojo/apiConsumer.mustache | 2 +-
.../ServiceComb/provider/microservice.mustache | 6 +-
.../consumer/openfeign/Application.mustache | 18 ++
.../consumer/openfeign/apiConsumer.mustache} | 26 +--
.../consumer/openfeign/applicationYml.mustache | 11 ++
.../openfeign/bodyParamsConsumer.mustache} | 0
.../openfeign/formParamsConsumer.mustache} | 0
.../openfeign/headerParamsConsumer.mustache} | 0
.../openfeign/pathParamsConsumer.mustache} | 0
.../consumer/openfeign}/pom.mustache | 102 +++++-----
.../openfeign/queryParamsConsumer.mustache} | 0
.../model}/enumClass.mustache | 0
.../model}/enumOuterClass.mustache | 0
.../model/model.mustache | 4 +-
.../model}/pojo.mustache | 9 +-
.../model/pom.mustache | 9 -
.../project/pom.mustache | 0
.../provider/servlet}/Application.mustache | 4 +-
.../provider/servlet}/api.mustache | 9 +-
.../provider/servlet/applicationYml.mustache | 11 ++
.../provider/servlet}/bodyParams.mustache | 0
.../provider/servlet}/formParams.mustache | 0
.../provider/servlet}/headerParams.mustache | 0
.../provider/servlet}/pathParams.mustache | 0
.../provider/servlet}/pom.mustache | 88 ++++-----
.../provider/servlet}/queryParams.mustache | 0
.../provider/servlet}/returnTypes.mustache | 0
.../servicecomb/toolkit/codegen/GeneratorTest.java | 34 ++++
.../toolkit/codegen/ServiceCombCodegenTest.java | 69 ++++++-
.../toolkit/codegen/SpringCloudCodegenTest.java} | 26 +--
.../servicecomb/toolkit/plugin/GenerateMojo.java | 15 ++
.../servicecomb/toolkit/plugin/GenerateUtil.java | 21 +-
.../servicecomb/toolkit/plugin/ServiceConfig.java | 55 ++++--
53 files changed, 800 insertions(+), 533 deletions(-)
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{DefaultCodeGenerator.java => AbstractConsumerDirectoryStrategy.java} (51%)
mode change 100755 => 100644
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{DefaultCodeGenerator.java => AbstractDirectoryStrategy.java} (51%)
mode change 100755 => 100644
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{DefaultCodeGenerator.java => AbstractMultiDirectoryStrategy.java} (51%)
mode change 100755 => 100644
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{ServiceType.java => AbstractProviderDirectoryStrategy.java} (65%)
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{ProjectMetaConstant.java => MicroServiceFramework.java} (89%)
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{GetRelativeBasePathLambda.java => ShowBasePathLambda.java} (78%)
copy codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/{ServiceCombCodegen.java => SpringCloudCodegen.java} (50%)
mode change 100755 => 100644
create mode 100644 codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/SpringCloudConsumerDirectoryStrategy.java
create mode 100644 codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/SpringCloudMultiDirectoryStrategy.java
create mode 100644 codegen/src/main/java/org/apache/servicecomb/toolkit/codegen/SpringCloudProviderDirectoryStrategy.java
create mode 100644 codegen/src/main/resources/SpringCloud/consumer/openfeign/Application.mustache
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/api.mustache => SpringCloud/consumer/openfeign/apiConsumer.mustache} (56%)
create mode 100644 codegen/src/main/resources/SpringCloud/consumer/openfeign/applicationYml.mustache
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/bodyParams.mustache => SpringCloud/consumer/openfeign/bodyParamsConsumer.mustache} (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/formParams.mustache => SpringCloud/consumer/openfeign/formParamsConsumer.mustache} (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/headerParams.mustache => SpringCloud/consumer/openfeign/headerParamsConsumer.mustache} (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/pathParams.mustache => SpringCloud/consumer/openfeign/pathParamsConsumer.mustache} (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/consumer/openfeign}/pom.mustache (53%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC/queryParams.mustache => SpringCloud/consumer/openfeign/queryParamsConsumer.mustache} (100%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud/model}/enumClass.mustache (100%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud/model}/enumOuterClass.mustache (100%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud}/model/model.mustache (79%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud/model}/pojo.mustache (89%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud}/model/pom.mustache (83%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud}/project/pom.mustache (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringBoot => SpringCloud/provider/servlet}/Application.mustache (62%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/api.mustache (71%)
create mode 100644 codegen/src/main/resources/SpringCloud/provider/servlet/applicationYml.mustache
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/bodyParams.mustache (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringBoot => SpringCloud/provider/servlet}/formParams.mustache (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/headerParams.mustache (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/pathParams.mustache (100%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/pom.mustache (58%)
copy codegen/src/main/resources/{ServiceComb/libraries/SpringMVC => SpringCloud/provider/servlet}/queryParams.mustache (100%)
copy codegen/src/main/resources/{ServiceComb => SpringCloud/provider/servlet}/returnTypes.mustache (100%)
copy codegen/src/{main/java/org/apache/servicecomb/toolkit/codegen/ServiceType.java => test/java/org/apache/servicecomb/toolkit/codegen/SpringCloudCodegenTest.java} (69%)