Stream apis

.github/workflows/gradle.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew clean build
     - name: Coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

build.gradle

@@ -133,14 +133,7 @@ task immudbStart {
     pb = new ProcessBuilder()
     pb.command("/bin/bash", "immudb/start.sh")
     Process proc = pb.start()
-
-    proc.waitFor(10, TimeUnit.SECONDS)
-
-    if (proc.isAlive()) {
-        println "immudb has been started."
-    } else {
-        throw new GradleException("Process exit bad: " + proc.exitValue())
-    }
+    proc.waitFor(15, TimeUnit.SECONDS)
 }
 
 task immudbStop(type: Exec) {
@@ -167,6 +160,10 @@ test {
     }
     // Run the unit tests sequentially.
     maxParallelForks = 1
+
+    testLogging {
+        events "FAILED"
+    }
 }
 
 test.dependsOn immudbStart

immudb/clean.sh

@@ -11,7 +11,6 @@ then
 fi
 
 rm -rf data
-rm -rf states
 
-echo "immudb's data and immudb4j's states folders were removed."
+echo "immudb's data folder was removed."
 

immudb/start.sh

@@ -13,10 +13,10 @@ then
   echo "Downloading immudb..."
 
   if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    URL=https://github.com/vchain-us/immudb/releases/download/v1.3.0/immudb-v1.3.0-linux-amd64
+    URL=https://github.com/vchain-us/immudb/releases/download/v1.4.0/immudb-v1.4.0-linux-amd64
     wget -O immudb $URL
   elif [[ "$OSTYPE" == "darwin"* ]]; then
-    URL=https://github.com/vchain-us/immudb/releases/download/v1.3.0/immudb-v1.3.0-darwin-amd64
+    URL=https://github.com/vchain-us/immudb/releases/download/v1.4.0/immudb-v1.4.0-darwin-amd64
     curl -o immudb -L $URL
   fi
 

src/main/java/io/codenotary/immudb4j/Entry.java

@@ -28,8 +28,15 @@ public class Entry {
 
     private Reference referencedBy;
 
+    private long revision;
+
     private Entry() {}
 
+    public Entry(byte[] key, byte[] value) {
+        this.key = key;
+        this.value = value;
+    }
+
     public static Entry valueOf(ImmudbProto.Entry e) {
         final Entry entry = new Entry();
 
@@ -45,6 +52,8 @@ public static Entry valueOf(ImmudbProto.Entry e) {
             entry.referencedBy = Reference.valueOf(e.getReferencedBy());
         }
 
+        entry.revision = e.getRevision();
+
         return entry;
     }
 
@@ -68,6 +77,10 @@ public Reference getReferenceBy() {
         return referencedBy;
     }
 
+    public long getRevision() {
+        return revision;
+    }
+
     public byte[] getEncodedKey() {
         if (referencedBy == null) {
             return Utils.wrapWithPrefix(key, Consts.SET_KEY_PREFIX);

src/main/java/io/codenotary/immudb4j/FileImmuStateHolder.java

@@ -59,21 +59,21 @@ private FileImmuStateHolder(Builder builder) throws IOException, IllegalStateExc
     }
 
     @Override
-    public synchronized ImmuState getState(String serverUuid, String database) {
-        return stateHolder.getState(serverUuid, database);
+    public synchronized ImmuState getState(String database) {
+        return stateHolder.getState(database);
     }
 
     @Override
-    public synchronized void setState(String serverUuid, ImmuState state) throws IllegalStateException {
+    public synchronized void setState(ImmuState state) throws IllegalStateException {
 
-        ImmuState currentState = stateHolder.getState(serverUuid, state.getDatabase());
+        ImmuState currentState = stateHolder.getState(state.getDatabase());
         if (currentState != null && currentState.getTxId() >= state.getTxId()) {
             return;
         }
 
-        stateHolder.setState(serverUuid, state);
+        stateHolder.setState(state);
 
-        Path newStateFile = statesFolder.resolve("state_" + serverUuid + "_" + state.getDatabase() + "_" + System.nanoTime());
+        Path newStateFile = statesFolder.resolve("state_" + state.getDatabase() + "_" + System.nanoTime());
 
         if (Files.exists(newStateFile)) {
             throw new RuntimeException("Failed attempting to create a new state file. Please retry.");