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

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

Hide file tree

Showing 8 changed files with 60 additions and 37 deletions.
diff --git a/...va/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java b/...va/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java
@@ -72,7 +72,8 @@ public List<Pipeline> getMatchingPipelines(T event, PipelineCache pipelineCache)
     return supportedTriggerTypes().stream()
         .flatMap(
             triggerType ->
-                Optional.ofNullable(triggers.get(triggerType)).orElse(Collections.emptyList())
+                Optional.ofNullable(triggers.get(triggerType))
+                    .orElse(Collections.emptyList())
                     .stream())
         .filter(this::isValidTrigger)
         .filter(matchTriggerFor(event))

diff --git a/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java b/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java
@@ -67,8 +67,7 @@ protected Function<Trigger, Trigger> buildTrigger(PluginEvent event) {
     return trigger -> {
       String pluginEventType = getPluginEventType(event);
 
-      return trigger
-          .toBuilder()
+      return trigger.toBuilder()
           .pluginEventType(pluginEventType)
           .pluginId(event.getContent().getPluginId())
           .description(event.getContent().getDescription())

diff --git a/...ub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java b/...ub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java
@@ -45,19 +45,15 @@ public class GooglePubsubMonitor implements PollingMonitor {
   @PreDestroy
   private void closeAsyncConnections() {
     log.info("Closing async connections for Google Pubsub subscribers");
-    pubsubSubscribers
-        .subscribersMatchingType(PubsubSystem.GOOGLE)
-        .parallelStream()
+    pubsubSubscribers.subscribersMatchingType(PubsubSystem.GOOGLE).parallelStream()
         .forEach(this::closeConnection);
   }
 
   @Override
   public void onApplicationEvent(ContextRefreshedEvent event) {
     // TODO(jacobkiefer): Register Echo as enabled on startup.
     log.info("Starting async connections for Google Pubsub subscribers");
-    pubsubSubscribers
-        .subscribersMatchingType(PubsubSystem.GOOGLE)
-        .parallelStream()
+    pubsubSubscribers.subscribersMatchingType(PubsubSystem.GOOGLE).parallelStream()
         .forEach(this::openConnection);
   }
 

diff --git a/...metry/src/main/java/com/netflix/spinnaker/echo/telemetry/SpinnakerInstanceDataProvider.kt b/...metry/src/main/java/com/netflix/spinnaker/echo/telemetry/SpinnakerInstanceDataProvider.kt
@@ -68,5 +68,6 @@ class SpinnakerInstanceDataProvider(private val config: TelemetryConfigProps, pr
 
   private fun getProtoDeploymentType(type: String): DeploymentMethod.Type =
     DeploymentMethod.Type.valueOf(
-      DeploymentMethod.Type.getDescriptor().findMatchingValue(type))
+      DeploymentMethod.Type.getDescriptor().findMatchingValue(type)
+    )
 }
diff --git a/...lemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/ExecutionDataProviderTest.kt b/...lemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/ExecutionDataProviderTest.kt
@@ -41,7 +41,8 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createLoggableEvent()
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.id).isEmpty()
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.UNKNOWN)
@@ -59,7 +60,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.id).isNotEmpty()
     expectThat(statsEvent.execution.id).isNotEqualTo("myExecutionId")
@@ -74,7 +76,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.PIPELINE)
   }
@@ -88,7 +91,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.ORCHESTRATION)
   }
@@ -102,7 +106,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.UNKNOWN)
   }
@@ -120,7 +125,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.MANAGED_PIPELINE_TEMPLATE_V1)
   }
@@ -138,7 +144,8 @@ class ExecutionDataProviderTest {
     val echoEvent = createEventWithExecutionData(executionData)
 
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.type).isEqualTo(Execution.Type.MANAGED_PIPELINE_TEMPLATE_V2)
   }
@@ -154,7 +161,8 @@ class ExecutionDataProviderTest {
     )
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.status).isEqualTo(status)
   }
@@ -172,7 +180,8 @@ class ExecutionDataProviderTest {
     )
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.trigger.type).isEqualTo(triggerType)
   }
@@ -194,14 +203,16 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(1)
     val stage = statsEvent.execution.stagesList[0]
     expectThat(stage.status).isEqualTo(Status.BUFFERED)
     expectThat(stage.type).isEqualTo("myStageType")
     expectThat(stage.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build()
+    )
   }
 
   @Test
@@ -235,27 +246,31 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(3)
 
     val stage1 = statsEvent.execution.stagesList[0]
     expectThat(stage1.status).isEqualTo(Status.BUFFERED)
     expectThat(stage1.type).isEqualTo("myStageType1")
     expectThat(stage1.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build()
+    )
 
     val stage2 = statsEvent.execution.stagesList[1]
     expectThat(stage2.status).isEqualTo(Status.REDIRECT)
     expectThat(stage2.type).isEqualTo("myStageType2")
     expectThat(stage2.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.AWS).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.AWS).build()
+    )
 
     val stage3 = statsEvent.execution.stagesList[2]
     expectThat(stage3.status).isEqualTo(Status.PAUSED)
     expectThat(stage3.type).isEqualTo("myStageType3")
     expectThat(stage3.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.APPENGINE).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.APPENGINE).build()
+    )
   }
 
   @Test
@@ -277,27 +292,31 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(3)
 
     val stage1 = statsEvent.execution.stagesList[0]
     expectThat(stage1.status).isEqualTo(Status.BUFFERED)
     expectThat(stage1.type).isEqualTo("myStageType")
     expectThat(stage1.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.GCE).build()
+    )
 
     val stage2 = statsEvent.execution.stagesList[1]
     expectThat(stage2.status).isEqualTo(Status.BUFFERED)
     expectThat(stage2.type).isEqualTo("myStageType")
     expectThat(stage2.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.AWS).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.AWS).build()
+    )
 
     val stage3 = statsEvent.execution.stagesList[2]
     expectThat(stage3.status).isEqualTo(Status.BUFFERED)
     expectThat(stage3.type).isEqualTo("myStageType")
     expectThat(stage3.cloudProvider).isEqualTo(
-      CloudProvider.newBuilder().setId(CloudProvider.ID.APPENGINE).build())
+      CloudProvider.newBuilder().setId(CloudProvider.ID.APPENGINE).build()
+    )
   }
 
   @Test
@@ -314,7 +333,8 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(1)
     val stage = statsEvent.execution.stagesList[0]
@@ -335,7 +355,8 @@ class ExecutionDataProviderTest {
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(1)
     val stage = statsEvent.execution.stagesList[0]
@@ -351,13 +372,15 @@ class ExecutionDataProviderTest {
     val executionData = mapOf(
       "stages" to listOf(
         mapOf(
-          "context" to mapOf("cloudProvider" to cloudProviderId.toString()))
+          "context" to mapOf("cloudProvider" to cloudProviderId.toString())
+        )
       )
     )
 
     val echoEvent = createEventWithExecutionData(executionData)
     val statsEvent = ExecutionDataProvider().populateData(
-      echoEvent, StatsEvent.getDefaultInstance())
+      echoEvent, StatsEvent.getDefaultInstance()
+    )
 
     expectThat(statsEvent.execution.stagesList).hasSize(1)
     val stage = statsEvent.execution.stagesList[0]

diff --git a/...ry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/PipelineCountsDataProviderTest.kt b/...ry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/PipelineCountsDataProviderTest.kt
@@ -68,7 +68,8 @@ class PipelineCountsDataProviderTest {
 
     val result = dataProvider.populateData(
       echoEventForApplication("app2"),
-      StatsEvent.getDefaultInstance())
+      StatsEvent.getDefaultInstance()
+    )
 
     expectThat(result.spinnakerInstance.pipelineCount).isEqualTo(5)
     expectThat(result.application.pipelineCount).isEqualTo(3)
@@ -94,7 +95,8 @@ class PipelineCountsDataProviderTest {
 
     val result = dataProvider.populateData(
       echoEventForApplication("app2"),
-      StatsEvent.getDefaultInstance())
+      StatsEvent.getDefaultInstance()
+    )
 
     // I don't particularly care if it counts the broken pipeline or not.
     expectThat(result.spinnakerInstance.pipelineCount)

diff --git a/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/GitlabWehbookEventHandler.java b/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/GitlabWehbookEventHandler.java
@@ -35,7 +35,8 @@ public GitlabWehbookEventHandler() {
 
   public boolean handles(String source) {
     return "gitlab".equals(source);
-  };
+  }
+  ;
 
   public boolean shouldSendEvent(Event event) {
     return true;

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ fiatVersion=1.22.0
 korkVersion=7.56.0
 kotlinVersion=1.3.71
 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'`.