forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/master' into 2.4.0
This commit is contained in:
commit
16e3226c8a
@ -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
|
||||
|
@ -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<Void> 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}}
|
||||
|
@ -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<Void> 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");
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
@ -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<Void> 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");
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user