From 895e69f043c3472a701e7b34022fb8b15b1522c1 Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Sat, 16 Jan 2021 11:51:57 +0800
Subject: [PATCH] refactor: change the convert method's name

---
 .../github/kfcfans/powerjob/common/PowerQuery.java  | 13 +++++--------
 .../server/common/utils/QueryConvertUtils.java      |  2 +-
 .../kfcfans/powerjob/server/service/JobService.java |  2 +-
 .../server/service/instance/InstanceService.java    |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java
index 09203229..8b34ed67 100644
--- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java
+++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerQuery.java
@@ -1,11 +1,16 @@
 package com.github.kfcfans.powerjob.common;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * PowerJob Query interface
  *
  * @author tjq
  * @since 2021/1/15
  */
+@Getter
+@Setter
 public abstract class PowerQuery {
 
     public static String EQUAL = "Eq";
@@ -33,12 +38,4 @@ public abstract class PowerQuery {
     public static String IS_NOT_NULL = "IsNotNull";
 
     private Long appIdEq;
-
-    public Long getAppIdEq() {
-        return appIdEq;
-    }
-
-    public void setAppIdEq(Long appIdEq) {
-        this.appIdEq = appIdEq;
-    }
 }
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java
index 4a1f66a1..2f8b4ebd 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java
@@ -22,7 +22,7 @@ import java.util.List;
 @SuppressWarnings("unchecked, rawtypes")
 public class QueryConvertUtils {
 
-    public static <T> Specification<T> autoConvert(PowerQuery powerQuery) {
+    public static <T> Specification<T> toSpecification(PowerQuery powerQuery) {
 
         return (Specification<T>) (root, query, cb) -> {
             List<Predicate> predicates = Lists.newLinkedList();
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java
index 0a3104cb..8525846e 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java
@@ -101,7 +101,7 @@ public class JobService {
     }
 
     public List<JobInfoDTO> queryJob(PowerQuery powerQuery) {
-        Specification<JobInfoDO> specification = QueryConvertUtils.autoConvert(powerQuery);
+        Specification<JobInfoDO> specification = QueryConvertUtils.toSpecification(powerQuery);
         return jobInfoRepository.findAll(specification).stream().map(JobService::convert).collect(Collectors.toList());
     }
 
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java
index 5a210630..adf666b4 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java
@@ -203,7 +203,7 @@ public class InstanceService {
 
     public List<InstanceInfoDTO> queryInstanceInfo(PowerQuery powerQuery) {
         return instanceInfoRepository
-                .findAll(QueryConvertUtils.autoConvert(powerQuery))
+                .findAll(QueryConvertUtils.toSpecification(powerQuery))
                 .stream()
                 .map(InstanceService::directConvert)
                 .collect(Collectors.toList());