Skip to content
This repository was archived by the owner on Sep 28, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
79e6b69
Start WebSocket
Aug 21, 2019
1282e63
Add Protocol, with EventListener, Exceptions and Task
Aug 22, 2019
d160136
Apply some fixs to responses field that could be null
Aug 23, 2019
fb0e3f3
add unhandled response event register methods
Aug 23, 2019
e462739
Kuzzle tests
Aug 23, 2019
ebcab6c
Merge branch 'sdk-java-cleanup' into KZL-1346/sdk-v3-websocket
Aug 23, 2019
7116364
finish unit tests for websocket
Aug 26, 2019
5092d82
fix race condition in test
Aug 26, 2019
f5cc23b
Massive changement and cleanup
Aug 29, 2019
ad9c3e7
Merge branch '3-dev' into KZL-1346/sdk-v3-websocket
Aug 29, 2019
2de5139
move unit tests
Aug 29, 2019
ccb82a8
Add comment for Kuzzle class
Aug 30, 2019
6dc71c1
add comments
Sep 2, 2019
58100a1
remove println
Sep 3, 2019
df4aab7
Improve IJObject
Sep 11, 2019
381ce53
cleanup
Sep 13, 2019
34421fc
add serializer/deserializer and remove abstract from WebSocket
Sep 13, 2019
afc5a74
change to use CustomMap
Sep 16, 2019
2e9a6be
Add some comments
Sep 16, 2019
319777f
Correction Serialization and Query
Sep 16, 2019
b2b2a31
fix travis and KuzzleOptions
Sep 16, 2019
14575be
fix travis
Sep 16, 2019
f4fd622
optimisation on deserializer
Sep 16, 2019
46f0eb3
apply @scottinet and @xbill82 requested changes
Sep 18, 2019
55fecdc
update gitignore
Sep 18, 2019
19e6b2d
refactoring
Nov 25, 2019
f8587c6
Apply @scottinet request changes
Nov 25, 2019
935ba70
remove wrong file
Nov 25, 2019
6345493
add URI usage for websocket constructor
Nov 25, 2019
567b334
rename method
Nov 25, 2019
381d0d4
rename method getKuzzleMap -> from
Nov 26, 2019
6b1fba6
add ID to ResponseError class
Nov 26, 2019
43773ca
add sdkName field
Nov 26, 2019
e999b21
simplify room existing check
Nov 26, 2019
9b383ba
SDK V3 WebSocket Unit Tests (#41)
Dec 2, 2019
ee945d8
Revert "SDK V3 WebSocket Unit Tests (#41)"
Dec 2, 2019
1e9bf23
Merge pull request #44 from kuzzleio/revert-41-KZL-1346/sdk-v3-websoc…
Dec 2, 2019
c727bf7
Revert "Revert "SDK V3 WebSocket Unit Tests""
Dec 2, 2019
eb2f032
Merge pull request #45 from kuzzleio/revert-44-revert-41-KZL-1346/sdk…
Dec 2, 2019
cecca45
apply some of @Aschen suggestions
Dec 11, 2019
100a812
Merge branch 'KZL-1346/sdk-v3-websocket' of https://github.com/kuzzle…
Dec 11, 2019
6939568
Apply @Aschen and @xbill82 requested changes
Dec 11, 2019
310b3a9
add KuzzleMap tests
Dec 11, 2019
f1048c9
add KuzzleMap tests
Dec 11, 2019
1983508
Merge remote-tracking branch 'origin/3-dev' into KZL-1346/sdk-v3-webs…
scottinet Jan 7, 2020
7236245
Add error unique identifier to API Error objects
scottinet Jan 7, 2020
6eb4ca3
[ci] use openjdk8 as oraclejdk8 is not available anymore it seems
scottinet Jan 7, 2020
5402a99
[doc] update documentation scripts to sdk v3
scottinet Jan 7, 2020
4a28f89
[ci] fix doc script
scottinet Jan 7, 2020
138a190
[ci] fix doc generation
scottinet Jan 7, 2020
28e2af1
[ci] travis, y u no cooperate?
scottinet Jan 7, 2020
da093f6
[ci] fix directories mixup
scottinet Jan 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@
build
out
.idea
bin
*.iml
*.class
bin
.classpath
.project
.settings

doc/framework
127 changes: 66 additions & 61 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@

env:
global:
# BINTRAY_USER
- secure: "LxONQZ8tHhxTqgu+kqx9fMCubCfTQHZsy/3ibE+l72xG8sOAYfj4hB5k1p4kklnv3skeFQEiL6B++B2qRITOEAPRdD8FExkc+UF/TM1rY5aUtjIjoA3uH4n9hYjHirTO5qNKf4KxDr1Zbcn4ISGebJ0EYwE0SG/ptrd06wPp1G8AHshc8XaZgen6gDaik66OWpQkOkmGsRz2EPmIBVgo7L2LGK21DSxE4/PTo+ou0WYCyxyyWSKLTLt1xZpt9LOtk7IckrHl+Nenl6IbV/CjHb3+5vwdifyFQd+K6AVe32iTIVjdxj7rDhEHYD0EqKb79ey+u8p9HquLnGH03gcVBeFQu/qhhQStsiwrD/S9c8jwBjWOOUnVI4bEbqjqxFaRlPfVnRaAjQZLRKHdqxyTJCdC2Ls79LmkqSCyTxM7WBwwgu4Slf6RJSbKJb5naHYlwDuKPbeyHLAYrxgjEHC28bxQiTr5wwBWxE9BLxUcnkFAXzsy3qE74FQOIjvQbtrruLIOGwRGRYtzyfygGA3MfTHug6JwZGngqFf3k+kbznE8fZe7zxMwT63P6/54rR5fU/plLoTNFqdQsZGAfGOSYuHIEzWXOkWxffqsOwxPa1VxQTLD32O95oBcrcvmw4toC2NeFTe/+zZRMfGMbu7QIi0AL3qFpky3j12zcyA/M2I="
# BINTRAY_KEY
- secure: "Iqn4ImAwFmQeoXXDb5JOsfcunSiSeLvdp4+AEsIeniMhpIk++ZJPDSxecC+NrvndTrxOXVqHEsFUfHnZYvPHMuvg9nhXvz/rmmyYH0hZqkKg2q2qM+Sz2UJBCvs6D1sJv3ZEVi8d6fVx5bbKXMzSE023XFBBK7l8nBsG5ObXBOzTzrus9UP+fk4FXif/QKJNcUSN7rLejUIxMCk36gMQYqYGiiqL3VE60aTpaUh7Vqj/8nCEPcO3K3gXTVybcGBcmsvinV5YEc+5s5ue8eX10ONY0oYF5GFd7aEsrKEFzT2d7MVq0a29cH1rWrxt6q7vXGZNKAdAQrDyRZUz9rMFtqH+2xOgagm22UiUYNlzrn2eDYRBd08X0y043gumdgmOq/CsyaI5bcUSKMr+rsZ2XIzBjefl8MU0xBhtKMO9g9WRfGBxjRbdg0ivRQoVGJbcUXTDl2WrLMgMjt8DT4nQP+PHdIV2FjZVNioqucqmEzfHIJt+hiw7EonGDnZ9uqkW6hm6b4JpGr5QF1yY6kKVCUQxLueUBAVdiZpULdevL7uYEUzdWIES2wTFE7LaWpHqnCOHYVpkIQpdole6+R0OhINhSHK0FW858xhZ2QGjtL1SSh5yzK4th6dpGKCiwMUSGSj5frpIeWPi+GqYoUQz+TvMGLGG2XGfihx74kQE0FA="
- AWS_ACCESS_KEY_ID=AKIAIYAXFUAHXOWP2MJA
# AWS_SECRET_ACCESS_KEY
- secure: "dIcQzFpHKRf92cAiMA+SYsudtHWNcbYadVDb7zlJayWGUGy0i4CGwwOoOOrUcWgHxYhdN9XGwvFJTSswjHLRiHEyPFBwW8x/VfaCRS+jAcblMXyWNajvm0930S/3fRv5LA+4UKNmeXMuCGSf35ZqyEIEeuThkIomYvB/tBD1wcMpBUtQfmilLm3sUTaGUnFB651jBHshlYOZ8BAGLLmX1PAfT1wCrpVcrjq5kayNOIilJkwKGSr6q9C0p7+ULNZ4bHsATKLlYNs7Xcs+9a66p1EtKetP72DQsHrr8x3wB2Hhk3U425kmjIoE3gYnF7x3h3EpO5m0rGessbgdRF1SF7XK7Bsj4ukLb4HoktA8G7734ox4848RpH60aKUHRCsiebX7JKgJe1eEwU5BZK8+PFPGH6bI1YG1HQNqthzotTHFXu058uMHnyLv2PmDWWEYMM79fCyuRo8gJJ8GJhDgaGLgtizzEb6grcNW+QwunjA6nP4o7F9o+9b3lfGlsgL595V/CeWLNnHvENkSr67RN2NkDZm6q6EHbOk8AWtQc24mVawCwCbcJjp0sPkbQdCHUXSBNXjdwrvJLA3h94A2uVEmrV7mzMdfj+i9X3IS/HXRLeQk6Ivq2s/b1W6c7rBfz4zZUO7Uu5iYpVzT71yNFra13JkW3REFgHgETEvGkko="


sudo: true

---
# -----------------
# YAML Templates
# -----------------

# ------------------------
# Jobs configuration
# ------------------------
jobs:
include:
- stage: Tests
name: Dead link check
if: type = pull_request OR type = push AND branch =~ /^master|[0-9]+-(dev|stable)$/ OR type = cron
language: node_js
node_js: 10
node_js: 12

before_script:
- npm run doc-prepare
- npm run --prefix doc/framework clone-repos
- bash -c "cd kuzzle-sdk-java && npm run doc-prepare"
- npm run --prefix $TRAVIS_BUILD_DIR/doc/framework clone-repos
script:
- gem install typhoeus
- HYDRA_MAX_CONCURRENCY=20 npm run --prefix doc/framework dead-links
- HYDRA_MAX_CONCURRENCY=20 npm run --prefix $TRAVIS_BUILD_DIR/doc/framework dead-links

- stage: Deployment Doc Dev
name: Deploy next-docs.kuzzle.io
if: type = push AND branch =~ .*-dev
language: node_js
node_js: 10
node_js: 12
env:
- NODE_ENV=production
- S3_BUCKET=docs-next.kuzzle.io
Expand All @@ -45,26 +39,26 @@ jobs:
- python-pip

install:
- pip install awscli --upgrade --user

- cd $TRAVIS_BUILD_DIR/kuzzle-sdk-java
- gradle assemble
script:
- npm run doc-prepare
- npm run doc-build
- cd kuzzle-sdk-java && npm run doc-prepare
- npm run doc-build && cd -

deploy:
provider: script
script:
- npm run doc-upload
- cd kuzzle-sdk-java && npm run doc-upload && cd -
skip_cleanup: true

after_deploy:
- npm run doc-cloudfront
- cd kuzzle-sdk-java && npm run doc-cloudfront && cd -

- stage: Deployment Doc Prod
name: Deploy docs.kuzzle.io
if: type = push AND branch =~ /^master|[0-9]+-stable$/
language: node_js
node_js: 10
node_js: 12
env:
- NODE_ENV=production
- S3_BUCKET=docs.kuzzle.io
Expand All @@ -78,42 +72,53 @@ jobs:
- python-pip

install:
- pip install awscli --upgrade --user

- cd $TRAVIS_BUILD_DIR/kuzzle-sdk-java
- gradle assemble
- cd $TRAVIS_BUILD_DIR/kuzzle-sdk-java
- gradle assemble
script:
- npm run doc-prepare
- npm run doc-build

deploy:
provider: script
script:
- npm run doc-upload
skip_cleanup: true

after_deploy:
- npm run doc-cloudfront


- stage: Deployment
name: Deploy to Bintray
if: branch = master AND tag IS present AND type != cron
language: java

jdk:
- openjdk8

script:
bash gradlew test jacocoTestReport

notifications:
email: false

- gradle check
after_success:
- bash <(curl -s https://codecov.io/bash)

deploy:
provider: script
script: ./gradlew bintrayUpload
skip_cleanup: true
on:
condition: $TRAVIS_BRANCH = master
# ---------------------------------------
# Builds
# ---------------------------------------
- stage: Builds
name: Build SDK Java
language: java
jdk: openjdk8
sudo: false
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
install:
- cd $TRAVIS_BUILD_DIR/kuzzle-sdk-java
- gradle assemble
- cd $TRAVIS_BUILD_DIR/kuzzle-sdk-java
- gradle assemble
script:
- gradle build

# ------------------------
# Stages configuration
# ------------------------
stages:
- name: Unit Tests
if: type =~ /(cron|push|pull_request)/ AND branch =~ /^master|[0-9]+-(dev|stable)$/
- name: Builds
if: type =~ /(cron|push|pull_request)/ AND branch =~ /^master|[0-9]+-(dev|stable)$/

# ---------------------------------------
# Notifications
# ---------------------------------------
notifications:
slack:
rooms:
- secure: "ACjz4TJEYBEzmwVOYrCNnr4+jC0FaX+qh150QacYGIgaQYL+U3xLEQmWNlZ3oxaPPMDAk42m+diHolqNwh6qsOWaPSWRlGfLKhHLSzRI98bhF7HQ+3eLMYmx7y7SKwRzyRjus0jgxp0Kc2mq0nhKqv+7rarQtIgWlC1PLrzZ35CUbUlqYSoeYAlXoyDB1eZgYsvjt+eC5yCvGePsfKbupWC2/hIVl+qZ+9AhVmOfiMv7daFW29Vu300aoY+0IqwX7jHGcmHn/7QCRsx0IBy/SL24TzfSV9SUSnbjK4fTrcrhjYDEZdH1lpvDtvr50GgkrTjy1wPVz8XIyCZ7LZolylkx+nR1MWyvum20QRFub2Qhz/+rS+OFiQZ8H01BPuklLUTSQhBksfpGBck3d2yNLiTqGEVWYTnZ9mkCnMQ3BzJXEF04KLHG7wYn2rk6wjPghVmFQH5GMsxM5v33CFgcNzp6lRJOX9CmjZosck6o9SA0WlazHH/CLWWKk1wrQ1ygDayW5m+N/o58UIxgW2LIUlp4tV1z/bRtO2yTd020yWchlKPVmf1A5OMfigJNMRsQGNZNadS7qA2M394OJw3/Hg+0EVF8gai/V8FRijmkxmhYyCIYMcjaGwx8JxfoMrRKcM76haBAhg0JQxsSVKzyXfONGzd5DXjcxSGZ2wuEdu0="
on_success: never
on_failure: always
131 changes: 0 additions & 131 deletions build.gradle

This file was deleted.

32 changes: 18 additions & 14 deletions doc/doc.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,55 @@

set -eu

DOC_VERSION=4
DOC_PATH=/sdk/java/4
DOC_VERSION=3
DOC_PATH=/sdk/java/3
PWD=$(dirname $(readlink -f $0))
FMWKDIR="$PWD/framework"
FMWKTARGET="$FMWKDIR/src$DOC_PATH"
VUEPRESS="$FMWKDIR/node_modules/.bin/vuepress"

# Used by vuepress
export DOC_DIR=$DOC_VERSION
export DOC_DIR="$PWD/${DOC_VERSION}"
export SITE_BASE=$DOC_PATH/

# Used to specify --no-cache for example
ARGS=${2:-""}

if [ ! -d "./$DOC_DIR" ]
if [ ! -d "$DOC_DIR" ]
then
echo "Cannot find $DOC_DIR/. You must run this script from doc/ directory."
echo "Cannot find documentation directory: $DOC_DIR"
exit 1
fi

case $1 in
prepare)
echo "Clone documentation framework"
rm -rf framework/
git clone --depth 10 --single-branch --branch master https://github.com/kuzzleio/documentation.git framework/
rm -rf $FMWKDIR
git clone --depth 10 --single-branch --branch master https://github.com/kuzzleio/documentation.git $FMWKDIR

echo "Link local doc for dead links checking"
rm framework/src$DOC_PATH
ln -s ../../../../$DOC_VERSION framework/src$DOC_PATH
rm $FMWKTARGET
ln -s ${DOC_DIR} $FMWKTARGET

echo "Install dependencies"
npm --prefix framework/ install
npm --prefix $FMWKDIR ci
;;

dev)
./framework/node_modules/.bin/vuepress dev $DOC_VERSION/ $ARGS
$VUEPRESS dev $DOC_DIR/ $ARGS
;;

build)
./framework/node_modules/.bin/vuepress build $DOC_VERSION/ $ARGS
$VUEPRESS build $DOC_DIR/ $ARGS
;;

build-netlify)
export SITE_BASE="/"
./framework/node_modules/.bin/vuepress build $DOC_VERSION/ $ARGS
$VUEPRESS build $DOC_DIR/ $ARGS
;;

upload)
aws s3 sync $DOC_VERSION/.vuepress/dist s3://$S3_BUCKET$SITE_BASE
aws s3 sync $DOC_DIR/.vuepress/dist s3://$S3_BUCKET$SITE_BASE
;;

cloudfront)
Expand Down
Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Loading