From 4bac7d70842fa017dee9fca2bf62a5057ab6d3f6 Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Fri, 23 Feb 2018 16:44:10 -0800 Subject: [PATCH] core: add InProcessServerBuilder.generateName() --- .../inprocess/InProcessServerBuilder.java | 13 +++++- .../inprocess/InProcessServerBuilderTest.java | 45 +++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java b/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java index 4e05a577e5..3aa889bc02 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java @@ -23,6 +23,7 @@ import io.grpc.internal.AbstractServerImplBuilder; import io.grpc.internal.GrpcUtil; import java.io.File; import java.util.List; +import java.util.UUID; import java.util.concurrent.TimeUnit; /** @@ -40,11 +41,12 @@ import java.util.concurrent.TimeUnit; *

Usage example

*

Server and client channel setup

*
- *   Server server = InProcessServerBuilder.forName("unique-name")
+ *   String uniqueName = InProcessServerBuilder.generateName();
+ *   Server server = InProcessServerBuilder.forName(uniqueName)
  *       .directExecutor() // directExecutor is fine for unit tests
  *       .addService(/* your code here */)
  *       .build().start();
- *   ManagedChannel channel = InProcessChannelBuilder.forName("unique-name")
+ *   ManagedChannel channel = InProcessChannelBuilder.forName(uniqueName)
  *       .directExecutor()
  *       .build();
  * 
@@ -76,6 +78,13 @@ public final class InProcessServerBuilder throw new UnsupportedOperationException("call forName() instead"); } + /** + * Generates a new server name that is unique each time. + */ + public static String generateName() { + return UUID.randomUUID().toString(); + } + private final String name; private InProcessServerBuilder(String name) { diff --git a/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java b/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java new file mode 100644 index 0000000000..714b557a76 --- /dev/null +++ b/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java @@ -0,0 +1,45 @@ +/* + * Copyright 2018, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.grpc.inprocess; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** + * Unit tests for {@link InProcessServerBuilder}. + */ +@RunWith(JUnit4.class) +public class InProcessServerBuilderTest { + + @Test + public void generateName() { + String name1 = InProcessServerBuilder.generateName(); + assertNotNull(name1); + assertFalse(name1.isEmpty()); + + String name2 = InProcessServerBuilder.generateName(); + assertNotNull(name2); + assertFalse(name2.isEmpty()); + + assertNotEquals(name1, name2); + } +}