This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch weak-contract-type
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/weak-contract-type by this
push:
new a7770bf [SCB-1213][WIP][WEAK] swagger generator placeholder resolver
not depend on spring
a7770bf is described below
commit a7770bf287ac2250cb2df6427118b37fc1cfd8cf
Author: wujimin <[email protected]>
AuthorDate: Fri Mar 22 11:18:32 2019 +0800
[SCB-1213][WIP][WEAK] swagger generator placeholder resolver not depend on
spring
---
.../definition/schema/AbstractSchemaFactory.java | 10 +----
.../definition/schema/StaticSchemaFactoryTest.java | 4 --
.../schema/TestProducerSchemaFactory.java | 5 ---
swagger/swagger-generator/generator-core/pom.xml | 2 +-
.../core/AbstractSwaggerGeneratorContext.java | 19 +++------
.../core/CompositeSwaggerGeneratorContext.java | 16 +-------
.../swagger/generator/core/SwaggerGenerator.java | 4 ++
.../core/unittest/UnitTestSwaggerUtils.java | 6 +--
.../generator/core/TestOperationGenerator.java | 47 ++++++++++++++--------
.../generator/core/TestSwaggerGenerator.java | 21 ++++++----
.../swagger/engine/SwaggerEnvironment.java | 14 -------
.../arguments/ArgumentsMapperConfig.java | 13 ------
12 files changed, 57 insertions(+), 104 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/AbstractSchemaFactory.java
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/AbstractSchemaFactory.java
index 0db01dc..8bedd95 100644
---
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/AbstractSchemaFactory.java
+++
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/AbstractSchemaFactory.java
@@ -27,9 +27,7 @@ import org.apache.servicecomb.core.definition.SchemaUtils;
import org.apache.servicecomb.core.definition.loader.SchemaLoader;
import org.apache.servicecomb.foundation.common.utils.JvmUtils;
import org.apache.servicecomb.serviceregistry.api.Const;
-import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
import org.apache.servicecomb.swagger.generator.core.SwaggerGenerator;
-import org.apache.servicecomb.swagger.generator.core.SwaggerGeneratorContext;
import io.swagger.models.Swagger;
@@ -39,13 +37,9 @@ import io.swagger.models.Swagger;
* 在producer场景中，如果本地没有契约，需要根据实现类动态生成契约
*/
public abstract class AbstractSchemaFactory<CONTEXT extends SchemaContext> {
-
protected SchemaLoader schemaLoader;
@Inject
- protected CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext;
-
- @Inject
public void setSchemaLoader(SchemaLoader schemaLoader) {
this.schemaLoader = schemaLoader;
}
@@ -93,9 +87,7 @@ public abstract class AbstractSchemaFactory<CONTEXT extends
SchemaContext> {
}
protected SwaggerGenerator generateSwagger(CONTEXT context) {
- SwaggerGeneratorContext generatorContext =
-
compositeSwaggerGeneratorContext.selectContext(context.getProviderClass());
- SwaggerGenerator generator = new SwaggerGenerator(generatorContext,
context.getProviderClass());
+ SwaggerGenerator generator = new
SwaggerGenerator(context.getProviderClass());
generator.setClassLoader(context.getMicroserviceMeta().getClassLoader());
generator.setPackageName(
SchemaUtils.generatePackageName(context.getMicroserviceMeta(),
context.getSchemaId()));
diff --git
a/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java
b/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java
index 2f254ae..38dc26e 100644
---
a/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java
+++
b/core/src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.core.unittest.UnitTestMeta;
import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
import org.apache.servicecomb.serviceregistry.api.registry.StaticMicroservice;
import org.apache.servicecomb.swagger.SwaggerUtils;
-import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -51,9 +50,6 @@ public class StaticSchemaFactoryTest {
System.setProperty(APPLICATION_ID_KEY, APP_ID_VALUE);
new UnitTestMeta();
- CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext = new
CompositeSwaggerGeneratorContext();
- ReflectUtils.setField(staticSchemaFactory,
"compositeSwaggerGeneratorContext", compositeSwaggerGeneratorContext);
-
SchemaLoader schemaLoader = new SchemaLoader();
ReflectUtils.setField(staticSchemaFactory, "schemaLoader", schemaLoader);
}
diff --git
a/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
b/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
index f33b47d..186fa42 100644
---
a/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
+++
b/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
@@ -38,7 +38,6 @@ import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.swagger.engine.SwaggerEnvironment;
import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation;
import org.apache.servicecomb.swagger.engine.bootstrap.BootstrapNormal;
-import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
import org.apache.servicecomb.swagger.invocation.Response;
import
org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerArgumentsMapperFactory;
import org.apache.servicecomb.swagger.invocation.converter.ConverterMgr;
@@ -96,13 +95,9 @@ public class TestProducerSchemaFactory {
producerArgsMapperFactory.setConverterMgr(converterMgr);
SchemaLoader schemaLoader = new SchemaLoader();
- CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext = new
CompositeSwaggerGeneratorContext();
producerSchemaFactory.setSwaggerEnv(swaggerEnv);
ReflectUtils.setField(producerSchemaFactory, "schemaLoader", schemaLoader);
- ReflectUtils.setField(producerSchemaFactory,
- "compositeSwaggerGeneratorContext",
- compositeSwaggerGeneratorContext);
Executor reactiveExecutor = new ReactiveExecutor();
Executor normalExecutor = (cmd) -> {
diff --git a/swagger/swagger-generator/generator-core/pom.xml
b/swagger/swagger-generator/generator-core/pom.xml
index 83b8a35..49110da 100644
--- a/swagger/swagger-generator/generator-core/pom.xml
+++ b/swagger/swagger-generator/generator-core/pom.xml
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-common</artifactId>
+ <artifactId>foundation-config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java
index 83fce36..207a584 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java
@@ -19,7 +19,9 @@ package org.apache.servicecomb.swagger.generator.core;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.util.Collections;
+import org.apache.servicecomb.config.inject.PlaceholderResolver;
import org.apache.servicecomb.foundation.common.RegisterManager;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.swagger.extend.annotations.RawJsonRequestBody;
@@ -40,8 +42,6 @@ import
org.apache.servicecomb.swagger.generator.core.processor.annotation.Respon
import
org.apache.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessor;
import
org.apache.servicecomb.swagger.generator.core.processor.parametertype.RawJsonRequestBodyProcessor;
import
org.apache.servicecomb.swagger.generator.core.processor.response.DefaultResponseTypeProcessor;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.util.StringValueResolver;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -55,8 +55,8 @@ import io.swagger.annotations.SwaggerDefinition;
/**
* 根据class反向生成swagger的上下文对象
*/
-public abstract class AbstractSwaggerGeneratorContext implements
SwaggerGeneratorContext, EmbeddedValueResolverAware {
- protected StringValueResolver stringValueResolver;
+public abstract class AbstractSwaggerGeneratorContext implements
SwaggerGeneratorContext {
+ protected PlaceholderResolver placeholderResolver = new
PlaceholderResolver();
protected AnnotationProcessorManager<ClassAnnotationProcessor>
classAnnotationMgr =
new AnnotationProcessorManager<>(AnnotationType.CLASS);
@@ -92,17 +92,8 @@ public abstract class AbstractSwaggerGeneratorContext
implements SwaggerGenerato
}
@Override
- public void setEmbeddedValueResolver(StringValueResolver resolver) {
- this.stringValueResolver = resolver;
- }
-
- @Override
public String resolveStringValue(String strVal) {
- if (stringValueResolver == null) {
- return strVal;
- }
-
- return stringValueResolver.resolveStringValue(strVal);
+ return placeholderResolver.replace(strVal, Collections.emptyMap()).get(0);
}
protected void initClassAnnotationMgr() {
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/CompositeSwaggerGeneratorContext.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/CompositeSwaggerGeneratorContext.java
index 70adc13..96f058e 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/CompositeSwaggerGeneratorContext.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/CompositeSwaggerGeneratorContext.java
@@ -24,13 +24,8 @@ import
org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringValueResolver;
-
-@Component
-public class CompositeSwaggerGeneratorContext implements
EmbeddedValueResolverAware {
+public class CompositeSwaggerGeneratorContext {
private static final Logger LOGGER =
LoggerFactory.getLogger(CompositeSwaggerGeneratorContext.class);
private List<SwaggerGeneratorContext> contextList;
@@ -41,15 +36,6 @@ public class CompositeSwaggerGeneratorContext implements
EmbeddedValueResolverAw
contextList =
SPIServiceUtils.getSortedService(SwaggerGeneratorContext.class);
}
- @Override
- public void setEmbeddedValueResolver(StringValueResolver resolver) {
- for (SwaggerGeneratorContext context : contextList) {
- if (EmbeddedValueResolverAware.class.isInstance(context)) {
- ((EmbeddedValueResolverAware)
context).setEmbeddedValueResolver(resolver);
- }
- }
- }
-
public List<SwaggerGeneratorContext> getContextList() {
return contextList;
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/SwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/SwaggerGenerator.java
index c686f8a..f5ebb23 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/SwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/SwaggerGenerator.java
@@ -79,6 +79,10 @@ public class SwaggerGenerator {
private String httpMethod;
+ public SwaggerGenerator(Class<?> cls) {
+ this(new CompositeSwaggerGeneratorContext().selectContext(cls), cls);
+ }
+
public SwaggerGenerator(SwaggerGeneratorContext context, Class<?> cls) {
this.swagger = new Swagger();
this.context = context;
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 346f829..558d3d3 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
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.net.URL;
import org.apache.commons.io.IOUtils;
-import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
import org.apache.servicecomb.swagger.generator.core.SwaggerGenerator;
import org.apache.servicecomb.swagger.generator.core.SwaggerGeneratorContext;
import org.junit.Assert;
@@ -35,8 +34,6 @@ import io.swagger.util.Yaml;
public final class UnitTestSwaggerUtils {
private static ObjectWriter writer = Yaml.pretty();
- private static CompositeSwaggerGeneratorContext compositeContext = new
CompositeSwaggerGeneratorContext();
-
private UnitTestSwaggerUtils() {
}
@@ -45,8 +42,7 @@ public final class UnitTestSwaggerUtils {
}
public static SwaggerGenerator generateSwagger(ClassLoader classLoader,
Class<?> cls) {
- SwaggerGeneratorContext context = compositeContext.selectContext(cls);
- SwaggerGenerator generator = new SwaggerGenerator(context, cls);
+ SwaggerGenerator generator = new SwaggerGenerator(cls);
generator.setClassLoader(classLoader);
generator.generate();
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
index 9fe126f..5de36cb 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -22,30 +22,42 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.lang.reflect.Method;
-import java.util.Collections;
import java.util.List;
-import io.swagger.annotations.*;
-import io.swagger.models.Response;
-import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.swagger.extend.parameter.HttpRequestParameter;
import
org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGeneratorContext;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.util.StringValueResolver;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.ExtensionProperty;
+import io.swagger.annotations.ResponseHeader;
+import io.swagger.models.Response;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.parameters.Parameter;
import io.swagger.models.parameters.QueryParameter;
public class TestOperationGenerator {
+ @BeforeClass
+ public static void setup() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @AfterClass
+ public static void teardown() {
+ ArchaiusUtils.resetConfig();
+ }
+
@Test
public void testPathPlaceHolder() {
- StringValueResolver stringValueResolver =
- SpringUtils.createStringValueResolver(Collections.singletonMap("var",
"varValue"));
+ ArchaiusUtils.setProperty("var", "varValue");
PojoSwaggerGeneratorContext context = new PojoSwaggerGeneratorContext();
- context.setEmbeddedValueResolver(stringValueResolver);
SwaggerGenerator swaggerGenerator = new SwaggerGenerator(context, null);
OperationGenerator operationGenerator = new
OperationGenerator(swaggerGenerator, null);
@@ -148,21 +160,22 @@ public class TestOperationGenerator {
private static class TestClass {
@ApiResponse(code = 200, message = "200 is ok............", response =
String.class,
- responseHeaders = @ResponseHeader(name = "x-user-domain", response
= String.class))
+ responseHeaders = @ResponseHeader(name = "x-user-domain", response =
String.class))
@ApiOperation(value = "value1", tags = {"tag1", "tag2"},
- responseHeaders = {@ResponseHeader(name = "x-user-name", response
= String.class),
- @ResponseHeader(name = "x-user-id", response =
String.class)},
- extensions= {@Extension(name="x-class-name", properties=
{@ExtensionProperty(value="value", name = "key")})})
+ responseHeaders = {@ResponseHeader(name = "x-user-name", response =
String.class),
+ @ResponseHeader(name = "x-user-id", response = String.class)},
+ extensions = {
+ @Extension(name = "x-class-name", properties =
{@ExtensionProperty(value = "value", name = "key")})})
public void function() {
}
-
@ApiOperation(value = "value1", tags = {"tag1", "tag2"},
- responseHeaders = {@ResponseHeader(name = "x-user-name", response
= String.class),
- @ResponseHeader(name = "x-user-id", response =
String.class)},
- extensions= {@Extension(name="x-class-name", properties=
{@ExtensionProperty(value="value", name = "key")})})
+ responseHeaders = {@ResponseHeader(name = "x-user-name", response =
String.class),
+ @ResponseHeader(name = "x-user-id", response = String.class)},
+ extensions = {
+ @Extension(name = "x-class-name", properties =
{@ExtensionProperty(value = "value", name = "key")})})
@ApiResponse(code = 200, message = "200 is ok............", response =
String.class,
- responseHeaders = @ResponseHeader(name = "x-user-domain", response
= String.class))
+ responseHeaders = @ResponseHeader(name = "x-user-domain", response =
String.class))
public void function1() {
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index eb9e827..4de3d96 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -20,22 +20,29 @@ package org.apache.servicecomb.swagger.generator.core;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertThat;
-import java.util.Collections;
-
-import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import
org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGeneratorContext;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.util.StringValueResolver;
public class TestSwaggerGenerator {
+ @BeforeClass
+ public static void setup() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @AfterClass
+ public static void teardown() {
+ ArchaiusUtils.resetConfig();
+ }
+
@Test
public void testBasePathPlaceHolder() {
- StringValueResolver stringValueResolver =
- SpringUtils.createStringValueResolver(Collections.singletonMap("var",
"varValue"));
+ ArchaiusUtils.setProperty("var", "varValue");
PojoSwaggerGeneratorContext context = new PojoSwaggerGeneratorContext();
- context.setEmbeddedValueResolver(stringValueResolver);
SwaggerGenerator swaggerGenerator = new SwaggerGenerator(context, null);
swaggerGenerator.setBasePath("/a/${var}/b");
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
index 8a5aa2d..5baa75c 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
@@ -27,7 +27,6 @@ import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
-import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
import
org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapperConfig;
import
org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerArgumentsMapper;
import
org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerArgumentsMapperFactory;
@@ -51,9 +50,6 @@ import io.swagger.models.Operation;
public class SwaggerEnvironment {
private static final Logger LOGGER =
LoggerFactory.getLogger(SwaggerEnvironment.class);
- @Inject
- protected CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext;
-
/**
* default producerArgumentsFactory
*/
@@ -78,15 +74,6 @@ public class SwaggerEnvironment {
producerResponseMapperFactorys.setConverterMgr(converterMgr);
}
- public CompositeSwaggerGeneratorContext
getCompositeSwaggerGeneratorContext() {
- return compositeSwaggerGeneratorContext;
- }
-
- public void setCompositeSwaggerGeneratorContext(
- CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext) {
- this.compositeSwaggerGeneratorContext = compositeSwaggerGeneratorContext;
- }
-
public ProducerArgumentsMapperFactory getProducerArgumentsFactory() {
return producerArgumentsFactory;
}
@@ -181,7 +168,6 @@ public class SwaggerEnvironment {
config.setSwaggerMethod(swaggerMethod);
config.setProviderMethod(producerMethod);
config.setSwaggerOperation(swaggerOperationMap.get(methodName));
-
config.setSwaggerGeneratorContext(compositeSwaggerGeneratorContext.selectContext(producerCls));
ProducerArgumentsMapperFactory argumentsMapperFactory =
selectProducerArgumentsMapperFactory(config);
ProducerArgumentsMapper argsMapper =
argumentsMapperFactory.createArgumentsMapper(config);
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/ArgumentsMapperConfig.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/ArgumentsMapperConfig.java
index da27083..71941dc 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/ArgumentsMapperConfig.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/ArgumentsMapperConfig.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicecomb.swagger.generator.core.SwaggerGeneratorContext;
-
import io.swagger.models.Operation;
public class ArgumentsMapperConfig {
@@ -33,8 +31,6 @@ public class ArgumentsMapperConfig {
private Operation swaggerOperation;
- private SwaggerGeneratorContext swaggerGeneratorContext;
-
// output
private List<ArgumentMapper> argumentMapperList = new ArrayList<>();
@@ -62,15 +58,6 @@ public class ArgumentsMapperConfig {
this.swaggerOperation = swaggerOperation;
}
- public SwaggerGeneratorContext getSwaggerGeneratorContext() {
- return swaggerGeneratorContext;
- }
-
- public void setSwaggerGeneratorContext(
- SwaggerGeneratorContext swaggerGeneratorContext) {
- this.swaggerGeneratorContext = swaggerGeneratorContext;
- }
-
public List<ArgumentMapper> getArgumentMapperList() {
return argumentMapperList;
}
