Fix the problem of using @RestController annotation to return data results

Author: qianmoQ

netty/src/main/java/io/edurt/gcm/netty/annotation/RestController.java

@@ -20,6 +20,7 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@ResponseBody
 public @interface RestController
 {
     String value() default "";

netty/src/main/java/io/edurt/gcm/netty/dispatcher/RequestDispatcher.java

@@ -8,6 +8,7 @@
 import io.edurt.gcm.netty.annotation.RequestBody;
 import io.edurt.gcm.netty.annotation.RequestParam;
 import io.edurt.gcm.netty.annotation.ResponseBody;
+import io.edurt.gcm.netty.annotation.RestController;
 import io.edurt.gcm.netty.configuration.NettyConfiguration;
 import io.edurt.gcm.netty.configuration.NettyConfigurationDefault;
 import io.edurt.gcm.netty.exception.NettyException;
@@ -97,7 +98,8 @@ public void triggerAction(FullHttpRequest httpRequest, FullHttpResponse httpResp
         LOGGER.debug("Parsing method parameters, used to inject the corresponding entity!");
         ArrayList<Class> classList = new ArrayList<>();
         ArrayList<Object> objectList = new ArrayList<>();
-        Object ctrlObject = injector.getInstance(Class.forName(ctrlClass));
+        Class<?> clazz = Class.forName(ctrlClass);
+        Object ctrlObject = injector.getInstance(clazz);
         LOGGER.debug("Current execute controller {}", ctrlObject);
         Map<String, String> requestParams = this.getRequestParams(httpRequest);
         Method[] methods = ctrlObject.getClass().getMethods();
@@ -155,7 +157,8 @@ else if (parameter.getAnnotation(RequestBody.class) != null) {
         Object[] objects = objectList.toArray();
         Method method = ctrlObject.getClass().getMethod(methodName, classes);
         String content = null;
-        if (method.isAnnotationPresent(ResponseBody.class)) {
+        // Fix the problem of using @RestController annotation to return data results
+        if (method.isAnnotationPresent(ResponseBody.class) || clazz.isAnnotationPresent(RestController.class)) {
             Gson gson = new Gson();
             try {
                 content = gson.toJson(method.invoke(ctrlObject, objects));

netty/src/test/java/io/edurt/gcm/netty/controller/TestImplicitResponseController.java

@@ -0,0 +1,28 @@
+/*
+ * Licensed 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 io.edurt.gcm.netty.controller;
+
+import io.edurt.gcm.netty.annotation.GetMapping;
+import io.edurt.gcm.netty.annotation.RequestParam;
+import io.edurt.gcm.netty.annotation.RestController;
+
+@RestController
+public class TestImplicitResponseController
+{
+    @GetMapping(value = {"/api/test/implicit/get"})
+    public String getMapping(@RequestParam(value = "value") String value)
+    {
+        return String.format("This is @GetMapping test case, value %s", value);
+    }
+}