From da9fcbf10dda3a8ab23c67c7c0264e2a11d9a286 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 10 Aug 2024 13:32:24 +0200
Subject: [PATCH] Add java.io.LineNumberReader (#1714)

---
 CHANGELOG.md                                     | 1 +
 src/babashka/impl/classes.clj                    | 1 +
 test-resources/lib_tests/httpkit/client_test.clj | 7 +++++--
 test/babashka/interop_test.clj                   | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d35753b..2889a804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ A preview of the next release can be installed from
 - Bump `fs`
 - Bump `process`
 - Bump `deps.clj`
+- Add `java.io.LineNumberReader`
 
 ## 1.3.191 (2024-06-19)
 
diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index a2c3c8e1..870597b5 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -276,6 +276,7 @@
           java.io.FileOutputStream
           java.io.FileReader
           java.io.FileWriter
+          java.io.LineNumberReader
           java.io.RandomAccessFile
           java.io.InputStream
           java.io.IOException
diff --git a/test-resources/lib_tests/httpkit/client_test.clj b/test-resources/lib_tests/httpkit/client_test.clj
index 546ff867..dba07bcd 100644
--- a/test-resources/lib_tests/httpkit/client_test.clj
+++ b/test-resources/lib_tests/httpkit/client_test.clj
@@ -1,5 +1,6 @@
 (ns httpkit.client-test
   (:require [cheshire.core :as json]
+            [clojure.string :as str]
             [clojure.test :refer [deftest is testing #_*report-counters*]]
             [org.httpkit.client :as client]))
 
@@ -16,12 +17,14 @@
 
 (deftest get-test
   (is (= 200 (:status @(client/get "https://postman-echo.com/get"))))
-  (is (= "https://postman-echo.com/get"
+  (is (str/includes?
          (-> @(client/get "https://postman-echo.com/get"
                           {:headers {"Accept" "application/json"}})
              :body
              (json/parse-string true)
-             :url)))
+             :url)
+         "postman-echo.com/get"))
+  ;; BB-TEST-PATCH: postman started responding with http:// instead of https://
   (testing "query params"
     (is (= {:foo1 "bar1", :foo2 "bar2"}
            (-> @(client/get "https://postman-echo.com/get" {:query-params {"foo1" "bar1" "foo2" "bar2"}})
diff --git a/test/babashka/interop_test.clj b/test/babashka/interop_test.clj
index 59e88287..83fc4faa 100644
--- a/test/babashka/interop_test.clj
+++ b/test/babashka/interop_test.clj
@@ -61,3 +61,7 @@
   (is (= :user/success
          (bb nil "(try (.createSocket (javax.net.ssl.SSLSocketFactory/getDefault) \"localhost\" 4444) (catch java.net.ConnectException e ::success))")))
   (is (bb nil " (.startHandshake (.createSocket (javax.net.ssl.SSLSocketFactory/getDefault) \"clojure.org\" 443)) ::success")))
+
+(deftest jio-line-number-reader-test
+  (is (= 2 (bb nil "(def rdr (java.io.LineNumberReader. (java.io.StringReader. \"foo\nbar\")))
+                    (binding [*in* rdr] (read-line) (read-line)) (.getLineNumber rdr)"))))