Skip to content

Commit

Permalink
Merge pull request eclipse-vertx#5375 from eclipse-vertx/unstable-cha…
Browse files Browse the repository at this point in the history
…nges

Unstable changes
  • Loading branch information
vietj authored Oct 27, 2024
2 parents 46e8167 + 2fe8041 commit f5d1cf1
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 16 deletions.
7 changes: 0 additions & 7 deletions vertx-core/src/main/java/io/vertx/core/file/AsyncFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import io.vertx.codegen.annotations.Fluent;
import io.vertx.codegen.annotations.Nullable;
import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.Future;
import io.vertx.core.Handler;
Expand Down Expand Up @@ -174,7 +173,6 @@ public interface AsyncFile extends ReadStream<Buffer>, WriteStream<Buffer> {
*
* @return the lock if it can be acquired immediately, otherwise {@code null}
*/
@Unstable
default @Nullable AsyncFileLock tryLock() {
return tryLock(0, Long.MAX_VALUE, false);
}
Expand All @@ -187,15 +185,13 @@ public interface AsyncFile extends ReadStream<Buffer>, WriteStream<Buffer> {
* @param shared whether the lock should be shared
* @return the lock if it can be acquired immediately, otherwise {@code null}
*/
@Unstable
@Nullable AsyncFileLock tryLock(long position, long size, boolean shared);

/**
* Acquire a non-shared lock on the entire file.
*
* @return a future indicating the completion of this operation
*/
@Unstable
default Future<AsyncFileLock> lock() {
return lock(0, Long.MAX_VALUE, false);
}
Expand All @@ -208,7 +204,6 @@ default Future<AsyncFileLock> lock() {
* @param shared whether the lock should be shared
* @return a future indicating the completion of this operation
*/
@Unstable
Future<AsyncFileLock> lock(long position, long size, boolean shared);

/**
Expand All @@ -222,7 +217,6 @@ default Future<AsyncFileLock> lock() {
* @param block the code block called after lock acquisition
* @return the future returned by the {@code block}
*/
@Unstable
default <T> Future<T> withLock(Supplier<Future<T>> block) {
return withLock(0, Long.MAX_VALUE, false, block);
}
Expand All @@ -241,7 +235,6 @@ default <T> Future<T> withLock(Supplier<Future<T>> block) {
* @param block the code block called after lock acquisition
* @return the future returned by the {@code block}
*/
@Unstable
default <T> Future<T> withLock(long position, long size, boolean shared, Supplier<Future<T>> block) {
return lock(position, size, shared)
.compose(lock -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
package io.vertx.core.http;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.Future;

Expand All @@ -25,6 +26,7 @@
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
@VertxGen
public interface HttpClientConnection extends HttpConnection, HttpClient {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.netty.handler.logging.ByteBufFormat;
import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.GenIgnore;
import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.json.annotations.JsonGen;
import io.vertx.core.Handler;
import io.vertx.core.buffer.Buffer;
Expand Down Expand Up @@ -591,7 +590,6 @@ public HttpServerOptions setCompressionLevel(int compressionLevel) {
/**
* @return the list of compressor to use
*/
@Unstable
public List<CompressionOptions> getCompressors() {
return compressors;
}
Expand All @@ -602,7 +600,6 @@ public List<CompressionOptions> getCompressors() {
* @see #setCompressors(List)
* @return a reference to this, so the API can be used fluently
*/
@Unstable
public HttpServerOptions addCompressor(CompressionOptions compressor) {
if (compressors == null) {
compressors = new ArrayList<>();
Expand All @@ -619,7 +616,6 @@ public HttpServerOptions addCompressor(CompressionOptions compressor) {
* @param compressors the list of compressors
* @return a reference to this, so the API can be used fluently
*/
@Unstable
public HttpServerOptions setCompressors(List<CompressionOptions> compressors) {
this.compressors = compressors;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
package io.vertx.core.net;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.core.Vertx;
import io.vertx.core.net.impl.MappingResolver;
import io.vertx.core.spi.endpoint.EndpointResolver;
Expand All @@ -20,6 +21,7 @@
/**
* A provider for address resolver.
*/
@Unstable
public interface AddressResolver {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
package io.vertx.core.net;

import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.json.annotations.JsonGen;
import io.vertx.core.impl.Arguments;
import io.vertx.core.json.JsonObject;
Expand Down Expand Up @@ -206,7 +205,6 @@ public boolean getLogActivity() {
/**
* @return Netty's logging handler's data format.
*/
@Unstable
public ByteBufFormat getActivityLogDataFormat() {
return activityLogDataFormat;
}
Expand All @@ -228,7 +226,6 @@ public NetworkOptions setLogActivity(boolean logActivity) {
* @param activityLogDataFormat the format to use
* @return a reference to this, so the API can be used fluently
*/
@Unstable
public NetworkOptions setActivityLogDataFormat(ByteBufFormat activityLogDataFormat) {
this.activityLogDataFormat = activityLogDataFormat;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

import io.netty.util.internal.ObjectUtil;
import io.vertx.codegen.annotations.DataObject;
import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.json.annotations.JsonGen;
import io.vertx.core.json.JsonObject;

/**
* Options describing how {@link io.netty.handler.traffic.GlobalTrafficShapingHandler} will handle traffic shaping.
*/
@Unstable
@DataObject
@JsonGen(publicConverter = false)
public class TrafficShapingOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;

import java.util.List;

@Unstable
@VertxGen
public interface Endpoint {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.Future;
import io.vertx.core.net.Address;
Expand All @@ -19,6 +20,7 @@
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
@VertxGen
public interface EndpointResolver {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;

/**
* Gather metrics for a request/response interaction with the server, this interface is write-only and used to report
* usage to build statistics for a load balancing purpose.
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
public interface InteractionMetrics<M> {

InteractionMetrics<?> INSTANCE = new InteractionMetrics<>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.core.net.endpoint.impl.ConsistentHashingSelector;
import io.vertx.core.net.endpoint.impl.NoMetricsLoadBalancer;

Expand All @@ -25,6 +26,7 @@
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
public interface LoadBalancer {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.GenIgnore;
import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;
import io.vertx.core.net.SocketAddress;

Expand All @@ -19,6 +20,7 @@
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
@VertxGen
public interface ServerEndpoint {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;
import io.vertx.codegen.annotations.VertxGen;

/**
* Request interaction with an endpoint, mostly callbacks to gather statistics.
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
@VertxGen
public interface ServerInteraction {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
*/
package io.vertx.core.net.endpoint;

import io.vertx.codegen.annotations.Unstable;

/**
* Select the most appropriate server among the list of servers of an endpoint.
*
* @author <a href="mailto:[email protected]">Julien Viet</a>
*/
@Unstable
public interface ServerSelector {

/**
Expand Down

0 comments on commit f5d1cf1

Please sign in to comment.