This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new f84a924 [SCB--2252]fix discovery revision API not used and other
TODOs (#2363)
f84a924 is described below
commit f84a924fc7ef5e75a7b32cea94e8ab1455325aa1
Author: bao liu <[email protected]>
AuthorDate: Thu Apr 29 09:05:38 2021 +0800
[SCB--2252]fix discovery revision API not used and other TODOs (#2363)
---
.../rest/codec/param/BodyProcessorCreator.java | 7 ------
.../codec/produce/ProduceTextPlainProcessor.java | 16 --------------
.../common/rest/definition/RestOperationMeta.java | 1 -
.../jaxrs/client/MultiErrorCodeServiceClient.java | 18 ----------------
.../servicecomb/registry/DiscoveryManager.java | 3 ---
.../apache/servicecomb/registry/api/Discovery.java | 13 -----------
.../api/registry/MicroserviceInstances.java | 1 -
.../metrics/core/TestVertxMetersInitializer.java | 14 ++++++------
.../lightweight/AbstractLightweightDiscovery.java | 9 --------
.../servicecomb/localregistry/LocalDiscovery.java | 12 -----------
.../schemadiscovery/SchemaDiscovery.java | 10 ---------
.../serviceregistry/ServiceCenterDiscovery.java | 12 -----------
.../config/ServiceRegistryConfig.java | 1 -
.../transport/rest/client/RestClientSender.java | 1 -
.../transport/rest/vertx/RestServerVerticle.java | 20 +++++++----------
.../rest/vertx/TestRestServerVerticle.java | 25 +++++++++++-----------
16 files changed, 26 insertions(+), 137 deletions(-)
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
index 3a612f7..5d92d3d 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
@@ -167,13 +167,6 @@ public class BodyProcessorCreator implements
ParamValueProcessorCreator {
return new BufferImpl().appendBytes(((String) arg).getBytes());
}
- // TODO recover this feature in SCB-1652
-// if (arg instanceof String && !isString) {
-// // consumer already encode body, not recommend, can not support
other transport
-// // if used in this way, it's not transport transparent
-// return Buffer.buffer((String) arg);
-// }
-
try (BufferOutputStream output = new BufferOutputStream()) {
RestObjectMapperFactory.getConsumerWriterMapper().writeValue(output,
arg);
return output.getBuffer();
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java
index 0311182..0fa64ba 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java
@@ -42,22 +42,6 @@ public class ProduceTextPlainProcessor implements
ProduceProcessor {
public Object doDecodeResponse(InputStream input, JavaType type) throws
Exception {
// plainText类型，肯定是返回string的，想不出有其他类型的场景
return IOUtils.toString(input, StandardCharsets.UTF_8);
- // TODO: 该方法尚需进一步修改
- // Class<?> returnCls = type.getRawClass();
- // if (returnCls.isPrimitive()) {
- // // 处理char类型
- // if (returnCls == char.class) {
- // return ((String)result).charAt(0);
- // }
- // // 处理其他如int, long, boolean等类型
- // return RestObjectMapper.INSTANCE.readValue((String)result,
type);
- // }
- // else {
- // // 处理如String等其他复杂类型
- // // 对于更多处理不了的复杂类型建议使用"application/json"
- // return returnCls.getConstructor(new Class<?>[]
{String.class})
- // .newInstance((String)result);
- // }
}
@Override
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java
index 011a5a3..0809656 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java
@@ -147,7 +147,6 @@ public class RestOperationMeta {
}
private boolean checkDownloadFileFlag() {
- // todo: logic of find
Response response =
operationMeta.getSwaggerOperation().getResponses().get("200");
if (response != null) {
Model model = response.getResponseSchema();
diff --git
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java
index 0e588cc..c702682 100644
---
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java
+++
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java
@@ -69,7 +69,6 @@ public class MultiErrorCodeServiceClient implements
CategorizedTestCase {
public void testRestTransport() throws Exception {
prepareServerDirectURL();
testErrorCodeWrongType();
- testErrorCodeWithHeaderJAXRSUsingRowTypeRest();
}
@Override
@@ -230,23 +229,6 @@ public class MultiErrorCodeServiceClient implements
CategorizedTestCase {
TestMgr.check(t500.getMessage(), "internal error");
}
- private static void testErrorCodeWithHeaderJAXRSUsingRowTypeRest() {
- // TODO recover this in SCB-1652
- // using string
-// MultiRequest request = new MultiRequest();
-// request.setCode(200);
-// request.setMessage("test message");
-// String stringRequest = Json.encode(request);
-//
-// ResponseEntity<MultiResponse200> result = template
-// .postForEntity(SERVER +
"/MultiErrorCodeService/errorCodeWithHeaderJAXRS", stringRequest,
-// MultiResponse200.class);
-// TestMgr.check(result.getStatusCodeValue(), 200);
-// TestMgr.check(result.getBody().getMessage(), "test message");
-// TestMgr.check(result.getBody().getCode(), 200);
-// TestMgr.check(result.getHeaders().getFirst("x-code"), 200);
- }
-
private static void testErrorCodeWithHeaderJAXRSUsingRowType() {
JsonObject requestJson = new JsonObject();
requestJson.put("code", 200);
diff --git
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
index 8ca06b4..189ddfe 100644
---
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
+++
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
@@ -75,9 +75,6 @@ public class DiscoveryManager {
.forEach(discovery -> {
MicroserviceInstances instances =
discovery.findServiceInstances(appId, serviceName, versionRule, revision);
result.mergeMicroserviceInstances(instances);
-
- // 逻辑错误，revision只与本次查询条件有关，与discovery无关
- discovery.setRevision(instances.getRevision());
});
return result;
diff --git
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
index 7fea725..593fa43 100644
---
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
+++
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
@@ -78,18 +78,5 @@ public interface Discovery extends SPIEnabled, SPIOrder,
LifeCycle {
return null;
}
- /**
- * Life Cycle：can be used when calling <code>findServiceInstances</code>
- *
- * TODO: should delete this revision<br>
- * because revision is microservice scope, not discovery scope
- */
- String getRevision();
-
- /**
- * Life Cycle：will be called when <code>findServiceInstances</code> is
successful
- */
- void setRevision(String revision);
-
String name();
}
diff --git
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstances.java
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstances.java
index 71adc54..1a9e0fd 100644
---
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstances.java
+++
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstances.java
@@ -67,7 +67,6 @@ public class MicroserviceInstances {
mergeMicroserviceNotExist(other.microserviceNotExist);
mergeRevision(other.revision);
mergeInstanceResponse(other.getInstancesResponse());
- mergeRevision(other.getRevision());
}
private void mergeRevision(String revision) {
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
index 175255d..f10c010 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
@@ -42,7 +42,7 @@ import com.netflix.spectator.api.Registry;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.DeploymentOptions;
-import io.vertx.core.Future;
+import io.vertx.core.Promise;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpServer;
import io.vertx.ext.web.Router;
@@ -64,9 +64,7 @@ public class TestVertxMetersInitializer {
public static class TestServerVerticle extends AbstractVerticle {
@Override
- @SuppressWarnings("deprecation")
- // TODO: vert.x 3.8.3 does not update startListen to promise, so we keep
use deprecated API now. update in newer version.
- public void start(Future<Void> startFuture) {
+ public void start(Promise<Void> startPromise) {
Router mainRouter = Router.router(vertx);
mainRouter.route("/").handler(context -> {
context.response().end(context.getBody());
@@ -77,11 +75,11 @@ public class TestVertxMetersInitializer {
server.listen(0, "0.0.0.0", ar -> {
if (ar.succeeded()) {
port = ar.result().actualPort();
- startFuture.complete();
+ startPromise.complete();
return;
}
- startFuture.fail(ar.cause());
+ startPromise.fail(ar.cause());
});
}
}
@@ -89,11 +87,11 @@ public class TestVertxMetersInitializer {
public static class TestClientVerticle extends AbstractVerticle {
@SuppressWarnings("deprecation")
@Override
- public void start(Future<Void> startFuture) {
+ public void start(Promise<Void> startPromise) {
HttpClient client = vertx.createHttpClient();
client.post(port, "127.0.0.1", "/").handler(resp -> {
resp.bodyHandler((buffer) -> {
- startFuture.complete();
+ startPromise.complete();
});
}).end(body);
}
diff --git
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
index 382f68e..921ab08 100644
---
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
+++
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
@@ -124,13 +124,4 @@ public abstract class AbstractLightweightDiscovery
implements Discovery, Initial
String revision) {
return store.findServiceInstances(appId, serviceName, revision);
}
-
- @Override
- public String getRevision() {
- return null;
- }
-
- @Override
- public void setRevision(String revision) {
- }
}
\ No newline at end of file
diff --git
a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
index 75c13a4..98d42c3 100644
---
a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
+++
b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
@@ -32,8 +32,6 @@ public class LocalDiscovery implements Discovery {
private LocalRegistryStore localDiscoveryStore = LocalRegistryStore.INSTANCE;
- private String revision;
-
@Override
public void init() {
// done in registration
@@ -81,16 +79,6 @@ public class LocalDiscovery implements Discovery {
}
@Override
- public String getRevision() {
- return revision;
- }
-
- @Override
- public void setRevision(String revision) {
- this.revision = revision;
- }
-
- @Override
public String name() {
return NAME;
}
diff --git
a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
index e1b5c8c..283bc60 100644
---
a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
+++
b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
@@ -111,16 +111,6 @@ public class SchemaDiscovery implements Discovery {
}
@Override
- public String getRevision() {
- return null;
- }
-
- @Override
- public void setRevision(String revision) {
-
- }
-
- @Override
public String name() {
return NAME;
}
diff --git
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
index ea7e2f7..af6caac 100644
---
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
+++
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
@@ -31,8 +31,6 @@ import com.netflix.config.DynamicPropertyFactory;
public class ServiceCenterDiscovery implements Discovery {
public static final String NAME = "service center discovery";
- private String revision;
-
@Override
public void init() {
// ServiceCenterRegistration has already done it
@@ -84,16 +82,6 @@ public class ServiceCenterDiscovery implements Discovery {
}
@Override
- public String getRevision() {
- return revision;
- }
-
- @Override
- public void setRevision(String revision) {
- this.revision = revision;
- }
-
- @Override
public String name() {
return NAME;
}
diff --git
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index 2c964f2..a0a1c03 100644
---
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -70,7 +70,6 @@ public class ServiceRegistryConfig {
private int instances;
- // TODO SCB-1691 getter of this field's behavior changed, should check
private boolean ssl = true;
private String clientName;
diff --git
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java
index 558245e..77f027e 100644
---
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java
+++
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java
@@ -87,7 +87,6 @@ public class RestClientSender {
}
protected CompletableFuture<Void> sendInVertxContext() {
- // todo: process timeout follow highway solution, maybe have obvious
better performance
httpClientRequest.setTimeout(invocation.getOperationMeta().getConfig().getMsRequestTimeout());
Multimap<String, Part> uploads = requestParameters.getUploads();
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
index 9c1885c..14bb138 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
@@ -50,8 +50,8 @@ import com.netflix.config.DynamicPropertyFactory;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Context;
-import io.vertx.core.Future;
import io.vertx.core.Handler;
+import io.vertx.core.Promise;
import io.vertx.core.Vertx;
import io.vertx.core.http.Http2Settings;
import io.vertx.core.http.HttpMethod;
@@ -79,16 +79,14 @@ public class RestServerVerticle extends AbstractVerticle {
this.endpointObject = (URIEndpointObject) endpoint.getAddress();
}
- @SuppressWarnings("deprecation")
- // TODO: vert.x 3.8.3 does not update startListen to promise, so we keep use
deprecated API now. update in newer version.
@Override
- public void start(Future<Void> startFuture) throws Exception {
+ public void start(Promise<Void> startPromise) throws Exception {
try {
super.start();
// 如果本地未配置地址，则表示不必监听，只需要作为客户端使用即可
if (endpointObject == null) {
LOGGER.warn("rest listen address is not configured, will not start.");
- startFuture.complete();
+ startPromise.complete();
return;
}
Router mainRouter = Router.router(vertx);
@@ -122,7 +120,7 @@ public class RestServerVerticle extends AbstractVerticle {
httpServerExceptionHandler.handle(e);
});
});
- startListen(httpServer, startFuture);
+ startListen(httpServer, startPromise);
} catch (Throwable e) {
// vert.x got some states that not print error and execute call back in
VertexUtils.blockDeploy, we add a log our self.
LOGGER.error("", e);
@@ -221,7 +219,7 @@ public class RestServerVerticle extends AbstractVerticle {
private void initDispatcher(Router mainRouter) {
List<VertxHttpDispatcher> dispatchers =
SPIServiceUtils.loadSortedService(VertxHttpDispatcher.class);
BeanUtils.addBeans(VertxHttpDispatcher.class, dispatchers);
-
+
for (VertxHttpDispatcher dispatcher : dispatchers) {
if (dispatcher.enabled()) {
dispatcher.init(mainRouter);
@@ -229,15 +227,13 @@ public class RestServerVerticle extends AbstractVerticle {
}
}
- @SuppressWarnings("deprecation")
- // TODO: vert.x 3.8.3 does not update startListen to promise, so we keep use
deprecated API now. update in newer version.
- private void startListen(HttpServer server, Future<Void> startFuture) {
+ private void startListen(HttpServer server, Promise<Void> startPromise) {
server.listen(endpointObject.getPort(), endpointObject.getHostOrIp(), ar
-> {
if (ar.succeeded()) {
LOGGER.info("rest listen success. address={}:{}",
endpointObject.getHostOrIp(),
ar.result().actualPort());
- startFuture.complete();
+ startPromise.complete();
return;
}
@@ -245,7 +241,7 @@ public class RestServerVerticle extends AbstractVerticle {
endpointObject.getHostOrIp(),
endpointObject.getPort());
LOGGER.error(msg, ar.cause());
- startFuture.fail(ar.cause());
+ startPromise.fail(ar.cause());
});
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
index d8a4be5..063abe1 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
@@ -40,6 +40,7 @@ import org.mockito.Mockito;
import io.vertx.core.Context;
import io.vertx.core.Future;
import io.vertx.core.Handler;
+import io.vertx.core.Promise;
import io.vertx.core.Vertx;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerResponse;
@@ -58,15 +59,13 @@ public class TestRestServerVerticle {
private RestServerVerticle instance = null;
- Future<Void> startFuture = null;
+ Promise<Void> startPromise = null;
@Before
- @SuppressWarnings("deprecation")
- // TODO: vert.x 3.8.3 does not update startListen to promise, so we keep use
deprecated API now. update in newer version.
public void setUp() {
ConfigUtil.installDynamicConfig();
instance = new RestServerVerticle();
- startFuture = Future.future();
+ startPromise = Promise.promise();
SCBBootstrap.createSCBEngineForTest();
}
@@ -74,7 +73,7 @@ public class TestRestServerVerticle {
@After
public void tearDown() {
instance = null;
- startFuture = null;
+ startPromise = null;
SCBEngine.getInstance().destroy();
ArchaiusUtils.resetConfig();
}
@@ -82,7 +81,7 @@ public class TestRestServerVerticle {
@Test
public void testRestServerVerticleWithRouter(@Mocked Transport transport,
@Mocked Vertx vertx,
@Mocked Context context,
- @Mocked JsonObject jsonObject, @Mocked Future<Void> startFuture) throws
Exception {
+ @Mocked JsonObject jsonObject, @Mocked Promise<Void> startPromise)
throws Exception {
URIEndpointObject endpointObject = new
URIEndpointObject("http://127.0.0.1:8080";);
new Expectations() {
{
@@ -103,13 +102,13 @@ public class TestRestServerVerticle {
RestServerVerticle server = new RestServerVerticle();
// process stuff done by Expectations
server.init(vertx, context);
- server.start(startFuture);
+ server.start(startPromise);
}
@Test
public void testRestServerVerticleWithRouterSSL(@Mocked Transport transport,
@Mocked Vertx vertx,
@Mocked Context context,
- @Mocked JsonObject jsonObject, @Mocked Future<Void> startFuture) throws
Exception {
+ @Mocked JsonObject jsonObject, @Mocked Promise<Void> startPromise)
throws Exception {
URIEndpointObject endpointObject = new
URIEndpointObject("http://127.0.0.1:8080?sslEnabled=true";);
new Expectations() {
{
@@ -130,13 +129,13 @@ public class TestRestServerVerticle {
RestServerVerticle server = new RestServerVerticle();
// process stuff done by Expectations
server.init(vertx, context);
- server.start(startFuture);
+ server.start(startPromise);
}
@Test
public void testRestServerVerticleWithHttp2(@Mocked Transport transport,
@Mocked Vertx vertx,
@Mocked Context context,
- @Mocked JsonObject jsonObject, @Mocked Future<Void> startFuture) {
+ @Mocked JsonObject jsonObject, @Mocked Promise<Void> startPromise) {
URIEndpointObject endpointObject = new
URIEndpointObject("http://127.0.0.1:8080?protocol=http2";);
new Expectations() {
{
@@ -158,7 +157,7 @@ public class TestRestServerVerticle {
boolean status = false;
try {
server.init(vertx, context);
- server.start(startFuture);
+ server.start(startPromise);
} catch (Exception e) {
status = true;
}
@@ -169,7 +168,7 @@ public class TestRestServerVerticle {
public void testStartFutureAddressEmpty() {
boolean status = false;
try {
- instance.start(startFuture);
+ instance.start(startPromise);
} catch (Exception ex) {
status = true;
}
@@ -182,7 +181,7 @@ public class TestRestServerVerticle {
MockForRestServerVerticle.getInstance().mockTransportConfig();
MockForRestServerVerticle.getInstance().mockRestServerVerticle();
try {
- instance.start(startFuture);
+ instance.start(startPromise);
} catch (Exception ex) {
status = true;
}
