valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-06 18:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Java:vertx] Initialize router in init method and re-use router member to create S… (#7234)

Browse Source 
* 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
This commit is contained in:
ccozzolino 2018-01-07 09:37:37 -06:00 committed by William Cheng
parent 14e7158164
commit d9745962be
5 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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