v1.0.0 Async peer-server fixed. Implementation complete.

Author: marcgrue

README.md

@@ -14,11 +14,10 @@ You can then use the various Datomic systems depending on the Client api from Ja
 
 Using the facade in a live Cloud setting has not yet been tested. But since dev-local is equivalent and works fine, Cloud should too.
 
-Note that this library is an independent release not associated with Datomic/Cognitect.
 
 ## Java/Scala
 
-Code is written in Scala but compiles to the same bytecode as Java. 
+Most code is written in Scala but compiles to the same bytecode as Java. 
 
 Each language has been given its own exclusive namespace to ensure full compatibility and to accommodate for differences.
 
@@ -161,7 +160,7 @@ Run the Java tests by right-clicking on the `test.java.datomicJava.client` packa
 
 Run the Scala tests by right-clicking on the `test.scala.datomicScala.client` package in the project view (in IntelliJ) and choose Run -> Specs2 in 'client' (or run individual tests similarly).
 
-Or run tests with sbt:
+Run tests with sbt:
 ```
 sbt
 
@@ -175,13 +174,15 @@ sbt:datomic-client-api-java-scala> testOnly datomicJava.client.api.*
 sbt:datomic-client-api-java-scala> testOnly datomicScala.client.api.*
 
 // Tests for scala 2.12
-sbt:datomic-client-api-java-scala> ++2.12.13; testOnly datomicJava.client.api.*
-sbt:datomic-client-api-java-scala> ++2.12.13; testOnly datomicScala.client.api.*
+sbt:datomic-client-api-java-scala> ++2.12.14; testOnly datomicJava.client.api.*
+sbt:datomic-client-api-java-scala> ++2.12.14; testOnly datomicScala.client.api.*
 ```
 
+### Test caveats
 
-#### Temporary limitation
-Due to a bug in the Peer Server async implementation, all asynchronous Peer Server tests won't pass since we can't build a Client with map data. Hopefully this will be solved soon, and then all asynchronous Peer Server tests should pass.
+Sometimes you'll need to re-start the peer-server to clear the cache. Then run the sbt tests twice to allow schema creation to propagate.
+
+To run tests from IntelliJ, make sure that any previous sbt process of this project is not also running (kill it). Otherwise dev-local tests won't pass.
 
 
 ## Use with your project
@@ -193,34 +194,34 @@ Add Java dependency in POM file:
 <dependency>
     <groupId>org.scalamolecule</groupId>
     <artifactId>datomic-client-api-java-scala</artifactId>
-    <version>0.7.0</version>
+    <version>1.0.0</version>
 </dependency>
 
 <!-- If using dev-local -->
 <dependency>
     <groupId>com.datomic</groupId>
     <artifactId>dev-local</artifactId>
-    <version>0.9.232</version>
+    <version>0.9.235</version>
 </dependency>
 
 <!-- If using peer-server -->
 <dependency>
     <groupId>com.datomic</groupId>
     <artifactId>datomic-pro</artifactId>
-    <version>1.0.6269</version>
+    <version>1.0.6319</version>
 </dependency>
 ```
 
 Add Scala dependency in sbt build file (crosscompiles to Scala 2.12 and 2.13):
 ```
 libraryDependencies ++= Seq(
-  "org.scalamolecule" %% "datomic-client-api-java-scala" % "0.7.0",
+  "org.scalamolecule" %% "datomic-client-api-java-scala" % "1.0.0",
   
   // If using dev-local
-  "com.datomic" % "dev-local" % "0.9.232",
+  "com.datomic" % "dev-local" % "0.9.235",
   
   // If using peer-server
-  "com.datomic" % "datomic-pro" % "1.0.6269"
+  "com.datomic" % "datomic-pro" % "1.0.6319"
 )
 ```
 

build.sbt

@@ -4,9 +4,9 @@ import sbt.url
 
 lazy val commonSettings = Seq(
   name := "datomic-client-api-java-scala",
-  version in ThisBuild := "0.7.0",
-  crossScalaVersions := Seq("2.12.13", "2.13.5"),
-  scalaVersion in ThisBuild := "2.13.5",
+  ThisBuild / version := "1.0.0",
+  crossScalaVersions := Seq("2.12.14", "2.13.6"),
+  ThisBuild / scalaVersion := "2.13.6",
   organization := "org.scalamolecule",
   organizationName := "ScalaMolecule",
   organizationHomepage := Some(url("http://www.scalamolecule.org")),
@@ -22,8 +22,8 @@ lazy val commonSettings = Seq(
     ("clojars" at "http://clojars.org/repo").withAllowInsecureProtocol(true),
     ("ICM repository" at "http://maven.icm.edu.pl/artifactory/repo/").withAllowInsecureProtocol(true)
   ),
-  unmanagedSourceDirectories in Compile ++= {
-    (unmanagedSourceDirectories in Compile).value.map { dir =>
+  Compile / unmanagedSourceDirectories ++= {
+    (Compile / unmanagedSourceDirectories).value.map { dir =>
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
         case _             => file(dir.getPath ++ "-2.13-")
@@ -39,8 +39,8 @@ lazy val core = project.in(file("core"))
       "org.clojure" % "clojure" % "1.10.1",
       "org.clojure" % "tools.analyzer.jvm" % "1.1.0",
       "com.datomic" % "datomic-free" % "0.9.5697",
-      "com.datomic" % "client-pro" % "0.9.66",
-      "com.datomic" % "client-cloud" % "0.8.105",
+      "com.datomic" % "client-pro" % "0.9.71",
+      "com.datomic" % "client-cloud" % "0.8.113",
       "us.bpsm" % "edn-java" % "0.7.1",
       "co.fs2" %% "fs2-core" % "2.4.4",
     ),
@@ -50,13 +50,13 @@ lazy val core = project.in(file("core"))
       Some("Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/")
     else
       Some("Sonatype OSS Staging" at "https://oss.sonatype.org/service/local/staging/deploy/maven2/")),
-    publishArtifact in Test := false,
-    scalacOptions in Compile in doc ++= Seq(
+    Test / publishArtifact := false,
+    Compile / doc / scalacOptions ++= Seq(
       "-doc-root-content", baseDirectory.value + "/src/main/scaladoc/rootdoc.txt",
       "-diagrams", "-groups",
       "-doc-version", version.value,
       "-doc-title", "Datomic Client api for Java/Scala",
-      "-sourcepath", (baseDirectory in ThisBuild).value.toString,
+      "-sourcepath", (ThisBuild / baseDirectory).value.toString,
       "-doc-source-url", s"https://github.com/scalamolecule/datomic-client-api-java-scala/tree/master€{FILE_PATH}.scala#L1"
     ),
     pomIncludeRepository := (_ => false),
@@ -83,22 +83,22 @@ lazy val tests = project.in(file("tests"))
     publish / skip := true,
     publish := ((): Unit),
     publishLocal := ((): Unit),
-    parallelExecution in Test := false,
+    Test / parallelExecution := false,
     libraryDependencies ++= Seq(
       // To test against dev-local, please download cognitect-dev-tools from
       // https://cognitect.com/dev-tools and run `./install`
-      "com.datomic" % "dev-local" % "0.9.232",
+      "com.datomic" % "dev-local" % "0.9.235",
       // To test against peer-server, please download datomic-pro from
       // https://www.datomic.com/get-datomic.html and run `bin/maven-install`
-      "com.datomic" % "datomic-pro" % "1.0.6269",
+      "com.datomic" % "datomic-pro" % "1.0.6316",
       "org.specs2" %% "specs2-core" % "4.10.5" % Test,
       "com.novocode" % "junit-interface" % "0.11" % Test,
       "junit" % "junit" % "4.13" % Test,
       "org.hamcrest" % "hamcrest-junit" % "2.0.0.0" % Test
     ),
     excludeDependencies += ExclusionRule("com.datomic", "datomic-free"),
-    unmanagedSourceDirectories in Test ++= {
-      (unmanagedSourceDirectories in Test).value.map { dir =>
+    Test / unmanagedSourceDirectories ++= {
+      (Test / unmanagedSourceDirectories).value.map { dir =>
         CrossVersion.partialVersion(scalaVersion.value) match {
           case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
           case _             => file(dir.getPath ++ "-2.13-")

core/src/main/scala-2.13+/datomicJava/client/api/async/AsyncDatomic.scala

@@ -2,8 +2,7 @@ package datomicJava.client.api.async
 
 import java.util.concurrent.CompletableFuture
 import java.util.stream.Stream
-import java.util.{List => jList, Map => jMap}
-import clojure.lang.LazySeq
+import java.util.{List => jList, Map => jMap, Collection => jCollection}
 import com.amazonaws.auth.AWSCredentialsProviderChain
 import datomic.Util
 import datomic.Util._
@@ -85,7 +84,7 @@ object AsyncDatomic extends ClojureBridge {
     CompletableFuture.supplyAsync { () =>
       Channel[Stream[_]](
         InvokeAsync.q(argMap),
-        Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+        Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
       )
     }
   }
@@ -113,12 +112,12 @@ object AsyncDatomic extends ClojureBridge {
 
   // Query as data structure or String + optional :offset, :limit, :timeout params
   // (see tests)
-  def qseq(map: jMap[_, _])
+  def qseq(argMap: jMap[_, _])
   : CompletableFuture[Channel[Stream[_]]] = {
     CompletableFuture.supplyAsync { () =>
       Channel[Stream[_]](
-        datomicAsyncFn("qseq").invoke(map),
-        Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+        InvokeAsync.qseq(argMap),
+        Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
       )
     }
   }

core/src/main/scala-2.13+/datomicJava/client/api/async/AsyncDb.scala

@@ -3,8 +3,7 @@ package datomicJava.client.api.async
 import java.io.{Reader, StringReader}
 import java.util.concurrent.CompletableFuture
 import java.util.stream.{Stream => jStream}
-import java.util.{Date, List => jList, Map => jMap}
-import clojure.lang.LazySeq
+import java.util.{Date, List => jList, Map => jMap, Collection => jCollection}
 import datomic.Util.readAll
 import datomicClient._
 import datomicClient.anomaly.CognitectAnomaly
@@ -262,7 +261,7 @@ case class AsyncDb(
       ).chunk
     }.thenApply {
       case Right(indexPull) => Channel[jStream[_]](
-        indexPull.asInstanceOf[LazySeq].stream()
+        indexPull.asInstanceOf[jCollection[_]].stream()
       ).chunk
       case Left(anomaly)    => async.Left(anomaly)
     }

core/src/main/scala-2.13+/datomicScala/client/api/async/AsyncDatomic.scala

@@ -1,9 +1,9 @@
 package datomicScala.client.api.async
 
 import java.util.stream.{Stream => jStream}
-import java.util.{List => jList, Map => jMap}
+import java.util.{Collection => jCollection, List => jList, Map => jMap}
 import cats.effect.IO
-import clojure.lang.LazySeq
+import clojure.lang.{LazySeq, PersistentVector}
 import com.amazonaws.auth.AWSCredentialsProviderChain
 import datomic.Util
 import datomic.Util._
@@ -88,7 +88,10 @@ object AsyncDatomic extends ClojureBridge {
   : Future[LazyList[Either[CognitectAnomaly, jStream[_]]]] = Future {
     Channel[jStream[_]](
       InvokeAsync.q(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some {
+        case v: PersistentVector => v.stream
+        case v: LazySeq          => v.stream
+      }
     ).lazyList
   }
 
@@ -111,13 +114,13 @@ object AsyncDatomic extends ClojureBridge {
   }
 
   // fs2 Stream implementation example
-  // This allows the first the first chunk to be lazy
+  // This allows the first chunk to be lazy
   // Usage is flexible but verbose
   def qStream(argMap: jMap[_, _])
   : fs2.Stream[IO, Either[CognitectAnomaly, jStream[_]]] = {
     Channel[jStream[_]](
       InvokeAsync.q(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
     ).myTerminatedStream
   }
 
@@ -128,7 +131,7 @@ object AsyncDatomic extends ClojureBridge {
   : Future[LazyList[Either[CognitectAnomaly, jStream[_]]]] = Future {
     Channel[jStream[_]](
       InvokeAsync.qseq(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
     ).lazyList
   }
 

core/src/main/scala-2.13+/datomicScala/client/api/async/AsyncDb.scala

@@ -2,7 +2,7 @@ package datomicScala.client.api.async
 
 import java.io.{Reader, StringReader}
 import java.util.stream.{Stream => jStream}
-import java.util.{Collections, Date, List => jList, Map => jMap}
+import java.util.{Collections, Date, List => jList, Map => jMap, Collection => jCollection}
 import clojure.lang.LazySeq
 import datomic.Util.readAll
 import datomicClient._
@@ -224,7 +224,7 @@ case class AsyncDb(
       ) {
         case Right(indexPull) =>
           Channel[jStream[_]](
-            indexPull.asInstanceOf[LazySeq].stream()
+            indexPull.asInstanceOf[jCollection[_]].stream()
           ).lazyList.head
 
         case Left(anomaly) => Left(anomaly)

core/src/main/scala-2.13-/datomicJava/client/api/async/AsyncDatomic.scala

@@ -2,8 +2,7 @@ package datomicJava.client.api.async
 
 import java.util.concurrent.CompletableFuture
 import java.util.stream.Stream
-import java.util.{List => jList, Map => jMap}
-import clojure.lang.LazySeq
+import java.util.{List => jList, Map => jMap, Collection => jCollection}
 import com.amazonaws.auth.AWSCredentialsProviderChain
 import datomic.Util
 import datomic.Util._
@@ -85,7 +84,7 @@ object AsyncDatomic extends ClojureBridge {
     CompletableFuture.supplyAsync { () =>
       Channel[Stream[_]](
         InvokeAsync.q(argMap),
-        Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+        Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
       )
     }
   }
@@ -120,7 +119,7 @@ object AsyncDatomic extends ClojureBridge {
     CompletableFuture.supplyAsync { () =>
       Channel[Stream[_]](
         datomicAsyncFn("qseq").invoke(map),
-        Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+        Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
       )
     }
   }

core/src/main/scala-2.13-/datomicJava/client/api/async/AsyncDb.scala

@@ -3,8 +3,7 @@ package datomicJava.client.api.async
 import java.io.{Reader, StringReader}
 import java.util.concurrent.CompletableFuture
 import java.util.stream.{Stream => jStream}
-import java.util.{Date, List => jList, Map => jMap}
-import clojure.lang.LazySeq
+import java.util.{Date, List => jList, Map => jMap, Collection => jCollection}
 import datomic.Util.readAll
 import datomicClient._
 import datomicClient.anomaly.CognitectAnomaly
@@ -261,7 +260,7 @@ case class AsyncDb(
       ).chunk
     }.thenApply {
       case Right(indexPull) => Channel[jStream[_]](
-        indexPull.asInstanceOf[LazySeq].stream()
+        indexPull.asInstanceOf[jCollection[_]].stream()
       ).chunk
       case Left(anomaly)    => async.Left(anomaly)
     }

core/src/main/scala-2.13-/datomicScala/client/api/async/AsyncDatomic.scala

@@ -1,9 +1,8 @@
 package datomicScala.client.api.async
 
 import java.util.stream.{Stream => jStream}
-import java.util.{List => jList, Map => jMap}
+import java.util.{List => jList, Map => jMap, Collection => jCollection}
 import cats.effect.IO
-import clojure.lang.LazySeq
 import com.amazonaws.auth.AWSCredentialsProviderChain
 import datomic.Util
 import datomic.Util._
@@ -88,7 +87,7 @@ object AsyncDatomic extends ClojureBridge {
   : Future[Stream[Either[CognitectAnomaly, jStream[_]]]] = Future {
     Channel[jStream[_]](
       InvokeAsync.q(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
     ).lazyList
   }
 
@@ -119,7 +118,7 @@ object AsyncDatomic extends ClojureBridge {
   : fs2.Stream[IO, Either[CognitectAnomaly, jStream[_]]] = {
     Channel[jStream[_]](
       InvokeAsync.q(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
     ).myTerminatedStream
   }
 
@@ -130,7 +129,7 @@ object AsyncDatomic extends ClojureBridge {
   : Future[Stream[Either[CognitectAnomaly, jStream[_]]]] = Future {
     Channel[jStream[_]](
       InvokeAsync.qseq(argMap),
-      Some((res: AnyRef) => res.asInstanceOf[LazySeq].stream)
+      Some((res: AnyRef) => res.asInstanceOf[jCollection[_]].stream)
     ).lazyList
   }
 

core/src/main/scala-2.13-/datomicScala/client/api/async/AsyncDb.scala

@@ -2,8 +2,7 @@ package datomicScala.client.api.async
 
 import java.io.{Reader, StringReader}
 import java.util.stream.{Stream => jStream}
-import java.util.{Collections, Date, List => jList, Map => jMap}
-import clojure.lang.LazySeq
+import java.util.{Collections, Date, List => jList, Map => jMap, Collection => jCollection}
 import datomic.Util.readAll
 import datomicClient._
 import datomicClient.anomaly.CognitectAnomaly
@@ -223,7 +222,7 @@ case class AsyncDb(
       ) {
         case Right(indexPull) =>
           Channel[jStream[_]](
-            indexPull.asInstanceOf[LazySeq].stream()
+            indexPull.asInstanceOf[jCollection[_]].stream()
           ).lazyList.head
 
         case Left(anomaly) => Left(anomaly)