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

core: remove unused, non-public INTEGER_MARSHALLER (#3530)

This commit is contained in:
Devin Smith 2017-10-03 12:42:52 -05:00 committed by zpencer
parent 0d5943614e
commit f5026cd334
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/io/grpc/Metadata.java
View File

@ -104,21 +104,6 @@ public final class Metadata {
} }
}; };
/** Simple metadata marshaller that encodes an integer as a signed decimal string. */
static final AsciiMarshaller<Integer> INTEGER_MARSHALLER =
new AsciiMarshaller<Integer>() {
@Override
public String toAsciiString(Integer value) {
return value.toString();
}
@Override
public Integer parseAsciiString(String serialized) {
return Integer.parseInt(serialized);
}
};
/** /**
* Constructor called by the transport layer when it receives binary metadata. Metadata will * Constructor called by the transport layer when it receives binary metadata. Metadata will
* mutate the passed in array. * mutate the passed in array.

25
core/src/test/java/io/grpc/MetadataTest.java
View File

@ -213,20 +213,6 @@ public class MetadataTest {
h1.merge(h2); h1.merge(h2);
} }
@Test
public void integerMarshallerIsDecimal() {
assertEquals("12345678", Metadata.INTEGER_MARSHALLER.toAsciiString(12345678));
}
@Test
public void roundTripIntegerMarshaller() {
roundTripInteger(0);
roundTripInteger(1);
roundTripInteger(-1);
roundTripInteger(0x12345678);
roundTripInteger(0x87654321);
}
@Test @Test
public void shortBinaryKeyName() { public void shortBinaryKeyName() {
thrown.expect(IllegalArgumentException.class); thrown.expect(IllegalArgumentException.class);
@ -242,11 +228,6 @@ public class MetadataTest {
Metadata.Key.of("nonbinary", FISH_MARSHALLER); Metadata.Key.of("nonbinary", FISH_MARSHALLER);
} }
private void roundTripInteger(Integer i) {
assertEquals(i, Metadata.INTEGER_MARSHALLER.parseAsciiString(
Metadata.INTEGER_MARSHALLER.toAsciiString(i)));
}
@Test @Test
public void verifyToString() { public void verifyToString() {
Metadata h = new Metadata(); Metadata h = new Metadata();
@ -329,9 +310,9 @@ public class MetadataTest {
@Test @Test
public void keyEqualsHashNameWorks() { public void keyEqualsHashNameWorks() {
Key<Integer> k1 = Key.of("case", Metadata.INTEGER_MARSHALLER); Key<?> k1 = Key.of("case", Metadata.ASCII_STRING_MARSHALLER);
Key<Integer> k2 = Key.of("CASE", Metadata.INTEGER_MARSHALLER); Key<?> k2 = Key.of("CASE", Metadata.ASCII_STRING_MARSHALLER);
assertEquals(k1, k1); assertEquals(k1, k1);
assertNotEquals(k1, null); assertNotEquals(k1, null);
assertNotEquals(k1, new Object(){}); assertNotEquals(k1, new Object(){});
@ -346,7 +327,7 @@ public class MetadataTest {
@Test @Test
public void invalidKeyName() { public void invalidKeyName() {
try { try {
Key.of("io.grpc/key1", Metadata.INTEGER_MARSHALLER); Key.of("io.grpc/key1", Metadata.ASCII_STRING_MARSHALLER);
fail("Should have thrown"); fail("Should have thrown");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertEquals("Invalid character '/' in key name 'io.grpc/key1'", e.getMessage()); assertEquals("Invalid character '/' in key name 'io.grpc/key1'", e.getMessage());