Skip to content

Commit 9ce1986

Browse files
committed
update dependencies
replace deprecated #mountSubRouter to Route#subRouter delete temporary folder after each test update dependencies replace deprecated #mountSubRouter to Route#subRouter delete temporary folder after each test
1 parent cba30ad commit 9ce1986

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/main/resources/handlebars/JavaVertXServer/apiVerticle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class {{title}}Verticle extends AbstractVerticle {
5555
server = vertx.createHttpServer(new HttpServerOptions().setPort({{serverPort}}).setHost("localhost"))
5656
.requestHandler(router);
5757

58-
router.mountSubRouter("/", openapiRouter);
58+
router.route("/*").subRouter(openapiRouter);
5959

6060
router.route().last().handler(context ->
6161
context.response()

src/main/resources/handlebars/JavaVertXServer/pom.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<java.version>1.8</java.version>
15-
<jupiter.version>5.8.2</jupiter.version>
16-
<vertx.version>4.3.0</vertx.version>
15+
<jupiter.version>5.9.0</jupiter.version>
16+
<vertx.version>4.3.3</vertx.version>
1717
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
1818
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
19-
<jackson.version>2.13.3</jackson.version>
19+
<jackson.version>2.13.4</jackson.version>
2020
<joschi.version>2.12.5</joschi.version>
21-
<slf4j-version>1.7.36</slf4j-version>
21+
<slf4j-version>2.0.1</slf4j-version>
2222
</properties>
2323

2424
<dependencies>

src/test/java/io/swagger/codegen/v3/generators/java/JavaVertxServerGeneratorCodegenTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
5656

5757
@AfterMethod
5858
public void tearDown() {
59-
//folder.delete();
59+
folder.delete();
6060
}
6161

6262
@Test(description = "verify that main verticle, openapi verticle and service are written as expected (OAS 2.x & web-api-service & Future)")
@@ -95,7 +95,7 @@ public void testUseOas2AndWebApiServiceAndFuture() throws Exception {
9595

9696
Assert.assertTrue(content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
9797
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
98-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
98+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
9999
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
100100
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
101101

@@ -161,7 +161,7 @@ public void testUseOas2AndWebApiServiceAndNotFuture() throws Exception {
161161

162162
Assert.assertTrue(content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
163163
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
164-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
164+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
165165
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
166166
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
167167

@@ -223,7 +223,7 @@ public void testUseOas3AndWebApiServiceAndFuture() throws Exception {
223223
Assert.assertTrue(
224224
content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
225225
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
226-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
226+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
227227
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
228228
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
229229

@@ -284,7 +284,7 @@ public void testUseOas3AndWebApiServiceAndNotFuture() throws Exception {
284284
Assert.assertTrue(
285285
content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
286286
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
287-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
287+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
288288
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
289289
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
290290

@@ -354,7 +354,7 @@ public void testRxUseOas3AndWebApiServiceAndFuture() throws Exception {
354354

355355
Assert.assertTrue(content.contains("return RouterBuilder.rxCreate(this.vertx, \"openapi.yaml\")"));
356356
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
357-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
357+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
358358
Assert.assertFalse(content.contains("onSuccess(server -> startPromise.complete())"));
359359
Assert.assertFalse(content.contains("onFailure(startPromise::fail);"));
360360
Assert.assertTrue(content.contains("rxStart()"));
@@ -428,7 +428,7 @@ public void testRxUseOas3AndWebApiServiceAndNotFuture() throws Exception {
428428

429429
Assert.assertTrue(content.contains("return RouterBuilder.rxCreate(this.vertx, \"openapi.yaml\")"));
430430
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
431-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
431+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
432432
Assert.assertFalse(content.contains("onSuccess(server -> startPromise.complete())"));
433433
Assert.assertFalse(content.contains("onFailure(startPromise::fail);"));
434434
Assert.assertTrue(content.contains("rxStart()"));
@@ -495,7 +495,7 @@ public void testUseOas3AndMountFromInterfaceAndFuture() throws Exception {
495495
Assert.assertTrue(content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
496496
Assert.assertFalse(content.contains("routerBuilder.mountServicesFromExtensions();"));
497497
Assert.assertTrue(content.contains("routerBuilder.mountServiceInterface"));
498-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
498+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
499499
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
500500
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
501501

@@ -555,7 +555,7 @@ public void testUseOas3AndMountFromInterfaceAndNotFuture() throws Exception {
555555
Assert.assertTrue(content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
556556
Assert.assertFalse(content.contains("routerBuilder.mountServicesFromExtensions();"));
557557
Assert.assertTrue(content.contains("routerBuilder.mountServiceInterface"));
558-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
558+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
559559
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
560560
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
561561

@@ -618,7 +618,7 @@ public void testUseOas3AndWebApiServiceAndNoDataobjectAndFuture() throws Excepti
618618
Assert.assertTrue(
619619
content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
620620
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
621-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
621+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
622622
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
623623
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
624624

@@ -675,7 +675,7 @@ public void testUseOas3AndWebApiServiceAndNoDataobjectAndNotFuture() throws Exce
675675
Assert.assertTrue(
676676
content.contains("RouterBuilder.create(this.vertx, \"openapi.yaml\")"));
677677
Assert.assertTrue(content.contains("routerBuilder.mountServicesFromExtensions();"));
678-
Assert.assertTrue(content.contains("router.mountSubRouter(\"/\", openapiRouter);"));
678+
Assert.assertTrue(content.contains("router.route(\"/*\").subRouter(openapiRouter);"));
679679
Assert.assertTrue(content.contains("onSuccess(server -> startPromise.complete())"));
680680
Assert.assertTrue(content.contains("onFailure(startPromise::fail);"));
681681

0 commit comments

Comments
 (0)