Skip to content

Commit

Permalink
whitespacing
Browse files Browse the repository at this point in the history
  • Loading branch information
zpencer committed May 22, 2017
1 parent 0f29244 commit e8cab28
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java
Expand Up @@ -181,7 +181,7 @@ private static InetSocketAddress overrideProxy(String proxyHostPort) {
"Detected GRPC_PROXY_EXP and will honor it, but this feature will "
+ "be removed in a future release. Use the JVM flags "
+ "\"-Dhttps.proxyHost=HOST -Dhttps.proxyPort=PORT\" to set the https proxy for "
+ "this JVM. ");
+ "this JVM.");
return new InetSocketAddress(parts[0], port);
}

Expand Down
3 changes: 1 addition & 2 deletions netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
Expand Up @@ -499,8 +499,7 @@ public TransportCreationParamsFilter create(
targetServerAddress,
authority,
userAgent,
proxyDetector
);
proxyDetector);
}
};
}
Expand Down
Expand Up @@ -138,9 +138,7 @@ public void pickFirstHttpProxy() throws Exception {
InetSocketAddress otherProxy = InetSocketAddress.createUnresolved("proxy2", 2222);
Proxy proxy1 = new Proxy(Proxy.Type.HTTP, proxyAddress);
Proxy proxy2 = new Proxy(Proxy.Type.HTTP, otherProxy);
when(proxySelector.select(any(URI.class))).thenReturn(ImmutableList.of(
proxy1, proxy2
));
when(proxySelector.select(any(URI.class))).thenReturn(ImmutableList.of(proxy1, proxy2));

Optional<ProxyParameters> detected = proxyDetector.proxyFor(destination);
assertTrue(detected.isPresent());
Expand Down Expand Up @@ -175,8 +173,6 @@ public void authRequired() throws Exception {

Optional<ProxyParameters> detected = proxyDetector.proxyFor(destination);
assertTrue(detected.isPresent());
assertEquals(
new ProxyParameters(proxyAddress, proxyUser, proxyPassword),
detected.get());
assertEquals(new ProxyParameters(proxyAddress, proxyUser, proxyPassword), detected.get());
}
}

0 comments on commit e8cab28

Please sign in to comment.