diff --git a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java index b2d523341..b78c8b26b 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java @@ -72,7 +72,8 @@ public List 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/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java index 304db8736..75e6bf7a8 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java @@ -67,8 +67,7 @@ protected Function 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/echo-pubsub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java b/echo-pubsub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java index bf60ca1e7..e9b68d6c1 100644 --- a/echo-pubsub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java +++ b/echo-pubsub-google/src/main/java/com/netflix/spinnaker/echo/pubsub/google/GooglePubsubMonitor.java @@ -45,9 +45,7 @@ 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); } @@ -55,9 +53,7 @@ private void closeAsyncConnections() { 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/echo-telemetry/src/main/java/com/netflix/spinnaker/echo/telemetry/SpinnakerInstanceDataProvider.kt b/echo-telemetry/src/main/java/com/netflix/spinnaker/echo/telemetry/SpinnakerInstanceDataProvider.kt index 2ec6a7191..438d39c5b 100644 --- a/echo-telemetry/src/main/java/com/netflix/spinnaker/echo/telemetry/SpinnakerInstanceDataProvider.kt +++ b/echo-telemetry/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/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/ExecutionDataProviderTest.kt b/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/ExecutionDataProviderTest.kt index 57f4af3c8..cf954157c 100644 --- a/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/ExecutionDataProviderTest.kt +++ b/echo-telemetry/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,7 +246,8 @@ class ExecutionDataProviderTest { val echoEvent = createEventWithExecutionData(executionData) val statsEvent = ExecutionDataProvider().populateData( - echoEvent, StatsEvent.getDefaultInstance()) + echoEvent, StatsEvent.getDefaultInstance() + ) expectThat(statsEvent.execution.stagesList).hasSize(3) @@ -243,19 +255,22 @@ class ExecutionDataProviderTest { 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,7 +292,8 @@ class ExecutionDataProviderTest { val echoEvent = createEventWithExecutionData(executionData) val statsEvent = ExecutionDataProvider().populateData( - echoEvent, StatsEvent.getDefaultInstance()) + echoEvent, StatsEvent.getDefaultInstance() + ) expectThat(statsEvent.execution.stagesList).hasSize(3) @@ -285,19 +301,22 @@ class ExecutionDataProviderTest { 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/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/PipelineCountsDataProviderTest.kt b/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/PipelineCountsDataProviderTest.kt index 81bd3ea33..77d10a361 100644 --- a/echo-telemetry/src/test/kotlin/com/netflix/spinnaker/echo/telemetry/PipelineCountsDataProviderTest.kt +++ b/echo-telemetry/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 index c68390dda..57931e844 100644 --- 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 index 5584096fd..80eefccbb 100644 --- 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 `'Composite=true'`.