From d9745962bef7f10c888ff001b257387b39a9fd04 Mon Sep 17 00:00:00 2001 From: ccozzolino Date: Sun, 7 Jan 2018 09:37:37 -0600 Subject: [PATCH 1/2] =?UTF-8?q?[Java:vertx]=20Initialize=20router=20in=20i?= =?UTF-8?q?nit=20method=20and=20re-use=20router=20member=20to=20create=20S?= =?UTF-8?q?=E2=80=A6=20(#7234)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Initialize router in init method and re-use router member to create SwaggerRouter * Added generated samples for 7320 fix * Fixed alignment to 4 spaces for 7320 fix --- .../JavaVertXServer/MainApiVerticle.mustache | 18 ++++++++++----- .../swagger/server/api/MainApiVerticle.java | 22 +++++++++++++------ .../async/src/main/resources/swagger.json | 15 ++----------- .../swagger/server/api/MainApiVerticle.java | 22 +++++++++++++------ .../rx/src/main/resources/swagger.json | 15 ++----------- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaVertXServer/MainApiVerticle.mustache b/modules/swagger-codegen/src/main/resources/JavaVertXServer/MainApiVerticle.mustache index 14433bcad2a..9f834d4e644 100644 --- a/modules/swagger-codegen/src/main/resources/JavaVertXServer/MainApiVerticle.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaVertXServer/MainApiVerticle.mustache @@ -9,26 +9,34 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import io.vertx.core.AbstractVerticle; +import io.vertx.core.Context; import io.vertx.core.Future; import io.vertx.core.file.FileSystem; import io.vertx.core.json.Json; import io.vertx.core.logging.Logger; import io.vertx.core.logging.LoggerFactory; +import io.vertx.core.Vertx; import io.vertx.ext.web.Router; public class MainApiVerticle extends AbstractVerticle { final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); - final Router router = Router.router(vertx); - + protected Router router; + + @Override + public void init(Vertx vertx, Context context) { + super.init(vertx, context); + router = Router.router(vertx); + } + @Override public void start(Future startFuture) throws Exception { Json.mapper.registerModule(new JavaTimeModule()); - FileSystem vertxFileSystem = vertx.fileSystem(); + FileSystem vertxFileSystem = vertx.fileSystem(); vertxFileSystem.readFile("swagger.json", readFile -> { if (readFile.succeeded()) { Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); - Router swaggerRouter = SwaggerRouter.swaggerRouter(Router.router(vertx), swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); + Router swaggerRouter = SwaggerRouter.swaggerRouter(router, swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); deployVerticles(startFuture); @@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("{{classname}}Verticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("{{classname}}Verticle : Deployement failed"); + LOGGER.error("{{classname}}Verticle : Deployment failed"); } }); {{/apis}}{{/apiInfo}} diff --git a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java index 8fb3ae2f3cf..34cf3a7761b 100644 --- a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java +++ b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java @@ -9,26 +9,34 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import io.vertx.core.AbstractVerticle; +import io.vertx.core.Context; import io.vertx.core.Future; import io.vertx.core.file.FileSystem; import io.vertx.core.json.Json; import io.vertx.core.logging.Logger; import io.vertx.core.logging.LoggerFactory; +import io.vertx.core.Vertx; import io.vertx.ext.web.Router; public class MainApiVerticle extends AbstractVerticle { final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); - final Router router = Router.router(vertx); - + protected Router router; + + @Override + public void init(Vertx vertx, Context context) { + super.init(vertx, context); + router = Router.router(vertx); + } + @Override public void start(Future startFuture) throws Exception { Json.mapper.registerModule(new JavaTimeModule()); - FileSystem vertxFileSystem = vertx.fileSystem(); + FileSystem vertxFileSystem = vertx.fileSystem(); vertxFileSystem.readFile("swagger.json", readFile -> { if (readFile.succeeded()) { Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); - Router swaggerRouter = SwaggerRouter.swaggerRouter(Router.router(vertx), swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); + Router swaggerRouter = SwaggerRouter.swaggerRouter(router, swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); deployVerticles(startFuture); @@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("PetApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("PetApiVerticle : Deployement failed"); + LOGGER.error("PetApiVerticle : Deployment failed"); } }); @@ -58,7 +66,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("StoreApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("StoreApiVerticle : Deployement failed"); + LOGGER.error("StoreApiVerticle : Deployment failed"); } }); @@ -67,7 +75,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("UserApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("UserApiVerticle : Deployement failed"); + LOGGER.error("UserApiVerticle : Deployment failed"); } }); diff --git a/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json b/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json index 4e35b37c4c8..1535f18c6e3 100644 --- a/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json +++ b/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], @@ -134,7 +134,6 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -174,7 +173,6 @@ "petstore_auth" : [ "write:pets", "read:pets" ] } ], "deprecated" : true, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -210,7 +208,6 @@ "security" : [ { "api_key" : [ ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "post" : { @@ -278,7 +275,6 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -348,7 +344,6 @@ "security" : [ { "api_key" : [ ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -414,7 +409,6 @@ "description" : "Order not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "delete" : { @@ -438,7 +432,6 @@ "description" : "Order not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -566,7 +559,6 @@ "description" : "Invalid username/password supplied" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -583,7 +575,6 @@ "description" : "successful operation" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -615,7 +606,6 @@ "description" : "User not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "put" : { @@ -671,7 +661,6 @@ "description" : "User not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } } diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/MainApiVerticle.java b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/MainApiVerticle.java index 8fb3ae2f3cf..34cf3a7761b 100644 --- a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/MainApiVerticle.java +++ b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/MainApiVerticle.java @@ -9,26 +9,34 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import io.vertx.core.AbstractVerticle; +import io.vertx.core.Context; import io.vertx.core.Future; import io.vertx.core.file.FileSystem; import io.vertx.core.json.Json; import io.vertx.core.logging.Logger; import io.vertx.core.logging.LoggerFactory; +import io.vertx.core.Vertx; import io.vertx.ext.web.Router; public class MainApiVerticle extends AbstractVerticle { final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); - final Router router = Router.router(vertx); - + protected Router router; + + @Override + public void init(Vertx vertx, Context context) { + super.init(vertx, context); + router = Router.router(vertx); + } + @Override public void start(Future startFuture) throws Exception { Json.mapper.registerModule(new JavaTimeModule()); - FileSystem vertxFileSystem = vertx.fileSystem(); + FileSystem vertxFileSystem = vertx.fileSystem(); vertxFileSystem.readFile("swagger.json", readFile -> { if (readFile.succeeded()) { Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); - Router swaggerRouter = SwaggerRouter.swaggerRouter(Router.router(vertx), swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); + Router swaggerRouter = SwaggerRouter.swaggerRouter(router, swagger, vertx.eventBus(), new OperationIdServiceIdResolver()); deployVerticles(startFuture); @@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("PetApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("PetApiVerticle : Deployement failed"); + LOGGER.error("PetApiVerticle : Deployment failed"); } }); @@ -58,7 +66,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("StoreApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("StoreApiVerticle : Deployement failed"); + LOGGER.error("StoreApiVerticle : Deployment failed"); } }); @@ -67,7 +75,7 @@ public class MainApiVerticle extends AbstractVerticle { LOGGER.info("UserApiVerticle : Deployed"); } else { startFuture.fail(res.cause()); - LOGGER.error("UserApiVerticle : Deployement failed"); + LOGGER.error("UserApiVerticle : Deployment failed"); } }); diff --git a/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json b/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json index 4e35b37c4c8..1535f18c6e3 100644 --- a/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json +++ b/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], @@ -134,7 +134,6 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -174,7 +173,6 @@ "petstore_auth" : [ "write:pets", "read:pets" ] } ], "deprecated" : true, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -210,7 +208,6 @@ "security" : [ { "api_key" : [ ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "post" : { @@ -278,7 +275,6 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -348,7 +344,6 @@ "security" : [ { "api_key" : [ ] } ], - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -414,7 +409,6 @@ "description" : "Order not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "delete" : { @@ -438,7 +432,6 @@ "description" : "Order not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -566,7 +559,6 @@ "description" : "Invalid username/password supplied" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -583,7 +575,6 @@ "description" : "successful operation" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } }, @@ -615,7 +606,6 @@ "description" : "User not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" }, "put" : { @@ -671,7 +661,6 @@ "description" : "User not found" } }, - "x-contentType" : "application/json", "x-accepts" : "application/json" } } From 26a665c7716275f9d4afa9eee443384013441263 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 7 Jan 2018 18:56:01 -0800 Subject: [PATCH 2/2] [Rust] Recommend style based on 'rustfmt' defaults (#7335) Rustfmt is widely accepted in the rust community. The actual style it enforces is not completely stable, but running a reasonably recent rustfmt and reading the short rfc-based style guide seems better than nothing by a long shot. --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab603bb2316..27fd3e8b0b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,6 +58,7 @@ Code change should conform to the programming style guide of the respective lang - Python: https://www.python.org/dev/peps/pep-0008/ - R: https://google.github.io/styleguide/Rguide.xml - Ruby: https://github.com/bbatsov/ruby-style-guide +- Rust: https://github.com/rust-lang-nursery/fmt-rfcs/blob/master/guide/guide.md (the default [rustfmt](https://github.com/rust-lang-nursery/rustfmt) configuration) - Scala: http://docs.scala-lang.org/style/ - Swift: [Apple Developer](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html) - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines