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

Merge remote-tracking branch 'origin/master' into 2.4.0

Browse Source
This commit is contained in:
wing328 2018-01-08 18:01:20 +08:00
commit 16e3226c8a
6 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTING.md
View File

@ -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/ - Python: https://www.python.org/dev/peps/pep-0008/
- R: https://google.github.io/styleguide/Rguide.xml - R: https://google.github.io/styleguide/Rguide.xml
- Ruby: https://github.com/bbatsov/ruby-style-guide - 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/ - 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) - 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 - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines

14
modules/swagger-codegen/src/main/resources/JavaVertXServer/MainApiVerticle.mustache
View File

@ -9,17 +9,25 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter;
import io.swagger.models.Swagger; import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser; import io.swagger.parser.SwaggerParser;
import io.vertx.core.AbstractVerticle; import io.vertx.core.AbstractVerticle;
import io.vertx.core.Context;
import io.vertx.core.Future; import io.vertx.core.Future;
import io.vertx.core.file.FileSystem; import io.vertx.core.file.FileSystem;
import io.vertx.core.json.Json; import io.vertx.core.json.Json;
import io.vertx.core.logging.Logger; import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory; import io.vertx.core.logging.LoggerFactory;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router; import io.vertx.ext.web.Router;
public class MainApiVerticle extends AbstractVerticle { public class MainApiVerticle extends AbstractVerticle {
final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); 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 @Override
public void start(Future<Void> startFuture) throws Exception { public void start(Future<Void> startFuture) throws Exception {
@ -28,7 +36,7 @@ public class MainApiVerticle extends AbstractVerticle {
vertxFileSystem.readFile("swagger.json", readFile -> { vertxFileSystem.readFile("swagger.json", readFile -> {
if (readFile.succeeded()) { if (readFile.succeeded()) {
Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); 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); deployVerticles(startFuture);
@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle {
LOGGER.info("{{classname}}Verticle : Deployed"); LOGGER.info("{{classname}}Verticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); startFuture.fail(res.cause());
LOGGER.error("{{classname}}Verticle : Deployement failed"); LOGGER.error("{{classname}}Verticle : Deployment failed");
} }
}); });
{{/apis}}{{/apiInfo}} {{/apis}}{{/apiInfo}}

18
samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java
View File

@ -9,17 +9,25 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter;
import io.swagger.models.Swagger; import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser; import io.swagger.parser.SwaggerParser;
import io.vertx.core.AbstractVerticle; import io.vertx.core.AbstractVerticle;
import io.vertx.core.Context;
import io.vertx.core.Future; import io.vertx.core.Future;
import io.vertx.core.file.FileSystem; import io.vertx.core.file.FileSystem;
import io.vertx.core.json.Json; import io.vertx.core.json.Json;
import io.vertx.core.logging.Logger; import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory; import io.vertx.core.logging.LoggerFactory;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router; import io.vertx.ext.web.Router;
public class MainApiVerticle extends AbstractVerticle { public class MainApiVerticle extends AbstractVerticle {
final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); 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 @Override
public void start(Future<Void> startFuture) throws Exception { public void start(Future<Void> startFuture) throws Exception {
@ -28,7 +36,7 @@ public class MainApiVerticle extends AbstractVerticle {
vertxFileSystem.readFile("swagger.json", readFile -> { vertxFileSystem.readFile("swagger.json", readFile -> {
if (readFile.succeeded()) { if (readFile.succeeded()) {
Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); 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); deployVerticles(startFuture);
@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle {
LOGGER.info("PetApiVerticle : Deployed"); LOGGER.info("PetApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); 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"); LOGGER.info("StoreApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); 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"); LOGGER.info("UserApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); startFuture.fail(res.cause());
LOGGER.error("UserApiVerticle : Deployement failed"); LOGGER.error("UserApiVerticle : Deployment failed");
} }
}); });

15
samples/server/petstore/java-vertx/async/src/main/resources/swagger.json
View File

@ -112,8 +112,8 @@
"type" : "array", "type" : "array",
"items" : { "items" : {
"type" : "string", "type" : "string",
"enum" : [ "available", "pending", "sold" ], "default" : "available",
"default" : "available" "enum" : [ "available", "pending", "sold" ]
}, },
"collectionFormat" : "csv" "collectionFormat" : "csv"
} ], } ],
@ -134,7 +134,6 @@
"security" : [ { "security" : [ {
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -174,7 +173,6 @@
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"deprecated" : true, "deprecated" : true,
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -210,7 +208,6 @@
"security" : [ { "security" : [ {
"api_key" : [ ] "api_key" : [ ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"post" : { "post" : {
@ -278,7 +275,6 @@
"security" : [ { "security" : [ {
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -348,7 +344,6 @@
"security" : [ { "security" : [ {
"api_key" : [ ] "api_key" : [ ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -414,7 +409,6 @@
"description" : "Order not found" "description" : "Order not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"delete" : { "delete" : {
@ -438,7 +432,6 @@
"description" : "Order not found" "description" : "Order not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -566,7 +559,6 @@
"description" : "Invalid username/password supplied" "description" : "Invalid username/password supplied"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -583,7 +575,6 @@
"description" : "successful operation" "description" : "successful operation"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -615,7 +606,6 @@
"description" : "User not found" "description" : "User not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"put" : { "put" : {
@ -671,7 +661,6 @@
"description" : "User not found" "description" : "User not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
} }

18
samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/MainApiVerticle.java
View File

@ -9,17 +9,25 @@ import com.github.phiz71.vertx.swagger.router.SwaggerRouter;
import io.swagger.models.Swagger; import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser; import io.swagger.parser.SwaggerParser;
import io.vertx.core.AbstractVerticle; import io.vertx.core.AbstractVerticle;
import io.vertx.core.Context;
import io.vertx.core.Future; import io.vertx.core.Future;
import io.vertx.core.file.FileSystem; import io.vertx.core.file.FileSystem;
import io.vertx.core.json.Json; import io.vertx.core.json.Json;
import io.vertx.core.logging.Logger; import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory; import io.vertx.core.logging.LoggerFactory;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router; import io.vertx.ext.web.Router;
public class MainApiVerticle extends AbstractVerticle { public class MainApiVerticle extends AbstractVerticle {
final static Logger LOGGER = LoggerFactory.getLogger(MainApiVerticle.class); 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 @Override
public void start(Future<Void> startFuture) throws Exception { public void start(Future<Void> startFuture) throws Exception {
@ -28,7 +36,7 @@ public class MainApiVerticle extends AbstractVerticle {
vertxFileSystem.readFile("swagger.json", readFile -> { vertxFileSystem.readFile("swagger.json", readFile -> {
if (readFile.succeeded()) { if (readFile.succeeded()) {
Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8"))); 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); deployVerticles(startFuture);
@ -49,7 +57,7 @@ public class MainApiVerticle extends AbstractVerticle {
LOGGER.info("PetApiVerticle : Deployed"); LOGGER.info("PetApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); 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"); LOGGER.info("StoreApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); 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"); LOGGER.info("UserApiVerticle : Deployed");
} else { } else {
startFuture.fail(res.cause()); startFuture.fail(res.cause());
LOGGER.error("UserApiVerticle : Deployement failed"); LOGGER.error("UserApiVerticle : Deployment failed");
} }
}); });

15
samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json
View File

@ -112,8 +112,8 @@
"type" : "array", "type" : "array",
"items" : { "items" : {
"type" : "string", "type" : "string",
"enum" : [ "available", "pending", "sold" ], "default" : "available",
"default" : "available" "enum" : [ "available", "pending", "sold" ]
}, },
"collectionFormat" : "csv" "collectionFormat" : "csv"
} ], } ],
@ -134,7 +134,6 @@
"security" : [ { "security" : [ {
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -174,7 +173,6 @@
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"deprecated" : true, "deprecated" : true,
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -210,7 +208,6 @@
"security" : [ { "security" : [ {
"api_key" : [ ] "api_key" : [ ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"post" : { "post" : {
@ -278,7 +275,6 @@
"security" : [ { "security" : [ {
"petstore_auth" : [ "write:pets", "read:pets" ] "petstore_auth" : [ "write:pets", "read:pets" ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -348,7 +344,6 @@
"security" : [ { "security" : [ {
"api_key" : [ ] "api_key" : [ ]
} ], } ],
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -414,7 +409,6 @@
"description" : "Order not found" "description" : "Order not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"delete" : { "delete" : {
@ -438,7 +432,6 @@
"description" : "Order not found" "description" : "Order not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -566,7 +559,6 @@
"description" : "Invalid username/password supplied" "description" : "Invalid username/password supplied"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -583,7 +575,6 @@
"description" : "successful operation" "description" : "successful operation"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
}, },
@ -615,7 +606,6 @@
"description" : "User not found" "description" : "User not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
}, },
"put" : { "put" : {
@ -671,7 +661,6 @@
"description" : "User not found" "description" : "User not found"
} }
}, },
"x-contentType" : "application/json",
"x-accepts" : "application/json" "x-accepts" : "application/json"
} }
} }