You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2020/03/02 01:39:49 UTC

[kylin] branch 2.6.x updated: KYLIN-4132 Kylin needn't use "org.apache.directory.api.util.Strings" to import extra dependency

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 7198656  KYLIN-4132 Kylin needn't use "org.apache.directory.api.util.Strings" to import extra dependency
7198656 is described below

commit 71986564d5d8c89681369192ea536ba3ecc0c284
Author: rupengwang <wa...@live.cn>
AuthorDate: Sun Mar 1 00:27:16 2020 +0800

    KYLIN-4132 Kylin needn't use "org.apache.directory.api.util.Strings" to import extra dependency
---
 .../src/main/java/org/apache/kylin/rest/service/JobService.java  | 9 ++++-----
 .../main/java/org/apache/kylin/rest/service/ProjectService.java  | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index c2a14d7..f0f41a5 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -33,7 +33,6 @@ import java.util.TimeZone;
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.directory.api.util.Strings;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.cube.CubeInstance;
@@ -831,7 +830,7 @@ public class JobService extends BasicService implements InitializingBean {
                                     return false;
                                 }
 
-                                if (Strings.isEmpty(jobName)) {
+                                if (StringUtils.isEmpty(jobName)) {
                                     return true;
                                 }
 
@@ -931,7 +930,7 @@ public class JobService extends BasicService implements InitializingBean {
                                     return false;
                                 }
 
-                                if (Strings.isEmpty(jobName)) {
+                                if (StringUtils.isEmpty(jobName)) {
                                     return true;
                                 }
 
@@ -1133,7 +1132,7 @@ public class JobService extends BasicService implements InitializingBean {
                                     return false;
                                 }
 
-                                if (Strings.isEmpty(jobName)) {
+                                if (StringUtils.isEmpty(jobName)) {
                                     return true;
                                 }
 
@@ -1208,7 +1207,7 @@ public class JobService extends BasicService implements InitializingBean {
                                     return false;
                                 }
 
-                                if (Strings.isEmpty(jobName)) {
+                                if (StringUtils.isEmpty(jobName)) {
                                     return true;
                                 }
 
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/ProjectService.java b/server-base/src/main/java/org/apache/kylin/rest/service/ProjectService.java
index 2677578..c1c4612 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/ProjectService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/ProjectService.java
@@ -29,7 +29,7 @@ import java.util.Set;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.Sets;
-import org.apache.directory.api.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.kylin.metadata.project.ProjectInstance;
 import org.apache.kylin.metadata.realization.RealizationType;
 import org.apache.kylin.rest.constant.Constant;
@@ -186,7 +186,7 @@ public class ProjectService extends BasicService {
         }
 
         // listAll method may not need a single param.But almost all listAll method pass
-        if (!Strings.isEmpty(projectName)) {
+        if (!StringUtils.isEmpty(projectName)) {
             readableProjects = Lists
                     .newArrayList(Iterators.filter(readableProjects.iterator(), new Predicate<ProjectInstance>() {
                         @Override