Encode clojure.lang.BigInt correctly

Author: marcgrue

README.md

@@ -197,7 +197,7 @@ Add Java dependency in POM file:
 <dependency>
     <groupId>org.scalamolecule</groupId>
     <artifactId>datomic-client-api-java-scala</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 
 <!-- If using dev-local -->
@@ -218,7 +218,7 @@ Add Java dependency in POM file:
 Add Scala dependency in sbt build file (crosscompiles to Scala 2.12 and 2.13):
 ```
 libraryDependencies ++= Seq(
-  "org.scalamolecule" %% "datomic-client-api-java-scala" % "1.0.1",
+  "org.scalamolecule" %% "datomic-client-api-java-scala" % "1.0.2",
   
   // If using dev-local
   "com.datomic" % "dev-local" % "1.0.238",

build.sbt

@@ -4,7 +4,7 @@ import sbt.url
 
 lazy val commonSettings = Seq(
   name := "datomic-client-api-java-scala",
-  ThisBuild / version := "1.0.1",
+  ThisBuild / version := "1.0.2",
   crossScalaVersions := Seq("2.12.15", "2.13.6"),
   ThisBuild / scalaVersion := "2.13.6",
   organization := "org.scalamolecule",

core/src/main/scala/datomicClient/ClojureBridge.scala

@@ -3,7 +3,7 @@ package datomicClient
 import java.net.URI
 import java.util.{List => jList, Map => jMap}
 import clojure.java.api.Clojure
-import clojure.lang.{IFn, PersistentVector, Keyword => clKeyword, Symbol => clSymbol}
+import clojure.lang.{IFn, PersistentVector, Keyword => clKeyword, Symbol => clSymbol, BigInt => clBigInt}
 import datomic.Util._
 import datomic.db.DbId
 import us.bpsm.edn.printer.Printer.Fn
@@ -37,28 +37,34 @@ trait ClojureBridge {
   // Printing edn with us.bpsm.edn
   // Adding recognition of clojure Keyword and Datomic DbId
 
-  lazy val clPersVec : Fn[PersistentVector] = new Printer.Fn[PersistentVector]() {
+  lazy val clPersVec: Fn[PersistentVector] = new Printer.Fn[PersistentVector]() {
     override def eval(self: PersistentVector, writer: Printer): Unit = {
       writer.append('[')
-      self.forEach(o =>  writer.printValue(o))
+      self.forEach(o => writer.printValue(o))
       writer.append(']')
     }
   }
-  lazy val clKw : Fn[clKeyword] = new Printer.Fn[clKeyword]() {
+  lazy val clKw     : Fn[clKeyword]        = new Printer.Fn[clKeyword]() {
     override def eval(self: clKeyword, writer: Printer): Unit = {
       writer.softspace.append(self.toString).softspace
     }
   }
-  lazy val clSym: Fn[clSymbol] = new Printer.Fn[clSymbol]() {
+  lazy val clSym   : Fn[clSymbol] = new Printer.Fn[clSymbol]() {
     override def eval(self: clSymbol, writer: Printer): Unit = {
       writer.softspace.append(self.toString).softspace
     }
   }
-  lazy val uri: Fn[URI]  = new Printer.Fn[URI]() {
+  lazy val clBigInt: Fn[clBigInt] = new Printer.Fn[clBigInt]() {
+    override def eval(self: clBigInt, writer: Printer): Unit = {
+      writer.softspace.append(self.toString + "N").softspace
+    }
+  }
+  lazy val uri     : Fn[URI]      = new Printer.Fn[URI]() {
     override def eval(self: URI, writer: Printer): Unit = {
-      writer.append(s""" #=(new java.net.URI "${self.toString}")""")}
+      writer.append(s""" #=(new java.net.URI "${self.toString}")""")
+    }
   }
-  lazy val dbId : Fn[DbId] = new Printer.Fn[DbId]() {
+  lazy val dbId     : Fn[DbId]             = new Printer.Fn[DbId]() {
     override def eval(self: DbId, writer: Printer): Unit = {
       if (self.idx.asInstanceOf[Long] > 0) {
         // Entity id
@@ -77,6 +83,7 @@ trait ClojureBridge {
     .put(classOf[PersistentVector], clPersVec)
     .put(classOf[clKeyword], clKw)
     .put(classOf[clSymbol], clSym)
+    .put(classOf[clBigInt], clBigInt)
     .put(classOf[URI], uri)
     .put(classOf[DbId], dbId)
     .build
@@ -85,6 +92,7 @@ trait ClojureBridge {
     .put(classOf[PersistentVector], clPersVec)
     .put(classOf[clKeyword], clKw)
     .put(classOf[clSymbol], clSym)
+    .put(classOf[clBigInt], clBigInt)
     .put(classOf[URI], uri)
     .put(classOf[DbId], dbId)
     .build

tests/src/test/java/datomicJava/client/api/async/AsyncDatomicTest.java

@@ -35,11 +35,11 @@ public void createClient() throws ExecutionException, InterruptedException {
             add path to where you want to save data as per instructions in link above
 
             Add dependency to dev-local in your project
-            "com.datomic" % "dev-local" % "0.9.229",
+            "com.datomic" % "dev-local" % "1.0.238",
 
             As long dev-local has a dependency on clojure 1.10.0-alpha4
             we also need to import a newer version of clojure
-            "org.clojure" % "clojure" % "1.10.1",
+            "org.clojure" % "clojure" % "1.10.3",
 
             (No need to start a transactor)
            */

tests/src/test/java/datomicJava/client/api/sync/DatomicTest.java

@@ -34,11 +34,11 @@ public void createClient() {
             add path to where you want to save data as per instructions in link above
 
             Add dependency to dev-local in your project
-            "com.datomic" % "dev-local" % "0.9.229",
+            "com.datomic" % "dev-local" % "1.0.238",
 
             As long dev-local has a dependency on clojure 1.10.0-alpha4
             we also need to import a newer version of clojure
-            "org.clojure" % "clojure" % "1.10.1",
+            "org.clojure" % "clojure" % "1.10.3",
 
             (No need to start a transactor)
            */

tests/src/test/scala-2.13+/datomicScala/client/api/async/AsyncDatomicTest.scala

@@ -25,11 +25,11 @@ class AsyncDatomicTest extends SpecAsync with AnomalyWrapper {
           add path to where you want to save data as per instructions in link above
 
           Add dependency to dev-local in your project
-          "com.datomic" % "dev-local" % "0.9.229",
+          "com.datomic" % "dev-local" % "1.0.238",
 
           As long dev-local has a dependency on clojure 1.10.0-alpha4
           we also need to import a newer version of clojure
-          "org.clojure" % "clojure" % "1.10.1",
+          "org.clojure" % "clojure" % "1.10.3",
 
           (No need to start a transactor)
          */

tests/src/test/scala-2.13+/datomicScala/client/api/sync/DatomicTest.scala

@@ -1,6 +1,7 @@
 package datomicScala.client.api.sync
 
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
+import datomic.Peer.function
 import datomic.Util
 import datomic.Util._
 import datomicClient.anomaly.{AnomalyWrapper, Forbidden, NotFound}
@@ -21,11 +22,11 @@ class DatomicTest extends Spec with AnomalyWrapper {
           add path to where you want to save data as per instructions in link above
 
           Add dependency to dev-local in your project
-          "com.datomic" % "dev-local" % "0.9.235",
+          "com.datomic" % "dev-local" % "1.0.238",
 
           As long dev-local has a dependency on clojure 1.10.0-alpha4
           we also need to import a newer version of clojure like this:
-          "org.clojure" % "clojure" % "1.10.1"
+          "org.clojure" % "clojure" % "1.10.3"
 
           (No need to start a transactor)
          */
@@ -100,7 +101,7 @@ class DatomicTest extends Spec with AnomalyWrapper {
           case notFound: NotFound =>
             // Is "x" or "x: nodename nor servname provided, or not known"
             notFound.msg.startsWith("x") === true
-          case NonFatal(e)           =>
+          case NonFatal(e)        =>
             throw new RuntimeException("Unexpectedly didn't throw a `NotFound` exception. Got " + e)
         }
 

tests/src/test/scala-2.13-/datomicScala/client/api/async/AsyncDatomicTest.scala

@@ -25,11 +25,11 @@ class AsyncDatomicTest extends SpecAsync with AnomalyWrapper {
           add path to where you want to save data as per instructions in link above
 
           Add dependency to dev-local in your project
-          "com.datomic" % "dev-local" % "0.9.229",
+          "com.datomic" % "dev-local" % "1.0.238",
 
           As long dev-local has a dependency on clojure 1.10.0-alpha4
           we also need to import a newer version of clojure
-          "org.clojure" % "clojure" % "1.10.1",
+          "org.clojure" % "clojure" % "1.10.3",
 
           (No need to start a transactor)
          */

tests/src/test/scala-2.13-/datomicScala/client/api/sync/DatomicTest.scala

@@ -21,11 +21,11 @@ class DatomicTest extends Spec with AnomalyWrapper {
           add path to where you want to save data as per instructions in link above
 
           Add dependency to dev-local in your project
-          "com.datomic" % "dev-local" % "0.9.229",
+          "com.datomic" % "dev-local" % "1.0.238",
 
           As long dev-local has a dependency on clojure 1.10.0-alpha4
           we also need to import a newer version of clojure
-          "org.clojure" % "clojure" % "1.10.1",
+          "org.clojure" % "clojure" % "1.10.3",
 
           (No need to start a transactor)
          */