You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ch...@apache.org on 2019/12/30 06:36:56 UTC
[servicecomb-toolkit] branch master updated (012c39d -> 41ac32f)
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git.
from 012c39d [SCB-1679] add unit test
new 638b269 [SCB-1676] nested complex properties are not parsed and added to the component
new 41ac32f [SCB-1676] optimizing the acquisition of bean properties
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../generator/annotation/ModelInterceptor.java | 4 +-
.../generator/context/OperationContext.java | 3 +-
.../generator/context/ParameterContext.java | 5 +-
.../toolkit/generator/util/ModelConverter.java | 99 ++++++++-
.../RequestResponse.java} | 12 +-
.../servicecomb/toolkit/generator/UtilsTest.java | 244 ++++++++++++++++++++-
.../generator/MultipartFileInterceptor.java | 4 +-
...stractHttpMethodMappingAnnotationProcessor.java | 4 +-
8 files changed, 359 insertions(+), 16 deletions(-)
copy oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/{HttpStatuses.java => util/RequestResponse.java} (83%)
[servicecomb-toolkit] 02/02: [SCB-1676] optimizing the acquisition
of bean properties
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit 41ac32ffb13afd81d368cc9d4eca275df8a8b3e2
Author: kakulisen <18...@163.com>
AuthorDate: Fri Dec 27 15:03:06 2019 +0800
[SCB-1676] optimizing the acquisition of bean properties
Signed-off-by: kakulisen <18...@163.com>
---
.../generator/context/OperationContext.java | 3 +-
.../generator/context/ParameterContext.java | 5 +-
.../toolkit/generator/util/ModelConverter.java | 79 ++++++++++++++++------
.../toolkit/generator/util/RequestResponse.java | 31 +++++++++
.../servicecomb/toolkit/generator/UtilsTest.java | 49 +++++++++++++-
...stractHttpMethodMappingAnnotationProcessor.java | 4 +-
6 files changed, 143 insertions(+), 28 deletions(-)
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/OperationContext.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/OperationContext.java
index 3560b3b..6d36ccb 100644
--- a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/OperationContext.java
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/OperationContext.java
@@ -28,6 +28,7 @@ import org.apache.servicecomb.toolkit.generator.HttpStatuses;
import org.apache.servicecomb.toolkit.generator.MediaTypes;
import org.apache.servicecomb.toolkit.generator.parser.api.OpenApiAnnotationParser;
import org.apache.servicecomb.toolkit.generator.util.ModelConverter;
+import org.apache.servicecomb.toolkit.generator.util.RequestResponse;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
@@ -177,7 +178,7 @@ public class OperationContext implements IExtensionsContext {
MediaType mediaType = new MediaType();
- Schema refSchema = ModelConverter.getSchema(returnType, getComponents());
+ Schema refSchema = ModelConverter.getSchema(returnType, getComponents(), RequestResponse.RESPONSE);
mediaType.schema(refSchema);
Content content = new Content();
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/ParameterContext.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/ParameterContext.java
index 57d66b1..ca9046a 100644
--- a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/ParameterContext.java
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/context/ParameterContext.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.toolkit.generator.parser.api.OpenApiAnnotationParser;
import org.apache.servicecomb.toolkit.generator.util.ModelConverter;
import org.apache.servicecomb.toolkit.generator.util.ParamUtils;
+import org.apache.servicecomb.toolkit.generator.util.RequestResponse;
import io.swagger.v3.core.util.ParameterProcessor;
import io.swagger.v3.core.util.ReflectionUtils;
@@ -96,7 +97,7 @@ public class ParameterContext implements ISchemaContext, IExtensionsContext {
}
ensureName();
if (schema == null || nullSchema.equals(schema)) {
- schema = ModelConverter.getSchema(parameter.getType(), getComponents());
+ schema = ModelConverter.getSchema(parameter.getType(), getComponents(), RequestResponse.REQUEST);
oasParameter.schema(schema);
}
@@ -236,7 +237,7 @@ public class ParameterContext implements ISchemaContext, IExtensionsContext {
Schema refSchema = oasParameter.getSchema();
if (refSchema == null || nullSchema.equals(refSchema)) {
- refSchema = ModelConverter.getSchema(parameter.getType(), getComponents());
+ refSchema = ModelConverter.getSchema(parameter.getType(), getComponents(), RequestResponse.REQUEST);
oasParameter.schema(refSchema);
}
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
index ae3f9e4..9ce26c9 100644
--- a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
@@ -18,14 +18,13 @@
package org.apache.servicecomb.toolkit.generator.util;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import java.util.ServiceLoader;
@@ -72,10 +71,10 @@ public class ModelConverter {
}
public static Schema getSchema(Type cls) {
- return getSchema(cls, null);
+ return getSchema(cls, null, null);
}
- public static Schema getSchema(Type cls, Components components) {
+ public static Schema getSchema(Type cls, Components components, RequestResponse requestResponse) {
for (ModelInterceptor interceptor : interceptorMgr) {
Schema schema = interceptor.process(cls, components);
@@ -84,19 +83,29 @@ public class ModelConverter {
}
}
- if (cls instanceof Class) {
- Map<String, Type> beanProperties = getBeanProperties((Class) cls);
+ if (cls instanceof Class && requestResponse != null) {
+
+ List<Type> beanProperties = null;
+ switch (requestResponse) {
+ case REQUEST:
+ beanProperties = getRequestBeanTypes((Class) cls);
+ break;
+ case RESPONSE:
+ beanProperties = getResponseBeanTypes((Class) cls);
+ break;
+ default:
+ }
Optional.ofNullable(beanProperties)
- .ifPresent(properties -> properties.forEach((name, type) ->
+ .ifPresent(properties -> properties.forEach(type ->
{
if (type instanceof ParameterizedType) {
Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments();
- Arrays.stream(actualTypeArguments).forEach(arg -> getSchema(arg, components));
+ Arrays.stream(actualTypeArguments).forEach(arg -> getSchema(arg, components, requestResponse));
}
if (type instanceof Class) {
- getSchema(type, components);
+ getSchema(type, components, requestResponse);
}
})
);
@@ -177,26 +186,54 @@ public class ModelConverter {
return mapper;
}
- public static Map<String, Type> getBeanProperties(Class cls) {
+ public static List<Type> getRequestBeanTypes(Class cls) {
if (cls.isPrimitive()) {
return null;
}
Method[] declaredMethods = cls.getDeclaredMethods();
- Map<String, Type> beanProperties = new HashMap<>();
+ List<Type> beanProperties = new ArrayList<>();
for (Method method : declaredMethods) {
- if (method.getName().startsWith("get")) {
- if (method.getReturnType() != null && method.getReturnType() != void.class) {
- String propName = method.getName().substring(3);
- try {
- cls.getDeclaredMethod("set" + propName, method.getReturnType());
- beanProperties.put(method.getName(), method.getGenericReturnType());
- } catch (NoSuchMethodException e) {
- continue;
- }
- }
+
+ /**
+ * Meet the following requirements, can be considered a request bean property
+ * 1. method modifiers is public and non-static
+ * 2. method name should be setAbc or setABC, setabc is not a setter method
+ * 3. return value of method is void
+ * 4. method has only one parameter
+ */
+ if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers()) && method.getName()
+ .startsWith("set") && method.getName().length() > 3 && Character.isUpperCase(method.getName().charAt(3))
+ && method.getReturnType()
+ .equals(Void.TYPE) && method.getParameterCount() == 1) {
+ beanProperties.add(method.getGenericParameterTypes()[0]);
}
}
return beanProperties;
}
+
+ public static List<Type> getResponseBeanTypes(Class cls) {
+ if (cls.isPrimitive()) {
+ return null;
+ }
+ Method[] declaredMethods = cls.getDeclaredMethods();
+ List<Type> beanPropertyTypes = new ArrayList<>();
+
+ for (Method method : declaredMethods) {
+ /**
+ * Meet the following requirements, can be considered a response bean property
+ * 1. method modifiers is public and non-static
+ * 2. method name should be getAbc or getABC, getabc is not a getter method
+ * 3. return value of method is not void
+ * 4. method has no parameters
+ */
+ if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers()) && method.getName()
+ .startsWith("get") && method.getName().length() > 3 && Character.isUpperCase(method.getName().charAt(3))
+ && !method.getReturnType()
+ .equals(Void.TYPE) && method.getParameterCount() == 0) {
+ beanPropertyTypes.add(method.getGenericReturnType());
+ }
+ }
+ return beanPropertyTypes;
+ }
}
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/RequestResponse.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/RequestResponse.java
new file mode 100644
index 0000000..26da697
--- /dev/null
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/RequestResponse.java
@@ -0,0 +1,31 @@
+/*
+ * 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.toolkit.generator.util;
+
+public enum RequestResponse {
+
+ /**
+ * Mark a request
+ */
+ REQUEST,
+
+ /**
+ * Mark a response
+ */
+ RESPONSE
+}
diff --git a/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java b/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
index 6aab6b9..494703e 100644
--- a/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
+++ b/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.servicecomb.toolkit.generator.annotation.ModelInterceptor;
import org.apache.servicecomb.toolkit.generator.util.ModelConverter;
import org.apache.servicecomb.toolkit.generator.util.ParamUtils;
+import org.apache.servicecomb.toolkit.generator.util.RequestResponse;
import org.apache.servicecomb.toolkit.generator.util.SwaggerAnnotationUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -62,10 +63,10 @@ public class UtilsTest {
Assert.assertEquals(ArraySchema.class, schema.getClass());
Components components = new Components();
- schema = ModelConverter.getSchema(ParameterClass[].class, components);
+ schema = ModelConverter.getSchema(ParameterClass[].class, components, null);
Assert.assertEquals(ArraySchema.class, schema.getClass());
- schema = ModelConverter.getSchema(ParameterClass.class, components);
+ schema = ModelConverter.getSchema(ParameterClass.class, components, null);
Assert.assertNotNull(schema.get$ref());
ModelInterceptor mockModelInterceptor = new ModelInterceptor() {
@@ -86,7 +87,7 @@ public class UtilsTest {
ModelConverter.unRegisterInterceptor(mockModelInterceptor);
Components component = new Components();
- ModelConverter.getSchema(BeanClass.class, component);
+ ModelConverter.getSchema(BeanClass.class, component, RequestResponse.REQUEST);
Assert.assertNotNull(component.getSchemas().get("Value"));
Schema beanClass = component.getSchemas().get("BeanClass");
@@ -136,6 +137,21 @@ public class UtilsTest {
}
@Test
+ public void getRequestOrResponseBean() {
+
+ List<Type> requestBeanTypes = ModelConverter.getRequestBeanTypes(RequestBeanClass.class);
+ List<Type> responseBeanTypes = ModelConverter.getResponseBeanTypes(ResponseBeanClass.class);
+
+ Assert.assertNotNull(requestBeanTypes);
+ Assert.assertNotNull(responseBeanTypes);
+
+ Assert.assertEquals(1, requestBeanTypes.size());
+ Assert.assertEquals("Value", ((Class) requestBeanTypes.get(0)).getSimpleName());
+ Assert.assertEquals(1, responseBeanTypes.size());
+ Assert.assertEquals("Value", ((Class) responseBeanTypes.get(0)).getSimpleName());
+ }
+
+ @Test
public void getContentFromAnnotation() {
Content contents = Mockito.mock(Content.class);
when(contents.encoding()).thenReturn(new Encoding[] {Mockito.mock(Encoding.class)});
@@ -145,6 +161,33 @@ public class UtilsTest {
Assert.assertEquals(1, contentFromAnnotation.size());
}
+ class RequestBeanClass {
+
+ public void setValue(Value value) {
+ }
+
+ public void setName(String name, String alias) {
+ }
+
+ public Integer getSomething() {
+ return 0;
+ }
+ }
+
+ class ResponseBeanClass {
+
+ public Value getValue() {
+ return new Value();
+ }
+
+ public String getName(String name) {
+ return name;
+ }
+
+ public void setSomething(Integer something) {
+ }
+ }
+
class ParameterClass {
public void method(String param) {
}
diff --git a/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/AbstractHttpMethodMappingAnnotationProcessor.java b/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/AbstractHttpMethodMappingAnnotationProcessor.java
index 753f84e..526b3c6 100644
--- a/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/AbstractHttpMethodMappingAnnotationProcessor.java
+++ b/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/AbstractHttpMethodMappingAnnotationProcessor.java
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
import org.apache.servicecomb.toolkit.generator.HttpStatuses;
import org.apache.servicecomb.toolkit.generator.context.OperationContext;
import org.apache.servicecomb.toolkit.generator.util.ModelConverter;
+import org.apache.servicecomb.toolkit.generator.util.RequestResponse;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -72,7 +73,8 @@ public abstract class AbstractHttpMethodMappingAnnotationProcessor<Annotation, C
Content content = new Content();
MediaType mediaType = new MediaType();
Schema schema = ModelConverter
- .getSchema(operationContext.getMethod().getReturnType(), operationContext.getComponents());
+ .getSchema(operationContext.getMethod().getReturnType(), operationContext.getComponents(),
+ RequestResponse.RESPONSE);
mediaType.schema(schema);
for (String produce : produceList) {
content.addMediaType(produce, mediaType);
[servicecomb-toolkit] 01/02: [SCB-1676] nested complex properties
are not parsed and added to the component
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit 638b269d34cd9e7e4e4c1fcb2177be1b63a31f3a
Author: kakulisen <18...@163.com>
AuthorDate: Mon Dec 23 11:45:44 2019 +0800
[SCB-1676] nested complex properties are not parsed and added to the component
Signed-off-by: kakulisen <18...@163.com>
---
.../generator/annotation/ModelInterceptor.java | 4 +-
.../toolkit/generator/util/ModelConverter.java | 60 ++++++-
.../servicecomb/toolkit/generator/UtilsTest.java | 197 ++++++++++++++++++++-
.../generator/MultipartFileInterceptor.java | 4 +-
4 files changed, 260 insertions(+), 5 deletions(-)
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/ModelInterceptor.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/ModelInterceptor.java
index 8415e1a..c6c8954 100644
--- a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/ModelInterceptor.java
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/annotation/ModelInterceptor.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.toolkit.generator.annotation;
+import java.lang.reflect.Type;
+
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.media.Schema;
@@ -24,5 +26,5 @@ public interface ModelInterceptor {
int order();
- Schema process(Class<?> cls, Components components);
+ Schema process(Type cls, Components components);
}
diff --git a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
index 307863d..ae3f9e4 100644
--- a/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
+++ b/oas-generator/oas-generator-core/src/main/java/org/apache/servicecomb/toolkit/generator/util/ModelConverter.java
@@ -17,10 +17,16 @@
package org.apache.servicecomb.toolkit.generator.util;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import java.util.ServiceLoader;
import org.apache.servicecomb.toolkit.generator.annotation.ModelInterceptor;
@@ -37,6 +43,7 @@ import io.swagger.v3.core.util.PrimitiveType;
import io.swagger.v3.core.util.RefUtils;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ObjectSchema;
import io.swagger.v3.oas.models.media.Schema;
public class ModelConverter {
@@ -64,11 +71,11 @@ public class ModelConverter {
interceptorMgr.remove(interceptor);
}
- public static Schema getSchema(Class<?> cls) {
+ public static Schema getSchema(Type cls) {
return getSchema(cls, null);
}
- public static Schema getSchema(Class<?> cls, Components components) {
+ public static Schema getSchema(Type cls, Components components) {
for (ModelInterceptor interceptor : interceptorMgr) {
Schema schema = interceptor.process(cls, components);
@@ -77,16 +84,42 @@ public class ModelConverter {
}
}
+ if (cls instanceof Class) {
+ Map<String, Type> beanProperties = getBeanProperties((Class) cls);
+
+ Optional.ofNullable(beanProperties)
+ .ifPresent(properties -> properties.forEach((name, type) ->
+ {
+ if (type instanceof ParameterizedType) {
+ Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments();
+ Arrays.stream(actualTypeArguments).forEach(arg -> getSchema(arg, components));
+ }
+
+ if (type instanceof Class) {
+ getSchema(type, components);
+ }
+ })
+ );
+ }
+
Schema schema = PrimitiveType.createProperty(cls);
if (schema == null) {
schema = context
.resolve(new AnnotatedType(cls));
}
+ if (schema == null) {
+ if (cls == List.class) {
+ schema = new ArraySchema();
+ ((ArraySchema) schema).setItems(new ObjectSchema());
+ }
+ }
+
if (components == null) {
return schema;
}
+ // correct reference
Schema refSchema = schema;
if (shouldExtractRef(schema)) {
@@ -143,4 +176,27 @@ public class ModelConverter {
return mapper;
}
+
+ public static Map<String, Type> getBeanProperties(Class cls) {
+ if (cls.isPrimitive()) {
+ return null;
+ }
+ Method[] declaredMethods = cls.getDeclaredMethods();
+ Map<String, Type> beanProperties = new HashMap<>();
+
+ for (Method method : declaredMethods) {
+ if (method.getName().startsWith("get")) {
+ if (method.getReturnType() != null && method.getReturnType() != void.class) {
+ String propName = method.getName().substring(3);
+ try {
+ cls.getDeclaredMethod("set" + propName, method.getReturnType());
+ beanProperties.put(method.getName(), method.getGenericReturnType());
+ } catch (NoSuchMethodException e) {
+ continue;
+ }
+ }
+ }
+ }
+ return beanProperties;
+ }
}
diff --git a/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java b/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
index 1ef65d1..6aab6b9 100644
--- a/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
+++ b/oas-generator/oas-generator-core/src/test/java/org/apache/servicecomb/toolkit/generator/UtilsTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.when;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
+import java.lang.reflect.Type;
import java.util.List;
import org.apache.servicecomb.toolkit.generator.annotation.ModelInterceptor;
@@ -74,7 +75,7 @@ public class UtilsTest {
}
@Override
- public Schema process(Class<?> cls, Components components) {
+ public Schema process(Type cls, Components components) {
return new Schema().name("unknown");
}
};
@@ -83,6 +84,55 @@ public class UtilsTest {
schema = ModelConverter.getSchema(ParameterClass.class);
Assert.assertEquals("unknown", schema.getName());
ModelConverter.unRegisterInterceptor(mockModelInterceptor);
+
+ Components component = new Components();
+ ModelConverter.getSchema(BeanClass.class, component);
+ Assert.assertNotNull(component.getSchemas().get("Value"));
+
+ Schema beanClass = component.getSchemas().get("BeanClass");
+ Assert.assertNotNull(beanClass);
+ Schema valueRef = (Schema) beanClass.getProperties().get("value");
+ Assert.assertEquals("#/components/schemas/Value", valueRef.get$ref());
+
+ Schema intVal = (Schema) beanClass.getProperties().get("intVal");
+ Assert.assertEquals("int32", intVal.getFormat());
+ Assert.assertEquals("integer", intVal.getType());
+
+ Schema intObj = (Schema) beanClass.getProperties().get("intObj");
+ Assert.assertEquals("int32", intObj.getFormat());
+ Assert.assertEquals("integer", intObj.getType());
+
+ Schema longVal = (Schema) beanClass.getProperties().get("longVal");
+ Assert.assertEquals("int64", longVal.getFormat());
+ Assert.assertEquals("integer", longVal.getType());
+
+ Schema longObj = (Schema) beanClass.getProperties().get("longObj");
+ Assert.assertEquals("int64", longObj.getFormat());
+ Assert.assertEquals("integer", longObj.getType());
+
+ Schema doubleVal = (Schema) beanClass.getProperties().get("doubleVal");
+ Assert.assertEquals("double", doubleVal.getFormat());
+ Assert.assertEquals("number", doubleVal.getType());
+
+ Schema doubleObj = (Schema) beanClass.getProperties().get("doubleObj");
+ Assert.assertEquals("double", doubleObj.getFormat());
+ Assert.assertEquals("number", doubleObj.getType());
+
+ Schema props = (Schema) beanClass.getProperties().get("props");
+ Assert.assertEquals(ArraySchema.class, props.getClass());
+ Assert.assertEquals("array", props.getType());
+ Assert.assertEquals("string", ((ArraySchema) props).getItems().getType());
+
+ Schema numbers = (Schema) beanClass.getProperties().get("numbers");
+ Assert.assertEquals(ArraySchema.class, numbers.getClass());
+ Assert.assertEquals("array", numbers.getType());
+ Assert.assertEquals("integer", ((ArraySchema) numbers).getItems().getType());
+ Assert.assertEquals("int32", ((ArraySchema) numbers).getItems().getFormat());
+
+ Schema values = (Schema) beanClass.getProperties().get("values");
+ Assert.assertEquals(ArraySchema.class, values.getClass());
+ Assert.assertEquals("array", values.getType());
+ Assert.assertEquals("#/components/schemas/Value", ((ArraySchema) values).getItems().get$ref());
}
@Test
@@ -99,4 +149,149 @@ public class UtilsTest {
public void method(String param) {
}
}
+
+ class BeanClass {
+
+ private String name;
+
+ private int intVal;
+
+ private long longVal;
+
+ private double doubleVal;
+
+ private Integer intObj;
+
+ private Long longObj;
+
+ private Double doubleObj;
+
+ private Value value;
+
+ List<String> props;
+
+ List<Integer> numbers;
+
+ List<Value> values;
+
+ List list;
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+
+ public int getIntVal() {
+ return intVal;
+ }
+
+ public void setIntVal(int intVal) {
+ this.intVal = intVal;
+ }
+
+ public long getLongVal() {
+ return longVal;
+ }
+
+ public void setLongVal(long longVal) {
+ this.longVal = longVal;
+ }
+
+ public double getDoubleVal() {
+ return doubleVal;
+ }
+
+ public void setDoubleVal(double doubleVal) {
+ this.doubleVal = doubleVal;
+ }
+
+ public Integer getIntObj() {
+ return intObj;
+ }
+
+ public void setIntObj(Integer intObj) {
+ this.intObj = intObj;
+ }
+
+ public Long getLongObj() {
+ return longObj;
+ }
+
+ public void setLongObj(Long longObj) {
+ this.longObj = longObj;
+ }
+
+ public Double getDoubleObj() {
+ return doubleObj;
+ }
+
+ public void setDoubleObj(Double doubleObj) {
+ this.doubleObj = doubleObj;
+ }
+
+ public List<Value> getValues() {
+ return values;
+ }
+
+ public void setValues(List<Value> values) {
+ this.values = values;
+ }
+
+ public List<Integer> getNumbers() {
+ return numbers;
+ }
+
+ public void setNumbers(List<Integer> numbers) {
+ this.numbers = numbers;
+ }
+
+ public List<String> getProps() {
+ return props;
+ }
+
+ public void setProps(List<String> props) {
+ this.props = props;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Value getValue() {
+ return value;
+ }
+
+ public void setValue(Value value) {
+ this.value = value;
+ }
+ }
+
+ class Value {
+ private String prop1;
+
+ private String prop2;
+
+ public String getProp1() {
+ return prop1;
+ }
+
+ public void setProp1(String prop1) {
+ this.prop1 = prop1;
+ }
+
+ public String getProp2() {
+ return prop2;
+ }
+
+ public void setProp2(String prop2) {
+ this.prop2 = prop2;
+ }
+ }
}
diff --git a/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/MultipartFileInterceptor.java b/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/MultipartFileInterceptor.java
index 4857143..a5c2a92 100644
--- a/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/MultipartFileInterceptor.java
+++ b/oas-generator/oas-generator-spring/src/main/java/org/apache/servicecomb/toolkit/generator/MultipartFileInterceptor.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.toolkit.generator;
+import java.lang.reflect.Type;
+
import org.apache.servicecomb.toolkit.generator.annotation.ModelInterceptor;
import org.apache.servicecomb.toolkit.generator.util.ModelConverter;
import org.springframework.web.multipart.MultipartFile;
@@ -33,7 +35,7 @@ public class MultipartFileInterceptor implements ModelInterceptor {
}
@Override
- public Schema process(Class<?> cls, Components components) {
+ public Schema process(Type cls, Components components) {
if (!MultipartFile.class.equals(cls)) {
return null;