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

Update type and comment in Timeoutmarshaller

This commit is contained in:
Carl Mastrangelo 2015-12-21 13:45:44 -08:00
parent d948330ef2
commit 707302d76e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -39,8 +39,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.grpc.Metadata; import io.grpc.Metadata;
@ -436,14 +435,16 @@ public final class GrpcUtil {
*/ */
@VisibleForTesting @VisibleForTesting
static class TimeoutMarshaller implements Metadata.AsciiMarshaller<Long> { static class TimeoutMarshaller implements Metadata.AsciiMarshaller<Long> {
private static final BiMap<TimeUnit, Character> UNITS =
ImmutableBiMap.<TimeUnit, Character>builder() // ImmutableMap's have consistent iteration order.
.put(TimeUnit.NANOSECONDS, 'n') private static final ImmutableMap<Character, TimeUnit> UNITS =
.put(TimeUnit.MICROSECONDS, 'u') ImmutableMap.<Character, TimeUnit>builder()
.put(TimeUnit.MILLISECONDS, 'm') .put('n', TimeUnit.NANOSECONDS)
.put(TimeUnit.SECONDS, 'S') .put('u', TimeUnit.MICROSECONDS)
.put(TimeUnit.MINUTES, 'M') .put('m', TimeUnit.MILLISECONDS)
.put(TimeUnit.HOURS, 'H') .put('S', TimeUnit.SECONDS)
.put('M', TimeUnit.MINUTES)
.put('H', TimeUnit.HOURS)
.build(); .build();
@Override @Override
@ -451,10 +452,10 @@ public final class GrpcUtil {
checkArgument(timeoutNanos >= 0, "Negative timeout"); checkArgument(timeoutNanos >= 0, "Negative timeout");
// the smallest integer with 9 digits // the smallest integer with 9 digits
int cutoff = 100000000; int cutoff = 100000000;
for (Entry<TimeUnit, Character> unit : UNITS.entrySet()) { for (Entry<Character, TimeUnit> unit : UNITS.entrySet()) {
long timeout = unit.getKey().convert(timeoutNanos, TimeUnit.NANOSECONDS); long timeout = unit.getValue().convert(timeoutNanos, TimeUnit.NANOSECONDS);
if (timeout < cutoff) { if (timeout < cutoff) {
return Long.toString(timeout) + unit.getValue(); return Long.toString(timeout) + unit.getKey();
} }
} }
throw new IllegalArgumentException("Timeout too large"); throw new IllegalArgumentException("Timeout too large");
@ -466,7 +467,7 @@ public final class GrpcUtil {
checkArgument(serialized.length() <= 9, "bad timeout format"); checkArgument(serialized.length() <= 9, "bad timeout format");
String valuePart = serialized.substring(0, serialized.length() - 1); String valuePart = serialized.substring(0, serialized.length() - 1);
char unit = serialized.charAt(serialized.length() - 1); char unit = serialized.charAt(serialized.length() - 1);
TimeUnit timeUnit = UNITS.inverse().get(unit); TimeUnit timeUnit = UNITS.get(unit);
if (timeUnit != null) { if (timeUnit != null) {
return timeUnit.toNanos(Long.parseLong(valuePart)); return timeUnit.toNanos(Long.parseLong(valuePart));
} }