Skip to content

Commit df37d57

Browse files
committed
Removed duplication
1 parent 1a31c5d commit df37d57

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

client/src/main/java/nl/altindag/client/ClientConfig.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -315,26 +315,24 @@ public io.vertx.ext.web.client.WebClient vertxWebClient(SSLFactory sslFactory) {
315315

316316
@Bean
317317
public RequestService clojureHttpClientService(SSLFactory sslFactory) {
318-
IFn require = Clojure.var("clojure.core", "require");
319-
require.invoke(Clojure.read("nl.altindag.client.service.ClojureHttpClientService"));
320-
IFn clojureHttpClientService = Clojure.var("nl.altindag.client.service.ClojureHttpClientService", "reify-request-service");
321-
return (RequestService) clojureHttpClientService.invoke(sslFactory);
318+
return instantiateClojureRequestService("nl.altindag.client.service.ClojureHttpClientService", sslFactory);
322319
}
323320

324321
@Bean
325322
public RequestService clojureJdkHttpClientService(SSLFactory sslFactory) {
326-
IFn require = Clojure.var("clojure.core", "require");
327-
require.invoke(Clojure.read("nl.altindag.client.service.ClojureJdkHttpClientService"));
328-
IFn clojureJdkHttpClientService = Clojure.var("nl.altindag.client.service.ClojureJdkHttpClientService", "reify-request-service");
329-
return (RequestService) clojureJdkHttpClientService.invoke(sslFactory);
323+
return instantiateClojureRequestService("nl.altindag.client.service.ClojureJdkHttpClientService", sslFactory);
330324
}
331325

332326
@Bean
333-
public RequestService clojureCljHttpClientService(SSLFactory sslFactory) {
327+
public RequestService clojureCijHttpClientService(SSLFactory sslFactory) {
328+
return instantiateClojureRequestService("nl.altindag.client.service.ClojureCijHttpClientService", sslFactory);
329+
}
330+
331+
private RequestService instantiateClojureRequestService(String namespace, SSLFactory sslFactory) {
334332
IFn require = Clojure.var("clojure.core", "require");
335-
require.invoke(Clojure.read("nl.altindag.client.service.ClojureCljHttpClientService"));
336-
IFn clojureJdkHttpClientService = Clojure.var("nl.altindag.client.service.ClojureCljHttpClientService", "reify-request-service");
337-
return (RequestService) clojureJdkHttpClientService.invoke(sslFactory);
333+
require.invoke(Clojure.read(namespace));
334+
IFn clojureHttpClientService = Clojure.var(namespace, "reify-request-service");
335+
return (RequestService) clojureHttpClientService.invoke(sslFactory);
338336
}
339337

340338
}

client/src/main/java/nl/altindag/client/service/ClojureCljHttpClientService.clj renamed to client/src/main/java/nl/altindag/client/service/ClojureCijHttpClientService.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
; limitations under the License.
1515
;
1616

17-
(ns nl.altindag.client.service.ClojureCljHttpClientService
17+
(ns nl.altindag.client.service.ClojureCijHttpClientService
1818
(:gen-class)
1919
(:require [clj-http.client :as http])
2020
(:import

0 commit comments

Comments
 (0)