diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiDocController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiDocController.mustache index b54be6d8e6a..fd48e5e8c44 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiDocController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiDocController.mustache @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache index cf57cb439ef..6287b9038f7 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache @@ -4,10 +4,10 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" {{#useSwaggerUI}} -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" {{/useSwaggerUI}} {{#useBeanValidation}} libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/errorHandler.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/errorHandler.mustache index cee7a1c4308..4c2999bc744 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/errorHandler.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/errorHandler.mustache @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index f93c7977973..e72324e61a8 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -3,6 +3,7 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -43,11 +44,11 @@ public class {{classname}}Controller extends Controller { {{/controllerOnly}} private final ObjectMapper mapper; {{#useBeanValidation}} - private final Configuration configuration; + private final Config configuration; {{/useBeanValidation}} @Inject - private {{classname}}Controller({{#useBeanValidation}}Configuration configuration{{^controllerOnly}}, {{/controllerOnly}}{{/useBeanValidation}}{{^controllerOnly}}{{classname}}ControllerImp{{#useInterfaces}}Interface{{/useInterfaces}} imp{{/controllerOnly}}) { + private {{classname}}Controller({{#useBeanValidation}}Config configuration{{^controllerOnly}}, {{/controllerOnly}}{{/useBeanValidation}}{{^controllerOnly}}{{classname}}ControllerImp{{#useInterfaces}}Interface{{/useInterfaces}} imp{{/controllerOnly}}) { {{^controllerOnly}} this.imp = imp; {{/controllerOnly}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache index 66fbf368ae6..0baa33f9c05 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/ApiDocController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/ApiDocController.java index c71ab0ce25b..afda3acfb7b 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index de24a005c34..354fdf8d1bf 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java index 4a1e7d14079..a373a130810 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java @@ -3,6 +3,7 @@ package com.puppies.store.apis; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java index e335fdadf6c..65bf54ff85c 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java @@ -3,6 +3,7 @@ package com.puppies.store.apis; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-api-package-override/build.sbt b/samples/server/petstore/java-play-framework-api-package-override/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/build.sbt +++ b/samples/server/petstore/java-play-framework-api-package-override/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt b/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-async/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index 3b212697967..01e9a08cd96 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -31,10 +32,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java index a0b75c6524f..a576e89a896 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -30,10 +31,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java index d84e39fb586..858096d6229 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -30,10 +31,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-async/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-async/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-async/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-async/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-async/build.sbt b/samples/server/petstore/java-play-framework-async/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-async/build.sbt +++ b/samples/server/petstore/java-play-framework-async/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-async/project/plugins.sbt b/samples/server/petstore/java-play-framework-async/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-async/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-async/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index 65c9c93ff75..bdbe7b692e9 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ import openapitools.OpenAPIUtils.ApiAction; public class PetApiController extends Controller { private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration) { + private PetApiController(Config configuration) { mapper = new ObjectMapper(); this.configuration = configuration; } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java index 2861687f718..9658efe06c9 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ import openapitools.OpenAPIUtils.ApiAction; public class StoreApiController extends Controller { private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration) { + private StoreApiController(Config configuration) { mapper = new ObjectMapper(); this.configuration = configuration; } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java index 42e6ca4952e..d0d4f7b6942 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ import openapitools.OpenAPIUtils.ApiAction; public class UserApiController extends Controller { private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration) { + private UserApiController(Config configuration) { mapper = new ObjectMapper(); this.configuration = configuration; } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-controller-only/build.sbt b/samples/server/petstore/java-play-framework-controller-only/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-controller-only/build.sbt +++ b/samples/server/petstore/java-play-framework-controller-only/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt b/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java index e0e6405d0d1..9e5428c6106 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java @@ -2,6 +2,7 @@ package controllers; import apimodels.Client; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ public class AnotherFakeApiController extends Controller { private final AnotherFakeApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private AnotherFakeApiController(Configuration configuration, AnotherFakeApiControllerImpInterface imp) { + private AnotherFakeApiController(Config configuration, AnotherFakeApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 9869b1937d4..e7505ca10b1 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -11,6 +11,7 @@ import apimodels.OuterComposite; import apimodels.User; import apimodels.XmlItem; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -35,10 +36,10 @@ public class FakeApiController extends Controller { private final FakeApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private FakeApiController(Configuration configuration, FakeApiControllerImpInterface imp) { + private FakeApiController(Config configuration, FakeApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java index fd0a33c0f87..ddc9ef4ed48 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java @@ -2,6 +2,7 @@ package controllers; import apimodels.Client; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ public class FakeClassnameTags123ApiController extends Controller { private final FakeClassnameTags123ApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private FakeClassnameTags123ApiController(Configuration configuration, FakeClassnameTags123ApiControllerImpInterface imp) { + private FakeClassnameTags123ApiController(Config configuration, FakeClassnameTags123ApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 3f06e26439a..4bd2fc642c5 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -5,6 +5,7 @@ import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -29,10 +30,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java index fc02da21aa9..f52ef8dd8c7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java index f5ad4683054..c8fc2bd59ff 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt b/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt +++ b/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt b/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 9e387633d16..da7f08a8d77 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java index 14a1bc06662..8d2e69e71a9 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java index af995380276..f7ff6777993 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt b/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt index 4403b74ade9..ae954d60a3f 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt +++ b/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt @@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index 5e02b35ec98..a9c6ddaf905 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -29,10 +30,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java index c4ef0664992..3d8450059aa 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java index 27c3af3e2cd..47f21a5366c 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt b/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt +++ b/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 3ffea9428ba..bae79d9ed83 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class PetApiController extends Controller { private final PetApiControllerImp imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImp imp) { + private PetApiController(Config configuration, PetApiControllerImp imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java index 96d2fc5eab8..b5091ffa438 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImp imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImp imp) { + private StoreApiController(Config configuration, StoreApiControllerImp imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java index bb94da53b95..fffccc383e8 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class UserApiController extends Controller { private final UserApiControllerImp imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImp imp) { + private UserApiController(Config configuration, UserApiControllerImp imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-no-interface/build.sbt b/samples/server/petstore/java-play-framework-no-interface/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-no-interface/build.sbt +++ b/samples/server/petstore/java-play-framework-no-interface/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 633a23ba589..81f5c019fc6 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java index fc02da21aa9..f52ef8dd8c7 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java index f5ad4683054..c8fc2bd59ff 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/build.sbt b/samples/server/petstore/java-play-framework-no-swagger-ui/build.sbt index d7b48f9e3f8..2b56ff7331c 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/build.sbt +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/build.sbt @@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index dbfc7e75504..4056c6b0157 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java index 07a66bd7f5e..4d93a9c62f8 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java index 83aec5cb925..4958e3590f2 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -26,10 +27,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt b/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") diff --git a/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java index 86d04cc7ce8..ac9f699c93f 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java @@ -10,6 +10,6 @@ public class ApiDocController extends Controller { } public Result api() { - return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json"); + return redirect("/assets/lib/swagger-ui/index.html?url=/assets/openapi.json"); } } diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 633a23ba589..81f5c019fc6 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -4,6 +4,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -28,10 +29,10 @@ public class PetApiController extends Controller { private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private PetApiController(Configuration configuration, PetApiControllerImpInterface imp) { + private PetApiController(Config configuration, PetApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java index fc02da21aa9..f52ef8dd8c7 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class StoreApiController extends Controller { private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private StoreApiController(Configuration configuration, StoreApiControllerImpInterface imp) { + private StoreApiController(Config configuration, StoreApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java index f5ad4683054..c8fc2bd59ff 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -3,6 +3,7 @@ package controllers; import java.util.List; import apimodels.User; +import com.typesafe.config.Config; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Http; @@ -27,10 +28,10 @@ public class UserApiController extends Controller { private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; - private final Configuration configuration; + private final Config configuration; @Inject - private UserApiController(Configuration configuration, UserApiControllerImpInterface imp) { + private UserApiController(Config configuration, UserApiControllerImpInterface imp) { this.imp = imp; mapper = new ObjectMapper(); this.configuration = configuration; diff --git a/samples/server/petstore/java-play-framework/app/openapitools/ErrorHandler.java b/samples/server/petstore/java-play-framework/app/openapitools/ErrorHandler.java index cee7a1c4308..4c2999bc744 100644 --- a/samples/server/petstore/java-play-framework/app/openapitools/ErrorHandler.java +++ b/samples/server/petstore/java-play-framework/app/openapitools/ErrorHandler.java @@ -1,6 +1,7 @@ package openapitools; +import com.typesafe.config.Config; import play.*; import play.api.OptionalSourceMapper; import play.api.UsefulException; @@ -18,7 +19,7 @@ import static play.mvc.Results.*; public class ErrorHandler extends DefaultHttpErrorHandler { @Inject - public ErrorHandler(Configuration configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { + public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider routes) { super(configuration, environment, sourceMapper, routes); } diff --git a/samples/server/petstore/java-play-framework/build.sbt b/samples/server/petstore/java-play-framework/build.sbt index 5d0ba01bb2f..76d960068cd 100644 --- a/samples/server/petstore/java-play-framework/build.sbt +++ b/samples/server/petstore/java-play-framework/build.sbt @@ -4,8 +4,8 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.1.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework/project/plugins.sbt b/samples/server/petstore/java-play-framework/project/plugins.sbt index 66fbf368ae6..0baa33f9c05 100644 --- a/samples/server/petstore/java-play-framework/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25")