fix batch 5

Author: wzy1935

src/main/generated/io/vertx/httpproxy/cache/CacheOptionsConverter.java

@@ -23,6 +23,16 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CacheOp
  obj.setMaxSize(((Number)member.getValue()).intValue());
  }
  break;
+ case "name":
+ if (member.getValue() instanceof String) {
+ obj.setName((String)member.getValue());
+ }
+ break;
+ case "shared":
+ if (member.getValue() instanceof Boolean) {
+ obj.setShared((Boolean)member.getValue());
+ }
+ break;
  }
  }
  }
@@ -33,5 +43,9 @@ static void toJson(CacheOptions obj, JsonObject json) {
 
  static void toJson(CacheOptions obj, java.util.Map<String, Object> json) {
  json.put("maxSize", obj.getMaxSize());
+ if (obj.getName() != null) {
+ json.put("name", obj.getName());
+ }
+ json.put("shared", obj.getShared());
  }
 }

src/main/java/io/vertx/httpproxy/HttpProxy.java

@@ -15,7 +15,6 @@
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientRequest;
 import io.vertx.core.http.HttpServerRequest;

src/main/java/io/vertx/httpproxy/ProxyContext.java

@@ -35,15 +35,15 @@ public interface ProxyContext {
  boolean isWebSocket();
 
  /**
- * Attach a payload to the context
+ * Attach a payload to the context.
  *
  * @param name the payload name
  * @param value any payload value
  */
  void set(String name, Object value);
 
  /**
- * Get a payload attached to this context
+ * Get a payload attached to this context.
  *
  * @param name the payload name
  * @param type the expected payload type

src/main/java/io/vertx/httpproxy/ProxyInterceptor.java

@@ -32,6 +32,7 @@ default Future<Void> handleProxyResponse(ProxyContext context) {
  /**
  * Used to set whether to apply the interceptor to the WebSocket
  * handshake packet. The default value is false.
+ *
  * @return the boolean value
  */
  default boolean allowApplyToWebSocket() {

src/main/java/io/vertx/httpproxy/ProxyRequest.java

@@ -101,7 +101,7 @@ static ProxyRequest reverseProxy(HttpServerRequest proxiedRequest) {
  ProxyRequest setBody(Body body);
 
  /**
- * Set the request authority
+ * Set the request authority.
  *
  * <ul>
  * <li>for HTTP/1 the {@literal Host} header</li>
@@ -128,7 +128,7 @@ static ProxyRequest reverseProxy(HttpServerRequest proxiedRequest) {
  MultiMap headers();
 
  /**
- * Put an HTTP header
+ * Put an HTTP header.
  *
  * @param name The header name
  * @param value The header value
@@ -157,7 +157,7 @@ default Future<Void> proxy(HttpClientRequest request) {
  Future<ProxyResponse> send(HttpClientRequest request);
 
  /**
- * Release the proxy request and its associated resources
+ * Release the proxy request and its associated resources.
  *
  * <p> The HTTP server request is resumed, no HTTP server response is sent.
  *

src/main/java/io/vertx/httpproxy/cache/CacheOptions.java

@@ -33,13 +33,13 @@ public class CacheOptions {
  private boolean shared = DEFAULT_SHARED;
 
  /**
- * Default constructor
+ * Default constructor.
  */
  public CacheOptions() {
  }
 
  /**
- * Copy constructor
+ * Copy constructor.
  *
  * @param other the options to copy
  */
@@ -50,7 +50,7 @@ public CacheOptions(CacheOptions other) {
  }
 
  /**
- * Constructor to create an options from JSON
+ * Constructor to create an options from JSON.
  *
  * @param json the JSON
  */
@@ -124,7 +124,7 @@ public String toString() {
  }
 
  /**
- * Convert to JSON
+ * Convert to JSON.
  *
  * @return the JSON
  */

src/main/java/io/vertx/httpproxy/impl/CacheImpl.java

@@ -44,8 +44,4 @@ public Future<Void> remove(String key) {
  return Future.succeededFuture();
  }
 
- @Override
- public Future<Void> close() {
- return Future.succeededFuture();
- }
 }

src/main/java/io/vertx/httpproxy/impl/ReverseProxy.java

@@ -50,11 +50,7 @@ public Cache newCache(CacheOptions options, Vertx vertx) {
  if (options.getShared()) {
  CloseFuture closeFuture = new CloseFuture();
  return ((VertxInternal) vertx).createSharedResource("__vertx.shared.proxyCache", options.getName(), closeFuture, (cf_) -> {
- Cache cache = new CacheImpl(options);
- cf_.add(completion -> {
- cache.close().onComplete(completion);
- });
- return cache;
+ return new CacheImpl(options);
  });
  }
  return new CacheImpl(options);

src/main/java/io/vertx/httpproxy/spi/cache/Cache.java

@@ -1,12 +1,14 @@
 package io.vertx.httpproxy.spi.cache;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.core.Future;
 import io.vertx.core.dns.SrvRecord;
 
 
 /**
  * Cache SPI.
  */
+@Unstable
 public interface Cache {
 
  /**
@@ -37,11 +39,4 @@ public interface Cache {
  * @return a succeed void future
  */
  Future<Void> remove(String key);
-
- /**
- * Being called when need to close the cache.
- *
- * @return a succeed void future
- */
- Future<Void> close();
 }

src/test/java/io/vertx/tests/cache/spi/CacheSpiTestBase.java

@@ -36,9 +36,7 @@ public void setUp() {
 
  @After
  public void tearDown(TestContext context) {
- cache.close().onComplete(context.asyncAssertSuccess(
- v -> vertx.close().onComplete(context.asyncAssertSuccess())
- ));
+ vertx.close().onComplete(context.asyncAssertSuccess());
  }
 
  private Resource generateResource(String absoluteURI, long maxAge) {