[SYNCOPE-1008] Trimming all the way
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/24a71aa9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/24a71aa9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/24a71aa9 Branch: refs/heads/master Commit: 24a71aa96c452c60f64fb58efc76b5ba171cfec9 Parents: af37b2b Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Mar 14 12:37:02 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Mar 14 12:37:14 2017 +0100 ---------------------------------------------------------------------- .../installer/validators/AbstractValidator.java | 4 --- .../validators/ArchetypeValidator.java | 29 ++++++++++---------- .../validators/ContainerValidator.java | 21 +++++++------- .../validators/PersistenceValidator.java | 7 +++-- 4 files changed, 30 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/24a71aa9/installer/src/main/java/org/apache/syncope/installer/validators/AbstractValidator.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/validators/AbstractValidator.java b/installer/src/main/java/org/apache/syncope/installer/validators/AbstractValidator.java index 6ff54e9..ab1667e 100644 --- a/installer/src/main/java/org/apache/syncope/installer/validators/AbstractValidator.java +++ b/installer/src/main/java/org/apache/syncope/installer/validators/AbstractValidator.java @@ -21,8 +21,4 @@ package org.apache.syncope.installer.validators; import com.izforge.izpack.api.installer.DataValidator; public abstract class AbstractValidator implements DataValidator { - - protected boolean isEmpty(final String string) { - return !(string != null && string.length() != 0); - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/24a71aa9/installer/src/main/java/org/apache/syncope/installer/validators/ArchetypeValidator.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/validators/ArchetypeValidator.java b/installer/src/main/java/org/apache/syncope/installer/validators/ArchetypeValidator.java index 064a9cc..7f4c0c4 100644 --- a/installer/src/main/java/org/apache/syncope/installer/validators/ArchetypeValidator.java +++ b/installer/src/main/java/org/apache/syncope/installer/validators/ArchetypeValidator.java @@ -20,6 +20,7 @@ package org.apache.syncope.installer.validators; import com.izforge.izpack.api.data.InstallData; import java.io.File; +import org.apache.commons.lang3.StringUtils; public class ArchetypeValidator extends AbstractValidator { @@ -27,44 +28,44 @@ public class ArchetypeValidator extends AbstractValidator { @Override public Status validateData(final InstallData installData) { - final String mavenDir = installData.getVariable("mvn.directory"); - final String mavenGroupId = installData.getVariable("mvn.groupid"); - final String mavenArtifactId = installData.getVariable("mvn.artifactid"); - final String mavenSecretKey = installData.getVariable("mvn.secretkey"); - final String mavenAnonymousKey = installData.getVariable("mvn.anonymous.key"); - final String mavenLogDirectory = installData.getVariable("mvn.log.directory"); - final String mavenBundleDirectory = installData.getVariable("mvn.bundle.directory"); + final String mavenDir = StringUtils.trim(installData.getVariable("mvn.directory")); + final String mavenGroupId = StringUtils.trim(installData.getVariable("mvn.groupid")); + final String mavenArtifactId = StringUtils.trim(installData.getVariable("mvn.artifactid")); + final String mavenSecretKey = StringUtils.trim(installData.getVariable("mvn.secretkey")); + final String mavenAnonymousKey = StringUtils.trim(installData.getVariable("mvn.anonymous.key")); + final String mavenLogDirectory = StringUtils.trim(installData.getVariable("mvn.log.directory")); + final String mavenBundleDirectory = StringUtils.trim(installData.getVariable("mvn.bundle.directory")); boolean verified = true; error = new StringBuilder("Required fields:\n"); - if (isEmpty(mavenDir)) { + if (StringUtils.isBlank(mavenDir)) { error.append("Maven home directory\n"); verified = false; } else if (!new File(mavenDir + "/bin/mvn").exists()) { error.append("Maven home directory not valid, check it please...\n"); verified = false; } - if (isEmpty(mavenGroupId)) { + if (StringUtils.isBlank(mavenGroupId)) { error.append("GroupID\n"); verified = false; } - if (isEmpty(mavenArtifactId)) { + if (StringUtils.isBlank(mavenArtifactId)) { error.append("ArtifactID\n"); verified = false; } - if (isEmpty(mavenSecretKey)) { + if (StringUtils.isBlank(mavenSecretKey)) { error.append("SecretKey\n"); verified = false; } - if (isEmpty(mavenAnonymousKey)) { + if (StringUtils.isBlank(mavenAnonymousKey)) { error.append("AnonymousKey\n"); verified = false; } - if (isEmpty(mavenLogDirectory)) { + if (StringUtils.isBlank(mavenLogDirectory)) { error.append("Logs directory\n"); verified = false; } - if (isEmpty(mavenBundleDirectory)) { + if (StringUtils.isBlank(mavenBundleDirectory)) { error.append("Bundles directory\n"); verified = false; } http://git-wip-us.apache.org/repos/asf/syncope/blob/24a71aa9/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java b/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java index 02c7b5a..adc7fa5 100644 --- a/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java +++ b/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java @@ -20,6 +20,7 @@ package org.apache.syncope.installer.validators; import com.izforge.izpack.api.data.InstallData; import java.io.File; +import org.apache.commons.lang3.StringUtils; import org.apache.syncope.installer.enums.Containers; import org.apache.syncope.installer.utilities.HttpUtils; @@ -50,19 +51,19 @@ public class ContainerValidator extends AbstractValidator { boolean verified = true; error = new StringBuilder("Required fields:\n"); - if (isEmpty(tomcatHost)) { + if (StringUtils.isBlank(tomcatHost)) { error.append("Tomcat host\n"); verified = false; } - if (isEmpty(tomcatPort)) { + if (StringUtils.isBlank(tomcatPort)) { error.append("Tomcat port\n"); verified = false; } - if (isEmpty(tomcatUser)) { + if (StringUtils.isBlank(tomcatUser)) { error.append("Tomcat user\n"); verified = false; } - if (isEmpty(tomcatPassword)) { + if (StringUtils.isBlank(tomcatPassword)) { error.append("Tomcat password\n"); verified = false; } @@ -82,23 +83,23 @@ public class ContainerValidator extends AbstractValidator { case JBOSS: boolean virified = true; error = new StringBuilder("Required fields:\n"); - if (isEmpty(jbossHost)) { + if (StringUtils.isBlank(jbossHost)) { error.append("JBoss Host\n"); virified = false; } - if (isEmpty(jbossPort)) { + if (StringUtils.isBlank(jbossPort)) { error.append("JBoss Port\n"); virified = false; } - if (isEmpty(jbossJdbcModule)) { + if (StringUtils.isBlank(jbossJdbcModule)) { error.append("JBoss JDBC module name\n"); virified = false; } - if (isEmpty(jbossAdminUsername)) { + if (StringUtils.isBlank(jbossAdminUsername)) { error.append("JBoss admin username\n"); virified = false; } - if (isEmpty(jbossAdminPassword)) { + if (StringUtils.isBlank(jbossAdminPassword)) { error.append("JBoss admin password\n"); virified = false; } @@ -117,7 +118,7 @@ public class ContainerValidator extends AbstractValidator { } case GLASSFISH: error = new StringBuilder("Required fields:\n"); - if (isEmpty(glassfishDir)) { + if (StringUtils.isBlank(glassfishDir)) { error.append("Glassfish directory\n"); return Status.ERROR; } http://git-wip-us.apache.org/repos/asf/syncope/blob/24a71aa9/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java b/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java index 1610367..b167c30 100644 --- a/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java +++ b/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java @@ -21,6 +21,7 @@ package org.apache.syncope.installer.validators; import com.izforge.izpack.api.data.InstallData; import java.sql.Driver; import java.util.Properties; +import org.apache.commons.lang3.StringUtils; import org.apache.syncope.installer.enums.DBs; import org.apache.syncope.installer.utilities.DriverLoader; @@ -63,15 +64,15 @@ public class PersistenceValidator extends AbstractValidator { boolean verified = true; error = new StringBuilder("Required fields:\n"); - if (isEmpty(persistenceUrl)) { + if (StringUtils.isBlank(persistenceUrl)) { error.append("Persistence URL\n"); verified = false; } - if (isEmpty(persistenceDbuser)) { + if (StringUtils.isBlank(persistenceDbuser)) { error.append("Persistence user\n"); verified = false; } - if (isEmpty(persistenceDbPassword)) { + if (StringUtils.isBlank(persistenceDbPassword)) { error.append("Persistence password\n"); verified = false; }
