add FastMapping verify #16

xlorne · xlorne · commit 9c45f00cad1c · 2022-09-10T23:22:09.000+08:00
diff --git a/springboot-example/src/main/java/com/codingapi/springboot/example/application/executor/DemoExecutor.java b/springboot-example/src/main/java/com/codingapi/springboot/example/application/executor/DemoExecutor.java
@@ -11,12 +11,13 @@
 public class DemoExecutor {
 
     private final DemoRepository demoRepository;
+
     public void swap(Demo demo1, Demo demo2) {
-        DemoChangeService demoChangeService = new DemoChangeService(demo1,demo2);
+        DemoChangeService demoChangeService = new DemoChangeService(demo1, demo2);
         demoChangeService.swap();
     }
 
-    public void create(String name){
+    public void create(String name) {
         Demo demo = new Demo(name);
         demoRepository.save(demo);
     }
diff --git a/springboot-example/src/main/java/com/codingapi/springboot/example/infrastructure/jap/repository/DemoEntityRepository.java b/springboot-example/src/main/java/com/codingapi/springboot/example/infrastructure/jap/repository/DemoEntityRepository.java
@@ -3,7 +3,7 @@
 import com.codingapi.springboot.example.infrastructure.entity.DemoEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface DemoEntityRepository extends JpaRepository<DemoEntity,Integer> {
+public interface DemoEntityRepository extends JpaRepository<DemoEntity, Integer> {
 
 
 }
diff --git a/springboot-example/src/main/java/com/codingapi/springboot/example/infrastructure/repository/impl/DemoRepositoryImpl.java b/springboot-example/src/main/java/com/codingapi/springboot/example/infrastructure/repository/impl/DemoRepositoryImpl.java
@@ -9,7 +9,7 @@
 
 @Repository
 @AllArgsConstructor
-public class DemoRepositoryImpl  implements DemoRepository {
+public class DemoRepositoryImpl implements DemoRepository {
 
     private final DemoEntityRepository demoEntityRepository;
 
diff --git a/springboot-example/src/main/java/com/codingapi/springboot/example/ui/controller/OpenController.java b/springboot-example/src/main/java/com/codingapi/springboot/example/ui/controller/OpenController.java
@@ -22,13 +22,13 @@ public class OpenController {
     private final DemoEntityRepository demoEntityRepository;
 
     @GetMapping("/save")
-    public Response save(@RequestParam("name") String name){
+    public Response save(@RequestParam("name") String name) {
         executor.create(name);
         return Response.buildSuccess();
     }
 
     @GetMapping("/findAll")
-    public MultiResponse<DemoEntity> findAll(PageRequest pageRequest){
+    public MultiResponse<DemoEntity> findAll(PageRequest pageRequest) {
         return MultiResponse.of(demoEntityRepository.findAll(pageRequest));
     }
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/DataFastConfiguration.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/DataFastConfiguration.java
@@ -19,19 +19,19 @@ public class DataFastConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public MvcEndpointMapping mvcEndpointMapping(RequestMappingHandlerMapping handlerMapping){
+    public MvcEndpointMapping mvcEndpointMapping(RequestMappingHandlerMapping handlerMapping) {
         return new MvcEndpointMapping(handlerMapping);
     }
 
     @Bean(initMethod = "registerMvcMapping")
     @ConditionalOnMissingBean
-    public MvcMappingRegistrar mappingRegistrar(MvcEndpointMapping mvcEndpointMapping,JpaExecutor jpaExecutor){
-        return new MvcMappingRegistrar(mvcEndpointMapping,jpaExecutor);
+    public MvcMappingRegistrar mappingRegistrar(MvcEndpointMapping mvcEndpointMapping, JpaExecutor jpaExecutor) {
+        return new MvcMappingRegistrar(mvcEndpointMapping, jpaExecutor);
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public JpaExecutor jpaExecutor(EntityManager entityManager){
+    public JpaExecutor jpaExecutor(EntityManager entityManager) {
         return new JpaExecutor(entityManager);
     }
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/annotation/FastController.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/annotation/FastController.java
@@ -8,5 +8,4 @@
 public @interface FastController {
 
 
-
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/annotation/FastMapping.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/annotation/FastMapping.java
@@ -27,13 +27,11 @@
 
     /**
      * mvc request method
-     *
      */
     RequestMethod method() default RequestMethod.GET;
 
     /**
      * mvc request url
-     *
      */
     String mapping() default "";
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/exception/FastMappingErrorException.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/exception/FastMappingErrorException.java
@@ -1,6 +1,6 @@
 package com.codingapi.springboot.fast.exception;
 
-public class FastMappingErrorException extends Exception{
+public class FastMappingErrorException extends Exception {
 
     public FastMappingErrorException(String message) {
         super(message);
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaExecutor.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaExecutor.java
@@ -13,20 +13,21 @@ public class JpaExecutor {
 
     private final EntityManager entityManager;
 
-    public Object execute(String hql,String countHql,Object[] args,Class<?> returnType){
-        JpaQuery query = new JpaQuery(hql,countHql,args,entityManager);
+    public Object execute(String hql, String countHql, Object[] args, Class<?> returnType) {
+        //only execute query sql
+        JpaQuery query = new JpaQuery(hql, countHql, args, entityManager);
 
-        if(returnType.equals(SingleResponse.class)){
+        if (returnType.equals(SingleResponse.class)) {
             return SingleResponse.of(query.getSingleResult());
         }
 
-        if(returnType.equals(MultiResponse.class)){
-            Object returnData =  query.getResultList();
-            if(Page.class.isAssignableFrom(returnData.getClass())) {
-                return MultiResponse.of((Page)returnData);
+        if (returnType.equals(MultiResponse.class)) {
+            Object returnData = query.getResultList();
+            if (Page.class.isAssignableFrom(returnData.getClass())) {
+                return MultiResponse.of((Page) returnData);
             }
 
-            if(Collection.class.isAssignableFrom(returnData.getClass())) {
+            if (Collection.class.isAssignableFrom(returnData.getClass())) {
                 return MultiResponse.of((Collection) returnData);
             }
         }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaQuery.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaQuery.java
@@ -22,76 +22,91 @@ public class JpaQuery {
 
     private final EntityManager entityManager;
 
-    public JpaQuery(String hql,String countHql,Object[] args, EntityManager entityManager) {
+    public JpaQuery(String hql, String countHql, Object[] args, EntityManager entityManager) {
         this.hql = hql;
         this.countHql = countHql;
         this.args = args;
         this.entityManager = entityManager;
         this.query = entityManager.createQuery(hql);
-        this.setParameter(query);
+        this.initParameter(query);
     }
 
+    /**
+     * init query parameter
+     */
     @SneakyThrows
-    private void setParameter(Query query){
-        if(args!=null&&args.length>0) {
+    private void initParameter(Query query) {
+        if (args != null && args.length > 0) {
             Set<Parameter<?>> parameters = query.getParameters();
-            for(Parameter<?> parameter:parameters){
+            for (Parameter<?> parameter : parameters) {
                 Integer position = parameter.getPosition();
-                if(position!=null){
+                if (position != null) {
                     query.setParameter(position, args[position - 1]);
                 }
-                if(StringUtils.hasText(parameter.getName())){
+                if (StringUtils.hasText(parameter.getName())) {
                     String name = parameter.getName();
                     Object obj = args[0];
-                    Field field =  ReflectionUtils.findField(obj.getClass(),name);
-                    if(field!=null) {
+                    Field field = ReflectionUtils.findField(obj.getClass(), name);
+                    if (field != null) {
                         field.setAccessible(true);
                         query.setParameter(name, field.get(obj));
                     }
                 }
             }
-
         }
     }
 
+    /**
+     * is Page Request
+     */
     private boolean isPageable() {
-        if(args!=null&& args.length>0){
-            Object lastObj = args[args.length-1];
+        if (args != null && args.length > 0 && StringUtils.hasText(countHql)) {
+            Object lastObj = args[args.length - 1];
             return lastObj instanceof Pageable;
         }
         return false;
     }
 
-    private Pageable getPageable(){
-        if(args!=null&& args.length>0){
-            Object lastObj = args[args.length-1];
-            if(lastObj instanceof Pageable){
-                return (Pageable) lastObj;
-            }
+    /**
+     * get PageRequest
+     */
+    private Pageable getPageable() {
+        if (isPageable()) {
+            Object lastObj = args[args.length - 1];
+            return (Pageable) lastObj;
         }
         return null;
     }
 
+    /**
+     * execute get list result data
+     */
     public Object getResultList() {
-        if(isPageable()&&StringUtils.hasText(countHql)){
+        if (isPageable()) {
             Pageable pageable = getPageable();
             query.setFirstResult((int) pageable.getOffset());
             query.setMaxResults(pageable.getPageSize());
             long total = getCount();
-            return new PageImpl<>(query.getResultList(),pageable,total);
+            return new PageImpl<>(query.getResultList(), pageable, total);
         }
         return query.getResultList();
     }
 
 
-    private long getCount(){
+    /**
+     * get sql execute data count
+     */
+    private long getCount() {
         Query countQuery = entityManager.createQuery(countHql);
-        setParameter(countQuery);
+        initParameter(countQuery);
         return (Long) countQuery.getSingleResult();
     }
 
 
-    public Object getSingleResult(){
+    /**
+     * get single result data
+     */
+    public Object getSingleResult() {
         return query.getSingleResult();
     }
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/MvcMethodProxy.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/MvcMethodProxy.java
@@ -14,14 +14,20 @@ public class MvcMethodProxy implements InvocationHandler {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args)
             throws Throwable {
-        if(method.equals(Object.class.getMethod("equals", Object.class))){
+
+        if (method.equals(Object.class.getMethod("equals", Object.class))) {
             return false;
         }
-        if(method.equals(Object.class.getMethod("hashCode"))){
+        if (method.equals(Object.class.getMethod("hashCode"))) {
             return hashCode();
         }
         FastMapping fastMapping = method.getAnnotation(FastMapping.class);
-        Class<?> returnType =  method.getReturnType();
-        return jpaExecutor.execute(fastMapping.value(),fastMapping.countQuery(),args,returnType);
+        if (fastMapping != null) {
+            Class<?> returnType = method.getReturnType();
+            return jpaExecutor.execute(fastMapping.value(), fastMapping.countQuery(), args, returnType);
+        }
+
+        // mvc mapping proxy can't execute return null.
+        return null;
     }
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/MvcEndpointMapping.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/MvcEndpointMapping.java
@@ -14,6 +14,14 @@ public class MvcEndpointMapping {
 
     private final RequestMappingHandlerMapping handlerMapping;
 
+    /**
+     * add mvc mapping
+     *
+     * @param url           mapping url
+     * @param requestMethod request method
+     * @param handler       executor handler
+     * @param method        executor method
+     */
     public void addMapping(String url, RequestMethod requestMethod, Object handler, Method method) {
 
         RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/registrar/DataFastBeanDefinitionRegistrar.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/registrar/DataFastBeanDefinitionRegistrar.java
@@ -1,7 +1,7 @@
 package com.codingapi.springboot.fast.registrar;
 
 import com.codingapi.springboot.fast.annotation.FastController;
-import com.codingapi.springboot.framework.registrar.RegisterBeanDefinition;
+import com.codingapi.springboot.framework.registrar.RegisterBeanScanner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -19,17 +19,15 @@ public class DataFastBeanDefinitionRegistrar implements ImportBeanDefinitionRegi
     @SneakyThrows
     @Override
     public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        RegisterBeanDefinition registerBeanDefinition = new RegisterBeanDefinition(importingClassMetadata, FastController.class);
-        Set<Class<?>> classSet = registerBeanDefinition.findTypes();
+        RegisterBeanScanner registerBeanScanner = new RegisterBeanScanner(importingClassMetadata, FastController.class);
+        Set<Class<?>> classSet = registerBeanScanner.findTypes();
 
-        //注册Bean
+        //register bean
         for (Class<?> clazz : classSet) {
-            log.info("FastController class:{}",clazz);
+            log.info("scanner @FastController class:{}", clazz);
             MvcMappingRegistrar.classSet.add(clazz);
         }
     }
 
 
-
-
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/registrar/MvcMappingRegistrar.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/registrar/MvcMappingRegistrar.java
@@ -19,43 +19,43 @@
 @Slf4j
 @AllArgsConstructor
 public class MvcMappingRegistrar {
-    protected final static  Set<Class<?>> classSet = new HashSet<>();
+    protected final static Set<Class<?>> classSet = new HashSet<>();
     private final MvcEndpointMapping mvcEndpointMapping;
     private final JpaExecutor jpaExecutor;
 
     @SneakyThrows
     public void registerMvcMapping() {
-       for(Class<?> clazz:classSet){
-           Method[] methods = clazz.getDeclaredMethods();
-           for(Method method:methods){
-               FastMapping fastMapping =  method.getAnnotation(FastMapping.class);
-               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);
-               }
-           }
-       }
+        for (Class<?> clazz : classSet) {
+            Method[] methods = clazz.getDeclaredMethods();
+            for (Method method : methods) {
+                FastMapping fastMapping = method.getAnnotation(FastMapping.class);
+                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);
+                }
+            }
+        }
     }
 
     private boolean verify(FastMapping fastMapping, Method method) throws FastMappingErrorException {
-        if(fastMapping==null){
+        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.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()));
+        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.countQuery())){
-                    throw new FastMappingErrorException(String.format("fast mapping %s missing countQuery .",fastMapping.mapping()));
+        for (Class<?> parameter : parameterTypes) {
+            if (Pageable.class.isAssignableFrom(parameter)) {
+                if (!StringUtils.hasText(fastMapping.countQuery())) {
+                    throw new FastMappingErrorException(String.format("fast mapping %s missing countQuery .", fastMapping.mapping()));
                 }
             }
         }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/AES.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/AES.java
@@ -31,7 +31,7 @@ public AES(String transform, byte[] keys, byte[] iv) {
 
 
     public AES(String key, String iv) {
-        this("AES/CBC/PKCS5Padding",key.getBytes(StandardCharsets.UTF_8),iv.getBytes(StandardCharsets.UTF_8));
+        this("AES/CBC/PKCS5Padding", key.getBytes(StandardCharsets.UTF_8), iv.getBytes(StandardCharsets.UTF_8));
     }
 
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/HandlerBeanDefinitionRegistrar.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/HandlerBeanDefinitionRegistrar.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/registrar/RegisterBeanScanner.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/registrar/RegisterBeanScanner.java

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@`
`11`	`11`	`public class DemoExecutor {`
`12`	`12`
`13`	`13`	`private final DemoRepository demoRepository;`
	`14`	`+`
`14`	`15`	`public void swap(Demo demo1, Demo demo2) {`
`15`		`- DemoChangeService demoChangeService = new DemoChangeService(demo1,demo2);`
	`16`	`+ DemoChangeService demoChangeService = new DemoChangeService(demo1, demo2);`
`16`	`17`	`demoChangeService.swap();`
`17`	`18`	`}`
`18`	`19`
`19`		`- public void create(String name){`
	`20`	`+ public void create(String name) {`
`20`	`21`	`Demo demo = new Demo(name);`
`21`	`22`	`demoRepository.save(demo);`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import com.codingapi.springboot.example.infrastructure.entity.DemoEntity;`
`4`	`4`	`import org.springframework.data.jpa.repository.JpaRepository;`
`5`	`5`
`6`		`-public interface DemoEntityRepository extends JpaRepository<DemoEntity,Integer> {`
	`6`	`+public interface DemoEntityRepository extends JpaRepository<DemoEntity, Integer> {`
`7`	`7`
`8`	`8`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ public class OpenController {`
`22`	`22`	`private final DemoEntityRepository demoEntityRepository;`
`23`	`23`
`24`	`24`	`@GetMapping("/save")`
`25`		`- public Response save(@RequestParam("name") String name){`
	`25`	`+ public Response save(@RequestParam("name") String name) {`
`26`	`26`	`executor.create(name);`
`27`	`27`	`return Response.buildSuccess();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@GetMapping("/findAll")`
`31`		`- public MultiResponse<DemoEntity> findAll(PageRequest pageRequest){`
	`31`	`+ public MultiResponse<DemoEntity> findAll(PageRequest pageRequest) {`
`32`	`32`	`return MultiResponse.of(demoEntityRepository.findAll(pageRequest));`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,4 @@`
`8`	`8`	`public @interface FastController {`
`9`	`9`
`10`	`10`
`11`		`-`
`12`	`11`	`}`