Merge branch 'master' into master

Author: kpramesh2212

.travis.yml

@@ -0,0 +1,27 @@
+
+dist: trusty
+language: java
+install: true
+
+jdk:
+  - oraclejdk8
+
+addons:
+  sonarcloud:
+    organization: "springdoc-openapi"
+    token:
+      secure: "m8Q4W1ZyUuzcfoCPu+7Q2SSTpiReHiK1MnUhl6wW6t3RwasD/s0c9pn1q6ZtSRpYBzFKzWxfdALV06vOFrfbTUlMhzWJnNFEdvF/ApEiRtfd0eOJYXZ219R9Wi2JsCvJd7GP9p56KwiUkbHU5zU4dPkFeYf8wPs8xwqepukb0vzTn5/EfQgpQST2nMvXi3dWUmZZl70Wokug9A5Xe4yiIf7AbrvEcXcveq0i4vsPFiPUyec6OYpKAi0cAa+qlIlkuz6YIgEMvlU2KpYqgJShO3EByU7tDkTOg500VzUylkGHMFYrrS5fdZmNSULJgVMzCleibKPWzbhZkftdy7S360mEMNWOIFkQnqCWA2wgQgXryltr3gQeb+gD85R8qtiNnwxEe5ctoOiw/VWAq40zgL+0v4qzmVDfAGuhGrVUhfKIlUu4h7tK0kkT1fqAhQBz1bwa3otQkRL88/63VKQE151lmx+65dnb7HwPDYxVSMsbIN7AdczEhqaIQh2tGWj8BvQgMpAIb5a8DkdLTD+3XtQEbj1OgJ/r67sHzE5aGu1A5N3fTDNx7RiyfbFQKWhmxraZfMJOpMqDx6l+yZlzS1yzyFBpc1EPsInG6kFWyjeQKk3S3ZOx3vTZtuFmyPS/dAgjdkOjn0Gbp0/oBlEnZjA2N/twvIhZUTUJ/Mk7j3w=" # encrypted value of your token
+
+script:
+  - ./gradlew -S clean build sonarqube
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/springdoc/springdoc-openapi-gradle-plugin.svg?branch=master)](https://travis-ci.org/springdoc/springdoc-openapi-gradle-plugin)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=springdoc_springdoc-openapi-gradle-plugin&metric=alert_status)](https://sonarcloud.io/dashboard?id=springdoc_springdoc-openapi-gradle-plugin)
+
 # **Introduction to springdoc-openapi-gradle-plugin**
 
 Spring Docs Open API Gradle Plugin - Generates OpenAPI-3 specification docs for spring boot application
@@ -89,4 +92,4 @@ Parameter | Description | Required | Default
 
 # Building the plugin
 
-TODO
+TODO

build.gradle.kts

@@ -1,13 +1,19 @@
 plugins {
     `java-gradle-plugin`
     id("com.gradle.plugin-publish") version "0.10.1"
+    id("org.sonarqube") version "2.8"
     kotlin("jvm") version "1.3.61"
     `maven-publish`
 }
 
 group = "org.springdoc"
 version = "1.0.0"
 
+sonarqube {
+    properties {
+        property("sonar.projectKey", "springdoc_springdoc-openapi-gradle-plugin")
+    }
+}
 repositories {
     mavenCentral()
     maven {
@@ -34,7 +40,7 @@ dependencies {
     implementation(group = "khttp", name = "khttp", version = "1.0.0")
     implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
     implementation(group = "org.awaitility", name = "awaitility-kotlin", version = "4.0.2")
-    implementation(files("/home/ramesh/gradle-processes/build/libs/gradle-processes-0.5.0.jar"))
+    implementation(group = "gradle.plugin.com.github.jengelman.gradle.plugins", name = "gradle-processes", version = "0.5.0")
 }
 
 gradlePlugin {

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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"'
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -125,8 +109,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

gradlew

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -18,7 +18,7 @@ import java.time.Duration
 import java.time.temporal.ChronoUnit.SECONDS
 
 
-open class OpenApiGeneratorTask: DefaultTask() {
+open class OpenApiGeneratorTask : DefaultTask() {
     @get:Input
     val apiDocsUrl: Property<String> = project.objects.property(String::class.java)
     @get:Input
@@ -51,7 +51,10 @@ open class OpenApiGeneratorTask: DefaultTask() {
     @TaskAction
     fun execute() {
         try {
-            await ignoreException ConnectException::class withPollInterval Durations.ONE_SECOND atMost Duration.of(waitTimeInSeconds.get().toLong(), SECONDS) until {
+            await ignoreException ConnectException::class withPollInterval Durations.ONE_SECOND atMost Duration.of(
+                waitTimeInSeconds.get().toLong(),
+                SECONDS
+            ) until {
                 val statusCode = khttp.get(apiDocsUrl.get()).statusCode
                 logger.trace("apiDocsUrl = {} status code = {}", apiDocsUrl.get(), statusCode)
                 statusCode < 299
@@ -65,7 +68,10 @@ open class OpenApiGeneratorTask: DefaultTask() {
             outputFile.writeText(gson.toJson(googleJsonObject))
         } catch (e: ConditionTimeoutException) {
             taskError.set("Timeout occurred while trying to connect to ${apiDocsUrl.get()}")
-            this.logger.error("Unable to connect to ${apiDocsUrl.get()} waited for ${waitTimeInSeconds.get()} seconds", e)
+            this.logger.error(
+                "Unable to connect to ${apiDocsUrl.get()} waited for ${waitTimeInSeconds.get()} seconds",
+                e
+            )
         }
     }
 

src/main/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGeneratorTask.kt

@@ -6,7 +6,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.slf4j.LoggerFactory
 
-open class OpenApiGradlePlugin: Plugin<Project> {
+open class OpenApiGradlePlugin : Plugin<Project> {
     private val LOGGER = LoggerFactory.getLogger(OpenApiGradlePlugin::class.java)
 
     override fun apply(project: Project) {
@@ -32,7 +32,7 @@ open class OpenApiGradlePlugin: Plugin<Project> {
             }
 
             // This is my task. Before I can run it I have to run the dependent tasks
-            val openApiGeneratorTask  = project.tasks.register(OPEN__API_TASK_NAME, OpenApiGeneratorTask::class.java) { openApiGenTask ->
+            project.tasks.register(OPEN__API_TASK_NAME, OpenApiGeneratorTask::class.java) { openApiGenTask ->
                 openApiGenTask.dependsOn(forkedSpringBoot)
 
                 openApiGenTask.doLast {