rename service

Author: lvyahui8

spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java

@@ -10,8 +10,8 @@
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
 import io.github.lvyahui8.spring.aggregate.repository.DataProviderRepository;
 import io.github.lvyahui8.spring.aggregate.repository.impl.DataProviderRepositoryImpl;
-import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateQueryService;
-import io.github.lvyahui8.spring.aggregate.service.impl.DataBeanAggregateQueryServiceImpl;
+import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateService;
+import io.github.lvyahui8.spring.aggregate.service.impl.DataBeanAggregateServiceImpl;
 import io.github.lvyahui8.spring.aggregate.util.DefinitionUtils;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import lombok.extern.slf4j.Slf4j;
@@ -100,7 +100,7 @@ private void dfs(Map<String,Set<String>> graphAdjMap,Map<String,Integer> visitSt
 
     @Bean
     @ConditionalOnMissingBean
-    public DataBeanAggregateQueryService dataBeanAggregateQueryService (
+    public DataBeanAggregateService dataBeanAggregateQueryService (
             @Qualifier("dataProviderRepository") DataProviderRepository dataProviderRepository) {
         if(properties.getBasePackages() != null) {
             Map<String,Set<String>> provideDependMap = new HashMap<>(64);
@@ -126,7 +126,7 @@ public DataBeanAggregateQueryService dataBeanAggregateQueryService (
             checkCycle(provideDependMap);
         }
 
-        DataBeanAggregateQueryServiceImpl service = new DataBeanAggregateQueryServiceImpl();
+        DataBeanAggregateServiceImpl service = new DataBeanAggregateServiceImpl();
         RuntimeSettings runtimeSettings = new RuntimeSettings();
         runtimeSettings.setIgnoreException(properties.isIgnoreException());
         runtimeSettings.setTimeout(properties.getDefaultTimeout());

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/facade/impl/DataBeanAggregateQueryFacadeImpl.java

@@ -3,7 +3,7 @@
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import io.github.lvyahui8.spring.aggregate.func.MultipleArgumentsFunction;
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
-import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateQueryService;
+import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateService;
 import io.github.lvyahui8.spring.aggregate.util.DefinitionUtils;
 import org.springframework.util.Assert;
 
@@ -20,10 +20,10 @@
  */
 public class DataBeanAggregateQueryFacadeImpl implements DataBeanAggregateQueryFacade {
 
-    private final DataBeanAggregateQueryService dataBeanAggregateQueryService;
+    private final DataBeanAggregateService dataBeanAggregateService;
 
-    public DataBeanAggregateQueryFacadeImpl(DataBeanAggregateQueryService dataBeanAggregateQueryService) {
-        this.dataBeanAggregateQueryService = dataBeanAggregateQueryService;
+    public DataBeanAggregateQueryFacadeImpl(DataBeanAggregateService dataBeanAggregateService) {
+        this.dataBeanAggregateService = dataBeanAggregateService;
     }
 
     @Override
@@ -33,7 +33,7 @@ public <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz) thr
         if(invokeParams == null) {
             invokeParams = Collections.emptyMap();
         }
-        return dataBeanAggregateQueryService.get(id,invokeParams,clazz);
+        return dataBeanAggregateService.get(id,invokeParams,clazz);
     }
 
     @Override
@@ -71,7 +71,7 @@ public <T> T get(Map<String, Object> invokeParams, MultipleArgumentsFunction<T>
         }
         try {
             @SuppressWarnings("unchecked")
-            T ret = (T) dataBeanAggregateQueryService.get(provider, invokeParams, applyMethod.getReturnType());
+            T ret = (T) dataBeanAggregateService.get(provider, invokeParams, applyMethod.getReturnType());
 
             return ret;
         } finally {

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/DataBeanAggregateQueryService.java renamed to spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/DataBeanAggregateService.java

@@ -9,7 +9,7 @@
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/6/2 21:49
  */
-public interface DataBeanAggregateQueryService {
+public interface DataBeanAggregateService {
 
     /**
      * 并发+递归获取并拼装数据

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAggregateQueryServiceImpl.java renamed to spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAggregateServiceImpl.java

@@ -8,7 +8,7 @@
 import io.github.lvyahui8.spring.aggregate.repository.DataProviderRepository;
 import io.github.lvyahui8.spring.aggregate.service.AbstractAsyncQueryTask;
 import io.github.lvyahui8.spring.aggregate.service.AsyncQueryTaskWrapper;
-import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateQueryService;
+import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateService;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
@@ -25,7 +25,7 @@
  * @since 2019/6/2 21:50
  */
 @Slf4j
-public class DataBeanAggregateQueryServiceImpl implements DataBeanAggregateQueryService {
+public class DataBeanAggregateServiceImpl implements DataBeanAggregateService {
 
     @Setter
     private DataProviderRepository repository;

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/aspect/AggregateQueryLoggingAspect.java

@@ -17,7 +17,7 @@ public class AggregateQueryLoggingAspect {
     @Autowired
     private ExampleProperties exampleProperties;
 
-    @Around("execution(* io.github.lvyahui8.spring.aggregate.service.impl.DataBeanAggregateQueryServiceImpl.get(..))")
+    @Around("execution(* io.github.lvyahui8.spring.aggregate.service.impl.DataBeanAggregateServiceImpl.get(..))")
     public Object doLogging(ProceedingJoinPoint joinPoint) throws Throwable {
         long startTime = System.currentTimeMillis();
         Object retVal ;