Adapt to vertx-core internal api changes

Author: vietj

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java

@@ -55,7 +55,7 @@ protected Future<Connection> doConnectInternal(DB2ConnectOptions options, Contex
     Map<String, String> properties = options.getProperties();
     int pipeliningLimit = options.getPipeliningLimit();
     return client.connect(server).flatMap(so -> {
-      VertxMetrics vertxMetrics = vertx.metricsSPI();
+      VertxMetrics vertxMetrics = vertx.metrics();
       ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
       DB2SocketConnection conn = new DB2SocketConnection((NetSocketInternal) so, metrics, options, cachePreparedStatements,
         preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java

@@ -76,7 +76,7 @@ private Future<Connection> connectOrRedirect(MSSQLConnectOptions options, Contex
   }
 
   private MSSQLSocketConnection createSocketConnection(NetSocket so, MSSQLConnectOptions options, ContextInternal context) {
-    VertxMetrics vertxMetrics = vertx.metricsSPI();
+    VertxMetrics vertxMetrics = vertx.metrics();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
     MSSQLSocketConnection conn = new MSSQLSocketConnection((NetSocketInternal) so, sslContextManager, metrics, options, false, 0, sql -> true, 1, context);
     conn.init();

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java

@@ -133,7 +133,7 @@ private Future<Connection> doConnect(MySQLConnectOptions options, SslMode sslMod
     ConnectOptions connectOptions = new ConnectOptions().setRemoteAddress(server);
     Future<NetSocket> fut = client.connect(connectOptions);
     return fut.flatMap(so -> {
-      VertxMetrics vertxMetrics = vertx.metricsSPI();
+      VertxMetrics vertxMetrics = vertx.metrics();
       ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
       MySQLSocketConnection conn = new MySQLSocketConnection((NetSocketInternal) so, metrics, options, cachePreparedStatements, preparedStatementCacheMaxSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
       conn.init();

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionFactory.java

@@ -60,7 +60,7 @@ private OracleDataSource getDatasource(SqlConnectOptions options) {
   @Override
   public Future<SqlConnection> connect(Context context, OracleConnectOptions options) {
     OracleDataSource datasource = getDatasource(options);
-    VertxMetrics vertxMetrics = ((VertxInternal)context.owner()).metricsSPI();
+    VertxMetrics vertxMetrics = ((VertxInternal)context.owner()).metrics();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
     ContextInternal ctx = (ContextInternal) context;
     return executeBlocking(context, () -> {

vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java

@@ -175,7 +175,7 @@ private PgSocketConnection newSocketConnection(ContextInternal context, NetSocke
     Predicate<String> preparedStatementCacheSqlFilter = options.getPreparedStatementCacheSqlFilter();
     int pipeliningLimit = options.getPipeliningLimit();
     boolean useLayer7Proxy = options.getUseLayer7Proxy();
-    VertxMetrics vertxMetrics = vertx.metricsSPI();
+    VertxMetrics vertxMetrics = vertx.metrics();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
     PgSocketConnection conn = new PgSocketConnection(socket, metrics, options, cachePreparedStatements, preparedStatementCacheMaxSize, preparedStatementCacheSqlFilter, pipeliningLimit, useLayer7Proxy, context);
     return conn;

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java

@@ -51,7 +51,10 @@ private void doClose(Promise<Void> p) {
   }
 
   public static ContextInternal asEventLoopContext(ContextInternal ctx) {
-    return ctx.owner().createEventLoopContext(ctx.nettyEventLoop(), ctx.owner().getWorkerPool(), ctx.classLoader());
+    return ctx.owner().contextBuilder()
+      .withEventLoop(ctx.nettyEventLoop())
+      .withWorkerPool(ctx.workerPool())
+      .build();
   }
 
   public Future<Connection> connect(ContextInternal context, C options) {

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java

@@ -93,7 +93,7 @@ public SqlConnectionPool(Function<Context, Future<SqlConnection>> connectionProv
       for (int i = 0; i < eventLoopSize; i++) {
         loops[i] = vertx.nettyEventLoopGroup().next();
       }
-      pool.contextProvider(new Function<ContextInternal, ContextInternal>() {
+      pool.contextProvider(new Function<>() {
         int idx = 0;
 
         @Override
@@ -102,15 +102,15 @@ public ContextInternal apply(ContextInternal contextInternal) {
           if (idx == loops.length) {
             idx = 0;
           }
-          return vertx.createEventLoopContext(loop, null, Thread.currentThread().getContextClassLoader());
+          return vertx.contextBuilder().withEventLoop(loop).build();
         }
       });
     } else {
-      pool.contextProvider(ctx -> ctx.owner().createEventLoopContext(ctx.nettyEventLoop(), null, Thread.currentThread().getContextClassLoader()));
+      pool.contextProvider(ctx -> ctx.owner().contextBuilder().withEventLoop(ctx.nettyEventLoop()).build());
     }
   }
 
-  private final PoolConnector<PooledConnection> connector = new PoolConnector<PooledConnection>() {
+  private final PoolConnector<PooledConnection> connector = new PoolConnector<>() {
     @Override
     public Future<ConnectResult<PooledConnection>> connect(ContextInternal context, Listener listener) {
       Future<SqlConnection> future = connectionProvider.apply(context);

vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/PoolImpl.java

@@ -69,7 +69,7 @@ public PoolImpl(VertxInternal vertx,
 
     Handler<SqlConnectionPool.PooledConnection> hook = connectionInitializer != null ? this::initializeConnection : null;
 
-    VertxMetrics metrics = vertx.metricsSPI();
+    VertxMetrics metrics = vertx.metrics();
     PoolMetrics poolMetrics;
     if (metrics != null) {
       poolMetrics = metrics.createPoolMetrics("sql", poolOptions.getName(), poolOptions.getMaxSize());