From d49eb4caf16a50e619157d4343db872914b3bf7a Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 29 Oct 2024 09:41:36 +0100 Subject: [PATCH] Move VertxByteBufAllocator from internal to impl scope --- .../src/main/java/io/vertx/core/buffer/impl/BufferImpl.java | 2 +- .../vertx/core/buffer/impl/PartialPooledByteBufAllocator.java | 2 +- .../java/io/vertx/core/http/impl/Http2ConnectionBase.java | 2 +- .../core/{internal => impl}/buffer/VertxByteBufAllocator.java | 4 ++-- .../src/main/java/io/vertx/core/net/impl/VertxHandler.java | 2 +- vertx-core/src/main/java/module-info.java | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) rename vertx-core/src/main/java/io/vertx/core/{internal => impl}/buffer/VertxByteBufAllocator.java (97%) diff --git a/vertx-core/src/main/java/io/vertx/core/buffer/impl/BufferImpl.java b/vertx-core/src/main/java/io/vertx/core/buffer/impl/BufferImpl.java index 6489db99b2f..ba06b62f8f8 100644 --- a/vertx-core/src/main/java/io/vertx/core/buffer/impl/BufferImpl.java +++ b/vertx-core/src/main/java/io/vertx/core/buffer/impl/BufferImpl.java @@ -18,7 +18,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.internal.buffer.BufferInternal; import io.vertx.core.impl.Arguments; -import io.vertx.core.internal.buffer.VertxByteBufAllocator; +import io.vertx.core.impl.buffer.VertxByteBufAllocator; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/vertx-core/src/main/java/io/vertx/core/buffer/impl/PartialPooledByteBufAllocator.java b/vertx-core/src/main/java/io/vertx/core/buffer/impl/PartialPooledByteBufAllocator.java index efb04cad899..7aea3c13445 100644 --- a/vertx-core/src/main/java/io/vertx/core/buffer/impl/PartialPooledByteBufAllocator.java +++ b/vertx-core/src/main/java/io/vertx/core/buffer/impl/PartialPooledByteBufAllocator.java @@ -13,7 +13,7 @@ import io.netty.buffer.*; -import io.vertx.core.internal.buffer.VertxByteBufAllocator; +import io.vertx.core.impl.buffer.VertxByteBufAllocator; /** * A {@link io.netty.buffer.ByteBufAllocator} which is partial pooled. Which means only direct {@link io.netty.buffer.ByteBuf}s are pooled. The rest diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java b/vertx-core/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java index 3c0897bcb8e..73a2428086d 100644 --- a/vertx-core/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java +++ b/vertx-core/src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java @@ -30,7 +30,7 @@ import io.vertx.core.VertxException; import io.vertx.core.buffer.Buffer; import io.vertx.core.internal.buffer.BufferInternal; -import io.vertx.core.internal.buffer.VertxByteBufAllocator; +import io.vertx.core.impl.buffer.VertxByteBufAllocator; import io.vertx.core.http.GoAway; import io.vertx.core.http.HttpClosedException; import io.vertx.core.http.HttpConnection; diff --git a/vertx-core/src/main/java/io/vertx/core/internal/buffer/VertxByteBufAllocator.java b/vertx-core/src/main/java/io/vertx/core/impl/buffer/VertxByteBufAllocator.java similarity index 97% rename from vertx-core/src/main/java/io/vertx/core/internal/buffer/VertxByteBufAllocator.java rename to vertx-core/src/main/java/io/vertx/core/impl/buffer/VertxByteBufAllocator.java index dcd81b55466..6f5cf505f7e 100644 --- a/vertx-core/src/main/java/io/vertx/core/internal/buffer/VertxByteBufAllocator.java +++ b/vertx-core/src/main/java/io/vertx/core/impl/buffer/VertxByteBufAllocator.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.core.internal.buffer; +package io.vertx.core.impl.buffer; import io.netty.buffer.AbstractByteBufAllocator; import io.netty.buffer.ByteBuf; @@ -25,8 +25,8 @@ public abstract class VertxByteBufAllocator extends AbstractByteBufAllocator { * Vert.x pooled allocator. */ public static final ByteBufAllocator POOLED_ALLOCATOR = new PooledByteBufAllocator(true); + /** - * * Vert.x shared un-pooled allocator. */ public static final ByteBufAllocator UNPOOLED_ALLOCATOR = new UnpooledByteBufAllocator(false); diff --git a/vertx-core/src/main/java/io/vertx/core/net/impl/VertxHandler.java b/vertx-core/src/main/java/io/vertx/core/net/impl/VertxHandler.java index 728f03231ff..758f8dbb187 100644 --- a/vertx-core/src/main/java/io/vertx/core/net/impl/VertxHandler.java +++ b/vertx-core/src/main/java/io/vertx/core/net/impl/VertxHandler.java @@ -20,7 +20,7 @@ import io.netty.channel.ChannelPromise; import io.netty.handler.timeout.IdleStateEvent; import io.vertx.core.Handler; -import io.vertx.core.internal.buffer.VertxByteBufAllocator; +import io.vertx.core.impl.buffer.VertxByteBufAllocator; import java.util.function.Function; diff --git a/vertx-core/src/main/java/module-info.java b/vertx-core/src/main/java/module-info.java index e0ce7ede921..9e0ead2d9cf 100644 --- a/vertx-core/src/main/java/module-info.java +++ b/vertx-core/src/main/java/module-info.java @@ -116,5 +116,6 @@ exports io.vertx.core.spi.cluster.impl.selector to io.vertx.core.tests; exports io.vertx.core.impl.verticle to io.vertx.core.tests; exports io.vertx.core.impl.deployment to io.vertx.core.tests; + exports io.vertx.core.impl.buffer to io.vertx.core.tests; }