Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SCB-2154] fix Response.isSuccessed typo #2115

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -121,7 +121,7 @@ public static Object syncInvoke(String microserviceName, String microserviceVers
*/
public static Object syncInvoke(Invocation invocation) throws InvocationException {
Response response = innerSyncInvoke(invocation);
if (response.isSuccessed()) {
if (response.isSucceed()) {
return response.getResult();
}
throw ExceptionFactory.convertConsumerException(response.getResult());
Expand Down
Expand Up @@ -47,10 +47,10 @@ public void testHttpResponse() {
String objectString = new String("Unit Testing");
Response oResponse = Response.success(objectString, Status.OK);

Assert.assertEquals(true, oResponse.isSuccessed());
Assert.assertEquals(true, oResponse.isSucceed());

oResponse = Response.succResp(objectString);
Assert.assertEquals(true, oResponse.isSuccessed());
Assert.assertEquals(true, oResponse.isSucceed());
Assert.assertEquals(200, oResponse.getStatusCode());

Throwable oThrowable = new Throwable("Error");
Expand Down
Expand Up @@ -146,7 +146,7 @@ public void testHandleForceReturnnull() throws Exception {
System.setProperty("servicecomb.fallback.Group_Name.testHandleForceReturnnull.force", "true");
System.setProperty("servicecomb.fallbackpolicy.Group_Name.testHandleForceReturnnull.policy", "returnnull");
bizkeeperHandler.handle(invocation, f -> {
Assert.assertTrue(f.isSuccessed());
Assert.assertTrue(f.isSucceed());
Assert.assertNull(f.getResult());
});
}
Expand Down Expand Up @@ -203,7 +203,7 @@ public Void answer(InvocationOnMock invocation) {
}
}).when(invocation).next(Mockito.any(AsyncResponse.class));
bizkeeperHandler.handle(invocation, f -> {
Assert.assertTrue(f.isSuccessed());
Assert.assertTrue(f.isSucceed());
});
}
}
Expand Up @@ -64,7 +64,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
return defaultMethodMeta.getOrCreateMethodHandle(proxy, method)
.invokeWithArguments(args);
}

PojoConsumerMeta pojoConsumerMeta = metaRefresher.getLatestMeta();
PojoConsumerOperationMeta consumerOperationMeta = pojoConsumerMeta.ensureFindOperationMeta(method);
Invocation invocation = invocationCreator.create(consumerOperationMeta, args);
Expand All @@ -78,7 +78,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl

protected Object syncInvoke(Invocation invocation, SwaggerConsumerOperation consumerOperation) {
Response response = InvokerUtils.innerSyncInvoke(invocation);
if (response.isSuccessed()) {
if (response.isSucceed()) {
return consumerOperation.getResponseMapper().mapResponse(response);
}

Expand All @@ -89,7 +89,7 @@ protected CompletableFuture<Object> completableFutureInvoke(Invocation invocatio
SwaggerConsumerOperation consumerOperation) {
CompletableFuture<Object> future = new InvocationContextCompletableFuture<>(invocation);
InvokerUtils.reactiveInvoke(invocation, response -> {
if (response.isSuccessed()) {
if (response.isSucceed()) {
Object result = consumerOperation.getResponseMapper().mapResponse(response);
future.complete(result);
return;
Expand Down
Expand Up @@ -233,7 +233,7 @@ private CseClientHttpResponse invoke(Map<String, Object> swaggerArguments) {
Invocation invocation = prepareInvocation(swaggerArguments);
Response response = doInvoke(invocation);

if (response.isSuccessed()) {
if (response.isSucceed()) {
return new CseClientHttpResponse(response);
}

Expand Down
Expand Up @@ -57,13 +57,13 @@ private ListenableFuture<ClientHttpResponse> invoke(Map<String, Object> swaggerA
Invocation invocation = prepareInvocation(swaggerArguments);
invocation.getHandlerContext().put(RestConst.CONSUMER_HEADER, this.getHeaders());
CompletableFuture<ClientHttpResponse> clientHttpResponseCompletableFuture = doAsyncInvoke(invocation);
return new CompletableToListenableFutureAdapter<ClientHttpResponse>(clientHttpResponseCompletableFuture);
return new CompletableToListenableFutureAdapter<>(clientHttpResponseCompletableFuture);
}

protected CompletableFuture<ClientHttpResponse> doAsyncInvoke(Invocation invocation) {
CompletableFuture<ClientHttpResponse> completableFuture = new CompletableFuture<>();
InvokerUtils.reactiveInvoke(invocation, (Response response) -> {
if (response.isSuccessed()) {
if (response.isSucceed()) {
completableFuture.complete(new CseClientHttpResponse(response));
} else {
completableFuture.completeExceptionally(response.getResult());
Expand All @@ -72,7 +72,6 @@ protected CompletableFuture<ClientHttpResponse> doAsyncInvoke(Invocation invocat
return completableFuture;
}


@Override
public ListenableFuture<ClientHttpResponse> executeAsync() {
this.setPath(findUriPath(this.getURI()));
Expand Down
Expand Up @@ -42,12 +42,17 @@ public class Response {
// 失败场景中,result是Throwable
private Object result;

public boolean isSuccessed() {
public boolean isSucceed() {
return HttpStatus.isSuccess(status);
}

@Deprecated
public boolean isSuccessed() {
return isSucceed();
}

public boolean isFailed() {
return !isSuccessed();
return !isSucceed();
}

public int getStatusCode() {
Expand Down
Expand Up @@ -41,7 +41,7 @@ public void handle(Response resp) {
@Test
public void testAr() {
ar.success(Status.ACCEPTED, 1);
Assert.assertEquals(true, response.isSuccessed());
Assert.assertEquals(true, response.isSucceed());
Assert.assertEquals(false, response.isFailed());
Assert.assertEquals(1, (int) response.getResult());
Assert.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatusCode());
Expand Down
Expand Up @@ -111,7 +111,7 @@ protected InvocationException createDecodeException(Invocation invocation, Respo
response.getReasonPhrase(),
response.getHeader(HttpHeaders.CONTENT_TYPE));

if (response.isSuccessed()) {
if (response.isSucceed()) {
return Exceptions.consumer(FAILED_TO_DECODE_REST_SUCCESS_RESPONSE, "failed to decode success response body.", e);
}
return Exceptions.consumer(FAILED_TO_DECODE_REST_FAIL_RESPONSE, "failed to decode fail response body.", e);
Expand Down