add FastMapping verify #16

Author: xlorne

springboot-example/src/main/java/com/codingapi/springboot/example/infrastructure/query/FastDemoApi.java

@@ -10,10 +10,11 @@
 @FastController
 public interface FastDemoApi {
 
-    @FastMapping(method = RequestMethod.GET,
+    @FastMapping(
+            method = RequestMethod.GET,
             mapping = "/open/demo/findByName",
-            hql = "select d from DemoEntity d where name = :name",
-            countHql = "select count(d) from DemoEntity d where name = :name")
+            value = "select d from DemoEntity d where name = :name",
+            countQuery = "select count(d) from DemoEntity d where name = :name")
     MultiResponse<DemoEntity> findByName(DemoDTO.DemoQuery query);
 
 }

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/annotation/FastMapping.java

@@ -14,14 +14,27 @@
 @ResponseBody
 public @interface FastMapping {
 
-    String hql() default "";
+    /**
+     * execute jpa hql
+     */
+    String value() default "";
 
 
-    String countHql() default "";
+    /**
+     * execute jpa count hql
+     */
+    String countQuery() default "";
 
+    /**
+     * mvc request method
+     *
+     */
     RequestMethod method() default RequestMethod.GET;
 
-
+    /**
+     * mvc request url
+     *
+     */
     String mapping() default "";
 
 }

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/MvcMethodProxy.java

@@ -22,6 +22,6 @@ public Object invoke(Object proxy, Method method, Object[] args)
         }
         FastMapping fastMapping = method.getAnnotation(FastMapping.class);
         Class<?> returnType =  method.getReturnType();
-        return jpaExecutor.execute(fastMapping.hql(),fastMapping.countHql(),args,returnType);
+        return jpaExecutor.execute(fastMapping.value(),fastMapping.countQuery(),args,returnType);
     }
 }

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/registrar/MvcMappingRegistrar.java

@@ -29,7 +29,7 @@ public void registerMvcMapping() {
            Method[] methods = clazz.getDeclaredMethods();
            for(Method method:methods){
                FastMapping fastMapping =  method.getAnnotation(FastMapping.class);
-               if(fastMapping!=null&&isVerify(fastMapping,method)) {
+               if(verify(fastMapping,method)) {
                    MvcMethodProxy handler = new MvcMethodProxy(jpaExecutor);
                    Object methodProxy =  Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, handler);
                    mvcEndpointMapping.addMapping(fastMapping.mapping(), fastMapping.method(), methodProxy, method);
@@ -38,15 +38,28 @@ public void registerMvcMapping() {
        }
     }
 
-    private boolean isVerify(FastMapping fastMapping,Method method) throws FastMappingErrorException {
+    private boolean verify(FastMapping fastMapping, Method method) throws FastMappingErrorException {
+        if(fastMapping==null){
+            return false;
+        }
+
+        if(!StringUtils.hasText(fastMapping.mapping())){
+            throw new FastMappingErrorException(String.format("fast method %s missing mapping .",method.getName()));
+        }
+
+        if(!StringUtils.hasText(fastMapping.value())){
+            throw new FastMappingErrorException(String.format("fast mapping %s missing value .",fastMapping.mapping()));
+        }
+
         Class<?>[] parameterTypes = method.getParameterTypes();
         for(Class<?> parameter:parameterTypes){
             if(Pageable.class.isAssignableFrom(parameter)){
-                if(!StringUtils.hasText(fastMapping.countHql())){
-                    throw new FastMappingErrorException(String.format("fast mapping %s missing countHql .",fastMapping.mapping()));
+                if(!StringUtils.hasText(fastMapping.countQuery())){
+                    throw new FastMappingErrorException(String.format("fast mapping %s missing countQuery .",fastMapping.mapping()));
                 }
             }
         }
+
         return true;
     }