Skip to content

Commit e91eaf3

Browse files
runeanielsenruneanielsen
committed
changes invalid transformation func names
1 parent 5ac2461 commit e91eaf3

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎src/typesense/api.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
(util/build-query options))
114114
:req {:headers {api-key-header-name key
115115
"Content-Type" "text/plain"}
116-
:body (util/hash-maps->json-lines documents)}}))
116+
:body (util/maps->json-lines documents)}}))
117117

118118
(defn delete-documents-req
119119
[{:keys [uri key]} collection-name options]

‎src/typesense/client.clj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[settings schema]
2323
(try+
2424
(let [{:keys [uri req]} (api/create-collection-req settings schema)]
25-
(util/http-response-json->hash-map (http/post uri req)))
25+
(util/http-response-json->map (http/post uri req)))
2626
(catch [:type :clj-http.client/unexceptional-status] e
2727
(throw (http-ex-data->typesense-ex-info e)))))
2828

@@ -32,7 +32,7 @@
3232
[settings collection-name]
3333
(try+
3434
(let [{:keys [uri req]} (api/drop-collection-req settings collection-name)]
35-
(util/http-response-json->hash-map (http/delete uri req)))
35+
(util/http-response-json->map (http/delete uri req)))
3636
(catch [:type :clj-http.client/unexceptional-status] e
3737
(throw (http-ex-data->typesense-ex-info e)))))
3838

@@ -43,7 +43,7 @@
4343
[settings]
4444
(try+
4545
(let [{:keys [uri req]} (api/list-collections-req settings)]
46-
(util/http-response-json->hash-map (http/get uri req)))
46+
(util/http-response-json->map (http/get uri req)))
4747
(catch [:type :clj-http.client/unexceptional-status] e
4848
(throw (http-ex-data->typesense-ex-info e)))))
4949

@@ -52,7 +52,7 @@
5252
[settings collection-name]
5353
(try+
5454
(let [{:keys [uri req]} (api/retrieve-collection-req settings collection-name)]
55-
(util/http-response-json->hash-map (http/get uri req)))
55+
(util/http-response-json->map (http/get uri req)))
5656
(catch [:type :clj-http.client/unexceptional-status] e
5757
(throw (http-ex-data->typesense-ex-info e)))))
5858

@@ -61,7 +61,7 @@
6161
[settings collection-name document]
6262
(try+
6363
(let [{:keys [uri req]} (api/create-document-req settings collection-name document)]
64-
(util/http-response-json->hash-map (http/post uri req)))
64+
(util/http-response-json->map (http/post uri req)))
6565
(catch [:type :clj-http.client/unexceptional-status] e
6666
(throw (http-ex-data->typesense-ex-info e)))))
6767

@@ -70,7 +70,7 @@
7070
[settings collection-name document]
7171
(try+
7272
(let [{:keys [uri req]} (api/upsert-document-req settings collection-name document)]
73-
(util/http-response-json->hash-map (http/post uri req)))
73+
(util/http-response-json->map (http/post uri req)))
7474
(catch [:type :clj-http.client/unexceptional-status] e
7575
(throw (http-ex-data->typesense-ex-info e)))))
7676

@@ -79,7 +79,7 @@
7979
[settings collection-name id]
8080
(try+
8181
(let [{:keys [uri req]} (api/retrieve-document-req settings collection-name id)]
82-
(util/http-response-json->hash-map (http/get uri req)))
82+
(util/http-response-json->map (http/get uri req)))
8383
(catch [:type :clj-http.client/unexceptional-status] e
8484
(throw (http-ex-data->typesense-ex-info e)))))
8585

@@ -88,7 +88,7 @@
8888
[settings collection-name id]
8989
(try+
9090
(let [{:keys [uri req]} (api/delete-document-req settings collection-name id)]
91-
(util/http-response-json->hash-map (http/delete uri req)))
91+
(util/http-response-json->map (http/delete uri req)))
9292
(catch [:type :clj-http.client/unexceptional-status] e
9393
(throw (http-ex-data->typesense-ex-info e)))))
9494

@@ -98,7 +98,7 @@
9898
[settings collection-name id document]
9999
(try+
100100
(let [{:keys [uri req]} (api/update-document-req settings collection-name id document)]
101-
(util/http-response-json->hash-map (http/patch uri req)))
101+
(util/http-response-json->map (http/patch uri req)))
102102
(catch [:type :clj-http.client/unexceptional-status] e
103103
(throw (http-ex-data->typesense-ex-info e)))))
104104

@@ -108,7 +108,7 @@
108108
(try+
109109
(let [options (merge opt {:action "create"})
110110
{:keys [uri req]} (api/import-documents-req settings collection-name documents options)]
111-
(util/http-response-jsonline->hash-maps (http/post uri req)))
111+
(util/http-response-jsonline->maps (http/post uri req)))
112112
(catch [:type :clj-http.client/unexceptional-status] e
113113
(throw (http-ex-data->typesense-ex-info e))))))
114114

@@ -118,7 +118,7 @@
118118
(try+
119119
(let [options (merge opt {:action "upsert"})
120120
{:keys [uri req]} (api/import-documents-req settings collection-name documents options)]
121-
(util/http-response-jsonline->hash-maps (http/post uri req)))
121+
(util/http-response-jsonline->maps (http/post uri req)))
122122
(catch [:type :clj-http.client/unexceptional-status] e
123123
(throw (http-ex-data->typesense-ex-info e))))))
124124

@@ -128,7 +128,7 @@
128128
(try+
129129
(let [options (merge opt {:action "update"})
130130
{:keys [uri req]} (api/import-documents-req settings collection-name documents options)]
131-
(util/http-response-jsonline->hash-maps (http/post uri req)))
131+
(util/http-response-jsonline->maps (http/post uri req)))
132132
(catch [:type :clj-http.client/unexceptional-status] e
133133
(throw (http-ex-data->typesense-ex-info e))))))
134134

@@ -137,7 +137,7 @@
137137
[settings collection-name options]
138138
(try+
139139
(let [{:keys [uri req]} (api/delete-documents-req settings collection-name options)]
140-
(util/http-response-json->hash-map (http/delete uri req)))
140+
(util/http-response-json->map (http/delete uri req)))
141141
(catch [:type :clj-http.client/unexceptional-status] e
142142
(throw (http-ex-data->typesense-ex-info e)))))
143143

@@ -146,7 +146,7 @@
146146
[settings collection-name options]
147147
(try+
148148
(let [{:keys [uri req]} (api/export-documents-req settings collection-name options)]
149-
(util/http-response-jsonline->hash-maps (http/get uri req)))
149+
(util/http-response-jsonline->maps (http/get uri req)))
150150
(catch [:type :clj-http.client/unexceptional-status] e
151151
(throw (http-ex-data->typesense-ex-info e)))))
152152

@@ -155,7 +155,7 @@
155155
[settings collection-name options]
156156
(try+
157157
(let [{:keys [uri req]} (api/search-req settings collection-name options)]
158-
(util/http-response-jsonline->hash-maps (http/get uri req)))
158+
(util/http-response-jsonline->maps (http/get uri req)))
159159
(catch [:type :clj-http.client/unexceptional-status] e
160160
(throw (http-ex-data->typesense-ex-info e)))))
161161

@@ -164,7 +164,7 @@
164164
[settings search-reqs common-search-params]
165165
(try+
166166
(let [{:keys [uri req]} (api/multi-search-req settings search-reqs common-search-params)]
167-
(util/http-response-json->hash-map (http/post uri req)))
167+
(util/http-response-json->map (http/post uri req)))
168168
(catch [:type :clj-http.client/unexceptional-status] e
169169
(throw (http-ex-data->typesense-ex-info e)))))
170170

@@ -173,7 +173,7 @@
173173
[settings options]
174174
(try+
175175
(let [{:keys [uri req]} (api/create-api-key-req settings options)]
176-
(util/http-response-json->hash-map (http/post uri req)))
176+
(util/http-response-json->map (http/post uri req)))
177177
(catch [:type :clj-http.client/unexceptional-status] e
178178
(throw (http-ex-data->typesense-ex-info e)))))
179179

@@ -182,7 +182,7 @@
182182
[settings id]
183183
(try+
184184
(let [{:keys [uri req]} (api/retrieve-api-key-req settings id)]
185-
(util/http-response-json->hash-map (http/get uri req)))
185+
(util/http-response-json->map (http/get uri req)))
186186
(catch [:type :clj-http.client/unexceptional-status] e
187187
(throw (http-ex-data->typesense-ex-info e)))))
188188

@@ -191,7 +191,7 @@
191191
[settings]
192192
(try+
193193
(let [{:keys [uri req]} (api/list-api-keys-req settings)]
194-
(util/http-response-json->hash-map (http/get uri req)))
194+
(util/http-response-json->map (http/get uri req)))
195195
(catch [:type :clj-http.client/unexceptional-status] e
196196
(throw (http-ex-data->typesense-ex-info e)))))
197197

@@ -200,7 +200,7 @@
200200
[settings id]
201201
(try+
202202
(let [{:keys [uri req]} (api/delete-api-key-req settings id)]
203-
(util/http-response-json->hash-map (http/delete uri req)))
203+
(util/http-response-json->map (http/delete uri req)))
204204
(catch [:type :clj-http.client/unexceptional-status] e
205205
(throw (http-ex-data->typesense-ex-info e)))))
206206

@@ -209,7 +209,7 @@
209209
[settings collection-name override-name override]
210210
(try+
211211
(let [{:keys [uri req]} (api/upsert-override-req settings collection-name override-name override)]
212-
(util/http-response-json->hash-map (http/put uri req)))
212+
(util/http-response-json->map (http/put uri req)))
213213
(catch [:type :clj-http.client/unexceptional-status] e
214214
(throw (http-ex-data->typesense-ex-info e)))))
215215

@@ -218,7 +218,7 @@
218218
[settings collection-name]
219219
(try+
220220
(let [{:keys [uri req]} (api/list-overrides-req settings collection-name)]
221-
(util/http-response-json->hash-map (http/get uri req)))
221+
(util/http-response-json->map (http/get uri req)))
222222
(catch [:type :clj-http.client/unexceptional-status] e
223223
(throw (http-ex-data->typesense-ex-info e)))))
224224

@@ -227,7 +227,7 @@
227227
[settings collection-name override-name]
228228
(try+
229229
(let [{:keys [uri req]} (api/retrieve-override-req settings collection-name override-name)]
230-
(util/http-response-json->hash-map (http/get uri req)))
230+
(util/http-response-json->map (http/get uri req)))
231231
(catch [:type :clj-http.client/unexceptional-status] e
232232
(throw (http-ex-data->typesense-ex-info e)))))
233233

@@ -236,7 +236,7 @@
236236
[settings collection-name override-name]
237237
(try+
238238
(let [{:keys [uri req]} (api/delete-override-req settings collection-name override-name)]
239-
(util/http-response-json->hash-map (http/delete uri req)))
239+
(util/http-response-json->map (http/delete uri req)))
240240
(catch [:type :clj-http.client/unexceptional-status] e
241241
(throw (http-ex-data->typesense-ex-info e)))))
242242

@@ -245,7 +245,7 @@
245245
[settings collection-name alias-collection]
246246
(try+
247247
(let [{:keys [uri req]} (api/upsert-alias-req settings collection-name alias-collection)]
248-
(util/http-response-json->hash-map (http/put uri req)))
248+
(util/http-response-json->map (http/put uri req)))
249249
(catch [:type :clj-http.client/unexceptional-status] e
250250
(throw (http-ex-data->typesense-ex-info e)))))
251251

@@ -254,7 +254,7 @@
254254
[settings]
255255
(try+
256256
(let [{:keys [uri req]} (api/list-aliases-req settings)]
257-
(util/http-response-json->hash-map (http/get uri req)))
257+
(util/http-response-json->map (http/get uri req)))
258258
(catch [:type :clj-http.client/unexceptional-status] e
259259
(throw (http-ex-data->typesense-ex-info e)))))
260260

@@ -263,7 +263,7 @@
263263
[settings collection-name]
264264
(try+
265265
(let [{:keys [uri req]} (api/retrieve-alias-req settings collection-name)]
266-
(util/http-response-json->hash-map (http/get uri req)))
266+
(util/http-response-json->map (http/get uri req)))
267267
(catch [:type :clj-http.client/unexceptional-status] e
268268
(throw (http-ex-data->typesense-ex-info e)))))
269269

@@ -272,7 +272,7 @@
272272
[settings collection-name]
273273
(try+
274274
(let [{:keys [uri req]} (api/delete-alias-req settings collection-name)]
275-
(util/http-response-json->hash-map (http/delete uri req)))
275+
(util/http-response-json->map (http/delete uri req)))
276276
(catch [:type :clj-http.client/unexceptional-status] e
277277
(throw (http-ex-data->typesense-ex-info e)))))
278278

@@ -281,7 +281,7 @@
281281
[settings collection-name synonym-name synonyms]
282282
(try+
283283
(let [{:keys [uri req]} (api/upsert-synonym-req settings collection-name synonym-name synonyms)]
284-
(util/http-response-json->hash-map (http/put uri req)))
284+
(util/http-response-json->map (http/put uri req)))
285285
(catch [:type :clj-http.client/unexceptional-status] e
286286
(throw (http-ex-data->typesense-ex-info e)))))
287287

@@ -290,7 +290,7 @@
290290
[settings collection-name synonym-name]
291291
(try+
292292
(let [{:keys [uri req]} (api/retrieve-synonym-req settings collection-name synonym-name)]
293-
(util/http-response-json->hash-map (http/get uri req)))
293+
(util/http-response-json->map (http/get uri req)))
294294
(catch [:type :clj-http.client/unexceptional-status] e
295295
(throw (http-ex-data->typesense-ex-info e)))))
296296

@@ -299,7 +299,7 @@
299299
[settings collection-name]
300300
(try+
301301
(let [{:keys [uri req]} (api/list-synonyms-req settings collection-name)]
302-
(util/http-response-json->hash-map (http/get uri req)))
302+
(util/http-response-json->map (http/get uri req)))
303303
(catch [:type :clj-http.client/unexceptional-status] e
304304
(throw (http-ex-data->typesense-ex-info e)))))
305305

@@ -308,6 +308,6 @@
308308
[settings collection-name synonym-name]
309309
(try+
310310
(let [{:keys [uri req]} (api/delete-synonym-req settings collection-name synonym-name)]
311-
(util/http-response-json->hash-map (http/delete uri req)))
311+
(util/http-response-json->map (http/delete uri req)))
312312
(catch [:type :clj-http.client/unexceptional-status] e
313313
(throw (http-ex-data->typesense-ex-info e)))))

‎src/typesense/util.clj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,35 @@
1515
(str "?"))
1616
""))
1717

18-
(defn hash-maps->json-lines
18+
(defn maps->json-lines
1919
"Take a vector of maps and returns json-line format.
2020
Returns an empty string if the vector is empty."
2121
[ms]
2222
(reduce #(str %1 (json/write-str %2) "\n") "" ms))
2323

24-
(defn json->hash-map
25-
"Transforms json to hash map.
24+
(defn json->map
25+
"Transforms json to a map.
2626
Return nil if the json string is nil or blank."
2727
[json]
2828
(when-not (str/blank? json)
2929
(json/read-str json :key-fn keyword)))
3030

31-
(defn json-lines->hash-maps
31+
(defn json-lines->maps
3232
"Transforms json-lines to vector of maps.
3333
Returns empty vector if json-lines are nil or blank."
3434
[json-lines]
3535
(if (str/blank? json-lines)
3636
[]
37-
(into [] (map json->hash-map) (str/split-lines json-lines))))
37+
(into [] (map json->map) (str/split-lines json-lines))))
3838

39-
(defn http-response-json->hash-map
40-
"Transforms HTTP response json to hash-map.
39+
(defn http-response-json->map
40+
"Transforms HTTP response json to a map.
4141
Returns nil if HTTP response body is nil or a blank string."
4242
[{:keys [body]}]
43-
(json->hash-map body))
43+
(json->map body))
4444

45-
(defn http-response-jsonline->hash-maps
46-
"Transforms HTTP response jsonline to vector of hash-maps.
45+
(defn http-response-jsonline->maps
46+
"Transforms HTTP response jsonline to vector of maps.
4747
Returns empty vector if HTTP response body is nil or a blank string."
4848
[{:keys [body]}]
49-
(json-lines->hash-maps body))
49+
(json-lines->maps body))

0 commit comments

Comments
 (0)