diff --git a/gradle.properties b/gradle.properties index e80e07585..e4545c497 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.linecorp.centraldogma -version=0.69.2-SNAPSHOT +version=0.70.1-SNAPSHOT projectName=Central Dogma projectUrl=https://line.github.io/centraldogma/ projectDescription=Highly-available version-controlled service configuration repository based on Git, ZooKeeper and HTTP/2 diff --git a/xds/src/test/java/com/linecorp/centraldogma/xds/group/v1/XdsGroupServiceTest.java b/xds/src/test/java/com/linecorp/centraldogma/xds/group/v1/XdsGroupServiceTest.java index 4cea53beb..dce2d7beb 100644 --- a/xds/src/test/java/com/linecorp/centraldogma/xds/group/v1/XdsGroupServiceTest.java +++ b/xds/src/test/java/com/linecorp/centraldogma/xds/group/v1/XdsGroupServiceTest.java @@ -22,8 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.concurrent.CompletableFuture; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -55,16 +53,12 @@ protected void configure(CentralDogmaBuilder builder) { @Test void createGroupViaHttp() { - final CompletableFuture future = - createGroupAsync("foo", dogma.httpClient()); - final CompletableFuture future2 = - createGroupAsync("foo", dogma.httpClient()); - AggregatedHttpResponse response = future.join(); + AggregatedHttpResponse response = createGroupAsync("foo", dogma.httpClient()).join(); assertOk(response); assertThatJson(response.contentUtf8()).isEqualTo("{\"name\":\"groups/foo\"}"); // Cannot create with the same name. - response = future2.join(); + response = createGroupAsync("foo", dogma.httpClient()).join(); assertThat(response.status()).isSameAs(HttpStatus.CONFLICT); assertThat(response.headers().get("grpc-status")) .isEqualTo(Integer.toString(Status.ALREADY_EXISTS.getCode().value()));