Skip to content

Commit 0d947b8

Browse files
author
Adrian Cole
committed
Merge pull request OpenFeign#67 from Netflix/defaults-withoutcodec
Defaults.WithoutCodec to avoid binding collisions.
2 parents 8262ae1 + 2fc54d5 commit 0d947b8

2 files changed

Lines changed: 44 additions & 37 deletions

File tree

‎CHANGES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Decoders/Encoders are now more flexible, having access to the Response/RequestTemplate respectively.
77
* Added Feign.Builder to simplify client customizations without using Dagger.
88
* Gson type adapters can be registered as Dagger set bindings.
9+
* New Defaults.WithoutCodec to avoid binding collisions.
910

1011
### Version 4.4.1
1112
* Fix NullPointerException on calling equals and hashCode.

‎core/src/main/java/feign/Feign.java‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -86,53 +86,61 @@ public static ObjectGraph createObjectGraph(Object... modules) {
8686
}
8787

8888
@SuppressWarnings("rawtypes")
89-
@dagger.Module(complete = false, injects = {Feign.class, Builder.class}, library = true)
89+
@dagger.Module(complete = false, injects = {Feign.class, Builder.class},
90+
includes = {Defaults.WithoutCodec.class, Defaults.Codec.class}, library = true)
9091
public static class Defaults {
9192

92-
@Provides Logger.Level logLevel() {
93-
return Logger.Level.NONE;
94-
}
93+
@dagger.Module(includes = {Defaults.Client.class}, library = true)
94+
public static class WithoutCodec {
95+
@Provides Contract contract() {
96+
return new Contract.Default();
97+
}
9598

96-
@Provides Contract contract() {
97-
return new Contract.Default();
98-
}
99+
@Provides Logger.Level logLevel() {
100+
return Logger.Level.NONE;
101+
}
99102

100-
@Provides SSLSocketFactory sslSocketFactory() {
101-
return SSLSocketFactory.class.cast(SSLSocketFactory.getDefault());
102-
}
103+
@Provides Logger noOp() {
104+
return new NoOpLogger();
105+
}
103106

104-
@Provides HostnameVerifier hostnameVerifier() {
105-
return HttpsURLConnection.getDefaultHostnameVerifier();
106-
}
107+
@Provides Retryer retryer() {
108+
return new Retryer.Default();
109+
}
107110

108-
@Provides Client httpClient(Client.Default client) {
109-
return client;
111+
@Provides ErrorDecoder errorDecoder() {
112+
return new ErrorDecoder.Default();
113+
}
110114
}
111115

112-
@Provides Retryer retryer() {
113-
return new Retryer.Default();
114-
}
116+
@dagger.Module(library = true)
117+
public static class Client {
118+
@Provides SSLSocketFactory sslSocketFactory() {
119+
return SSLSocketFactory.class.cast(SSLSocketFactory.getDefault());
120+
}
115121

116-
@Provides Logger noOp() {
117-
return new NoOpLogger();
118-
}
122+
@Provides HostnameVerifier hostnameVerifier() {
123+
return HttpsURLConnection.getDefaultHostnameVerifier();
124+
}
119125

120-
@Provides
121-
Encoder defaultEncoder() {
122-
return new Encoder.Default();
123-
}
126+
@Provides feign.Client httpClient(feign.Client.Default client) {
127+
return client;
128+
}
124129

125-
@Provides
126-
Decoder defaultDecoder() {
127-
return new Decoder.Default();
130+
@Provides Options options() {
131+
return new Options();
132+
}
128133
}
129134

130-
@Provides ErrorDecoder errorDecoder() {
131-
return new ErrorDecoder.Default();
132-
}
135+
@dagger.Module(library = true)
136+
public static class Codec {
137+
@Provides Encoder defaultEncoder() {
138+
return new Encoder.Default();
139+
}
133140

134-
@Provides Options options() {
135-
return new Options();
141+
@Provides Decoder defaultDecoder() {
142+
return new Decoder.Default();
143+
}
136144
}
137145
}
138146

@@ -313,13 +321,11 @@ static class BuilderModule {
313321
return logger;
314322
}
315323

316-
@Provides
317-
Encoder encoder() {
324+
@Provides Encoder encoder() {
318325
return encoder;
319326
}
320327

321-
@Provides
322-
Decoder decoder() {
328+
@Provides Decoder decoder() {
323329
return decoder;
324330
}
325331

0 commit comments

Comments
 (0)