From dff60ec831115c675b45b9daf3ada6318745d1b7 Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 21 May 2021 00:09:36 +0900 Subject: [PATCH 1/2] Remove redundant public modifiers for Groovy See gh-724 --- .../restdocs/build/matrix/MatrixTestExtension.groovy | 2 +- .../restdocs/build/matrix/MatrixTestPlugin.groovy | 4 ++-- .../restdocs/build/samples/SampleBuildConfigurer.groovy | 2 +- .../restdocs/build/samples/SamplesExtension.groovy | 2 +- .../restdocs/build/samples/SamplesPlugin.groovy | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy index b3b4dab7..da282f7b 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy @@ -21,7 +21,7 @@ import org.gradle.api.Task import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.tasks.testing.Test -public class MatrixTestExtension { +class MatrixTestExtension { private List entries = [] diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy index ea1cf777..56825bf7 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy @@ -19,9 +19,9 @@ package org.springframework.restdocs.build.matrix import org.gradle.api.Plugin import org.gradle.api.Project -public class MatrixTestPlugin implements Plugin { +class MatrixTestPlugin implements Plugin { - public void apply(Project project) { + void apply(Project project) { project.extensions.create('matrixTest', MatrixTestExtension, project) } diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SampleBuildConfigurer.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SampleBuildConfigurer.groovy index 536b7f19..530f8ae1 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SampleBuildConfigurer.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SampleBuildConfigurer.groovy @@ -23,7 +23,7 @@ import org.gradle.api.tasks.Exec import org.gradle.api.tasks.Copy import org.gradle.api.tasks.GradleBuild -public class SampleBuildConfigurer { +class SampleBuildConfigurer { private final String name diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy index c5649f4a..eae89116 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy @@ -19,7 +19,7 @@ package org.springframework.restdocs.build.samples import org.gradle.api.Project import org.gradle.api.Task -public class SamplesExtension { +class SamplesExtension { Project Project diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy index 26d88515..6faec42c 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy @@ -19,9 +19,9 @@ package org.springframework.restdocs.build.samples import org.gradle.api.Plugin import org.gradle.api.Project -public class SamplesPlugin implements Plugin { +class SamplesPlugin implements Plugin { - public void apply(Project project) { + void apply(Project project) { def buildSamplesTask = project.tasks.create('buildSamples') buildSamplesTask.description = 'Builds the configured samples' buildSamplesTask.group = 'Build' From ae8e82f4411ab77873da8ad7a2a04e7bff090233 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 May 2021 17:42:55 +0100 Subject: [PATCH 2/2] Polish "Remove redundant public modifiers for Groovy" See gh-724 --- .../restdocs/build/matrix/MatrixTestExtension.groovy | 2 +- .../restdocs/build/matrix/MatrixTestPlugin.groovy | 2 +- .../restdocs/build/samples/SamplesExtension.groovy | 2 +- .../springframework/restdocs/build/samples/SamplesPlugin.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy index da282f7b..543316fd 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy index 56825bf7..65551d11 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy index eae89116..f606e2d6 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy index 6faec42c..f2f65317 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.