Fix download ctrl. Move reactive functionality into separed service. Versions update.

Author: daggerok

.dockerignore

@@ -0,0 +1,4 @@
+**
+!modules/apps/file-items-service/build/libs/*.jar
+!modules/apps/file-server/build/libs/*.jar
+!modules/docker/all/nginx/default.conf

.travis.yml

@@ -2,14 +2,11 @@ service:
 - docker
 
 language: java
-jdk:
-- oraclejdk8
-#- oraclejdk10
+jdk: oraclejdk8
 node_js: lts/*
 
 addons:
   apt:
-    update: true
     packages:
     - sudo
     - lsof
@@ -33,19 +30,19 @@ before_install:
 #
 - sudo pip install docker-compose httpie >/dev/null 2>&1
 - source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
-- stop_any 5432 5672 27017 8082 8082 8081 8081 8080 8080 80 80
+- stop_any 80 5432 8002 8001
 
 script:
 # jgiven tests and docs
-#- bash gradlew -S -Pdebug clean test jgiven build documentation >/dev/null || true
-- bash gradlew -S -Pdebug clean check build >/dev/null
+- ./gradlew -S -Pdebug clean test jgiven build documentation >/dev/null
+- ./gradlew -S -Pdebug clean check build >/dev/null
 
 - export APP_UPLOAD_PATH="/tmp/file-storage"
 - mkdir -p ${APP_UPLOAD_PATH}
 - cp -Rf ./modules/apps/file-server/build/libs "${APP_UPLOAD_PATH}/"
 
 # postgres
-- bash gradlew clean assemble postgresUp >/dev/null
+- ./gradlew clean assemble postgresUp >/dev/null
 - bash ./modules/apps/file-items-service/build/libs/*.jar --spring.profiles.active=db-pg >/dev/null &
 - wait_for 8001
 - bash ./modules/apps/file-server/build/libs/*.jar >/dev/null &
@@ -55,11 +52,11 @@ script:
 - http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
 - http --auth user:password :8002/api/v1/files
 - http --auth user:password :8002/
-- stop_any 8002 8002 8001 8001 80 80
-- bash gradlew postgresDown >/dev/null
+- stop_any 80 8002 8001 5432
+- ./gradlew postgresDown >/dev/null
 
 # h2
-- bash gradlew clean assemble >/dev/null
+- ./gradlew clean assemble >/dev/null
 #- bash ./modules/apps/file-items-service/build/libs/*jar --spring.profiles.active=db-h2 >/dev/null &
 - bash ./modules/apps/file-items-service/build/libs/*jar >/dev/null &
 - wait_for 8001
@@ -70,10 +67,10 @@ script:
 - http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
 - http --auth user:password :8002/api/v1/files
 - http --auth user:password :8002/
-- stop_any 8002 8002 8001 8001 80 80
+- stop_any 80 8002 8001 5432
 
 # install as linux service
-- bash gradlew clean assemble postgresUp >/dev/null
+- ./gradlew clean assemble postgresUp >/dev/null
 - cp -Rf ./modules/apps/file-server/build/libs "${APP_UPLOAD_PATH}/"
 - mv -f ./modules/apps/file-items-service/build/libs/*.jar /tmp/file-items-service.jar
 - #export SPRING_PROFILES_ACTIVE=db-pg
@@ -92,30 +89,18 @@ script:
 - http --auth user:password :8002/
 - sudo service file-server                                        stop
 - sudo service file-items-service                                 stop
-- bash gradlew postgresDown >/dev/null 2>&1
+- ./gradlew postgresDown >/dev/null 2>&1
 - unset SPRING_PROFILES_ACTIVE
+- stop_any 80 8002 8001 5432
 
-# scripts/application.bash
-- bash ./scripts/application.bash start build
-- bash ./scripts/application.bash stop build
-- bash ./scripts/application.bash start build
-- http --auth user:password -f post :8002/upload filename="$(date)-build.gradle" file@build.gradle
-- http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
-- http --auth user:password -f post :8002/upload filename="$(date)-README.md" file@README.md
-- http --auth user:password :8001/api/v1/file-items
-- http --auth user:password :8002/api/v1/files
-- yes | bash ./scripts/application.bash clean build
-
-# scripts/application-h2.bash
-- bash ./scripts/application-h2.bash start build
-- bash ./scripts/application-h2.bash stop build
-- bash ./scripts/application-h2.bash start build
-- http --auth user:password :8001/actuator/health
-- http --auth user:password -f post :8002/upload filename="$(date)-build.gradle" file@build.gradle
-- http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
-- http --auth user:password :8002/api/v1/files
-- http --auth user:password :8002/
-- yes | bash ./scripts/application-h2.bash clean build
+# services behind reverse-proxy
+- ./gradlew clean
+- ./gradlew
+- ./gradlew allUp
+- wait_for 80
+- http -a user:password :80
+- ./gradlew allDown
+- stop_any 80 8002 8001 5432
 
 env:
   global:
@@ -124,6 +109,7 @@ env:
   - secure: D04FeSPymLevdF11Ej1dUAxxHV9rKHHj/0sld/KPNh/mr876dm1l9AMo6VcBC5Kr1a6AwDJiOG9d8XgUEFRNvhBb3nMjIJa/99psykPL1N4WWZojULkeUtfhbVC+4d5qoLjNM2svT8IFJ9hO1kfgBGKk1Cd5KA+PtjceEIAJ29gaBvnbYo3MspXZsd3RA87kgY/poxQX2j7JeyKqQQKTLN8FTLqu7vgmdZWRYrUrSXiZvoJc9yJ+7PW6u4N4nVlReYb6+GGOM6BAtyB0dDxxG50sL8VcrYnzRlWyEXMaqNlqu2FBI+sBEuzkVkGulZMIsHDfKQhMPH/g2bN79FiPJVEiS7aOBiSMjS2f7vAq9JS3xOnNmMPjHOkAfzpktXbYHydeQIW6vcUue58qUkaj+zn7kyocg83hDlR/j3ATfXJvOGF4vqhkRwPtz7WeZ+Lra7nMrlhaLkFpALco7+ZOB9BwDa3lV1oic6Xv4pRNHgdIx+KcBOI6n4BND22ckzwa0p2+kfDHakIyojX2nNiWg7jzl1oDokI/3nnx/L2piUjKHspjvq7wiJjZefbYRgfLqML+TJ/osZ4P4rin8RLb6my/J3ApMlDH9PyiLNkafnhYKGsTP43XCYMBwVGxv++f/+6JeXsS35Hs4YXbCc1ANt7sTck6FzKgrELgTTOViGk=
 
 before_deploy:
+# publish tag release
 - mkdir -p ${HOME}/.m2
 - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"                      ' >  ${HOME}/.m2/settings.xml
 - echo '          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"               ' >> ${HOME}/.m2/settings.xml
@@ -138,7 +124,30 @@ before_deploy:
 - echo '  </servers>                                                                  ' >> ${HOME}/.m2/settings.xml
 - echo '</settings>                                                                   ' >> ${HOME}/.m2/settings.xml
 - ./mvnw
-#
+
+# test published release by using scripts/application.bash
+- bash ./scripts/application.bash start build
+- bash ./scripts/application.bash stop build
+- bash ./scripts/application.bash start build
+- http --auth user:password -f post :8002/upload filename="$(date)-build.gradle" file@build.gradle
+- http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
+- http --auth user:password -f post :8002/upload filename="$(date)-README.md" file@README.md
+- http --auth user:password :8001/api/v1/file-items
+- http --auth user:password :8002/api/v1/files
+- yes | bash ./scripts/application.bash clean build
+
+# test published release by using scripts/application-h2.bash
+- bash ./scripts/application-h2.bash start build
+- bash ./scripts/application-h2.bash stop build
+- bash ./scripts/application-h2.bash start build
+- http --auth user:password :8001/actuator/health
+- http --auth user:password -f post :8002/upload filename="$(date)-build.gradle" file@build.gradle
+- http --auth user:password -f post :8002/upload filename="$(date)-settings.gradle" file@settings.gradle
+- http --auth user:password :8002/api/v1/files
+- http --auth user:password :8002/
+- yes | bash ./scripts/application-h2.bash clean build
+
+# documentation
 - ./mvnw -Pdocs >/dev/null
 - mkdir -p target/generated-docs
 - cp -Rf target/generated-docs/index.html target/generated-docs/404.html

README.md

@@ -1,7 +1,7 @@
 streaming-file-server [![build](https://travis-ci.org/daggerok/streaming-file-server.svg?branch=master)](https://travis-ci.org/daggerok/streaming-file-server)
 =====================
 
-_latests VERSION: 4.3.4_
+_latests VERSION: 4.3.5_
 
 full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
 
@@ -19,16 +19,16 @@ Read [reference documentation](http://daggerok.github.io/streaming-file-server)
 
 ```bash
 # database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/docker-compose.yml
 docker-compose -f docker-compose.yml up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-items-service-4.3.4.jar
-bash file-items-service-4.3.4.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-items-service-4.3.5.jar
+bash file-items-service-4.3.5.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-server-4.3.4.jar
-bash file-server-4.3.4.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
+bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose -f docker-compose.yml down -v
@@ -37,7 +37,7 @@ docker-compose -f docker-compose.yml down -v
 **or simply using shell-script**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -53,7 +53,7 @@ bash application.bash clean ./path/to/file-storage
 
 installed binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
 
-**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application.cmd**
 
 ```cmd
 @rem start
@@ -73,18 +73,18 @@ installed binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and o
 **with h2 in-memory database**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-items-service-4.3.4.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-server-4.3.4.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-items-service-4.3.5.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
 
-# bash file-items-service-4.3.4.jar --spring.profiles.active=db-h2 # or just:
-bash file-items-service-4.3.4.jar
-bash file-server-4.3.4.jar --app.upload.path=./path/to/file-storage
+# bash file-items-service-4.3.5.jar --spring.profiles.active=db-h2 # or just:
+bash file-items-service-4.3.5.jar
+bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
 ```
 
 **or simply shell script for h2**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -96,7 +96,7 @@ bash application-h2.bash stop
 bash application-h2.bash clean ./path/to/file-storage
 ```
 
-**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application-h2.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application-h2.cmd**
 
 ```cmd
 @rem start
@@ -199,7 +199,7 @@ docker system prune -af --volumes
 ### stack
 
 - spring
-  - spring-boot 2.0.4.RELEASE ~~1.x~~
+  - spring-boot 2.0.6.RELEASE ~~1.x~~
   - ~~QueryDSL~~, ~~spring-data-rest,~~ spring-data-jpa
   - cors: see modules/apps/file-items-service/src/main/java/daggerok/config/AppCfg.java
   - 404 fallback: see modules/apps/file-server/src/main/java/daggerok/web/config/FallbackConfig.java

RELEASE.md

@@ -1,32 +1,23 @@
 # streaming-file-server
 
-_version: 4.3.4_
+_version: 4.3.5_
 
 ## Java file server 
 
 **Java file server** based on *spring-boot* with no memory, upload or download files size limitations
 
-Update version:
-
-- bootstrap 3 to 4 migration:
-  - bootstrap -> 4.1.3
-  - bootstrap-file-input -> 4.4.8
-  - font-awesome -> 5.4.1
-  - replaced glyphicons with [Free Font Awesome](https://fontawesome.com/free)
-- gradle documentation
-  - org.asciidoctor.convert -> 1.5.8.1
-  - org.ajoberstar.git-publish -> 2.0.0-rc.2
-- upgrade gradle up to 4.10.2
-- other versions upgrade:
-  - jgiven -> 0.16.1
-  - powermock -> 2.0.0-RC.1
-  - powermock -> 2.0.0-RC.1
-  - selenide -> 5.0.0
-  - asciidoctorj-pdf -> 1.5.0-alpha.16
-  - com.github.ben-manes gradle plugin -> 0.20.0
-  - com.ewerk.gradle.plugins.querydsl -> 1.0.10
-  - io.spring.dependency-management -> 1.0.6.RELEASE
-  - com.avast.gradle.docker-compose -> 0.7.1
+1. Applied spring team recommendations base on [that JIRA: Reactive Repositories are not supported by JPA. Need
+spring-webflux + spring-data-jpa combination get working](https://jira.spring.io/browse/DATACMNS-1413)
+2. Fix Download web controller (download file wailed with optional error)
+3. Fix docker compose all, add nginx reverse proxy
+4. Versions update
+
+  | dependency              | version       |
+  |------------------------:|:--------------|
+  | spring-boot             | 2.0.6.RELEASE |
+  | lombok                  | 1.18.4        |
+  | org.asciidoctor.convert | 1.5.9.1       |
+  | gradle                  | 5.0-rc-1      |
 
 ## Installation
 
@@ -36,16 +27,16 @@ Update version:
 
 ```bash
 # docker compose file for postgres database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/docker-compose.yml
 docker-compose up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-items-service-4.3.4.jar
-java -jar file-items-service-4.3.4.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-items-service-4.3.5.jar
+java -jar file-items-service-4.3.5.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-server-4.3.4.jar
-java -jar file-server-4.3.4.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
+java -jar file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose down -v
@@ -55,7 +46,7 @@ docker-compose down -v
 
 ```bash
 # bash script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -75,7 +66,7 @@ binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
 
 ```cmd
 @rem batch shell-script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application.cmd
 
 @rem start
 application.cmd start path\to\file-storage
@@ -96,18 +87,18 @@ binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and of course j
 #### manual setup
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-items-service-4.3.4.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/file-server-4.3.4.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-items-service-4.3.5.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
 
-bash file-items-service-4.3.4.jar --spring.profiles.active=db-h2
-bash file-server-4.3.4.jar --app.upload.path=./path/to/file-storage
+bash file-items-service-4.3.5.jar --spring.profiles.active=db-h2
+bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
 ```
 
 #### or for simplicity use special h2 automation shell-script
 
 ```bash
 # bash shell script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -123,7 +114,7 @@ bash application-h2.bash clean ./path/to/file-storage
 
 ```cmd
 @rem cmd script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.4/application-h2.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application-h2.cmd
 
 @rem start
 application-h2.cmd start path\to\file-storage