Fix validation failures when building silversetup

Author: mmoqui

src/main/groovy/org/silverpeas/setup/SilverpeasSetupExtension.groovy

@@ -95,7 +95,7 @@ class SilverpeasSetupExtension {
    * Some of them are computed from the properties in the file <code>config.properties</code>.
    * Tasks can overwrite some of the settings as well as add their own properties.
    */
-  final Map settings = [:]
+  final Map<String, String> settings = [:]
 
   /**
    * Constructs a new silverpeas configuration extension. It checks the environment variables
@@ -129,7 +129,7 @@ class SilverpeasSetupExtension {
     settings.context = config.context.properties()
   }
 
-  void setSettings(final Map configProperties) {
+  void setSettings(final Map<String, String> configProperties) {
     this.settings.putAll(configProperties)
   }
 

src/main/groovy/org/silverpeas/setup/SilverpeasSetupPlugin.groovy

@@ -81,14 +81,14 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
     Task jbossConf = project.tasks.create(CONFIGURE_JBOSS.name, JBossConfigurationTask) {
       it.driversDir = extension.installation.dsDriversDir.get()
       it.config = extension.config
-      it.jboss        = jBossServer
-      it.settings     = extension.settings
+      it.jboss = jBossServer
+      it.settings = extension.settings
     }
 
     Task silverpeasConf = project.tasks.create(CONFIGURE_SILVERPEAS.name, SilverpeasConfigurationTask) {
       it.silverpeasHome = extension.silverpeasHome
-      it.config         = extension.config
-      it.settings       = extension.settings
+      it.config = extension.config
+      it.settings = extension.settings
     }.dependsOn(construction)
 
     Task configuration = project.tasks.create(CONFIGURE.name) {
@@ -101,8 +101,8 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
     }.dependsOn(construction)
 
     Task migration = project.tasks.create(MIGRATE.name, SilverpeasMigrationTask) {
-      it.migration        = extension.migration
-      it.settings         = extension.settings
+      it.migration = extension.migration
+      it.settings = extension.settings
     }.dependsOn(configuration)
 
     project.tasks.create(INSTALL.name, SilverpeasInstallationTask) {
@@ -121,30 +121,32 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @param project the Gradle project that uses the plugin
    * @param extension the project extension of the plugin
    */
-  private void setUpGradleAssemblingTaskForThisPlugin(Project project,
-                                                      SilverpeasSetupExtension extension) {
+  private static void setUpGradleAssemblingTaskForThisPlugin(Project project,
+                                                             SilverpeasSetupExtension extension) {
     try {
       Task assemble = project.tasks.getByName(ASSEMBLE.name).doLast {
         if (!extension.installation.distDir.get().exists()) {
           extension.installation.distDir.get().mkdirs()
         }
         SilverpeasBuilder builder = new SilverpeasBuilder(project, FileLogger.getLogger(delegate.name))
         builder.driversDir = extension.installation.dsDriversDir.get()
-        builder.silverpeasHome = extension.silverpeasHome
+        builder.silverpeasHome = extension.silverpeasHome.get()
         builder.settings = extension.settings
         builder.extractSoftwareBundles(extension.installation.bundles,
             extension.installation.distDir.get())
       }
       assemble.description = 'Assemble all the software bundles that made Silverpeas'
-      assemble.onlyIf { !extension.installation.distDir.get().exists() &&
-          !extension.installation.dsDriversDir.get().exists()
+      assemble.onlyIf {
+        !extension.installation.distDir.get().exists() &&
+            !extension.installation.dsDriversDir.get().exists()
       }
       assemble.outputs.upToDateWhen {
         extension.installation.distDir.get().exists() &&
             extension.installation.dsDriversDir.get().exists()
       }
     } catch (UnknownTaskException e) {
       // nothing to do
+      println e.message
     }
   }
 
@@ -155,12 +157,12 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @param project the Gradle project
    * @param extension the project extension of the plugin
    */
-  private void setUpGradleBuildTaskForThisPlugin(Project project,
-                                                 SilverpeasSetupExtension extension) {
+  private static void setUpGradleBuildTaskForThisPlugin(Project project,
+                                                        SilverpeasSetupExtension extension) {
     try {
       Task build = project.tasks.getByName(BUILD.name).doLast {
         SilverpeasBuilder builder = new SilverpeasBuilder(project, FileLogger.getLogger(delegate.name))
-        builder.silverpeasHome = extension.silverpeasHome
+        builder.silverpeasHome = extension.silverpeasHome.get()
         builder.settings = extension.settings
         builder.developmentMode = extension.installation.developmentMode.get()
         builder.generateSilverpeasApplication(extension.installation.distDir.get())
@@ -180,6 +182,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
       }
     } catch (UnknownTaskException e) {
       // nothing to do
+      println e.message
     }
   }
 
@@ -190,7 +193,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @return the project extension of the plugin
    */
   private SilverpeasSetupExtension createSilverpeasSetupExtention(Project project) {
-    def extension = project.extensions.create(EXTENSION, SilverpeasSetupExtension, project)
+    SilverpeasSetupExtension extension = project.extensions.create(EXTENSION, SilverpeasSetupExtension, project)
     extension.settings = loadConfigurationProperties(extension.config.configurationHome.get())
     completeSettings(extension.settings, extension)
     encryptAdminPassword(extension.settings)
@@ -205,8 +208,8 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @param jBossServer the JBoss server wrapper to initialize with some of the plugin's input
    * properties exposed to the project.
    */
-  private void initializePluginParameters(Project project,
-                                          JBossServer jBossServer) {
+  private static void initializePluginParameters(Project project,
+                                                 JBossServer jBossServer) {
     project.afterEvaluate { Project currentProject, ProjectState state ->
       SilverpeasSetupExtension extension =
           (SilverpeasSetupExtension) currentProject.extensions.getByName(EXTENSION)
@@ -228,7 +231,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * the String value.
    * @param extension the project extension of the plugin
    */
-  private void registerManagedBeansForScripts(SilverpeasSetupExtension extension) {
+  private static void registerManagedBeansForScripts(SilverpeasSetupExtension extension) {
     SilverpeasSetupService setupService = new SilverpeasSetupService(extension.settings)
     String.metaClass.asPath = { Paths.get(setupService.expanseVariables(delegate.toString())) }
     ManagedBeanContainer.registry()
@@ -266,7 +269,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @param settings the settings to complete/
    * @param extension the project extension of the plugin
    */
-  private void completeSettings(Map settings, SilverpeasSetupExtension extension) {
+  private static void completeSettings(Map<String, String> settings, SilverpeasSetupExtension extension) {
     settings.SILVERPEAS_HOME = normalizePath(extension.silverpeasHome.path)
     settings.MIGRATION_HOME = normalizePath(extension.migration.homeDir.get().path)
     settings.CONFIGURATION_HOME = normalizePath(extension.config.configurationHome.get().path)
@@ -320,7 +323,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * Replaces the administrator password set in the specified settings by its encrypted counterpart.
    * @param settings the settings with the administrator password.
    */
-  private void encryptAdminPassword(Map settings) {
+  private static void encryptAdminPassword(Map<String, String> settings) {
     Encryption encryption = EncryptionFactory.instance.createDefaultEncryption()
     settings.SILVERPEAS_ADMIN_PASSWORD = encryption.encrypt(settings.SILVERPEAS_ADMIN_PASSWORD)
   }
@@ -330,7 +333,7 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
    * @param project the Gradle project
    * @param loggingProperties the logging properties.
    */
-  private void initLogging(Project project, SilverpeasLoggingProperties loggingProperties) {
+  private static void initLogging(Project project, SilverpeasLoggingProperties loggingProperties) {
     String timestamp = new Date().format('yyyyMMdd_HHmmss')
     if (!loggingProperties.logDir.exists()) {
       loggingProperties.logDir.mkdirs()

src/main/groovy/org/silverpeas/setup/TaskEventLogging.groovy

@@ -50,7 +50,7 @@ class TaskEventLogging extends BuildAdapter implements TaskExecutionListener {
 
   private buildStarted = false
   private List<String> executedTasks = []
-  private long startTimestamp;
+  private long startTimestamp
 
   TaskEventLogging() {
     startTimestamp = System.currentTimeMillis()
@@ -120,7 +120,7 @@ class TaskEventLogging extends BuildAdapter implements TaskExecutionListener {
     result.rethrowFailure()
   }
 
-  private String unformat(String name) {
+  private static String unformat(String name) {
     StringBuilder str = new StringBuilder()
     str.append(name.charAt(0).toUpperCase())
     for (int i = 1; i < name.length(); i++) {
@@ -133,7 +133,7 @@ class TaskEventLogging extends BuildAdapter implements TaskExecutionListener {
     return str.toString()
   }
 
-  private void outputTask(String taskTitle) {
+  private static void outputTask(String taskTitle) {
     StringBuilder result = new StringBuilder("${taskTitle}... ")
     int charToAdd = 20 - result.length()
     for (int i = 0; i < charToAdd; i++) {
@@ -142,7 +142,7 @@ class TaskEventLogging extends BuildAdapter implements TaskExecutionListener {
     print result.toString()
   }
 
-  private void outputStatus(String status) {
+  private static void outputStatus(String status) {
     println "       ${status}"
   }
 }

src/main/groovy/org/silverpeas/setup/api/AbstractScript.groovy

@@ -32,7 +32,7 @@ abstract class AbstractScript implements Script {
 
   protected File script
   protected FileLogger logger
-  protected Map settings
+  protected Map<String, String> settings
 
   /**
    * Constructs a new script instance that refers the script located at the specified path.
@@ -59,7 +59,7 @@ abstract class AbstractScript implements Script {
    * @return itself.
    */
   @Override
-  AbstractScript useSettings(final Map settings) {
+  AbstractScript useSettings(final Map<String, String> settings) {
     this.settings = settings
     return this
   }
@@ -160,6 +160,6 @@ abstract class AbstractScript implements Script {
    */
   @Override
   boolean equals(final Object obj) {
-    return (obj.class.name.equals(this.class.name) && obj.hashCode() == this.hashCode())
+    return (obj.class.name == this.class.name && obj.hashCode() == this.hashCode())
   }
 }

src/main/groovy/org/silverpeas/setup/api/DataSourceProvider.groovy

@@ -36,18 +36,18 @@ class DataSourceProvider {
 
   private final DataSource dataSource
 
-  DataSourceProvider(final Map settings) {
+  DataSourceProvider(final Map<String, String> settings) {
     Objects.requireNonNull(settings)
-    DriverAdapterCPDS cpds = new DriverAdapterCPDS();
-    cpds.setDriver(settings.DB_DRIVER);
-    cpds.setUrl(settings.DB_URL);
-    cpds.setUser(settings.DB_USER);
-    cpds.setPassword(settings.DB_PASSWORD);
-
-    SharedPoolDataSource tds = new SharedPoolDataSource();
-    tds.setConnectionPoolDataSource(cpds);
-    tds.setMaxTotal(10);
-    tds.setDefaultMaxWaitMillis(50);
+    DriverAdapterCPDS cpds = new DriverAdapterCPDS()
+    cpds.setDriver(settings.DB_DRIVER)
+    cpds.setUrl(settings.DB_URL)
+    cpds.setUser(settings.DB_USER)
+    cpds.setPassword(settings.DB_PASSWORD)
+
+    SharedPoolDataSource tds = new SharedPoolDataSource()
+    tds.setConnectionPoolDataSource(cpds)
+    tds.setMaxTotal(10)
+    tds.setDefaultMaxWaitMillis(50)
     dataSource = tds
   }
 }

src/main/groovy/org/silverpeas/setup/api/FileLogger.groovy

@@ -247,7 +247,7 @@ class FileLogger {
   }
 
   private def getLogHandler() {
-    return this.logHandler == null ? DEFAULT_LOG_HANDLER: this.logHandler;
+    return this.logHandler == null ? DEFAULT_LOG_HANDLER: this.logHandler
   }
 
   private FileLogger(String namespace) {

src/main/groovy/org/silverpeas/setup/api/GroovyScript.groovy

@@ -49,7 +49,7 @@ class GroovyScript extends AbstractScript {
    * @throws RuntimeException if an error occurs during the execution of the script.
   */
   @Override
-  void run(Map args) throws RuntimeException {
+  void run(Map<String, ?> args) throws RuntimeException {
     logger.info "${script.name} processing..."
     Binding parameters = new Binding()
     parameters.setVariable('settings', settings)

src/main/groovy/org/silverpeas/setup/api/JBossServer.groovy

@@ -80,7 +80,7 @@ class JBossServer {
     }
   }
 
-  private void assertCommandSucceeds(command) throws AssertionError, InvalidObjectException {
+  private static void assertCommandSucceeds(command) throws AssertionError, InvalidObjectException {
     String result = command.in.text
     if (command.exitValue() != 0 || result.contains('"outcome" => "failed"')) {
       boolean rollBacked = result.contains('"rolled-back" => true')
@@ -165,7 +165,7 @@ class JBossServer {
    * @return itself.
    */
   JBossServer withStartingTimeout(long timeout) {
-    if (this.timeout != null && this.timeout > 0) {
+    if (this.timeout > 0) {
       this.timeout = timeout
     }
     return this
@@ -404,13 +404,13 @@ class JBossServer {
    * @throws RuntimeException if the adding of the artifact failed.
    */
   void add(String artifactPath, String name, String context) throws RuntimeException {
-    String normalizedArtifactPath = FilenameUtils.separatorsToUnix(artifactPath);
+    String normalizedArtifactPath = FilenameUtils.separatorsToUnix(artifactPath)
     Path artifactTruePath = Paths.get(normalizedArtifactPath)
     boolean archive = Files.isRegularFile(artifactTruePath)
     if (!isInDeployments(name)) {
       Process proc = executeCliCommand(
           "/deployment=${name}:add(runtime-name=${context},content=[{path=>${normalizedArtifactPath},archive=${archive}}])",
-          SystemUtils.IS_OS_WINDOWS);
+          SystemUtils.IS_OS_WINDOWS)
       proc.waitFor()
       if (proc.exitValue() != 0 || !isInDeployments(name)) {
         throw new RuntimeException("Adding of ${name} in JBoss failed with exit code " +
@@ -537,9 +537,9 @@ class JBossServer {
    * @return the instance of the process which handles the CLI command execution.
    */
   Process executeCliCommand(String commands, boolean wrapIntoDoubleQuotes = false) {
-    String finalCommands = commands;
+    String finalCommands = commands
     if (wrapIntoDoubleQuotes) {
-      finalCommands = "\"" + finalCommands + "\"";
+      finalCommands = "\"" + finalCommands + "\""
     }
     return new ProcessBuilder(cli, '--connect', finalCommands)
         .redirectErrorStream(true)

src/main/groovy/org/silverpeas/setup/api/JcrRepositoryFactory.groovy

@@ -26,7 +26,6 @@ package org.silverpeas.setup.api
 import groovy.xml.XmlUtil
 import org.apache.jackrabbit.core.RepositoryImpl
 import org.apache.jackrabbit.core.config.RepositoryConfig
-import org.gradle.api.Project
 
 import javax.jcr.Repository
 import javax.jcr.RepositoryException
@@ -44,14 +43,13 @@ class JcrRepositoryFactory {
   private static final String JCR_CONFIG_FILE = '/repository.xml'
 
   private File repositoryConf
-  private Project project
 
   private synchronized File getRepositoryConfiguration(Map settings) {
     if (!repositoryConf) {
       initJNDIContext()
       File destination = File.createTempFile('repository', 'xml')
 
-      SAXParserFactory factory = javax.xml.parsers.SAXParserFactory.newInstance()
+      SAXParserFactory factory = SAXParserFactory.newInstance()
       factory.validating = false
       factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd",
           false)
@@ -71,14 +69,14 @@ class JcrRepositoryFactory {
     return repositoryConf
   }
 
-  private void initJNDIContext() {
+  private static void initJNDIContext() {
     DataSourceProvider dataSourceProvider = ManagedBeanContainer.get(DataSourceProvider)
-    InitialContext ic = new InitialContext();
+    InitialContext ic = new InitialContext()
     try {
       ic.lookup('java:/datasources/DocumentStore')
-    } catch(NameNotFoundException ex) {
+    } catch(NameNotFoundException e) {
       ic.createSubcontext('java:/datasources')
-      ic.bind('java:/datasources/DocumentStore', dataSourceProvider.dataSource);
+      ic.bind('java:/datasources/DocumentStore', dataSourceProvider.dataSource)
     }
   }
 
@@ -89,15 +87,15 @@ class JcrRepositoryFactory {
   Repository createRepository(Map settings) {
     try {
       File repositoryConf = getRepositoryConfiguration(settings)
-      Properties jcrProperties = new Properties();
+      Properties jcrProperties = new Properties()
       jcrProperties.load(new FileInputStream(
-          "${settings.SILVERPEAS_HOME}/properties/org/silverpeas/util/jcr.properties"));
-      String jcrHomePath = jcrProperties[JCR_HOME];
+          "${settings.SILVERPEAS_HOME}/properties/org/silverpeas/util/jcr.properties"))
+      String jcrHomePath = jcrProperties[JCR_HOME]
 
-      RepositoryConfig config = RepositoryConfig.create(repositoryConf.path, jcrHomePath);
-      return RepositoryImpl.create(config);
+      RepositoryConfig config = RepositoryConfig.create(repositoryConf.path, jcrHomePath)
+      return RepositoryImpl.create(config)
     } catch (IOException | RepositoryException ex) {
-      throw new RuntimeException(ex.getMessage(), ex);
+      throw new RuntimeException(ex.getMessage(), ex)
     }
   }
 }