@@ -30,25 +30,22 @@ public static Builder builder() {
3030 return new Builder ();
3131 }
3232
33- // Doesn't extend Feign.Builder for two reasons:
34- // * Hide invocationHandlerFactory - as this isn't customizable
35- // * Provide a path to the new fallback method w/o using covariant return types
36- public static final class Builder {
37- private final Feign .Builder delegate = new Feign .Builder ();
33+ public static final class Builder extends Feign .Builder {
34+
3835 private Contract contract = new Contract .Default ();
3936
4037 /**
4138 * @see #target(Class, String, Object)
4239 */
4340 public <T > T target (Target <T > target , final T fallback ) {
44- delegate .invocationHandlerFactory (new InvocationHandlerFactory () {
41+ super .invocationHandlerFactory (new InvocationHandlerFactory () {
4542 @ Override
4643 public InvocationHandler create (Target target , Map <Method , MethodHandler > dispatch ) {
4744 return new HystrixInvocationHandler (target , dispatch , fallback );
4845 }
4946 });
50- delegate .contract (new HystrixDelegatingContract (contract ));
51- return delegate .build ().newInstance (target );
47+ super .contract (new HystrixDelegatingContract (contract ));
48+ return super .build ().newInstance (target );
5249 }
5350
5451 /**
@@ -90,126 +87,78 @@ public <T> T target(Class<T> apiType, String url, T fallback) {
9087 return target (new Target .HardCodedTarget <T >(apiType , url ), fallback );
9188 }
9289
93- /**
94- * @see feign.Feign.Builder#contract
95- */
90+ @ Override
91+ public Feign .Builder invocationHandlerFactory (InvocationHandlerFactory invocationHandlerFactory ) {
92+ throw new UnsupportedOperationException ();
93+ }
94+
95+ @ Override
9696 public Builder contract (Contract contract ) {
9797 this .contract = contract ;
9898 return this ;
9999 }
100100
101- /**
102- * @see feign.Feign.Builder#build
103- */
101+ @ Override
104102 public Feign build () {
105- delegate .invocationHandlerFactory (new HystrixInvocationHandler .Factory ());
106- delegate .contract (new HystrixDelegatingContract (contract ));
107- return delegate .build ();
103+ super .invocationHandlerFactory (new HystrixInvocationHandler .Factory ());
104+ super .contract (new HystrixDelegatingContract (contract ));
105+ return super .build ();
108106 }
109107
110- // re-declaring methods in Feign.Builder is same work as covariant overrides,
111- // but results in less complex bytecode.
112-
113- /**
114- * @see feign.Feign.Builder#target(Class, String)
115- */
116- public <T > T target (Class <T > apiType , String url ) {
117- return target (new Target .HardCodedTarget <T >(apiType , url ));
118- }
119-
120- /**
121- * @see feign.Feign.Builder#target(Target)
122- */
123- public <T > T target (Target <T > target ) {
124- return build ().newInstance (target );
125- }
126-
127- /**
128- * @see feign.Feign.Builder#logLevel
129- */
108+ // Covariant overrides to support chaining to new fallback method.
109+ @ Override
130110 public Builder logLevel (Logger .Level logLevel ) {
131- delegate .logLevel (logLevel );
132- return this ;
111+ return (Builder ) super .logLevel (logLevel );
133112 }
134113
135- /**
136- * @see feign.Feign.Builder#client
137- */
114+ @ Override
138115 public Builder client (Client client ) {
139- delegate .client (client );
140- return this ;
116+ return (Builder ) super .client (client );
141117 }
142118
143- /**
144- * @see feign.Feign.Builder#retryer
145- */
119+ @ Override
146120 public Builder retryer (Retryer retryer ) {
147- delegate .retryer (retryer );
148- return this ;
121+ return (Builder ) super .retryer (retryer );
149122 }
150123
151- /**
152- * @see feign.Feign.Builder#retryer
153- */
124+ @ Override
154125 public Builder logger (Logger logger ) {
155- delegate .logger (logger );
156- return this ;
126+ return (Builder ) super .logger (logger );
157127 }
158128
159- /**
160- * @see feign.Feign.Builder#encoder
161- */
129+ @ Override
162130 public Builder encoder (Encoder encoder ) {
163- delegate .encoder (encoder );
164- return this ;
131+ return (Builder ) super .encoder (encoder );
165132 }
166133
167- /**
168- * @see feign.Feign.Builder#decoder
169- */
134+ @ Override
170135 public Builder decoder (Decoder decoder ) {
171- delegate .decoder (decoder );
172- return this ;
136+ return (Builder ) super .decoder (decoder );
173137 }
174138
175- /**
176- * @see feign.Feign.Builder#decode404
177- */
139+ @ Override
178140 public Builder decode404 () {
179- delegate .decode404 ();
180- return this ;
141+ return (Builder ) super .decode404 ();
181142 }
182143
183- /**
184- * @see feign.Feign.Builder#errorDecoder
185- */
144+ @ Override
186145 public Builder errorDecoder (ErrorDecoder errorDecoder ) {
187- delegate .errorDecoder (errorDecoder );
188- return this ;
146+ return (Builder ) super .errorDecoder (errorDecoder );
189147 }
190148
191- /**
192- * @see feign.Feign.Builder#options
193- */
149+ @ Override
194150 public Builder options (Request .Options options ) {
195- delegate .options (options );
196- return this ;
151+ return (Builder ) super .options (options );
197152 }
198153
199- /**
200- * @see feign.Feign.Builder#requestInterceptor
201- */
154+ @ Override
202155 public Builder requestInterceptor (RequestInterceptor requestInterceptor ) {
203- delegate .requestInterceptor (requestInterceptor );
204- return this ;
156+ return (Builder ) super .requestInterceptor (requestInterceptor );
205157 }
206158
207- /**
208- * @see feign.Feign.Builder#requestInterceptors
209- */
159+ @ Override
210160 public Builder requestInterceptors (Iterable <RequestInterceptor > requestInterceptors ) {
211- delegate .requestInterceptors (requestInterceptors );
212- return this ;
161+ return (Builder ) super .requestInterceptors (requestInterceptors );
213162 }
214163 }
215164}
0 commit comments