[GitHub] WillemJiang closed pull request #478: [SCB-156] Improvement SpringMVC Integration Test and InvokeUtils

[GitBox <gi...@apache.org>]

WillemJiang closed pull request #478: [SCB-156] Improvement SpringMVC Integration Test and InvokeUtils
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/478
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/src/main/java/io/servicecomb/core/provider/consumer/InvokerUtils.java b/core/src/main/java/io/servicecomb/core/provider/consumer/InvokerUtils.java
index 3a9b31044..a7662bbd9 100644
--- a/core/src/main/java/io/servicecomb/core/provider/consumer/InvokerUtils.java
+++ b/core/src/main/java/io/servicecomb/core/provider/consumer/InvokerUtils.java
@@ -87,12 +87,11 @@ public static void reactiveInvoke(Invocation invocation, AsyncResponse asyncResp
       ReactiveResponseExecutor respExecutor = new ReactiveResponseExecutor();
       invocation.setResponseExecutor(respExecutor);
 
-      AsyncResponse wrappedAsyncResponse = response -> {
+      invocation.next(ar -> {
         invocation.triggerFinishedEvent();
-        asyncResp.handle(response);
-      };
+        asyncResp.handle(ar);
+      });
 
-      invocation.next(wrappedAsyncResponse);
     } catch (Throwable e) {
       invocation.triggerFinishedEvent();
       LOGGER.error("invoke failed, {}", invocation.getOperationMeta().getMicroserviceQualifiedName());
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
index 5364f376d..7a7a1aacc 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -19,6 +19,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -64,7 +65,6 @@ public static void run() throws Exception {
     controller = BeanUtils.getBean("controller");
     metricsPublisher = BeanUtils.getBean("metricsPublisher");
 
-
     String prefix = "cse://springmvc";
 
     try {
@@ -95,26 +95,23 @@ public static void run() throws Exception {
       String content = restTemplate.getForObject("cse://springmvc/codeFirstSpringmvc/metricsForTest", String.class);
       Map<String, String> resultMap = JsonUtils.OBJ_MAPPER.readValue(content, HashMap.class);
 
-      TestMgr.check(String.valueOf(true), String.valueOf(resultMap.get("CPU and Memory").contains("heapUsed=")));
-
-      TestMgr.check(resultMap.get("totalRequestProvider OPERATIONAL_LEVEL"),
-          "{springmvc.codeFirst.saySomething=3, springmvc.codeFirst.testRawJsonAnnotation=3, " +
-              "springmvc.codeFirst.sayHi2=3, springmvc.codeFirst.responseEntity=6, springmvc.codeFirst.fileUpload=3, " +
-              "springmvc.codeFirst.responseEntityPATCH=3, springmvc.codeFirst.textPlain=3, " +
-              "springmvc.codeFirst.metricsForTest=1, springmvc.codeFirst.testform=6, " +
-              "springmvc.controller.saySomething=6, springmvc.codeFirst.fallbackReturnNull=6, " +
-              "springmvc.codeFirst.addString=3, springmvc.codeFirst.reduce=3, springmvc.codeFirst.sayHi=3, " +
-              "springmvc.codeFirst.cseResponse=6, springmvc.codeFirst.bytes=3, springmvc.controller.sayHei=3, " +
-              "springmvc.codeFirst.fallbackThrowException=9, springmvc.codeFirst.testModelWithIgnoreField=1, " +
-              "springmvc.codeFirst.testUserMap=3, springmvc.codeFirst.isTrue=3, springmvc.codeFirst.add=3, " +
-              "springmvc.codeFirst.fallbackFromCache=6, springmvc.controller.sayHi=17, springmvc.codeFirst.sayHello=6,"
-              +
-              " springmvc.controller.sayHello=6, springmvc.codeFirst.addDate=3}");
-
-      TestMgr.check(String.valueOf(resultMap.get("RequestQueueRelated").contains("springmvc.codeFirst.saySomething")),
-          String.valueOf(true));
-      TestMgr.check(String.valueOf(resultMap.get("RequestQueueRelated").contains("springmvc.controller.sayHi")),
-          String.valueOf(true));
+      TestMgr.check(true, resultMap.get("CPU and Memory").contains("heapUsed="));
+
+      String[] requestProviders = resultMap.get("totalRequestProvider OPERATIONAL_LEVEL")
+          .replace("{", "")
+          .replace("}", "").split(",");
+      Map<String, Integer> requests = new HashMap<>();
+      for (String requestProvider : requestProviders) {
+        String[] requestKeyAndValues = requestProvider.split("=");
+        requests.put(requestKeyAndValues[0], Integer.parseInt(requestKeyAndValues[1]));
+      }
+
+      for (Entry<String, Integer> request : requests.entrySet()) {
+        TestMgr.check(true, request.getValue() > 0);
+      }
+
+      TestMgr.check(true, resultMap.get("RequestQueueRelated").contains("springmvc.codeFirst.saySomething"));
+      TestMgr.check(true, resultMap.get("RequestQueueRelated").contains("springmvc.controller.sayHi"));
     } catch (Exception e) {
       TestMgr.check("true", "false");
     }
@@ -123,11 +120,11 @@ public static void run() throws Exception {
     try {
       RegistryMetric metric = metricsPublisher.metrics();
 
-      TestMgr.check(String.valueOf(metric.getInstanceMetric().getSystemMetric().getHeapUsed() != 0), "true");
-      TestMgr.check(String.valueOf(metric.getProducerMetrics().size() == 28), "true");
-      TestMgr.check(String.valueOf(
-          metric.getProducerMetrics().get("springmvc.codeFirst.saySomething").getProducerCall().getTotal() == 3),
-          "true");
+      TestMgr
+          .check(true, metric.getInstanceMetric().getSystemMetric().getHeapUsed() != 0);
+      TestMgr.check(true, metric.getProducerMetrics().size() > 0);
+      TestMgr.check(true,
+          metric.getProducerMetrics().get("springmvc.codeFirst.saySomething").getProducerCall().getTotal() > 0);
     } catch (Exception e) {
       TestMgr.check("true", "false");
     }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services