This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch 2.8.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.8.x by this push:
new 86eedb158 [#4417]not generate random name so that work with 1.x when
upgrading (#4420)
86eedb158 is described below
commit 86eedb158f3759d77d0105080b56ef503aa9f1ba
Author: liubao68 <[email protected]>
AuthorDate: Thu Jul 25 09:18:56 2024 +0800
[#4417]not generate random name so that work with 1.x when upgrading (#4420)
---
.../core/invocation/endpoint/EndpointTest.java | 4 +-
core/src/test/resources/test/test/schema.yaml | 1 -
.../ServerEndpoint.yaml | 1 -
.../ServerEndpoint.yaml | 1 -
.../demo-local-registry-server/ServerEndpoint.yaml | 1 -
.../ServiceCenterEndpoint.yaml | 1 -
.../src/main/resources/SpringMVCSchema.yaml | 1 -
.../springmvc/server/ProducerTestsAfterBootup.java | 1 -
.../ClientServerEndpoint.yaml | 1 -
inspector/src/test/resources/schema1.yaml | 1 -
inspector/src/test/resources/schema2.yaml | 1 -
.../task/TestMicroserviceRegisterTask.java | 8 ---
.../swagger/extend/ModelResolverExt.java | 5 +-
.../swagger/generator/SwaggerGenerator.java | 2 -
.../swagger/generator/SwaggerGeneratorFeature.java | 66 ----------------------
.../generator/core/AbstractSwaggerGenerator.java | 50 ++++------------
.../core/unittest/UnitTestSwaggerUtils.java | 4 +-
.../generator/pojo/PojoOperationGenerator.java | 11 ----
.../swagger/converter/ConverterMgrTest.java | 2 +-
.../src/test/resources/schemas/allMethod.yaml | 3 -
.../src/test/resources/schemas/allType.yaml | 1 -
.../src/test/resources/schemas/apiOperation.yaml | 1 -
.../src/test/resources/schemas/apiResponse.yaml | 1 -
.../src/test/resources/schemas/array.yaml | 1 -
.../src/test/resources/schemas/boolean.yaml | 1 -
.../src/test/resources/schemas/booleanObject.yaml | 1 -
.../src/test/resources/schemas/byte.yaml | 1 -
.../src/test/resources/schemas/byteObject.yaml | 1 -
.../src/test/resources/schemas/bytes.yaml | 1 -
.../src/test/resources/schemas/bytesObject.yaml | 1 -
.../src/test/resources/schemas/char.yaml | 1 -
.../src/test/resources/schemas/charObject.yaml | 1 -
.../test/resources/schemas/completableFuture.yaml | 1 -
.../src/test/resources/schemas/date.yaml | 1 -
.../src/test/resources/schemas/double.yaml | 1 -
.../src/test/resources/schemas/doubleObject.yaml | 1 -
.../resources/schemas/emptySwaggerDefinition.yaml | 1 -
.../src/test/resources/schemas/enum.yaml | 2 -
.../src/test/resources/schemas/float.yaml | 1 -
.../src/test/resources/schemas/floatObject.yaml | 1 -
.../src/test/resources/schemas/ignoreRequest.yaml | 1 -
.../src/test/resources/schemas/int.yaml | 1 -
.../src/test/resources/schemas/intObject.yaml | 1 -
.../src/test/resources/schemas/list.yaml | 1 -
.../src/test/resources/schemas/long.yaml | 1 -
.../src/test/resources/schemas/longObject.yaml | 1 -
.../src/test/resources/schemas/map.yaml | 1 -
.../src/test/resources/schemas/mapList.yaml | 1 -
.../src/test/resources/schemas/multiParam.yaml | 2 -
.../test/resources/schemas/nestedListString.yaml | 1 -
.../src/test/resources/schemas/object.yaml | 1 -
.../src/test/resources/schemas/oneEnum.yaml | 1 -
.../src/test/resources/schemas/part.yaml | 1 -
.../src/test/resources/schemas/partArray.yaml | 1 -
.../src/test/resources/schemas/partList.yaml | 1 -
.../src/test/resources/schemas/responseHeader.yaml | 1 -
.../test/resources/schemas/security-apikey.yaml | 1 -
.../src/test/resources/schemas/security-basic.yaml | 1 -
.../test/resources/schemas/security-oauth2.yaml | 1 -
.../src/test/resources/schemas/set.yaml | 1 -
.../src/test/resources/schemas/short.yaml | 1 -
.../src/test/resources/schemas/shortObject.yaml | 1 -
.../src/test/resources/schemas/string.yaml | 1 -
.../schemas/testCompletableFutureOptional.yaml | 1 -
.../src/test/resources/schemas/testOptional.yaml | 1 -
.../test/resources/schemas/wrapToBodyWithDesc.yaml | 1 -
.../test/resources/schemas/aggregatedParam.yaml | 1 -
.../resources/schemas/beanParamDefaultBody.yaml | 1 -
.../schemas/beanParamWithJsonIgnoredTagged.yaml | 1 -
.../test/resources/schemas/beanParamWithPart.yaml | 1 -
.../src/test/resources/schemas/consumes.yaml | 1 -
.../src/test/resources/schemas/cookie.yaml | 1 -
.../test/resources/schemas/dynamicStatusEnum.yaml | 1 -
.../src/test/resources/schemas/echo.yaml | 1 -
.../src/test/resources/schemas/emptyContract.yaml | 1 -
.../src/test/resources/schemas/emptyPath.yaml | 1 -
.../src/test/resources/schemas/enumBody.yaml | 1 -
.../src/test/resources/schemas/form.yaml | 1 -
.../src/test/resources/schemas/jdkStatusEnum.yaml | 1 -
.../test/resources/schemas/nestedListString.yaml | 1 -
.../src/test/resources/schemas/patch.yaml | 1 -
.../src/test/resources/schemas/query.yaml | 1 -
.../resources/schemas/rawJsonStringMethod.yaml | 1 -
.../src/test/resources/schemas/response.yaml | 1 -
.../src/test/resources/schemas/responseText.yaml | 1 -
.../test/resources/schemas/MethodEmptyPath.yaml | 1 -
.../resources/schemas/asyncResponseEntity.yaml | 1 -
.../src/test/resources/schemas/cookie.yaml | 1 -
.../test/resources/schemas/defaultParameter.yaml | 1 -
.../src/test/resources/schemas/emptyPath.yaml | 1 -
.../src/test/resources/schemas/enumBody.yaml | 1 -
.../test/resources/schemas/inheritHttpMethod.yaml | 1 -
.../test/resources/schemas/mixupAnnotations.yaml | 1 -
.../test/resources/schemas/nestedListString.yaml | 1 -
.../src/test/resources/schemas/part.yaml | 1 -
.../src/test/resources/schemas/partAnnotation.yaml | 1 -
.../src/test/resources/schemas/partArray.yaml | 1 -
.../resources/schemas/partArrayAnnotation.yaml | 1 -
.../src/test/resources/schemas/partList.yaml | 1 -
.../test/resources/schemas/partListAnnotation.yaml | 1 -
.../resources/schemas/rawJsonStringMethod.yaml | 1 -
.../schemas/requestMappingHttpMethod.yaml | 1 -
.../src/test/resources/schemas/responseEntity.yaml | 1 -
.../test/resources/schemas/swaggerTestTarget.yaml | 1 -
.../swaggerTestTarget_ValueOverWritePath.yaml | 1 -
.../test/resources/schemas/testBlankMediaType.yaml | 1 -
...estCompletableFutureResponseEntityOptional.yaml | 1 -
.../resources/schemas/testMultipleMediaType.yaml | 1 -
.../test/resources/schemas/testObjectParam.yaml | 1 -
.../schemas/testResponseEntityOptional.yaml | 1 -
.../test/resources/schemas/testSimpleParam.yaml | 1 -
.../resources/schemas/testSingleMediaType.yaml | 1 -
112 files changed, 14 insertions(+), 245 deletions(-)
diff --git
a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
index d6203589c..b6e1f8bd5 100644
---
a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
+++
b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
@@ -44,9 +44,6 @@ public class EndpointTest {
@Test
void should_ignore_endpoint_when_generate_swagger() {
SwaggerGenerator generator = SwaggerGenerator.create(TestSchema.class);
- generator.getSwaggerGeneratorFeature()
- .setExtJavaInterfaceInVendor(false)
- .setExtJavaClassInVendor(false);
Swagger swagger = generator.generate();
assertThat(SwaggerUtils.swaggerToString(swagger))
@@ -55,6 +52,7 @@ public class EndpointTest {
+ "info:\n"
+ " version: \"1.0.0\"\n"
+ " title: \"swagger definition for
org.apache.servicecomb.core.invocation.endpoint.EndpointTest$TestSchema\"\n"
+ + " x-java-interface:
\"org.apache.servicecomb.core.invocation.endpoint.EndpointTest$TestSchema\"\n"
+ "basePath: \"/TestSchema\"\n"
+ "consumes:\n"
+ "- \"application/json\"\n"
diff --git a/core/src/test/resources/test/test/schema.yaml
b/core/src/test/resources/test/test/schema.yaml
index 1fc4b15f9..d0ec83c9e 100644
--- a/core/src/test/resources/test/test/schema.yaml
+++ b/core/src/test/resources/test/test/schema.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/applications/demo-local-registry-cross/demo-local-registry-server-cross/ServerEndpoint.yaml
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/applications/demo-local-registry-cross/demo-local-registry-server-cross/ServerEndpoint.yaml
index 78c9d1bca..0f7fdc778 100644
---
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/applications/demo-local-registry-cross/demo-local-registry-server-cross/ServerEndpoint.yaml
+++
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/applications/demo-local-registry-cross/demo-local-registry-server-cross/ServerEndpoint.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.registry.ServerEndpoint"
- x-java-interface: "gen.swagger.ServerEndpointIntf"
basePath: "/register/url/prefix"
schemes:
- "http"
diff --git
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml
index 78c9d1bca..0f7fdc778 100644
---
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml
+++
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.registry.ServerEndpoint"
- x-java-interface: "gen.swagger.ServerEndpointIntf"
basePath: "/register/url/prefix"
schemes:
- "http"
diff --git
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml
index 78c9d1bca..0f7fdc778 100644
---
a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml
+++
b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.registry.ServerEndpoint"
- x-java-interface: "gen.swagger.ServerEndpointIntf"
basePath: "/register/url/prefix"
schemes:
- "http"
diff --git
a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml
b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml
index 8ba87fadd..7526a8960 100644
---
a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml
+++
b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.registry.ServiceCenterEndpoint"
- x-java-interface: "gen.swagger.ServiceCenterEndpointIntf"
basePath: "/v4/default/registry"
schemes:
- "http"
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/resources/SpringMVCSchema.yaml
b/demo/demo-springmvc/springmvc-client/src/main/resources/SpringMVCSchema.yaml
index 34031a987..a4cc4b75f 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/resources/SpringMVCSchema.yaml
+++
b/demo/demo-springmvc/springmvc-client/src/main/resources/SpringMVCSchema.yaml
@@ -25,7 +25,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.springmvc.client.SpringMVCSchema"
- x-java-interface: "gen.swagger.SpringMVCSchemaIntf"
basePath: "/springMvcSchema"
schemes:
- "http"
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
index a23cad0ff..3f4faa706 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
@@ -47,7 +47,6 @@ public class ProducerTestsAfterBootup implements BootListener
{
+ "info:\n"
+ " version: \"1.0.0\"\n"
+ " title: \"swagger definition for
org.apache.servicecomb.demo.springmvc.server.CodeFirstSpringmvcForSchema\"\n"
- + " x-java-interface: \"gen.swagger.CodeFirstSpringmvcForSchemaIntf\"\n"
+ "basePath: \"/forScheam\"\n"
+ "consumes:\n"
+ "- \"application/json\"\n"
diff --git
a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/microservices/demo-zeroconfig-schemadiscovery-registry-edge/ClientServerEndpoint.yaml
b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/microservices/demo-zeroconfig-schemadiscovery-registry-edge/ClientServerEndpoint.yaml
index 7cf4edd1d..6c00bfa29 100644
---
a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/microservices/demo-zeroconfig-schemadiscovery-registry-edge/ClientServerEndpoint.yaml
+++
b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/microservices/demo-zeroconfig-schemadiscovery-registry-edge/ClientServerEndpoint.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.demo.zeroconfig.client.ClientServerEndpoint"
- x-java-interface: "gen.swagger.ClientServerEndpointIntf"
basePath: "/register/url/prefix"
schemes:
- "http"
diff --git a/inspector/src/test/resources/schema1.yaml
b/inspector/src/test/resources/schema1.yaml
index 6bf42c9c0..1c719a65e 100644
--- a/inspector/src/test/resources/schema1.yaml
+++ b/inspector/src/test/resources/schema1.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.metrics.core.publish.MetricsRestPublisher"
- x-java-interface:
"cse.gen.perfTest.perf1.metricsEndpoint.MetricsRestPublisherIntf"
basePath: "/metrics"
schemes:
- "http"
diff --git a/inspector/src/test/resources/schema2.yaml
b/inspector/src/test/resources/schema2.yaml
index eee3faba7..3658f3436 100644
--- a/inspector/src/test/resources/schema2.yaml
+++ b/inspector/src/test/resources/schema2.yaml
@@ -19,7 +19,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.metrics.core.publish.HealthCheckerRestPublisher"
- x-java-interface:
"cse.gen.perfTest.perf1.healthEndpoint.HealthCheckerRestPublisherIntf"
basePath: "/health"
schemes:
- "http"
diff --git
a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
index aa0d1349c..c600386e7 100644
---
a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
+++
b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
@@ -527,7 +527,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -569,7 +568,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -621,7 +619,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -660,7 +657,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -747,7 +743,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -789,7 +784,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -866,7 +860,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
@@ -908,7 +901,6 @@ public class TestMicroserviceRegisterTask {
"info:\n" +
" version: \"1.0.0\"\n" +
" title: \"swagger definition for
org.apache.servicecomb.demo.jaxrs.server.RequestClientTimeOut\"\n" +
- " x-java-interface:
\"cse.gen.jaxrstest.jaxrs.clientreqtimeout.RequestClientTimeOutIntf\"\n" +
"basePath: \"/clientreqtimeout\"\n" +
"consumes:\n" +
"- \"application/json\"\n" +
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
index e0bc42fb4..e1bcac772 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
@@ -40,7 +40,6 @@ import
org.apache.servicecomb.swagger.extend.property.creator.PartPropertyCreato
import org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator;
import
org.apache.servicecomb.swagger.extend.property.creator.ShortPropertyCreator;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -109,9 +108,7 @@ public class ModelResolverExt extends ModelResolver {
@VisibleForTesting
protected void setType(JavaType type, Map<String, Object> vendorExtensions) {
- if (SwaggerGeneratorFeature.isLocalExtJavaClassInVendor()) {
- vendorExtensions.put(SwaggerConst.EXT_JAVA_CLASS, type.toCanonical());
- }
+ vendorExtensions.put(SwaggerConst.EXT_JAVA_CLASS, type.toCanonical());
}
private void checkType(JavaType type) {
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
index c3d98c9c9..0f3d8d93a 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
@@ -44,8 +44,6 @@ public interface SwaggerGenerator {
throw new IllegalStateException("impossible, must be bug. can not generate
swagger for " + cls.getName());
}
- SwaggerGeneratorFeature getSwaggerGeneratorFeature();
-
/**
* support placeholder
* @param basePath
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
deleted file mode 100644
index 398e5f546..000000000
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicecomb.swagger.generator;
-
-public class SwaggerGeneratorFeature {
- private static final ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal
= new ThreadLocal<>();
-
- public static ThreadLocal<SwaggerGeneratorFeature> getFeatureThreadLocal() {
- return featureThreadLocal;
- }
-
- public static boolean isLocalExtJavaClassInVendor() {
- SwaggerGeneratorFeature feature = featureThreadLocal.get();
- return feature != null ? feature.extJavaClassInVendor : true;
- }
-
- // packageName and extJavaInVender is unnecessary, new invocation mechanism
not depend them
- // just remain them for compatible
- private String packageName = "gen.swagger";
-
- private boolean extJavaClassInVendor = true;
-
- private boolean extJavaInterfaceInVendor = true;
-
- public String getPackageName() {
- return packageName;
- }
-
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
-
- public boolean isExtJavaClassInVendor() {
- return extJavaClassInVendor;
- }
-
- public SwaggerGeneratorFeature setExtJavaClassInVendor(boolean
extJavaClassInVendor) {
- this.extJavaClassInVendor = extJavaClassInVendor;
-
- return this;
- }
-
- public boolean isExtJavaInterfaceInVendor() {
- return extJavaInterfaceInVendor;
- }
-
- public SwaggerGeneratorFeature setExtJavaInterfaceInVendor(boolean
extJavaInterfaceInVendor) {
- this.extJavaInterfaceInVendor = extJavaInterfaceInVendor;
-
- return this;
- }
-}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
index fe82fd9c9..288f57c6f 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
@@ -39,7 +39,6 @@ import
org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor;
import org.apache.servicecomb.swagger.generator.OperationGenerator;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils;
import io.swagger.annotations.Api;
@@ -58,8 +57,6 @@ import io.swagger.models.Tag;
* </pre>
*/
public abstract class AbstractSwaggerGenerator implements SwaggerGenerator {
- protected SwaggerGeneratorFeature swaggerGeneratorFeature = new
SwaggerGeneratorFeature();
-
protected Class<?> cls;
protected Swagger swagger;
@@ -105,41 +102,26 @@ public abstract class AbstractSwaggerGenerator implements
SwaggerGenerator {
this.httpMethod = httpMethod.toLowerCase(Locale.US);
}
- public SwaggerGeneratorFeature getSwaggerGeneratorFeature() {
- return swaggerGeneratorFeature;
- }
-
public Swagger generate() {
LOGGER.info("generate schema from [{}]", cls);
scanClassAnnotation();
- ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal =
SwaggerGeneratorFeature.getFeatureThreadLocal();
- featureThreadLocal.set(swaggerGeneratorFeature);
- try {
- scanMethods();
- addOperationsToSwagger();
+ scanMethods();
+ addOperationsToSwagger();
- correctSwagger();
+ correctSwagger();
- return swagger;
- } finally {
- featureThreadLocal.remove();
- }
+ return swagger;
}
public void scanClassAnnotation() {
- ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal =
SwaggerGeneratorFeature.getFeatureThreadLocal();
- featureThreadLocal.set(swaggerGeneratorFeature);
- try {
- for (Annotation annotation : cls.getAnnotations()) {
- ClassAnnotationProcessor<Annotation> processor =
findClassAnnotationProcessor(annotation.annotationType());
- if (processor == null) {
- continue;
- }
- processor.process(this, annotation);
+
+ for (Annotation annotation : cls.getAnnotations()) {
+ ClassAnnotationProcessor<Annotation> processor =
findClassAnnotationProcessor(annotation.annotationType());
+ if (processor == null) {
+ continue;
}
- } finally {
- featureThreadLocal.remove();
+ processor.process(this, annotation);
}
}
@@ -203,21 +185,9 @@ public abstract class AbstractSwaggerGenerator implements
SwaggerGenerator {
}
protected void setJavaInterface(Info info) {
- if (!swaggerGeneratorFeature.isExtJavaInterfaceInVendor()) {
- return;
- }
-
if (cls.isInterface()) {
info.setVendorExtension(SwaggerConst.EXT_JAVA_INTF, cls.getName());
- return;
}
-
- if (StringUtils.isEmpty(swaggerGeneratorFeature.getPackageName())) {
- return;
- }
-
- String intfName = swaggerGeneratorFeature.getPackageName() + "." +
cls.getSimpleName() + "Intf";
- info.setVendorExtension(SwaggerConst.EXT_JAVA_INTF, intfName);
}
@Override
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
index f26513275..81193c902 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
@@ -24,13 +24,13 @@ import java.util.Objects;
import org.apache.commons.io.IOUtils;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
+import org.junit.jupiter.api.Assertions;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectWriter;
import io.swagger.models.Swagger;
import io.swagger.util.Yaml;
-import org.junit.jupiter.api.Assertions;
public final class UnitTestSwaggerUtils {
private static final ObjectWriter writer = Yaml.pretty();
@@ -71,8 +71,6 @@ public final class UnitTestSwaggerUtils {
public static SwaggerGenerator testSwagger(String resPath, Class<?> cls,
String... methods) {
SwaggerGenerator generator = SwaggerGenerator.create(cls);
generator.replaceMethodWhiteList(methods);
- generator.getSwaggerGeneratorFeature().setPackageName("gen.cse.ms.ut");
-
Swagger swagger = generator.generate();
String schema = pretty(swagger);
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
index cd6c5eb8c..acca28c7f 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
@@ -29,8 +29,6 @@ import javax.ws.rs.HttpMethod;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.ParameterGenerator;
-import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import
org.apache.servicecomb.swagger.generator.core.AbstractOperationGenerator;
import org.apache.servicecomb.swagger.generator.core.AbstractSwaggerGenerator;
import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType;
@@ -100,15 +98,6 @@ public class PojoOperationGenerator extends
AbstractOperationGenerator {
}
swagger.addDefinition(simpleRef, bodyModel);
- SwaggerGeneratorFeature feature =
swaggerGenerator.getSwaggerGeneratorFeature();
- // bodyFields.size() > 1 is no reason, just because old version do
this......
- // if not care for this, then can just delete all logic about
EXT_JAVA_CLASS/EXT_JAVA_INTF
- if (feature.isExtJavaClassInVendor()
- && bodyFields.size() > 1
- && StringUtils.isNotEmpty(feature.getPackageName())) {
- bodyModel.getVendorExtensions().put(SwaggerConst.EXT_JAVA_CLASS,
feature.getPackageName() + "." + simpleRef);
- }
-
RefModel refModel = new RefModel();
refModel.setReference("#/definitions/" + simpleRef);
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
index de1188544..be64fb4a3 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
@@ -51,7 +51,7 @@ public class ConverterMgrTest {
@Test
public void should_use_Object_when_model_type_is_not_available() {
Model model = swagger.getDefinitions().get("testEnumBody");
-
assertThat(SwaggerUtils.getClassName(model.getVendorExtensions())).isEqualTo("gen.cse.ms.ut.testEnumBody");
+
assertThat(SwaggerUtils.getClassName(model.getVendorExtensions())).isNull();
assertThat(ConverterMgr.findJavaType(swagger,
model).getRawClass()).isEqualTo(Object.class);
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml
index 5390865f0..b5805ad65 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
@@ -683,7 +682,6 @@ definitions:
- "YELLOW"
- "BLUE"
x-java-class:
"org.apache.servicecomb.foundation.test.scaffolding.model.Color"
- x-java-class: "gen.cse.ms.ut.testEnumBody"
testFloatBody:
type: "object"
properties:
@@ -781,7 +779,6 @@ definitions:
type: "object"
additionalProperties:
$ref: "#/definitions/User"
- x-java-class: "gen.cse.ms.ut.testMultiParamBody"
testOneEnumBody:
type: "object"
properties:
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml
index c9802302e..5fa759c78 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml
index 9e3243336..44a35116b 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml
index 51d9e6d38..b78cbc934 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml
index 1786c4f46..1dfaee467 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml
index 481f990cf..eae2c8d64 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml
index 89d45bed2..6fa5d081e 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml
index 37145cdfe..533b43f81 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml
index 30e4f38fc..4376e8bdd 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml
index 4226256b2..ef35cb353 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml
index 5b6754f39..a807afb63 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml
index 16965f754..aeaea6b81 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml
index 990a2c964..af8dba598 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml
index 212ceca38..583d6085a 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml
index a6d176355..b15132ecb 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml
index b58aa2cd9..5c151cba1 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml
index f1f2a83d6..dc1d342cb 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/emptySwaggerDefinition.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/emptySwaggerDefinition.yaml
index 09cba695e..042836aed 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/emptySwaggerDefinition.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/emptySwaggerDefinition.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessorTest$EmptySwaggerDefinition"
- x-java-interface: "gen.cse.ms.ut.EmptySwaggerDefinitionIntf"
basePath: "/EmptySwaggerDefinition"
schemes:
- "http"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml
index 91e0a673b..7e6c3d6c2 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
@@ -57,4 +56,3 @@ definitions:
- "YELLOW"
- "BLUE"
x-java-class:
"org.apache.servicecomb.foundation.test.scaffolding.model.Color"
- x-java-class: "gen.cse.ms.ut.testEnumBody"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml
index 500cdb22d..e884c5c83 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml
index 56d19670e..57f736072 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml
index 8c9fbed34..3e2ea767d 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml
index 1fc4b15f9..d0ec83c9e 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml
index ed16f263a..df2bcdaf2 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml
index c894e8bed..c283baf71 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml
index 1de9207ef..e8ee23cae 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml
index eeb67d3bd..b7da71238 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml
index cd7f8123a..65e306c09 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml
index c94873c4e..16394f372 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml
index 8e69b26e0..d5c171161 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
@@ -182,4 +181,3 @@ definitions:
type: "object"
additionalProperties:
$ref: "#/definitions/User"
- x-java-class: "gen.cse.ms.ut.testMultiParamBody"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml
index 59d8190b1..e35280afc 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml
index 067923726..13da8f71d 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml
index fc280b060..027b47b84 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml
index 7ff945592..296fbfd37 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml
index 1883eda88..9a5b96e76 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml
index 63dbd57a4..1123a2275 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml
index bbefa65eb..880278306 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-apikey.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-apikey.yaml
index d2e323690..87bea82f3 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-apikey.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-apikey.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessorTest$SecurityApiKey"
- x-java-interface: "gen.cse.ms.ut.SecurityApiKeyIntf"
basePath: "/SecurityApiKey"
schemes:
- "http"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-basic.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-basic.yaml
index c2d76976c..8f77366c8 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-basic.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-basic.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessorTest$SecurityBasic"
- x-java-interface: "gen.cse.ms.ut.SecurityBasicIntf"
basePath: "/SecurityBasic"
schemes:
- "http"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-oauth2.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-oauth2.yaml
index 5d88c26ac..6a881d1cb 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-oauth2.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/security-oauth2.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessorTest$SecurityOAuth2"
- x-java-interface: "gen.cse.ms.ut.SecurityOAuth2Intf"
basePath: "/SecurityOAuth2"
schemes:
- "http"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml
index aec08067b..13ef03e35 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml
index 5c07dc5f2..aedfb8922 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml
index b24bc5328..69765e3da 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml
index 3b0ce3d95..fcb40e672 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml
index e6a8e0ff3..9f6be201d 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml
index 8778e9689..0659bd402 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml
index 470b3346c..0cc30156a 100644
---
a/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml
+++
b/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.core.schema.Schema"
- x-java-interface: "gen.cse.ms.ut.SchemaIntf"
basePath: "/Schema"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/aggregatedParam.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/aggregatedParam.yaml
index a074d0c78..d2e27a7a1 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/aggregatedParam.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/aggregatedParam.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamDefaultBody.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamDefaultBody.yaml
index 768741ed1..9e2ba1bc7 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamDefaultBody.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamDefaultBody.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithJsonIgnoredTagged.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithJsonIgnoredTagged.yaml
index 6ce1e66e5..71a1bcf67 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithJsonIgnoredTagged.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithJsonIgnoredTagged.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithPart.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithPart.yaml
index 4423f07ec..0be30358c 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithPart.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/beanParamWithPart.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml
index 64c35c1d0..598e5ec8b 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.model.ConsumesAndProduces"
- x-java-interface: "gen.cse.ms.ut.ConsumesAndProducesIntf"
basePath: "/ConsumesAndProduces"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml
index 896793e18..76deee784 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/cookie.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml
index 906054f03..d9c881af3 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
index 384966550..59da8f389 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyContract.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyContract.yaml
index 11bcbbaa5..35eba10cb 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyContract.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyContract.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml
index f76bd99fd..db5d2c6f0 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/emptyPath.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml
index b5b78b023..64350d3a3 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/enumBody.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml
index 911269c20..4543363fb 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/form.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/jdkStatusEnum.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/jdkStatusEnum.yaml
index 67efb0def..d5d4f1105 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/jdkStatusEnum.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/jdkStatusEnum.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml
index aa02f5688..f6662a5fb 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/patch.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/patch.yaml
index 6a89b056f..6c8dce0bb 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/patch.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/patch.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml
index be256d1d6..06d27a209 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/query.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml
index a482f6c66..bd8d7e079 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/rawJsonStringMethod.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml
index b4db5ae2b..ba3414221 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/response.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/responseText.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/responseText.yaml
index c596de61a..39e4061f4 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/responseText.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/responseText.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.jaxrs.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml
index 958dc7d43..075776a42 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/MethodEmptyPath.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.MethodEmptyPath"
- x-java-interface: "gen.cse.ms.ut.MethodEmptyPathIntf"
basePath: "/MethodEmptyPath"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml
index cb3125f8d..717d1cd79 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/asyncResponseEntity.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/cookie.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/cookie.yaml
index 5ec6b6d7f..5689a2930 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/cookie.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/cookie.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml
index f8f4de1c4..96cc06e83 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.MethodDefaultParameter"
- x-java-interface: "gen.cse.ms.ut.MethodDefaultParameterIntf"
basePath: "/MethodDefaultParameter"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml
index 7b292cb45..d22a04cc1 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/emptyPath.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml
index 449ac41cf..3224e7967 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/enumBody.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml
index 69f8051f2..6aa1d9b4d 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/inheritHttpMethod.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml
index ae7adc86d..298a819cb 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.MethodMixupAnnotations"
- x-java-interface: "gen.cse.ms.ut.MethodMixupAnnotationsIntf"
basePath: "/MethodMixupAnnotations"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/nestedListString.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/nestedListString.yaml
index 4375c9e0b..fbfc9d61d 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/nestedListString.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/nestedListString.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/part.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/part.yaml
index fcfa80f5b..3b6806360 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/part.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/part.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partAnnotation.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partAnnotation.yaml
index 1d12b4283..b2ce6b277 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partAnnotation.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partAnnotation.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArray.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArray.yaml
index 579eb52cd..d8eb4d1ea 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArray.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArray.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArrayAnnotation.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArrayAnnotation.yaml
index 510e0a68e..f3778d115 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArrayAnnotation.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partArrayAnnotation.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partList.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partList.yaml
index f1621bf60..fa6ee7c08 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partList.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partList.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partListAnnotation.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partListAnnotation.yaml
index 1adfd9ac3..d1a7d0745 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partListAnnotation.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/partListAnnotation.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml
index 94c17f0b7..e0370226f 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/rawJsonStringMethod.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/requestMappingHttpMethod.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/requestMappingHttpMethod.yaml
index aea116650..c14b12469 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/requestMappingHttpMethod.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/requestMappingHttpMethod.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.ClassMethodNoHttpMethod"
- x-java-interface: "gen.cse.ms.ut.ClassMethodNoHttpMethodIntf"
basePath: "/c"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml
index 8784ffedb..619e5976d 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.MethodResponseEntity"
- x-java-interface: "gen.cse.ms.ut.MethodResponseEntityIntf"
basePath: "/MethodResponseEntity"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget.yaml
index e36b6ce1e..9e88d8acc 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.SwaggerTestTarget"
- x-java-interface: "gen.cse.ms.ut.SwaggerTestTargetIntf"
basePath: "/test"
consumes:
- "text/plain"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget_ValueOverWritePath.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget_ValueOverWritePath.yaml
index cb59f48c2..a2fd8f574 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget_ValueOverWritePath.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/swaggerTestTarget_ValueOverWritePath.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.SwaggerTestTarget_ValueOverWritePath"
- x-java-interface: "gen.cse.ms.ut.SwaggerTestTarget_ValueOverWritePathIntf"
basePath: "/testValue"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testBlankMediaType.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testBlankMediaType.yaml
index 242dec4d4..653591b4a 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testBlankMediaType.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testBlankMediaType.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.TestProducer"
- x-java-interface: "gen.cse.ms.ut.TestProducerIntf"
basePath: "/"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml
index d7970e1a0..a89e23de1 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testCompletableFutureResponseEntityOptional.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testMultipleMediaType.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testMultipleMediaType.yaml
index 4ecccae23..c5df7b891 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testMultipleMediaType.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testMultipleMediaType.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.TestProducer"
- x-java-interface: "gen.cse.ms.ut.TestProducerIntf"
basePath: "/"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
index a28f15bfc..8a7be3bfd 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema"
- x-java-interface: "gen.cse.ms.ut.DefaultParameterSchemaIntf"
basePath: "/"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml
index b31a1731f..87c25ff20 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testResponseEntityOptional.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.Echo"
- x-java-interface: "gen.cse.ms.ut.EchoIntf"
basePath: "/Echo"
consumes:
- "a"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
index a6406ff60..68a6eccf3 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema"
- x-java-interface: "gen.cse.ms.ut.DefaultParameterSchemaIntf"
basePath: "/"
consumes:
- "application/json"
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSingleMediaType.yaml
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSingleMediaType.yaml
index 47f8bd011..658d1b80e 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSingleMediaType.yaml
+++
b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSingleMediaType.yaml
@@ -20,7 +20,6 @@ swagger: "2.0"
info:
version: "1.0.0"
title: "swagger definition for
org.apache.servicecomb.swagger.generator.springmvc.model.TestProducer"
- x-java-interface: "gen.cse.ms.ut.TestProducerIntf"
basePath: "/"
consumes:
- "application/json"
