diff --git a/acceptance-test/projects/codegen-v3/multiple-codegen-versions/build.gradle b/acceptance-test/projects/codegen-v3/multiple-codegen-versions/build.gradle index 17a7b515..9c2f23cd 100644 --- a/acceptance-test/projects/codegen-v3/multiple-codegen-versions/build.gradle +++ b/acceptance-test/projects/codegen-v3/multiple-codegen-versions/build.gradle @@ -24,7 +24,7 @@ swaggerSources { language = 'spring' components = ['models', 'apis'] configFile = file('v2-config.json') - configuration = configurations.swaggerCodegenV2 + configuration.from(configurations.swaggerCodegenV2) } } petstoreV3 { @@ -33,7 +33,7 @@ swaggerSources { language = 'spring' components = ['models', 'apis'] configFile = file('v3-config.json') - configuration = configurations.swaggerCodegenV3 + configuration.from(configurations.swaggerCodegenV3) } } } diff --git a/acceptance-test/projects/openapi-v3/multiple-codegen-versions/build.gradle b/acceptance-test/projects/openapi-v3/multiple-codegen-versions/build.gradle index 7e02b2cf..a48b15e5 100644 --- a/acceptance-test/projects/openapi-v3/multiple-codegen-versions/build.gradle +++ b/acceptance-test/projects/openapi-v3/multiple-codegen-versions/build.gradle @@ -24,7 +24,7 @@ swaggerSources { language = 'spring' components = ['models', 'apis'] configFile = file('v2-config.json') - configuration = configurations.swaggerCodegenV2 + configuration.from(configurations.swaggerCodegenV2) } } petstoreV3 { @@ -33,7 +33,7 @@ swaggerSources { language = 'spring' components = ['models', 'apis'] configFile = file('v3-config.json') - configuration = configurations.openApiGen + configuration.from(configurations.openApiGen) } } } diff --git a/acceptance-test/projects/ui-v2/basic/build.gradle b/acceptance-test/projects/ui-v2/basic/build.gradle index 6cfef46d..c663b8cc 100644 --- a/acceptance-test/projects/ui-v2/basic/build.gradle +++ b/acceptance-test/projects/ui-v2/basic/build.gradle @@ -17,9 +17,9 @@ swaggerSources { ui { doLast { // overwrite index.html for Swagger UI 2.x - copy { - from 'index.html' - into outputDir + files.copy { + it.from 'index.html' + it.into outputDir } } } diff --git a/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/GradleProject.groovy b/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/GradleProject.groovy index f9a1f28d..26066d25 100644 --- a/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/GradleProject.groovy +++ b/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/GradleProject.groovy @@ -25,7 +25,7 @@ class GradleProject { GradleRunner.create() .withProjectDir(new File('projects')) .withPluginClasspath() - .withArguments('-s', "$path:$taskName") + .withArguments('-s', '--configuration-cache', "$path:$taskName") .build() } catch (UnexpectedBuildFailure e) { throw new BuildFailureException(e) diff --git a/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/misc/DefaultTasksSpec.groovy b/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/misc/DefaultTasksSpec.groovy index b22248fb..ea1360f0 100644 --- a/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/misc/DefaultTasksSpec.groovy +++ b/acceptance-test/src/test/groovy/org/hidetake/gradle/swagger/generator/test/misc/DefaultTasksSpec.groovy @@ -5,7 +5,7 @@ import spock.lang.Specification import spock.lang.Unroll import static org.gradle.testkit.runner.TaskOutcome.NO_SOURCE -import static org.gradle.testkit.runner.TaskOutcome.SKIPPED +import static org.gradle.testkit.runner.TaskOutcome.SUCCESS class DefaultTasksSpec extends Specification { @@ -22,7 +22,7 @@ class DefaultTasksSpec extends Specification { where: taskName | status 'generateSwaggerCode' | NO_SOURCE - 'generateSwaggerCodeHelp' | SKIPPED + 'generateSwaggerCodeHelp' | SUCCESS 'generateSwaggerUI' | NO_SOURCE 'validateSwagger' | NO_SOURCE } diff --git a/build.gradle b/build.gradle index 63404933..21baa34a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,12 @@ plugins { id 'groovy-gradle-plugin' - id 'com.gradle.plugin-publish' version '0.20.0' + id 'com.gradle.plugin-publish' version '1.2.1' } -sourceCompatibility = '1.8' -targetCompatibility = '1.8' +java { + sourceCompatibility = '1.8' + targetCompatibility = '1.8' +} repositories { mavenCentral() @@ -28,12 +30,6 @@ test { group = 'org.hidetake' version = System.getenv('GITHUB_REF')?.split('/')?.last() ?: 'SNAPSHOT' -pluginBundle { - website = 'https://github.com/int128/gradle-swagger-generator-plugin' - vcsUrl = 'https://github.com/int128/gradle-swagger-generator-plugin' - tags = ['swagger', 'api', 'generator'] -} - gradlePlugin { plugins { swaggerPlugin { @@ -41,6 +37,9 @@ gradlePlugin { displayName = 'Gradle Swagger Generator Plugin' description = 'Gradle plugin for OpenAPI YAML validation, code generation and API document publishing' implementationClass = 'org.hidetake.gradle.swagger.generator.SwaggerGeneratorPlugin' + website = 'https://github.com/int128/gradle-swagger-generator-plugin' + vcsUrl = 'https://github.com/int128/gradle-swagger-generator-plugin' + tags = ['swagger', 'api', 'generator'] } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..d64cd491 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..1af9e093 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateReDoc.groovy b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateReDoc.groovy index c0f60842..b0eec62e 100644 --- a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateReDoc.groovy +++ b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateReDoc.groovy @@ -2,16 +2,19 @@ package org.hidetake.gradle.swagger.generator import groovy.xml.XmlUtil import org.gradle.api.DefaultTask +import org.gradle.api.internal.file.FileOperations import org.gradle.api.tasks.* import org.hidetake.gradle.swagger.generator.util.Resources +import javax.inject.Inject + /** * A task to generate ReDoc. * * @author Hidetake Iwata */ @CacheableTask -class GenerateReDoc extends DefaultTask { +abstract class GenerateReDoc extends DefaultTask { @SkipWhenEmpty @InputFile @PathSensitive(PathSensitivity.NAME_ONLY) File inputFile @@ -31,6 +34,9 @@ class GenerateReDoc extends DefaultTask { @Optional @Input Map options = [:] + @Inject + abstract FileOperations getFiles() + GenerateReDoc() { outputDir = new File(project.buildDir, 'redoc') } @@ -51,17 +57,16 @@ class GenerateReDoc extends DefaultTask { html.body.first().script.first().attributes().src = scriptSrc if (wipeOutputDir) { - assert outputDir != project.projectDir, 'Prevent wiping the project directory' - project.delete(outputDir) + files.delete(outputDir) } outputDir.mkdirs() new File(outputDir, 'index.html').withWriter('UTF-8') { writer -> XmlUtil.serialize(html, writer) } - project.copy { - from inputFile - into outputDir + files.copy { + it.from inputFile + it.into outputDir } } diff --git a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCode.groovy b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCode.groovy index 564c30d3..18d34dd1 100644 --- a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCode.groovy +++ b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCode.groovy @@ -2,21 +2,28 @@ package org.hidetake.gradle.swagger.generator import groovy.util.logging.Slf4j import org.gradle.api.DefaultTask -import org.gradle.api.Project -import org.gradle.api.artifacts.Configuration +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.internal.file.FileOperations +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.provider.Property import org.gradle.api.tasks.* +import org.gradle.jvm.toolchain.JavaLauncher +import org.gradle.jvm.toolchain.JavaToolchainService +import org.gradle.process.ExecOperations import org.gradle.process.JavaExecSpec import org.hidetake.gradle.swagger.generator.codegen.AdaptorFactory import org.hidetake.gradle.swagger.generator.codegen.DefaultAdaptorFactory import org.hidetake.gradle.swagger.generator.codegen.GenerateOptions import org.hidetake.gradle.swagger.generator.codegen.JavaExecOptions +import javax.inject.Inject + /** * A task to generate a source code from the Swagger specification. */ @Slf4j @CacheableTask -class GenerateSwaggerCode extends DefaultTask { +abstract class GenerateSwaggerCode extends DefaultTask { @SkipWhenEmpty @InputFile @PathSensitive(PathSensitivity.NAME_ONLY) File inputFile @@ -57,26 +64,47 @@ class GenerateSwaggerCode extends DefaultTask { List jvmArgs @Optional - @Input - def configuration + @Nested + abstract Property getLauncher() + + @Classpath + abstract ConfigurableFileCollection getConfiguration() @Internal AdaptorFactory adaptorFactory = DefaultAdaptorFactory.instance + @Inject + abstract ExecOperations getExec() + + @Inject + abstract FileOperations getFiles() + + @Inject + abstract JavaToolchainService getJavaToolchainService() + GenerateSwaggerCode() { outputDir = new File(project.buildDir, 'swagger-code') + configuration.from(project.configurations.swaggerCodegen) + project.plugins.withId("java") { + def toolchain = project.extensions.getByType(JavaPluginExtension).toolchain + def defaultLauncher = getJavaToolchainService().launcherFor(toolchain) + launcher.convention(defaultLauncher) + } } @TaskAction void exec() { def javaExecOptions = execInternal() log.info("JavaExecOptions: $javaExecOptions") - project.javaexec { JavaExecSpec c -> + exec.javaexec { JavaExecSpec c -> c.classpath(javaExecOptions.classpath) c.mainClass = javaExecOptions.main c.args = javaExecOptions.args c.systemProperties(javaExecOptions.systemProperties) c.jvmArgs(javaExecOptions.jvmArgs ?: []) + if (launcher.isPresent()) { + c.executable = launcher.get().executablePath.asFile + } } } @@ -86,13 +114,13 @@ class GenerateSwaggerCode extends DefaultTask { assert outputDir, "outputDir should be set in the task $name" if (wipeOutputDir) { - assert outputDir != project.projectDir, 'Prevent wiping the project directory' - project.delete(outputDir) + // assert outputDir != project.projectDir, 'Prevent wiping the project directory' + files.delete(outputDir) } outputDir.mkdirs() def generateOptions = new GenerateOptions( - generatorFiles: Helper.configuration(project, configuration).resolve(), + generatorFiles: getConfiguration().files, inputFile: inputFile.path, language: language, outputDir: outputDir.path, @@ -120,18 +148,6 @@ class GenerateSwaggerCode extends DefaultTask { } protected static class Helper { - static Configuration configuration(Project project, configuration) { - switch (configuration) { - case null: - return project.configurations.swaggerCodegen - case String: - return project.configurations.getByName(configuration) - case Configuration: - return configuration - } - throw new IllegalArgumentException("configuration must be String or org.gradle.api.artifacts.Configuration but unknown type: ${configuration}") - } - static Map systemProperties(components) { if (components instanceof Collection) { components.collectEntries { k -> [(k as String): ''] } diff --git a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeHelp.groovy b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeHelp.groovy index 0e854bb5..8ae1887d 100644 --- a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeHelp.groovy +++ b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeHelp.groovy @@ -3,17 +3,23 @@ package org.hidetake.gradle.swagger.generator import groovy.util.logging.Slf4j import org.gradle.api.DefaultTask import org.gradle.api.Task +import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.tasks.CacheableTask +import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.SkipWhenEmpty import org.gradle.api.tasks.TaskAction +import org.gradle.process.ExecOperations import org.gradle.process.JavaExecSpec import org.hidetake.gradle.swagger.generator.codegen.AdaptorFactory import org.hidetake.gradle.swagger.generator.codegen.ConfigHelpOptions import org.hidetake.gradle.swagger.generator.codegen.DefaultAdaptorFactory import org.hidetake.gradle.swagger.generator.codegen.HelpOptions +import javax.inject.Inject + /** * A task to show help of swagger-codegen. * @@ -21,31 +27,36 @@ import org.hidetake.gradle.swagger.generator.codegen.HelpOptions */ @Slf4j @CacheableTask -class GenerateSwaggerCodeHelp extends DefaultTask { +abstract class GenerateSwaggerCodeHelp extends DefaultTask { @Input + @Optional String language - @Optional - @Input - def configuration + @Classpath + abstract ConfigurableFileCollection getConfiguration() @Optional @Input List jvmArgs + @Inject + abstract ExecOperations getExec(); + @Internal AdaptorFactory adaptorFactory = DefaultAdaptorFactory.instance GenerateSwaggerCodeHelp() { - onlyIf { language } + configuration.from(project.configurations.swaggerCodegen) } @TaskAction void exec() { - assert language, "language should be set in the task $name" + if (language == null) { + return + } - def generatorFiles = GenerateSwaggerCode.Helper.configuration(project, configuration).resolve() + def generatorFiles = configuration.files def adaptor = adaptorFactory.findAdaptor(generatorFiles) if (adaptor == null) { throw new IllegalStateException('''\ @@ -64,7 +75,7 @@ class GenerateSwaggerCodeHelp extends DefaultTask { ) def helpJavaExecOptions = adaptor.help(helpOptions) log.info("JavaExecOptions: $helpJavaExecOptions") - project.javaexec { JavaExecSpec c -> + exec.javaexec { JavaExecSpec c -> c.classpath(helpJavaExecOptions.classpath) c.main = helpJavaExecOptions.main c.args = helpJavaExecOptions.args @@ -80,7 +91,7 @@ class GenerateSwaggerCodeHelp extends DefaultTask { ) def configHelpJavaExecOptions = adaptor.configHelp(configHelpOptions) log.info("JavaExecOptions: $configHelpJavaExecOptions") - project.javaexec { JavaExecSpec c -> + exec.javaexec { JavaExecSpec c -> c.classpath(configHelpJavaExecOptions.classpath) c.main = configHelpJavaExecOptions.main c.args = configHelpJavaExecOptions.args @@ -95,7 +106,7 @@ class GenerateSwaggerCodeHelp extends DefaultTask { group: 'help', type: GenerateSwaggerCodeHelp) { language = task.language - configuration = task.configuration + configuration.from(task.configuration) } } diff --git a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUI.groovy b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUI.groovy index ba63139f..9f0ff319 100644 --- a/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUI.groovy +++ b/src/main/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUI.groovy @@ -2,12 +2,17 @@ package org.hidetake.gradle.swagger.generator import groovy.util.logging.Slf4j import org.gradle.api.DefaultTask +import org.gradle.api.file.ArchiveOperations +import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCopyDetails import org.gradle.api.file.RelativePath +import org.gradle.api.internal.file.FileOperations import org.gradle.api.tasks.* import org.hidetake.gradle.swagger.generator.util.Mappers import org.hidetake.gradle.swagger.generator.util.Resources +import javax.inject.Inject + /** * A task to generate Swagger UI. * @@ -15,7 +20,7 @@ import org.hidetake.gradle.swagger.generator.util.Resources */ @Slf4j @CacheableTask -class GenerateSwaggerUI extends DefaultTask { +abstract class GenerateSwaggerUI extends DefaultTask { @SkipWhenEmpty @InputFile @PathSensitive(PathSensitivity.NAME_ONLY) File inputFile @@ -32,20 +37,22 @@ class GenerateSwaggerUI extends DefaultTask { @Optional @Input @Deprecated String header + @InputFiles @PathSensitive(PathSensitivity.NAME_ONLY) + abstract ConfigurableFileCollection getSwaggerUI() + + @Inject + abstract FileOperations getFiles() + + @Inject + abstract ArchiveOperations getArchives() + GenerateSwaggerUI() { outputDir = new File(project.buildDir, 'swagger-ui') + swaggerUI.from(project.configurations.swaggerUI) } @TaskAction void exec() { - if (project.configurations.swaggerUI.dependencies.empty) { - throw new IllegalStateException('''\ - Dependency for swagger-ui should be given as follows: - dependencies { - swaggerUI 'org.webjars:swagger-ui:x.x.x' - }'''.stripIndent()) - } - // TODO: remove in the future release if (options) { log.warn('WARNING: GenerateSwaggerUI.options is no longer supported. See https://github.com/int128/gradle-swagger-generator-plugin/issues/81') @@ -55,8 +62,7 @@ class GenerateSwaggerUI extends DefaultTask { } if (wipeOutputDir) { - assert outputDir != project.projectDir, 'Prevent wiping the project directory' - project.delete(outputDir) + files.delete(outputDir) } outputDir.mkdirs() @@ -66,10 +72,10 @@ class GenerateSwaggerUI extends DefaultTask { } private void extractWebJar() { - project.copy { - into(outputDir) - project.configurations.swaggerUI.each { jar -> - from(project.zipTree(jar)) { + files.copy { cp -> + cp.into(outputDir) + swaggerUI.each { jar -> + cp.from(archives.zipTree(jar)) { include('META-INF/resources/webjars/swagger-ui/*/') exclude('**/*.gz') eachFile { FileCopyDetails details -> diff --git a/src/main/groovy/org/hidetake/gradle/swagger/generator/ResolveSwaggerTemplate.groovy b/src/main/groovy/org/hidetake/gradle/swagger/generator/ResolveSwaggerTemplate.groovy index 59a977a8..81533c6b 100644 --- a/src/main/groovy/org/hidetake/gradle/swagger/generator/ResolveSwaggerTemplate.groovy +++ b/src/main/groovy/org/hidetake/gradle/swagger/generator/ResolveSwaggerTemplate.groovy @@ -1,19 +1,25 @@ package org.hidetake.gradle.swagger.generator +import org.gradle.api.file.ArchiveOperations import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.tasks.Sync +import javax.inject.Inject + /** * A task to extract template files from a dependency. */ -class ResolveSwaggerTemplate extends Sync { +abstract class ResolveSwaggerTemplate extends Sync { + + @Inject + abstract ArchiveOperations getArchives(); ResolveSwaggerTemplate() { - from { - project.configurations.swaggerTemplate.resolve().collect { - project.zipTree(it) + from(project.configurations.swaggerTemplate.elements.map { + it.collect { zipFile -> + archives.zipTree(zipFile) } - } + }) into("${project.buildDir}/swagger-template") duplicatesStrategy = DuplicatesStrategy.INCLUDE } diff --git a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateReDocSpec.groovy b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateReDocSpec.groovy index b7d1a31d..e36772c3 100644 --- a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateReDocSpec.groovy +++ b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateReDocSpec.groovy @@ -32,21 +32,4 @@ class GenerateReDocSpec extends Specification { false | 'keep' | true } - def "task should fail if outputDir == projectDir"() { - given: - def project = Fixture.projectWithPlugin { - generateReDoc { - inputFile = Fixture.file(Fixture.YAML.petstore) - outputDir = projectDir - } - } - - when: - project.tasks.generateReDoc.exec() - - then: - AssertionError e = thrown() - e.message.contains('project directory') - } - } diff --git a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeSpec.groovy b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeSpec.groovy index ce89ae77..a81454a7 100644 --- a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeSpec.groovy +++ b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerCodeSpec.groovy @@ -39,28 +39,6 @@ class GenerateSwaggerCodeSpec extends Specification { false | 'keep' | true } - def "task should fail if outputDir == projectDir"() { - given: - def mockAdaptorFactory = Mock(AdaptorFactory) - mockAdaptorFactory.findAdaptor(_) >> Mock(Adaptor) - - def project = Fixture.projectWithPlugin { - generateSwaggerCode { - language = 'java' - inputFile = new File('something') - outputDir = projectDir - adaptorFactory = mockAdaptorFactory - } - } - - when: - project.tasks.generateSwaggerCode.execInternal() - - then: - AssertionError e = thrown() - e.message.contains('project directory') - } - def "task should call the adaptor"() { given: def mockAdaptor = Mock(Adaptor) diff --git a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUISpec.groovy b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUISpec.groovy index dcc831ce..53be46ae 100644 --- a/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUISpec.groovy +++ b/src/test/groovy/org/hidetake/gradle/swagger/generator/GenerateSwaggerUISpec.groovy @@ -9,17 +9,6 @@ class GenerateSwaggerUISpec extends Specification { @TempDir File repositoryFolder - def "task should fail if swaggerUI dependency is not set"() { - given: - def project = Fixture.projectWithPlugin() - - when: - project.tasks.generateSwaggerUI.exec() - - then: - thrown(IllegalStateException) - } - @Unroll def 'task should #verb the output directory if wipeOutputDir == #wipe'() { given: @@ -58,33 +47,4 @@ class GenerateSwaggerUISpec extends Specification { false | 'keep' | true } - def "task should fail if outputDir == projectDir"() { - given: - Fixture.createJAR(new File(repositoryFolder, 'swagger-ui.jar'), [ - 'index.html': 'dummy-content', - ]) - - def project = Fixture.projectWithPlugin { - repositories { - flatDir { - dirs repositoryFolder - } - } - dependencies { - swaggerUI 'org.webjars:swagger-ui:' - } - generateSwaggerUI { - inputFile = Fixture.file(Fixture.YAML.petstore) - outputDir = projectDir - } - } - - when: - project.tasks.generateSwaggerUI.exec() - - then: - AssertionError e = thrown() - e.message.contains('project directory') - } - }