Adapt to latest vertx-core changes

vert-x3 · Nov 17, 2023 · 9ee15db · 9ee15db
1 parent 25a0d4e
commit 9ee15db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/vertx-grpc/src/main/java/examples/Examples.java b/vertx-grpc/src/main/java/examples/Examples.java
@@ -158,7 +158,7 @@ public void sslServer(Vertx vertx) {
       .useSsl(options -> options
         .setSsl(true)
         .setUseAlpn(true)
-        .setKeyStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("server-keystore.jks")
           .setPassword("secret")));
   }
@@ -206,7 +206,7 @@ public void sslClient(Vertx vertx) {
       .useSsl(options -> options
         .setSsl(true)
         .setUseAlpn(true)
-        .setTrustStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("client-truststore.jks")
           .setPassword("secret")))
       .build();

diff --git a/vertx-grpc/src/test/java/io/vertx/ext/grpc/SslTest.java b/vertx-grpc/src/test/java/io/vertx/ext/grpc/SslTest.java
@@ -28,13 +28,13 @@ public class SslTest extends GrpcTestBase {
   public void testConnect(TestContext ctx) throws Exception {
     testSimple(options -> options.setSsl(true)
       .setUseAlpn(true)
-      .setTrustStoreOptions(new JksOptions()
+      .setTrustOptions(new JksOptions()
         .setPath("tls/client-truststore.jks")
         .setPassword("wibble")), options ->
       options
         .setSsl(true)
         .setUseAlpn(true)
-        .setKeyStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("tls/server-keystore.jks")
           .setPassword("wibble")), ctx, true);
   }
@@ -48,7 +48,7 @@ public void testTrustAll(TestContext ctx) throws Exception {
       options
         .setSsl(true)
         .setUseAlpn(true)
-        .setKeyStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("tls/server-keystore.jks")
           .setPassword("wibble")), ctx, true);
   }
@@ -59,18 +59,18 @@ public void testClientAuth(TestContext ctx) throws Exception {
         .setTrustAll(true)
         .setSsl(true)
         .setUseAlpn(true)
-        .setKeyStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("tls/server-keystore.jks")
           .setPassword("wibble"))
       , options ->
         options
           .setSsl(true)
           .setUseAlpn(true)
-          .setKeyStoreOptions(new JksOptions()
+          .setKeyCertOptions(new JksOptions()
             .setPath("tls/server-keystore.jks")
             .setPassword("wibble"))
           .setClientAuth(ClientAuth.REQUIRED)
-          .setTrustStoreOptions(new JksOptions()
+          .setTrustOptions(new JksOptions()
             .setPath("tls/client-truststore.jks")
             .setPassword("wibble")), ctx, true);
   }
@@ -84,11 +84,11 @@ public void testClientAuthFail(TestContext ctx) throws Exception {
       options
         .setSsl(true)
         .setUseAlpn(true)
-        .setKeyStoreOptions(new JksOptions()
+        .setKeyCertOptions(new JksOptions()
           .setPath("tls/server-keystore.jks")
           .setPassword("wibble"))
         .setClientAuth(ClientAuth.REQUIRED)
-        .setTrustStoreOptions(new JksOptions()
+        .setTrustOptions(new JksOptions()
           .setPath("tls/client-truststore.jks")
           .setPassword("wibble")), ctx, false);
   }