Merge pull request #74 from kuzzleio/1.3.0-proposal

Release 1.3.0
kuzzleio · Apr 27, 2022 · b169c97 · b169c97
2 parents 9be2a59 + 01a8042
commit b169c97
Show file tree

Hide file tree

Showing 128 changed files with 1,096 additions and 317 deletions.
diff --git a/.ci/doc/config.yml b/.ci/doc/config.yml
@@ -1,9 +1,11 @@
 ---
-
 snippets:
   mount: /mnt
   path: 'doc/**/snippets/*.test.yml'
   templates: /mnt/.ci/doc/templates
+  protocols:
+    - http
+    - websocket
 
 runners:
   default: java
@@ -15,4 +17,4 @@ runners:
       cmd: cd /mnt && ./gradlew jar
     run:
       before: timeout 600 bash -c 'until stat /tmp/runner_is_ready && curl -f -s -o /dev/null http://kuzzle:7512/_now; do sleep 1; done'
-      cmd: /mnt/.ci/doc/test-snippet.sh {{ snippet.source }}
+      cmd: SNIPPET_PROTOCOL="{{ snippet.protocol }}" /mnt/.ci/doc/test-snippet.sh {{ snippet.source }}
diff --git a/.ci/doc/docker-compose.yml b/.ci/doc/docker-compose.yml
@@ -41,13 +41,15 @@ services:
       - CONFIG_FILE=/mnt/.ci/doc/config.yml
 
   doc-runner-java:
-    image: adoptopenjdk/openjdk8
+    image: adoptopenjdk/openjdk11
     command: >
-      bash -c '
+      sh -c '
         mkdir -p /var/snippets/java;
         touch /tmp/runner_is_ready;
         tail -f /dev/null
       '
+    links:
+      - kuzzle
     volumes:
       - ../..:/mnt
       - snippets:/var/snippets

diff --git a/.ci/doc/java-project/build.gradle b/.ci/doc/java-project/build.gradle
@@ -12,25 +12,27 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile 'io.ktor:ktor-client-websockets:1.5.2'
-    compile 'io.ktor:ktor-client-okhttp:1.5.2'
-    compile 'io.ktor:ktor-client-cio:1.5.2'
-    compile 'io.ktor:ktor-client-json:1.5.2'
-    compile 'io.ktor:ktor-client-gson:1.5.2'
-    compile 'io.ktor:ktor-client-serialization:1.5.2'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+  testImplementation group: 'junit', name: 'junit', version: '4.12'
+  implementation 'io.ktor:ktor-client-core:1.6.8'
+  implementation 'io.ktor:ktor-client-websockets:1.6.8'
+  implementation 'io.ktor:ktor-client-okhttp:1.6.8'
+  implementation 'io.ktor:ktor-client-cio:1.6.8'
+  implementation 'io.ktor:ktor-client-json:1.6.8'
+  implementation 'io.ktor:ktor-client-gson:1.6.8'
+  implementation 'io.ktor:ktor-client-serialization:1.6.8'
+  implementation 'com.google.code.gson:gson:2.9.0'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 jar {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   manifest {
     attributes(
-      'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
+      'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '),
       'Main-Class': 'SnippetTest'
     )
   }
   from {
-    configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
   }
 }
diff --git a/.ci/doc/java-project/gradle/wrapper/gradle-wrapper.properties b/.ci/doc/java-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/.ci/doc/kotlin-project/build.gradle b/.ci/doc/kotlin-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
 }
 
 group 'test.example.java'
@@ -12,25 +12,27 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile 'io.ktor:ktor-client-websockets:1.5.2'
-    compile 'io.ktor:ktor-client-okhttp:1.5.2'
-    compile 'io.ktor:ktor-client-cio:1.5.2'
-    compile 'io.ktor:ktor-client-json:1.5.2'
-    compile 'io.ktor:ktor-client-gson:1.5.2'
-    compile 'io.ktor:ktor-client-serialization:1.5.2'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+  testImplementation group: 'junit', name: 'junit', version: '4.12'
+  implementation 'io.ktor:ktor-client-core:1.6.8'
+  implementation 'io.ktor:ktor-client-websockets:1.6.8'
+  implementation 'io.ktor:ktor-client-okhttp:1.6.8'
+  implementation 'io.ktor:ktor-client-cio:1.6.8'
+  implementation 'io.ktor:ktor-client-json:1.6.8'
+  implementation 'io.ktor:ktor-client-gson:1.6.8'
+  implementation 'io.ktor:ktor-client-serialization:1.6.8'
+  implementation 'com.google.code.gson:gson:2.9.0'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 jar {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   manifest {
     attributes(
-      'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
+      'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '),
       'Main-Class': 'SnippetTestKt'
     )
   }
   from {
-    configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
   }
 }
diff --git a/.ci/doc/kotlin-project/gradle/wrapper/gradle-wrapper.properties b/.ci/doc/kotlin-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/.ci/doc/templates/catch.tpl.java b/.ci/doc/templates/catch.tpl.java
@@ -1,6 +1,6 @@
 import io.kuzzle.sdk.Kuzzle;
 import java.util.ArrayList;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import java.util.*;
 
@@ -9,7 +9,13 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
       System.out.println("Error");

diff --git a/.ci/doc/templates/catch.tpl.kt b/.ci/doc/templates/catch.tpl.kt
@@ -1,12 +1,17 @@
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.protocol.WebSocket
+import io.kuzzle.sdk.protocol.*
 
 import java.util.concurrent.ExecutionException
 import io.kuzzle.sdk.coreClasses.responses.Response
 
 fun main() {
-  val ws = WebSocket("kuzzle")
-  val kuzzle = Kuzzle(ws).apply {
+  val protocol: AbstractProtocol;
+  if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL") == "http") {
+    protocol = Http("kuzzle")
+  } else {
+    protocol = WebSocket("kuzzle")
+  }
+  val kuzzle = Kuzzle(protocol).apply {
     connect()
   }
   try {

diff --git a/.ci/doc/templates/default.tpl.java b/.ci/doc/templates/default.tpl.java
@@ -1,5 +1,5 @@
 import io.kuzzle.sdk.Kuzzle;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import io.kuzzle.sdk.coreClasses.SearchResult;
 import io.kuzzle.sdk.coreClasses.lang.Lang;
@@ -10,7 +10,13 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
       System.out.println("Success");

diff --git a/.ci/doc/templates/default.tpl.kt b/.ci/doc/templates/default.tpl.kt
@@ -1,5 +1,5 @@
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.protocol.WebSocket
+import io.kuzzle.sdk.protocol.*
 
 import java.util.concurrent.ExecutionException
 import io.kuzzle.sdk.coreClasses.responses.Response
@@ -8,8 +8,13 @@ import io.kuzzle.sdk.coreClasses.lang.Lang
 import java.util.*;
 
 fun main() {
-  val ws = WebSocket("kuzzle")
-  val kuzzle = Kuzzle(ws).apply {
+  val protocol: AbstractProtocol;
+  if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL") == "http") {
+    protocol = Http("kuzzle")
+  } else {
+    protocol = WebSocket("kuzzle")
+  }
+  val kuzzle = Kuzzle(protocol).apply {
     connect()
   }
   try {

diff --git a/.ci/doc/templates/print-result-array.tpl.java b/.ci/doc/templates/print-result-array.tpl.java
@@ -1,5 +1,5 @@
 import io.kuzzle.sdk.Kuzzle;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import io.kuzzle.sdk.coreClasses.lang.Lang;
 import java.util.*;
@@ -9,7 +9,13 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
       for (Object o : result.get("successes")) {

diff --git a/.ci/doc/templates/print-result-array.tpl.kt b/.ci/doc/templates/print-result-array.tpl.kt
@@ -1,14 +1,19 @@
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.protocol.WebSocket
+import io.kuzzle.sdk.protocol.*
 
 import java.util.concurrent.ExecutionException
 import io.kuzzle.sdk.coreClasses.responses.Response
 import io.kuzzle.sdk.coreClasses.maps.KuzzleMap
 import io.kuzzle.sdk.coreClasses.lang.Lang
 
 fun main() {
-  val ws = WebSocket("kuzzle")
-  val kuzzle = Kuzzle(ws).apply {
+  val protocol: AbstractProtocol;
+  if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL") == "http") {
+    protocol = Http("kuzzle")
+  } else {
+    protocol = WebSocket("kuzzle")
+  }
+  val kuzzle = Kuzzle(protocol).apply {
     connect()
   }
   try {

diff --git a/.ci/doc/templates/print-result-arraylist.tpl.java b/.ci/doc/templates/print-result-arraylist.tpl.java
@@ -1,5 +1,5 @@
 import io.kuzzle.sdk.Kuzzle;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import io.kuzzle.sdk.coreClasses.lang.Lang;
 import java.util.*;
@@ -9,7 +9,13 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
       for (Object o : result) {

diff --git a/.ci/doc/templates/print-result-arraylist.tpl.kt b/.ci/doc/templates/print-result-arraylist.tpl.kt
@@ -1,13 +1,18 @@
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.protocol.WebSocket
+import io.kuzzle.sdk.protocol.*
 
 import java.util.concurrent.ExecutionException
 import io.kuzzle.sdk.coreClasses.responses.Response
 import io.kuzzle.sdk.coreClasses.lang.Lang
 
 fun main() {
-  val ws = WebSocket("kuzzle")
-  val kuzzle = Kuzzle(ws).apply {
+  val protocol: AbstractProtocol;
+  if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL") == "http") {
+    protocol = Http("kuzzle")
+  } else {
+    protocol = WebSocket("kuzzle")
+  }
+  val kuzzle = Kuzzle(protocol).apply {
     connect()
   }
   try {

diff --git a/.ci/doc/templates/print-result.tpl.java b/.ci/doc/templates/print-result.tpl.java
@@ -1,5 +1,5 @@
 import io.kuzzle.sdk.Kuzzle;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import io.kuzzle.sdk.coreClasses.lang.Lang;
 import java.util.*;
@@ -9,7 +9,13 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
       System.out.println(result.toString());

diff --git a/.ci/doc/templates/print-result.tpl.kt b/.ci/doc/templates/print-result.tpl.kt
@@ -1,14 +1,19 @@
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.protocol.WebSocket
+import io.kuzzle.sdk.protocol.*
 import java.util.Date
 
 import java.util.concurrent.ExecutionException
 import io.kuzzle.sdk.coreClasses.lang.Lang
 import io.kuzzle.sdk.coreClasses.responses.Response
 
 fun main() {
-  val ws = WebSocket("kuzzle")
-  val kuzzle = Kuzzle(ws).apply {
+  val protocol: AbstractProtocol;
+  if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL") == "http") {
+    protocol = Http("kuzzle")
+  } else {
+    protocol = WebSocket("kuzzle")
+  }
+  val kuzzle = Kuzzle(protocol).apply {
     connect()
   }
   try {

diff --git a/.ci/doc/templates/print-search-result.tpl.java b/.ci/doc/templates/print-search-result.tpl.java
@@ -1,6 +1,6 @@
 import io.kuzzle.sdk.Kuzzle;
 import java.util.*;
-import io.kuzzle.sdk.protocol.WebSocket;
+import io.kuzzle.sdk.protocol.*;
 import io.kuzzle.sdk.coreClasses.responses.Response;
 import io.kuzzle.sdk.coreClasses.SearchResult;
 import io.kuzzle.sdk.coreClasses.lang.Lang;
@@ -10,10 +10,16 @@ public class SnippetTest {
 
   public static void main(String[] argv) {
     try {
-      kuzzle = new Kuzzle(new WebSocket("kuzzle"));
+      AbstractProtocol protocol;
+      if (System.getenv("SNIPPET_PROTOCOL") != null && System.getenv("SNIPPET_PROTOCOL").equals("http")) {
+        protocol = new Http("kuzzle");
+      } else {
+        protocol = new WebSocket("kuzzle");
+      }
+      kuzzle = new Kuzzle(protocol);
       kuzzle.connect();
       [snippet-code]
-          System.out.println("Successfully retrieved " + matched.size() + " documents");
+      System.out.println("Successfully retrieved " + matched.size() + " documents");
     } catch (Exception e) {
       e.printStackTrace();
     } finally {