From 67dc9b3193d6f3a890696cb2eb8cebf09e7e80b4 Mon Sep 17 00:00:00 2001
From: Artem Solomatin <artem00298@gmail.com>
Date: Tue, 6 Jun 2023 01:39:10 +0300
Subject: [PATCH] Fix clojure (#1476)

---
 .../app/apps/runner/dockers/clojure/check/checker.clj  | 10 +++++-----
 services/app/apps/runner/lib/runner/languages.ex       |  4 ++--
 services/app/apps/runner/priv/templates/clojure.eex    | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/services/app/apps/runner/dockers/clojure/check/checker.clj b/services/app/apps/runner/dockers/clojure/check/checker.clj
index 69454e039..8f4f6fc6e 100644
--- a/services/app/apps/runner/dockers/clojure/check/checker.clj
+++ b/services/app/apps/runner/dockers/clojure/check/checker.clj
@@ -2,7 +2,7 @@
   (load-file "check/solution.clj")
   (catch Exception ex
     (do
-     (println (json/generate-string {:status "error" :result (.getMessage ex)}))
+     (println (cheshire.core/generate-string {:status "error" :result (.getMessage ex)}))
      (System/exit 0)
      )))
 
@@ -30,11 +30,11 @@
     output (get info :output)]
 
     (try (assert (= expected result))
-      (println (json/generate-string {:status "success" :result result :expected expected :output output :arguments args :execution_time execution-time}))
+      (println (cheshire.core/generate-string {:status "success" :result result :expected expected :output output :arguments args :execution_time execution-time}))
       true
     (catch java.lang.AssertionError e
       (do
-        (println (json/generate-string {:status "failure" :result result :expected expected :output output :arguments args :execution_time execution-time}))
+        (println (cheshire.core/generate-string {:status "failure" :result result :expected expected :output output :arguments args :execution_time execution-time}))
         false
         )))))
 
@@ -64,9 +64,9 @@
                   (assert-result 6 solution [5, 1])
                 ])]
         (if success
-          (println (json/generate-string {:status "ok" :result "__seed:124949491112958542__"}))))
+          (println (cheshire.core/generate-string {:status "ok" :result "__seed:124949491112958542__"}))))
     (catch Exception ex
       (do
-        (println (json/generate-string {:status "error" :result (.getMessage ex)}))
+        (println (cheshire.core/generate-string {:status "error" :result (.getMessage ex)}))
         (System/exit 0)
       ))))
diff --git a/services/app/apps/runner/lib/runner/languages.ex b/services/app/apps/runner/lib/runner/languages.ex
index 55c4100f7..d342c4c23 100644
--- a/services/app/apps/runner/lib/runner/languages.ex
+++ b/services/app/apps/runner/lib/runner/languages.ex
@@ -378,11 +378,11 @@ defmodule Runner.Languages do
     "clojure" => %LanguageMeta{
       name: "clojure",
       slug: "clojure",
-      version: "1.11.2",
+      version: "1.11.2.1",
       check_dir: "check",
       solution_file_name: "solution.clj",
       checker_file_name: "checker.clj",
-      docker_image: "codebattle/clojure:1.11.2",
+      docker_image: "codebattle/clojure:1.11.2.1",
       solution_template: "(defn solution [<%= arguments %>] <%= return_statement %>)",
       arguments_template: %{argument: "<%= name %>", delimiter: " "},
       return_template: "<%= default_value %>",
diff --git a/services/app/apps/runner/priv/templates/clojure.eex b/services/app/apps/runner/priv/templates/clojure.eex
index 978b926f1..a022559c4 100644
--- a/services/app/apps/runner/priv/templates/clojure.eex
+++ b/services/app/apps/runner/priv/templates/clojure.eex
@@ -2,7 +2,7 @@
   (load-file "check/solution.clj")
   (catch Exception ex
     (do
-     (println (json/write-str {:status "error" :result (.getMessage ex)}))
+     (println (cheshire.core/generate-string {:status "error" :result (.getMessage ex)}))
      (System/exit 0)
      )))
 
@@ -30,11 +30,11 @@
     output (get info :output)]
 
     (try (assert (= expected result))
-      (println (json/write-str {:status "success" :result result :expected expected :output output :arguments args :execution_time execution_time}))
+      (println (cheshire.core/generate-string {:status "success" :result result :expected expected :output output :arguments args :execution_time execution_time}))
       true
     (catch java.lang.AssertionError e
       (do
-        (println (json/write-str {:status "failure" :result result :expected expected :output output :arguments args :execution_time execution_time}))
+        (println (cheshire.core/generate-string {:status "failure" :result result :expected expected :output output :arguments args :execution_time execution_time}))
         false
         )))))
 
@@ -57,9 +57,9 @@
                   <% end %>
                 ])]
         (if success
-          (println (json/write-str {:status "ok" :result <%= check_code %>}))))
+          (println (cheshire.core/generate-string {:status "ok" :result <%= check_code %>}))))
     (catch Exception ex
       (do
-        (println (json/write-str {:status "error" :result (.getMessage ex)}))
+        (println (cheshire.core/generate-string {:status "error" :result (.getMessage ex)}))
         (System/exit 0)
       ))))