Skip to content

Commit aead1b7

Browse files
author
adriancole
committed
fixed excessively long lines and testng setup
1 parent 53402b1 commit aead1b7

10 files changed

Lines changed: 45 additions & 20 deletions

File tree

‎build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ subprojects {
2828
project(':feign-core') {
2929
apply plugin: 'java'
3030

31+
test {
32+
useTestNG()
33+
}
34+
3135
dependencies {
3236
compile 'com.google.guava:guava:14.0.1'
3337
compile 'com.squareup.dagger:dagger:1.0.1'
@@ -37,5 +41,5 @@ project(':feign-core') {
3741
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
3842
testCompile 'org.testng:testng:6.8.1'
3943
testCompile 'com.google.mockwebserver:mockwebserver:20130505'
40-
}
41-
}
44+
}
45+
}

‎feign-core/src/main/java/feign/ReflectiveFeign.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ static class FeignInvocationHandler extends AbstractInvocationHandler {
6666
this.methodToHandler = checkNotNull(methodToHandler, "methodToHandler for %s", target);
6767
}
6868

69-
@Override protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
69+
@Override
70+
protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
7071
return methodToHandler.get(method).invoke(args);
7172
}
7273

@@ -97,7 +98,8 @@ public static class Module {
9798
return in;
9899
}
99100

100-
@Provides Function<Target, Map<String, MethodHandler>> targetToHandlersByName(ParseHandlersByName parseHandlersByName) {
101+
@Provides
102+
Function<Target, Map<String, MethodHandler>> targetToHandlersByName(ParseHandlersByName parseHandlersByName) {
101103
return parseHandlersByName;
102104
}
103105
}
@@ -208,7 +210,8 @@ private BuildFormEncodedTemplateFromArgs(MethodMetadata metadata, FormEncoder fo
208210
this.formEncoder = formEncoder;
209211
}
210212

211-
@Override protected RequestTemplate resolve(Object[] argv, RequestTemplate mutable, ImmutableMap<String, Object> variables) {
213+
@Override
214+
protected RequestTemplate resolve(Object[] argv, RequestTemplate mutable, ImmutableMap<String, Object> variables) {
212215
formEncoder.encodeForm(Maps.filterKeys(variables, Predicates.in(metadata.formParams())), mutable);
213216
return super.resolve(argv, mutable, variables);
214217
}
@@ -222,7 +225,8 @@ private BuildBodyEncodedTemplateFromArgs(MethodMetadata metadata, BodyEncoder bo
222225
this.bodyEncoder = bodyEncoder;
223226
}
224227

225-
@Override protected RequestTemplate resolve(Object[] argv, RequestTemplate mutable, ImmutableMap<String, Object> variables) {
228+
@Override
229+
protected RequestTemplate resolve(Object[] argv, RequestTemplate mutable, ImmutableMap<String, Object> variables) {
226230
Object body = argv[metadata.bodyIndex()];
227231
checkArgument(body != null, "Body parameter %s was null", metadata.bodyIndex());
228232
bodyEncoder.encodeBody(body, mutable);

‎feign-core/src/main/java/feign/Wire.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public static class LoggingWire extends Wire {
3939
}
4040
}
4141

42-
@Override Response wireAndRebufferResponse(Target<?> target, Response response) throws IOException {
42+
@Override
43+
Response wireAndRebufferResponse(Target<?> target, Response response) throws IOException {
4344
if (logger.isLoggable(Level.FINE)) {
4445
return super.wireAndRebufferResponse(target, response);
4546
}
@@ -77,7 +78,8 @@ public static class NoOpWire extends Wire {
7778
@Override void wireRequest(Target<?> target, Request request) {
7879
}
7980

80-
@Override Response wireAndRebufferResponse(Target<?> target, Response response) throws IOException {
81+
@Override
82+
Response wireAndRebufferResponse(Target<?> target, Response response) throws IOException {
8183
return response;
8284
}
8385

‎feign-core/src/main/java/feign/codec/Decoders.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public static <T> Decoder transformFirstGroup(String pattern, final Function<Str
4343
final Pattern patternForMatcher = compile(checkNotNull(pattern, "pattern"), DOTALL);
4444
checkNotNull(applyFirstGroup, "applyFirstGroup");
4545
return new Decoder() {
46-
@Override public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
46+
@Override
47+
public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
4748
Matcher matcher = patternForMatcher.matcher(CharStreams.toString(reader));
4849
if (matcher.find()) {
4950
return applyFirstGroup.apply(matcher.group(1));
@@ -88,7 +89,8 @@ public static <T> Decoder transformEachFirstGroup(String pattern, final Function
8889
final Pattern patternForMatcher = compile(checkNotNull(pattern, "pattern"), DOTALL);
8990
checkNotNull(applyFirstGroup, "applyFirstGroup");
9091
return new Decoder() {
91-
@Override public List<T> decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
92+
@Override
93+
public List<T> decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
9294
Matcher matcher = patternForMatcher.matcher(CharStreams.toString(reader));
9395
ImmutableList.Builder<T> builder = ImmutableList.<T>builder();
9496
while (matcher.find()) {

‎feign-core/src/main/java/feign/codec/SAXDecoder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ protected SAXDecoder(SAXParserFactory factory) {
3535
this.factory = checkNotNull(factory, "factory");
3636
}
3737

38-
@Override public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws IOException, SAXException,
38+
@Override
39+
public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws IOException, SAXException,
3940
ParserConfigurationException {
4041
ContentHandlerWithResult handler = typeToNewHandler(type);
4142
checkState(handler != null, "%s returned null for type %s", this, type);

‎feign-core/src/main/java/feign/codec/ToStringDecoder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import java.io.Reader;
77

88
public class ToStringDecoder extends Decoder {
9-
@Override public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
9+
@Override
10+
public Object decode(String methodKey, Reader reader, TypeToken<?> type) throws Throwable {
1011
return CharStreams.toString(reader);
1112
}
1213
}

‎feign-core/src/test/java/feign/ContractTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ static interface BodyWithoutParameters {
7979
}
8080

8181
static interface WithURIParam {
82-
@GET @Path("/{1}/{2}") Response uriParam(@PathParam("1") String one, URI endpoint, @PathParam("2") String two);
82+
@GET @Path("/{1}/{2}")
83+
Response uriParam(@PathParam("1") String one, URI endpoint, @PathParam("2") String two);
8384
}
8485

8586
@Test public void methodCanHaveUriParam() throws Exception {
@@ -97,7 +98,11 @@ static interface WithURIParam {
9798
}
9899

99100
static interface FormParams {
100-
@POST @Body("%7B\"customer_name\": \"{customer_name}\", \"user_name\": \"{user_name}\", \"password\": \"{password}\"%7D") void login(@FormParam("customer_name") String customer, @FormParam("user_name") String user);
101+
@POST
102+
@Body("%7B\"customer_name\": \"{customer_name}\", \"user_name\": \"{user_name}\", \"password\": \"{password}\"%7D")
103+
void login(
104+
@FormParam("customer_name") String customer,
105+
@FormParam("user_name") String user, @FormParam("password") String password);
101106
}
102107

103108
@Test public void formParamsParseIntoIndexToName() throws Exception {

‎feign-core/src/test/java/feign/FeignTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public class FeignTest {
3333
static interface TestInterface {
3434
@POST String post();
3535

36-
@GET @Path("/{1}/{2}") Response uriParam(@PathParam("1") String one, URI endpoint, @PathParam("2") String two);
36+
@GET @Path("/{1}/{2}")
37+
Response uriParam(@PathParam("1") String one, URI endpoint, @PathParam("2") String two);
3738

3839
@dagger.Module(overrides = true, library = true)
3940
static class Module {

‎feign-core/src/test/java/feign/TrustingSSLSocketFactory.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ private TrustingSSLSocketFactory() {
4646
return ENABLED_CIPHER_SUITES;
4747
}
4848

49-
@Override public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
49+
@Override
50+
public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
5051
return setEnabledCipherSuites(delegate.createSocket(s, host, port, autoClose));
5152
}
5253

@@ -55,20 +56,23 @@ static Socket setEnabledCipherSuites(Socket socket) {
5556
return socket;
5657
}
5758

58-
@Override public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
59+
@Override
60+
public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
5961
return setEnabledCipherSuites(delegate.createSocket(host, port));
6062
}
6163

6264
@Override public Socket createSocket(InetAddress host, int port) throws IOException {
6365
return setEnabledCipherSuites(delegate.createSocket(host, port));
6466
}
6567

66-
@Override public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException,
68+
@Override
69+
public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException,
6770
UnknownHostException {
6871
return setEnabledCipherSuites(delegate.createSocket(host, port, localHost, localPort));
6972
}
7073

71-
@Override public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
74+
@Override
75+
public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
7276
throws IOException {
7377
return setEnabledCipherSuites(delegate.createSocket(address, port, localAddress, localPort));
7478
}

‎feign-core/src/test/java/feign/examples/GitHubExample.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
public class GitHubExample {
3333

3434
interface GitHub {
35-
@GET @Path("/repos/{owner}/{repo}/contributors") List<Contributor> contributors(@PathParam("owner") String owner, @PathParam("repo") String repo);
35+
@GET @Path("/repos/{owner}/{repo}/contributors") List<Contributor> contributors(
36+
@PathParam("owner") String owner, @PathParam("repo") String repo);
3637
}
3738

3839
static class Contributor {

0 commit comments

Comments
 (0)