From 58d3bc9695d195a371d1e64f413c4b2a1dd21bde Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 6 Jan 2021 11:59:35 +0100 Subject: [PATCH] Remove unused imports and remove unnecessary modifiers --- .../cloudogu/scm/CopyCorePluginsTask.groovy | 10 ++---- .../com/cloudogu/scm/PackageYamlTask.groovy | 36 +++++-------------- .../com/cloudogu/scm/ReleaseYamlTask.groovy | 32 +++-------------- .../groovy/com/cloudogu/scm/ScmServer.groovy | 2 +- .../cloudogu/scm/ScmServerExtension.groovy | 16 ++++----- .../cloudogu/scm/WriteServerConfigTask.groovy | 22 +++--------- 6 files changed, 30 insertions(+), 88 deletions(-) diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/CopyCorePluginsTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/CopyCorePluginsTask.groovy index 2397dbb1ff..69ca75a120 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/CopyCorePluginsTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/CopyCorePluginsTask.groovy @@ -25,23 +25,19 @@ package com.cloudogu.scm +import com.google.common.hash.Hashing +import com.google.common.io.Files +import groovy.xml.MarkupBuilder import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.artifacts.Configuration -import org.gradle.api.file.Directory import org.gradle.api.file.DirectoryProperty import org.gradle.api.provider.Property import org.gradle.api.provider.Provider import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Internal - import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction -import groovy.xml.MarkupBuilder -import java.io.BufferedWriter - -import com.google.common.hash.Hashing -import com.google.common.io.Files class CopyCorePluginsTask extends DefaultTask { diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/PackageYamlTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/PackageYamlTask.groovy index 2c7c760ffd..cee6d9ca6c 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/PackageYamlTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/PackageYamlTask.groovy @@ -25,30 +25,12 @@ package com.cloudogu.scm +import com.google.common.hash.HashCode +import com.google.common.hash.Hashing +import com.google.common.io.Files import org.gradle.api.DefaultTask import org.gradle.api.GradleException -import org.gradle.api.artifacts.Configuration -import org.gradle.api.file.Directory -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.provider.Property -import org.gradle.api.provider.Provider -import org.gradle.api.tasks.Classpath -import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.Internal -import org.gradle.api.GradleException - -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import groovy.xml.MarkupBuilder -import java.io.BufferedWriter -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Optional -import org.gradle.api.tasks.InputFile - -import com.google.common.hash.Hashing -import com.google.common.hash.HashCode -import com.google.common.io.Files -import groovy.json.JsonOutput +import org.gradle.api.tasks.* class PackageYamlTask extends DefaultTask { @@ -56,26 +38,26 @@ class PackageYamlTask extends DefaultTask { private File artifact @Input - public String getType() { + String getType() { return type } - public void setType(String type) { + void setType(String type) { this.type = type } @Optional @InputFile - public File getArtifact() { + File getArtifact() { return artifact } - public void setArtifact(File artifact) { + void setArtifact(File artifact) { this.artifact = artifact } @OutputFile - public File getOutputFile() { + File getOutputFile() { return new File(project.buildDir, 'libs/package.yml') } diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ReleaseYamlTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/ReleaseYamlTask.groovy index 9b3deac063..5a2dd9b5b3 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/ReleaseYamlTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/ReleaseYamlTask.groovy @@ -28,50 +28,28 @@ package com.cloudogu.scm import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.artifacts.Configuration -import org.gradle.api.file.Directory -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.provider.Property -import org.gradle.api.provider.Provider import org.gradle.api.tasks.Classpath -import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.Internal -import org.gradle.api.GradleException - import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction -import groovy.xml.MarkupBuilder -import java.io.BufferedWriter -import org.gradle.api.artifacts.Configuration -import org.gradle.api.tasks.Optional -import org.gradle.api.tasks.Classpath -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFile - -import com.google.common.hash.Hashing -import com.google.common.hash.HashCode -import com.google.common.io.Files -import groovy.json.JsonOutput - -import java.text.SimpleDateFormat import org.yaml.snakeyaml.Yaml +import java.text.SimpleDateFormat class ReleaseYamlTask extends DefaultTask { private Configuration configuration @Classpath - public Configuration getConfiguration() { + Configuration getConfiguration() { return configuration } - public void setConfiguration(Configuration configuration) { + void setConfiguration(Configuration configuration) { this.configuration = configuration } @OutputFile - public File getOutputFile() { + File getOutputFile() { return new File(project.buildDir, 'libs/release.yml') } @@ -93,7 +71,7 @@ class ReleaseYamlTask extends DefaultTask { } files.forEach { file -> - file.withReader { r -> + file.withReader { r -> def pkg = yaml.load(r) release.packages.add(pkg) } diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy index 0be8f81b3c..c1d7681c25 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy @@ -39,7 +39,7 @@ import org.eclipse.jetty.server.handler.ShutdownHandler import java.awt.Desktop -public class ScmServer { +class ScmServer { def configuration private Server server diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServerExtension.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServerExtension.groovy index 9ee1f14984..abfc9bc961 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServerExtension.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServerExtension.groovy @@ -46,25 +46,25 @@ class ScmServerExtension implements Serializable { } @Input - public boolean isOpenBrowser() { + boolean isOpenBrowser() { return openBrowser } - public void setOpenBrowser(boolean openBrowser) { + void setOpenBrowser(boolean openBrowser) { this.openBrowser = openBrowser } @Input - public boolean isLiveReload() { + boolean isLiveReload() { return liveReload } - public void setLiveReload(boolean liveReload) { + void setLiveReload(boolean liveReload) { this.liveReload = liveReload } @Input - public String getHome() { + String getHome() { if (project.hasProperty('home')) { return project.getProperty('home') } @@ -72,7 +72,7 @@ class ScmServerExtension implements Serializable { } @Input - public int getPort() { + int getPort() { if (project.hasProperty('port')) { return Integer.parseInt(project.getProperty('port')) } @@ -81,11 +81,11 @@ class ScmServerExtension implements Serializable { @Optional @InputFile - public File getWarFile() { + File getWarFile() { return warFile } - public void setWarFile(File warFile) { + void setWarFile(File warFile) { this.warFile = warFile } diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy index 2d52969926..990e522118 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy @@ -25,27 +25,13 @@ package com.cloudogu.scm +import groovy.json.JsonOutput import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.artifacts.Configuration -import org.gradle.api.file.Directory -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.provider.Property -import org.gradle.api.provider.Provider -import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.Internal -import org.gradle.api.GradleException - import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction -import groovy.xml.MarkupBuilder -import java.io.BufferedWriter -import org.gradle.api.tasks.Input - -import com.google.common.hash.Hashing -import com.google.common.io.Files -import groovy.json.JsonOutput class WriteServerConfigTask extends DefaultTask { @@ -61,7 +47,7 @@ class WriteServerConfigTask extends DefaultTask { } @OutputFile - public File getServerConfig() { + File getServerConfig() { return new File(project.buildDir, 'server/config.json') } @@ -90,8 +76,8 @@ class WriteServerConfigTask extends DefaultTask { File serverConfig = getServerConfig() serverConfig.getParentFile().mkdirs() serverConfig.text = JsonOutput.toJson([ - home: extension.getHome(), - port: extension.getPort(), + home: extension.getHome(), + port: extension.getPort(), contextPath: '/scm', stage: 'DEVELOPMENT', headerSize: 16384,