loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Play Framework] Update minor version + scala version + swagger-ui version (#7200)

Browse Source 
* Update play framework minor version + scala + swagger-ui + Remove bugs in the url of swagger-ui.

* update samples

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Jean-François Côté 2020-08-15 05:25:30 -04:00 committed by GitHub
parent 554747d59c
commit 14c14bf9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
76 changed files with 158 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/JavaPlayFramework/apiDocController.mustache vendored
View File

@ -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");
}
}

4
modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache vendored
View File

@ -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"

3
modules/openapi-generator/src/main/resources/JavaPlayFramework/errorHandler.mustache vendored
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

5
modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache vendored
View File

@ -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}}

2
modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache vendored
View File

@ -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")

2
samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-api-package-override/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-async/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-async/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-async/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-async/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-controller-only/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java
View File

@ -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;
}

5
samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java
View File

@ -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;
}

5
samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java
View File

@ -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;
}

3
samples/server/petstore/java-play-framework-controller-only/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-controller-only/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt
View File

@ -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")

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java
View File

@ -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;

2
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-fake-endpoints/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/ApiDocController.java
View File

@ -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");
}
}

1
samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
View File

@ -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;

1
samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
View File

@ -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;

1
samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-no-bean-validation/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java
View File

@ -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;

4
samples/server/petstore/java-play-framework-no-exception-handling/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-no-interface/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-no-interface/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-no-interface/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt
View File

@ -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")

5
samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

2
samples/server/petstore/java-play-framework-no-swagger-ui/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework-no-wrap-calls/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt
View File

@ -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")

2
samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java
View File

@ -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");
}
}

5
samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java
View File

@ -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;

5
samples/server/petstore/java-play-framework/app/controllers/UserApiController.java
View File

@ -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;

3
samples/server/petstore/java-play-framework/app/openapitools/ErrorHandler.java
View File

@ -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<Router> routes) {
public ErrorHandler(Config configuration, Environment environment, OptionalSourceMapper sourceMapper, Provider<Router> routes) {
super(configuration, environment, sourceMapper, routes);
}

4
samples/server/petstore/java-play-framework/build.sbt
View File

@ -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

2
samples/server/petstore/java-play-framework/project/plugins.sbt
View File

@ -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")