You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/09/27 13:23:53 UTC
[incubator-servicecomb-java-chassis] 01/02: [SCB-74] POJO static
method is export as an operation
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 229907d8bab360235ebe998591579594e7cd54f0
Author: heyile <he...@huawei.com>
AuthorDate: Wed Sep 26 15:36:15 2018 +0800
[SCB-74] POJO static method is export as an operation
---
.../org/apache/servicecomb/it/ConsumerMain.java | 2 +
.../it/testcase/TestIgnoreStaticMethod.java | 63 ++++++++++++++++++++++
.../it/schema/IgnoreStaticMethodSchema.java | 28 ++++++++++
.../swagger/generator/core/SwaggerGenerator.java | 7 ++-
4 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
index 12a59f0..ba051e1 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
@@ -27,6 +27,7 @@ import org.apache.servicecomb.it.testcase.TestDataTypePrimitive;
import org.apache.servicecomb.it.testcase.TestDefaultJsonValueJaxrsSchema;
import org.apache.servicecomb.it.testcase.TestDefaultValue;
import org.apache.servicecomb.it.testcase.TestIgnoreMethod;
+import org.apache.servicecomb.it.testcase.TestIgnoreStaticMethod;
import org.apache.servicecomb.it.testcase.TestParamCodec;
import org.apache.servicecomb.it.testcase.TestParamCodecEdge;
import org.apache.servicecomb.it.testcase.TestRequestBodySpringMvcSchema;
@@ -117,6 +118,7 @@ public class ConsumerMain {
ITJUnitUtils.runWithHighwayAndRest(TestChangeTransport.class);
ITJUnitUtils.runWithHighwayAndRest(TestDataTypePrimitive.class);
ITJUnitUtils.runWithHighwayAndRest(TestAnnotatedAttribute.class);
+ ITJUnitUtils.runWithHighwayAndRest(TestIgnoreStaticMethod.class);
// only rest support default value feature
ITJUnitUtils.runWithRest(TestDefaultValue.class);
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestIgnoreStaticMethod.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestIgnoreStaticMethod.java
new file mode 100644
index 0000000..6c8d4c9
--- /dev/null
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestIgnoreStaticMethod.java
@@ -0,0 +1,63 @@
+package org.apache.servicecomb.it.testcase;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.servicecomb.it.Consumers;
+import org.apache.servicecomb.it.junit.ITJUnitUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestIgnoreStaticMethod {
+ interface IgnoreStaticMethod {
+ int sub(int num1, int num2);
+
+ int add(int num1, int num2);
+ }
+
+ private static Consumers<IgnoreStaticMethod> consumers;
+
+ private static String producerName;
+
+ @Before
+ public void prepare() {
+ if (!ITJUnitUtils.getProducerName().equals(producerName)) {
+ producerName = ITJUnitUtils.getProducerName();
+ consumers = new Consumers<>(producerName, "ignoreStaticMethodSchema", IgnoreStaticMethod.class);
+ consumers.init(ITJUnitUtils.getTransport());
+ }
+ }
+
+
+
+ @Test
+ public void ignoreStaticMethod_pojo() {
+
+ int add = consumers.getIntf().add(5, 8);
+ assertEquals(13, add);
+ try {
+ int sub = consumers.getIntf().sub(5, 8);
+ } catch (Exception exception) {
+ assertTrue(exception.getMessage().contains("sub not exist"));
+ }
+
+ }
+
+ @Test
+ public void ignoreStaticMethod_rt() {
+ Map<String, Integer> map = new HashMap<>();
+ map.put("num1", 5);
+ map.put("num2", 8);
+ int add = consumers.getSCBRestTemplate().postForObject("/add", map, int.class);
+ assertEquals(13, add);
+
+ try {
+ int sub = consumers.getSCBRestTemplate().postForObject("/sub", map, int.class);
+ } catch (Exception exception) {
+ assertTrue(exception.getMessage().contains("message=Not Found"));
+ }
+ }
+}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/IgnoreStaticMethodSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/IgnoreStaticMethodSchema.java
new file mode 100644
index 0000000..8ef4a94
--- /dev/null
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/IgnoreStaticMethodSchema.java
@@ -0,0 +1,28 @@
+package org.apache.servicecomb.it.schema;
+
+import org.apache.servicecomb.provider.pojo.RpcSchema;
+
+import io.swagger.annotations.SwaggerDefinition;
+
+@RpcSchema(schemaId = "ignoreStaticMethodSchema")
+@SwaggerDefinition(basePath = "/v1/ignoreStaticMethodSchema")
+public class IgnoreStaticMethodSchema {
+
+ private IgnoreStaticMethodSchema() {
+ }
+
+ private static IgnoreStaticMethodSchema INSTANCE = new IgnoreStaticMethodSchema();
+
+ public static IgnoreStaticMethodSchema getINSTANCE() {
+ return INSTANCE;
+ }
+
+ public static int sub(int num1, int num2) {
+ return num1 - num2;
+ }
+
+ public int add(int num1, int num2) {
+ return num1 + num2;
+ }
+
+}
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 aa472fd..8dac32a 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
@@ -19,6 +19,7 @@ package org.apache.servicecomb.swagger.generator.core;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
@@ -222,6 +223,11 @@ public class SwaggerGenerator {
if (method.getDeclaringClass().getName().equals(Object.class.getName())) {
return true;
}
+ // skip static method
+ int modifiers = method.getModifiers();
+ if (Modifier.isStatic(modifiers)) {
+ return true;
+ }
ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
if (apiOperation != null && apiOperation.hidden()) {
@@ -239,7 +245,6 @@ public class SwaggerGenerator {
if (isSkipMethod(method)) {
continue;
}
-
OperationGenerator operationGenerator = new OperationGenerator(this, method);
operationGenerator.setHttpMethod(httpMethod);
try {