You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2018/02/19 13:47:00 UTC

incubator-unomi git commit: UNOMI-162 leverage StringUtils

Repository: incubator-unomi
Updated Branches:
  refs/heads/master 162660191 -> 384ed0262


UNOMI-162 leverage StringUtils


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/384ed026
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/384ed026
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/384ed026

Branch: refs/heads/master
Commit: 384ed026206e6b4c6baa974f843df444342417d1
Parents: 1626601
Author: dgaillard <dg...@jahia.com>
Authored: Mon Feb 19 14:46:51 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Mon Feb 19 14:46:51 2018 +0100

----------------------------------------------------------------------
 .../elasticsearch/ElasticSearchPersistenceServiceImpl.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/384ed026/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index 3dfcc2d..761c757 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -324,8 +324,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
                 Settings.Builder transportSettings = Settings.builder()
                         .put(CLUSTER_NAME, clusterName);
 
-                if (transportClientClassName != null && transportClientClassName.trim().length() > 0 &&
-                        transportClientJarDirectory != null && transportClientJarDirectory.trim().length() > 0) {
+                if (StringUtils.isNotBlank(transportClientClassName) && StringUtils.isNotBlank(transportClientJarDirectory)) {
                     logger.info("Connecting to ElasticSearch persistence backend using transport class " + transportClientClassName +
                             " with JAR directory "+transportClientJarDirectory +
                             " using cluster name " + clusterName + " and index name " + indexName + "...");
@@ -1843,7 +1842,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
 
         ChildFirstClassLoader childFirstClassLoader = new ChildFirstClassLoader(this.getClass().getClassLoader(), urls.toArray(new URL[urls.size()]));
 
-        if (transportClientProperties != null && transportClientProperties.trim().length() > 0) {
+        if (StringUtils.isNotBlank(transportClientProperties)) {
             String[] clientProperties = transportClientProperties.split(",");
             if (clientProperties.length > 0) {
                 for (String clientProperty : clientProperties) {