fix: don't use mutable objects for constants

grv87 · Dec 1, 2018 · e51c829 · e51c829
1 parent 5544399
commit e51c829
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 32 deletions.
diff --git a/src/compatTest/groovy/org/fidata/gradle/GradlePluginPluginSpecification.groovy b/src/compatTest/groovy/org/fidata/gradle/GradlePluginPluginSpecification.groovy
@@ -21,6 +21,7 @@ package org.fidata.gradle
 
 import static org.fidata.testfixtures.gradle.GradleRunnerUtils.skippedTaskPathsGradleBugWorkaround
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import spock.lang.Specification
 import spock.lang.Unroll
 import org.gradle.testkit.runner.GradleRunner
@@ -39,14 +40,14 @@ class GradlePluginPluginSpecification extends Specification {
   File settingsFile = new File(testProjectDir, 'settings.gradle')
   File propertiesFile = new File(testProjectDir, 'gradle.properties')
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/compatTest/groovy/org/fidata/gradle/JVMBasePluginSpecification.groovy b/src/compatTest/groovy/org/fidata/gradle/JVMBasePluginSpecification.groovy
@@ -20,6 +20,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.testkit.runner.GradleRunner
 import spock.lang.Specification
 
@@ -35,14 +36,14 @@ class JVMBasePluginSpecification extends Specification {
   File buildFile = new File(testProjectDir, 'build.gradle')
   File propertiesFile = new File(testProjectDir, 'gradle.properties')
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/compatTest/groovy/org/fidata/gradle/ProjectPluginBuildSrcSpecification.groovy b/src/compatTest/groovy/org/fidata/gradle/ProjectPluginBuildSrcSpecification.groovy
@@ -21,6 +21,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.testkit.runner.GradleRunner
 import spock.lang.Specification
 
@@ -42,14 +43,14 @@ class ProjectPluginBuildSrcSpecification extends Specification {
 
   File buildSrcPropertiesFile = new File(buildSrcTestProjectDir, 'gradle.properties')
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : System.getProperty('org.fidata.compatTest.artifactoryUser'),
     'artifactoryPassword': System.getProperty('org.fidata.compatTest.artifactoryPassword'),
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/compatTest/groovy/org/fidata/gradle/ProjectPluginSpecification.groovy b/src/compatTest/groovy/org/fidata/gradle/ProjectPluginSpecification.groovy
@@ -20,6 +20,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.testkit.runner.GradleRunner
 import spock.lang.Specification
 
@@ -35,14 +36,14 @@ class ProjectPluginSpecification extends Specification {
   File buildFile = new File(testProjectDir, 'build.gradle')
   File propertiesFile = new File(testProjectDir, 'gradle.properties')
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId'            : 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/functionalTest/groovy/org/fidata/gradle/GroovyProjectPluginSpecification.groovy b/src/functionalTest/groovy/org/fidata/gradle/GroovyProjectPluginSpecification.groovy
@@ -20,6 +20,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.Rule
@@ -36,14 +37,14 @@ class GroovyProjectPluginSpecification extends Specification {
 
   Project project
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/functionalTest/groovy/org/fidata/gradle/JVMBasePluginSpecification.groovy b/src/functionalTest/groovy/org/fidata/gradle/JVMBasePluginSpecification.groovy
@@ -20,6 +20,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.testfixtures.ProjectBuilder
@@ -37,14 +38,14 @@ class JVMBasePluginSpecification extends Specification {
 
   Project project
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/functionalTest/groovy/org/fidata/gradle/ProjectPluginExtraPropertiesSpecification.groovy b/src/functionalTest/groovy/org/fidata/gradle/ProjectPluginExtraPropertiesSpecification.groovy
@@ -21,6 +21,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.gradle.api.Project
 import org.gradle.api.internal.plugins.PluginApplicationException
 import org.gradle.testfixtures.ProjectBuilder
@@ -40,14 +41,14 @@ class ProjectPluginExtraPropertiesSpecification extends Specification {
 
   Project project
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/functionalTest/groovy/org/fidata/gradle/ProjectPluginSpecification.groovy b/src/functionalTest/groovy/org/fidata/gradle/ProjectPluginSpecification.groovy
@@ -20,6 +20,7 @@
 package org.fidata.gradle
 
 import static org.fidata.testfixtures.TestFixtures.initEmptyGitRepository
+import com.google.common.collect.ImmutableMap
 import org.spdx.spdxspreadsheet.InvalidLicenseStringException
 import spock.lang.Specification
 import org.junit.Rule
@@ -40,14 +41,14 @@ class ProjectPluginSpecification extends Specification {
 
   Project project
 
-  static final Map<String, String> EXTRA_PROPERTIES = [
+  static final Map<String, String> EXTRA_PROPERTIES = ImmutableMap.copyOf([
     'artifactoryUser'    : 'dummyArtifactoryUser',
     'artifactoryPassword': 'dummyArtifactoryPassword',
     'gitUsername': 'dummyGitUser',
     'gitPassword': 'dummyGitPassword',
     'ghToken': 'dummyGhToken',
     'gpgKeyId': 'ABCD1234',
-  ]
+  ])
 
   // fixture methods
 

diff --git a/src/main/groovy/org/fidata/gradle/ProjectPlugin.groovy b/src/main/groovy/org/fidata/gradle/ProjectPlugin.groovy
@@ -30,6 +30,7 @@ import static org.fidata.gradle.utils.VersionUtils.isPreReleaseVersion
 import static org.gradle.language.base.plugins.LifecycleBasePlugin.VERIFICATION_GROUP
 import static com.dorongold.gradle.tasktree.TaskTreePlugin.TASK_TREE_TASK_NAME
 import static org.fidata.gpg.GpgUtils.getGpgHome
+import com.google.common.collect.ImmutableList
 import com.github.zafarkhaja.semver.ParseException
 import java.nio.file.InvalidPathException
 import org.gradle.api.plugins.quality.Pmd
@@ -116,7 +117,7 @@ final class ProjectPlugin extends AbstractProjectPlugin {
   /**
    * List of filenames considered as license files
    */
-  public static final List<String> LICENSE_FILE_NAMES = [
+  public static final List<String> LICENSE_FILE_NAMES = ImmutableList.of(
     // License file names recognized by JFrog Artifactory
     'license',
     'LICENSE',
@@ -126,7 +127,7 @@ final class ProjectPlugin extends AbstractProjectPlugin {
     // GPL standard file names
     'COPYING',
     'COPYING.LESSER',
-  ]
+  )
 
   /**
    * Minimum supported version of Gradle
@@ -276,7 +277,7 @@ final class ProjectPlugin extends AbstractProjectPlugin {
    * Move these filters into separate library
    * <grv87 2018-09-22>
    */
-  public static final List<String> BUILD_INFO_ENV_VARS_EXCLUDE_PATTERS = [
+  public static final List<String> BUILD_INFO_ENV_VARS_EXCLUDE_PATTERS = ImmutableList.of(
     '*Password',
     '*Passphrase',
     '*SecretKey',
@@ -287,7 +288,7 @@ final class ProjectPlugin extends AbstractProjectPlugin {
     '*gradlePluginsSecret',
     '*OAuthClientSecret',
     '*Token',
-  ]
+  )
 
   private void configureArtifactory() {
     project.convention.getPlugin(ArtifactoryPluginConvention).with {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/GradlePluginPluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/GradlePluginPluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 
@@ -30,7 +31,7 @@ final class GradlePluginPluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.java-gradle-plugin': new PluginDependee(),
     'org.ajoberstar.stutter': new PluginDependee(
       version: '[0, 1[',
@@ -45,7 +46,7 @@ final class GradlePluginPluginDependees {
       version: '[0, 1[',
       enabled: false,
     ),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private GradlePluginPluginDependees() {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/GroovyBaseProjectPluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/GroovyBaseProjectPluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 
@@ -30,9 +31,9 @@ final class GroovyBaseProjectPluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.groovy-base': new PluginDependee(),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private GroovyBaseProjectPluginDependees() {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/GroovyProjectPluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/GroovyProjectPluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 
@@ -30,9 +31,9 @@ final class GroovyProjectPluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.groovy': new PluginDependee(),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private GroovyProjectPluginDependees() {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/JVMBasePluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/JVMBasePluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 import org.fidata.gradle.utils.PluginDependeeExclusion
@@ -31,7 +32,7 @@ final class JVMBasePluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.java-base': new PluginDependee(),
     'org.gradle.java-library': new PluginDependee(),
     'org.gradle.maven-publish': new PluginDependee(
@@ -53,7 +54,7 @@ final class JVMBasePluginDependees {
       ],
       enabled: false,
     ),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private JVMBasePluginDependees() {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/JavaProjectPluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/JavaProjectPluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 
@@ -30,13 +31,13 @@ final class JavaProjectPluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.java': new PluginDependee(),
     'io.franzbecker.gradle-lombok': new PluginDependee(
       configurationName: 'implementation',
       version: '[1, 2[',
     ),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private JavaProjectPluginDependees() {

diff --git a/src/pluginDependees/groovy/org/fidata/gradle/ProjectPluginDependees.groovy b/src/pluginDependees/groovy/org/fidata/gradle/ProjectPluginDependees.groovy
@@ -19,6 +19,7 @@
  */
 package org.fidata.gradle
 
+import com.google.common.collect.ImmutableMap
 import groovy.transform.CompileStatic
 import org.fidata.gradle.utils.PluginDependee
 import org.fidata.gradle.utils.PluginDependeeExclusion
@@ -31,7 +32,7 @@ final class ProjectPluginDependees {
   /**
    * List of plugin dependees with IDs
    */
-  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = [
+  static final Map<String, PluginDependee> PLUGIN_DEPENDEES = ImmutableMap.copyOf([
     'org.gradle.idea': new PluginDependee(),
     'org.gradle.lifecycle-base': new PluginDependee(),
     'org.fidata.prerequisites': new PluginDependee(
@@ -91,7 +92,7 @@ final class ProjectPluginDependees {
       configurationName: 'implementation',
       version: '[1, 2[',
     ),
-  ]
+  ])
 
   // Suppress default constructor for noninstantiability
   private ProjectPluginDependees() {