chore(spotless): upgrade spinnaker gradle plugin (#3838)

This includes updates to google-java-format and ktlint, so requires some formatting changes. These were made with a simple `./gradlew spotlessApply`.
spinnaker · Jul 28, 2020 · f44c924 · f44c924
1 parent f89aa30
commit f44c924
Show file tree

Hide file tree

Showing 87 changed files with 1,503 additions and 1,028 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ keikoVersion=3.8.0
 korkVersion=7.56.0
 kotlinVersion=1.3.72
 org.gradle.parallel=true
-spinnakerGradleVersion=8.3.0
+spinnakerGradleVersion=8.4.0
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.

diff --git a/...groovy/com/netflix/spinnaker/orca/clouddriver/tasks/conditions/EvaluateConditionTask.java b/...groovy/com/netflix/spinnaker/orca/clouddriver/tasks/conditions/EvaluateConditionTask.java
@@ -112,7 +112,8 @@ public TaskResult execute(@Nonnull StageExecution stage) {
           suppliers.stream()
               .flatMap(
                   supplier ->
-                      supplier.getConditions(ctx.getCluster(), ctx.getRegion(), ctx.getAccount())
+                      supplier
+                          .getConditions(ctx.getCluster(), ctx.getRegion(), ctx.getAccount())
                           .stream())
               .filter(Objects::nonNull)
               .collect(Collectors.toSet());

diff --git a/.../com/netflix/spinnaker/orca/clouddriver/tasks/providers/alicloud/AliCloudImageFinder.java b/.../com/netflix/spinnaker/orca/clouddriver/tasks/providers/alicloud/AliCloudImageFinder.java
@@ -49,7 +49,8 @@ public Collection<ImageDetails> byTags(
       Map<String, String> tags,
       List<String> warningsCollector) {
     List<AliCloudImage> allMatchedImages =
-        oortService.findImage(getCloudProvider(), packageName, null, null, prefixTags(tags))
+        oortService
+            .findImage(getCloudProvider(), packageName, null, null, prefixTags(tags))
             .stream()
             .map(image -> objectMapper.convertValue(image, AliCloudImage.class))
             .sorted()

diff --git a/...a/clouddriver/tasks/providers/aws/cloudformation/WaitForCloudFormationCompletionTask.java b/...a/clouddriver/tasks/providers/aws/cloudformation/WaitForCloudFormationCompletionTask.java
@@ -139,7 +139,8 @@ private String getChangeSetInfo(Map stack, Map context, String field) {
     String changeSetName = (String) context.get("changeSetName");
     log.debug("Getting change set status from stack for changeset {}: {}", changeSetName, stack);
     return Optional.ofNullable((List<Map<String, ?>>) stack.get("changeSets"))
-        .orElse(Collections.emptyList()).stream()
+        .orElse(Collections.emptyList())
+        .stream()
         .filter(changeSet -> changeSet.get("name").equals(changeSetName))
         .findFirst()
         .map(changeSet -> (String) changeSet.get(field))

diff --git a/.../groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/GoogleImageFinder.java b/.../groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/GoogleImageFinder.java
@@ -47,7 +47,8 @@ public Collection<ImageDetails> byTags(
       Map<String, String> tags,
       List<String> warningsCollector) {
     List<GoogleImage> allMatchedImages =
-        oortService.findImage(getCloudProvider(), packageName, null, null, prefixTags(tags))
+        oortService
+            .findImage(getCloudProvider(), packageName, null, null, prefixTags(tags))
             .stream()
             .map(image -> objectMapper.convertValue(image, GoogleImage.class))
             .sorted()

diff --git a/...oovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/oracle/OracleImageFinder.java b/...oovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/oracle/OracleImageFinder.java
@@ -48,7 +48,8 @@ public Collection<ImageDetails> byTags(
     StageData stageData = (StageData) stage.mapTo(StageData.class);
 
     List<OracleImage> allMatchedImages =
-        oortService.findImage(getCloudProvider(), packageName, null, null, prefixTags(freeformTags))
+        oortService
+            .findImage(getCloudProvider(), packageName, null, null, prefixTags(freeformTags))
             .stream()
             .map(imageAsMap -> objectMapper.convertValue(imageAsMap, OracleImage.class))
             .sorted()

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/DynamicStageResolver.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/DynamicStageResolver.kt
@@ -95,19 +95,19 @@ class DynamicStageResolver(
    */
   private fun validatePreferences(duplicates: Map<String, MutableList<StageDefinitionBuilder>>) {
     duplicates.forEach { duplicate ->
-        val pref = getPreference(duplicate.key)
+      val pref = getPreference(duplicate.key)
 
-        if (pref == NO_PREFERENCE) {
-          throw NoPreferenceConfigPresentException(duplicate.key)
-        }
+      if (pref == NO_PREFERENCE) {
+        throw NoPreferenceConfigPresentException(duplicate.key)
+      }
 
-        // Ensure the preference is actually valid: Is there a StageDefinitionBuilder with a matching canonical name?
-        duplicate.value.map { it.extensionClass.canonicalName }.let {
-          if (!it.contains(pref)) {
-            throw InvalidStageDefinitionBuilderPreference(duplicate.key, pref, it)
-          }
+      // Ensure the preference is actually valid: Is there a StageDefinitionBuilder with a matching canonical name?
+      duplicate.value.map { it.extensionClass.canonicalName }.let {
+        if (!it.contains(pref)) {
+          throw InvalidStageDefinitionBuilderPreference(duplicate.key, pref, it)
         }
       }
+    }
   }
 
   /**

diff --git a/...c/main/java/com/netflix/spinnaker/orca/listeners/DelegatingApplicationEventMulticaster.kt b/...c/main/java/com/netflix/spinnaker/orca/listeners/DelegatingApplicationEventMulticaster.kt
@@ -56,7 +56,8 @@ class DelegatingApplicationEventMulticaster(
       return true
     }
     if (listener is InspectableApplicationListenerMethodAdapter &&
-      listener.getMethod().getAnnotation(Sync::class.java) != null) {
+      listener.getMethod().getAnnotation(Sync::class.java) != null
+    ) {
       return true
     }
     return false

diff --git a/...r/orca/pipeline/expressions/functions/DeployedServerGroupsExpressionFunctionProvider.java b/...r/orca/pipeline/expressions/functions/DeployedServerGroupsExpressionFunctionProvider.java
@@ -96,7 +96,8 @@ public static List<Map<String, Object>> deployedServerGroups(
                             task -> Optional.ofNullable(task.results).orElse(emptyList()).stream())
                         .flatMap(
                             result ->
-                                Optional.ofNullable(result.deployments).orElse(emptyList())
+                                Optional.ofNullable(result.deployments)
+                                    .orElse(emptyList())
                                     .stream())
                         .collect(Collectors.toList());
                 deployDetails.put("deployments", deployments);

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/BuildInfo.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/BuildInfo.kt
@@ -9,6 +9,6 @@ abstract class BuildInfo<A>(
   open val scm: List<SourceControl>? = emptyList(),
   open val building: Boolean = false
 ) {
-    var fullDisplayName: String? = null
-        get() = field ?: "$name#$number"
+  var fullDisplayName: String? = null
+    get() = field ?: "$name#$number"
 }
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/JenkinsTrigger.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/JenkinsTrigger.kt
@@ -110,15 +110,15 @@ constructor(
   @param:JsonProperty("building") override var building: Boolean = false,
   @param:JsonProperty("timestamp") val timestamp: Long?
 ) :
-    BuildInfo<JenkinsArtifact>(name, number, url, result, artifacts, scm, building) {
-
-    @JvmOverloads
-    constructor(
-      name: String,
-      number: Int,
-      url: String,
-      result: String,
-      artifacts: List<JenkinsArtifact> = emptyList(),
-      scm: List<SourceControl> = emptyList()
-    ) : this(name, number, url, result, artifacts, scm, false, null)
+  BuildInfo<JenkinsArtifact>(name, number, url, result, artifacts, scm, building) {
+
+  @JvmOverloads
+  constructor(
+    name: String,
+    number: Int,
+    url: String,
+    result: String,
+    artifacts: List<JenkinsArtifact> = emptyList(),
+    scm: List<SourceControl> = emptyList()
+  ) : this(name, number, url, result, artifacts, scm, false, null)
 }
diff --git a/...re/src/main/java/com/netflix/spinnaker/orca/pipeline/model/support/TriggerDeserializer.kt b/...re/src/main/java/com/netflix/spinnaker/orca/pipeline/model/support/TriggerDeserializer.kt
@@ -56,38 +56,40 @@ class TriggerDeserializer :
           get("repository").textValue(),
           get("tag").textValue()
         )
-        looksLikeConcourse() -> ConcourseTrigger(
-                get("type").textValue(),
-                get("correlationId")?.textValue(),
-                get("user")?.textValue() ?: "[anonymous]",
-                get("parameters")?.mapValue(parser) ?: mutableMapOf(),
-                get("artifacts")?.listValue(parser) ?: mutableListOf(),
-                get("notifications")?.listValue(parser) ?: mutableListOf(),
-                get("rebake")?.booleanValue() == true,
-                get("dryRun")?.booleanValue() == true,
-                get("strategy")?.booleanValue() == true
-        ).apply {
-          buildInfo = get("buildInfo")?.parseValue(parser)
-          properties = get("properties")?.parseValue(parser) ?: mutableMapOf()
-        }
-        looksLikeJenkins() -> JenkinsTrigger(
-          get("type").textValue(),
-          get("correlationId")?.textValue(),
-          get("user")?.textValue() ?: "[anonymous]",
-          get("parameters")?.mapValue(parser) ?: mutableMapOf(),
-          get("artifacts")?.listValue(parser) ?: mutableListOf(),
-          get("notifications")?.listValue(parser) ?: mutableListOf(),
-          get("rebake")?.booleanValue() == true,
-          get("dryRun")?.booleanValue() == true,
-          get("strategy")?.booleanValue() == true,
-          get("master").textValue(),
-          get("job").textValue(),
-          get("buildNumber").intValue(),
-          get("propertyFile")?.textValue()
-        ).apply {
-          buildInfo = get("buildInfo")?.parseValue(parser)
-          properties = get("properties")?.mapValue(parser) ?: mutableMapOf()
-        }
+        looksLikeConcourse() ->
+          ConcourseTrigger(
+            get("type").textValue(),
+            get("correlationId")?.textValue(),
+            get("user")?.textValue() ?: "[anonymous]",
+            get("parameters")?.mapValue(parser) ?: mutableMapOf(),
+            get("artifacts")?.listValue(parser) ?: mutableListOf(),
+            get("notifications")?.listValue(parser) ?: mutableListOf(),
+            get("rebake")?.booleanValue() == true,
+            get("dryRun")?.booleanValue() == true,
+            get("strategy")?.booleanValue() == true
+          ).apply {
+            buildInfo = get("buildInfo")?.parseValue(parser)
+            properties = get("properties")?.parseValue(parser) ?: mutableMapOf()
+          }
+        looksLikeJenkins() ->
+          JenkinsTrigger(
+            get("type").textValue(),
+            get("correlationId")?.textValue(),
+            get("user")?.textValue() ?: "[anonymous]",
+            get("parameters")?.mapValue(parser) ?: mutableMapOf(),
+            get("artifacts")?.listValue(parser) ?: mutableListOf(),
+            get("notifications")?.listValue(parser) ?: mutableListOf(),
+            get("rebake")?.booleanValue() == true,
+            get("dryRun")?.booleanValue() == true,
+            get("strategy")?.booleanValue() == true,
+            get("master").textValue(),
+            get("job").textValue(),
+            get("buildNumber").intValue(),
+            get("propertyFile")?.textValue()
+          ).apply {
+            buildInfo = get("buildInfo")?.parseValue(parser)
+            properties = get("properties")?.mapValue(parser) ?: mutableMapOf()
+          }
         looksLikePipeline() -> PipelineTrigger(
           get("type").textValue(),
           get("correlationId")?.textValue(),

diff --git a/.../src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/DualExecutionRepository.kt b/.../src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/DualExecutionRepository.kt
@@ -215,11 +215,13 @@ class DualExecutionRepository(
         buildTimeEndBoundary,
         executionCriteria
       )
-      .plus(previous.retrievePipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(
-        pipelineConfigIds,
-        buildTimeStartBoundary,
-        buildTimeEndBoundary,
-        executionCriteria)
+      .plus(
+        previous.retrievePipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(
+          pipelineConfigIds,
+          buildTimeStartBoundary,
+          buildTimeEndBoundary,
+          executionCriteria
+        )
       ).distinctBy { it.id }
   }
 
@@ -235,11 +237,13 @@ class DualExecutionRepository(
         buildTimeStartBoundary,
         buildTimeEndBoundary,
         executionCriteria
-      ).plus(previous.retrieveAllPipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(
-        pipelineConfigIds,
-        buildTimeStartBoundary,
-        buildTimeEndBoundary,
-        executionCriteria)
+      ).plus(
+        previous.retrieveAllPipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(
+          pipelineConfigIds,
+          buildTimeStartBoundary,
+          buildTimeEndBoundary,
+          executionCriteria
+        )
       ).distinctBy { it.id }
   }
 

diff --git a/.../main/java/com/netflix/spinnaker/orca/pipeline/persistence/InMemoryExecutionRepository.kt b/.../main/java/com/netflix/spinnaker/orca/pipeline/persistence/InMemoryExecutionRepository.kt
@@ -44,20 +44,20 @@ class InMemoryExecutionRepository : ExecutionRepository {
 
   override fun retrieveAllApplicationNames(executionType: ExecutionType?): MutableList<String> {
     return if (executionType == null) {
-        pipelines.values + orchestrations.values
-      } else {
-        storageFor(executionType).values
-      }
+      pipelines.values + orchestrations.values
+    } else {
+      storageFor(executionType).values
+    }
       .map { it.application }
       .toMutableList()
   }
 
   override fun retrieveAllApplicationNames(executionType: ExecutionType?, minExecutions: Int): MutableList<String> {
     return if (executionType == null) {
-        pipelines.values + orchestrations.values
-      } else {
-        storageFor(executionType).values
-      }
+      pipelines.values + orchestrations.values
+    } else {
+      storageFor(executionType).values
+    }
       .groupBy { it.application }
       .filter { it.value.size >= minExecutions }
       .keys
@@ -88,8 +88,10 @@ class InMemoryExecutionRepository : ExecutionRepository {
   override fun resume(type: ExecutionType, id: String, user: String?, ignoreCurrentStatus: Boolean) {
     retrieve(type, id).also {
       if (!ignoreCurrentStatus && it.status != ExecutionStatus.PAUSED) {
-        throw UnresumablePipelineException("Unable to resume pipeline that is not PAUSED " +
-          "(executionId: ${it.id}, currentStatus: ${it.status}")
+        throw UnresumablePipelineException(
+          "Unable to resume pipeline that is not PAUSED " +
+            "(executionId: ${it.id}, currentStatus: ${it.status}"
+        )
       }
       it.status = ExecutionStatus.RUNNING
       it.paused?.resumedBy = user
@@ -135,8 +137,10 @@ class InMemoryExecutionRepository : ExecutionRepository {
   override fun pause(type: ExecutionType, id: String, user: String?) {
     retrieve(type, id).also {
       if (it.status != ExecutionStatus.RUNNING) {
-        throw UnpausablePipelineException("Unable to pause pipeline that is not RUNNING " +
-          "(executionId: ${it.id}, currentStatus: ${it.status})")
+        throw UnpausablePipelineException(
+          "Unable to pause pipeline that is not RUNNING " +
+            "(executionId: ${it.id}, currentStatus: ${it.status})"
+        )
       }
       it.status = ExecutionStatus.PAUSED
       it.paused = PipelineExecution.PausedDetails().apply {

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtils.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtils.java
@@ -286,8 +286,13 @@ private List<Artifact> getPriorArtifacts(Map<String, Object> pipeline) {
 
   private Optional<PipelineExecution> getExecutionForPipelineId(
       String pipelineId, ExecutionCriteria criteria) {
-    return executionRepository.retrievePipelinesForPipelineConfigId(pipelineId, criteria)
-        .subscribeOn(Schedulers.io()).toList().toBlocking().single().stream()
+    return executionRepository
+        .retrievePipelinesForPipelineConfigId(pipelineId, criteria)
+        .subscribeOn(Schedulers.io())
+        .toList()
+        .toBlocking()
+        .single()
+        .stream()
         .min(startTimeOrId);
   }
 

diff --git a/...egrations-gremlin/src/main/java/com/netflix/spinnaker/orca/config/GremlinConfiguration.kt b/...egrations-gremlin/src/main/java/com/netflix/spinnaker/orca/config/GremlinConfiguration.kt
@@ -39,7 +39,8 @@ class GremlinConfiguration {
     val mapper = OrcaObjectMapper
       .newInstance()
       .setPropertyNamingStrategy(
-        PropertyNamingStrategy.SNAKE_CASE)
+        PropertyNamingStrategy.SNAKE_CASE
+      )
       .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) // we want Instant serialized as ISO string
     return RestAdapter.Builder()
       .setRequestInterceptor(spinnakerRequestInterceptor)

diff --git a/orca-interlink/src/main/java/com/netflix/spinnaker/orca/interlink/MessageFlagger.kt b/orca-interlink/src/main/java/com/netflix/spinnaker/orca/interlink/MessageFlagger.kt
@@ -71,13 +71,15 @@ class MessageFlagger(val clock: Clock, val props: FlaggerProperties) {
       mutex.lock()
       val matches = queue.filter { it.timestamp.isAfter(timeCutoff) && it.hash == hash }
       if (matches.count() >= props.threshold) {
-        throw MessageFlaggedException("Event '$event' with fingerprint '${event.fingerprint}' has been encountered " +
-          "${matches.count()} times in the last ${props.lookbackSeconds}s")
+        throw MessageFlaggedException(
+          "Event '$event' with fingerprint '${event.fingerprint}' has been encountered " +
+            "${matches.count()} times in the last ${props.lookbackSeconds}s"
+        )
       }
 
       queue.add(TimestampedHash(now, hash))
     } finally {
-        mutex.unlock()
+      mutex.unlock()
     }
   }
 

diff --git a/...ta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/pipeline/RunCanaryIntervalsStage.kt b/...ta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/pipeline/RunCanaryIntervalsStage.kt
@@ -63,8 +63,10 @@ class RunCanaryIntervalsStage(private val clock: Clock) : StageDefinitionBuilder
     val canaryConfig = parent.mapTo<KayentaCanaryContext>("/canaryConfig")
 
     val lifetime: Duration = if (canaryConfig.endTime != null) {
-      Duration.ofMinutes((canaryConfig.startTime ?: Instant.now(clock))
-        .until(canaryConfig.endTime, ChronoUnit.MINUTES))
+      Duration.ofMinutes(
+        (canaryConfig.startTime ?: Instant.now(clock))
+          .until(canaryConfig.endTime, ChronoUnit.MINUTES)
+      )
     } else if (canaryConfig.lifetime != null) {
       canaryConfig.lifetime
     } else {
@@ -227,12 +229,12 @@ data class DeployedServerGroupContext @JsonCreator constructor(
   companion object {
     fun from(data: Map<String, String>): DeployedServerGroupContext {
       return DeployedServerGroupContext(
-              data["controlLocation"].orEmpty(),
-              data["controlScope"].orEmpty(),
-              data["controlAccountId"],
-              data["experimentLocation"].orEmpty(),
-              data["experimentScope"].orEmpty(),
-              data["experimentAccountId"]
+        data["controlLocation"].orEmpty(),
+        data["controlScope"].orEmpty(),
+        data["controlAccountId"],
+        data["experimentLocation"].orEmpty(),
+        data["experimentScope"].orEmpty(),
+        data["experimentAccountId"]
       )
     }
   }