grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: MethodDescriptor.toBuilder() should copy schemaDescriptor (#3941)

This commit is contained in:
zpencer 2018-01-10 13:15:25 -08:00 committed by GitHub
parent 4115491a24
commit 16cec947c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/io/grpc/MethodDescriptor.java
View File

@ -438,7 +438,8 @@ public final class MethodDescriptor<ReqT, RespT> {
.setFullMethodName(fullMethodName) .setFullMethodName(fullMethodName)
.setIdempotent(idempotent) .setIdempotent(idempotent)
.setSafe(safe) .setSafe(safe)
.setSampledToLocalTracing(sampledToLocalTracing); .setSampledToLocalTracing(sampledToLocalTracing)
.setSchemaDescriptor(schemaDescriptor);
} }
/** /**

41
core/src/test/java/io/grpc/MethodDescriptorTest.java
View File

@ -16,8 +16,10 @@
package io.grpc; package io.grpc;
import static junit.framework.TestCase.assertSame;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import io.grpc.MethodDescriptor.MethodType; import io.grpc.MethodDescriptor.MethodType;
@ -129,4 +131,43 @@ public class MethodDescriptorTest {
.build(); .build();
assertTrue(md4.isSampledToLocalTracing()); assertTrue(md4.isSampledToLocalTracing());
} }
@Test
public void toBuilderTest() {
MethodDescriptor<String, String> md1 = MethodDescriptor.<String, String>newBuilder()
.setType(MethodType.UNARY)
.setFullMethodName("package.service/method")
.setRequestMarshaller(StringMarshaller.INSTANCE)
.setResponseMarshaller(StringMarshaller.INSTANCE)
.setSampledToLocalTracing(true)
.setIdempotent(true)
.setSafe(true)
.setSchemaDescriptor(new Object())
.build();
// Verify that we are not using any default builder values, so if md1 and md2 matches,
// it's because toBuilder explicitly copied it.
MethodDescriptor<String, String> defaults = MethodDescriptor.<String, String>newBuilder()
.setType(MethodType.UNARY)
.setFullMethodName("package.service/method")
.setRequestMarshaller(StringMarshaller.INSTANCE)
.setResponseMarshaller(StringMarshaller.INSTANCE)
.build();
assertNotEquals(md1.isSampledToLocalTracing(), defaults.isSampledToLocalTracing());
assertNotEquals(md1.isIdempotent(), defaults.isIdempotent());
assertNotEquals(md1.isSafe(), defaults.isSafe());
assertNotEquals(md1.getSchemaDescriptor(), defaults.getSchemaDescriptor());
// Verify that the builder correctly copied over the values
MethodDescriptor<Integer, Integer> md2 = md1.toBuilder(
IntegerMarshaller.INSTANCE,
IntegerMarshaller.INSTANCE).build();
assertSame(md1.getType(), md2.getType());
assertSame(md1.getFullMethodName(), md2.getFullMethodName());
assertSame(IntegerMarshaller.INSTANCE, md2.getRequestMarshaller());
assertSame(IntegerMarshaller.INSTANCE, md2.getResponseMarshaller());
assertEquals(md1.isSampledToLocalTracing(), md2.isSampledToLocalTracing());
assertEquals(md1.isIdempotent(), md2.isIdempotent());
assertEquals(md1.isSafe(), md2.isSafe());
assertSame(md1.getSchemaDescriptor(), md2.getSchemaDescriptor());
}
} }