Update asciidoctor. Argh! About to give up :( (C) whatthecommit.com

Author: daggerok

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.1_
+_latests VERSION: 4.3.2_
 
 full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
 
@@ -17,16 +17,16 @@ full-stack java file server based on spring-boot / spring-* with no limitation f
 
 ```bash
 # database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/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.1/file-items-service-4.3.1.jar
-bash file-items-service-4.3.1.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-items-service-4.3.2.jar
+bash file-items-service-4.3.2.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/file-server-4.3.1.jar
-bash file-server-4.3.1.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-server-4.3.2.jar
+bash file-server-4.3.2.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose -f docker-compose.yml down -v
@@ -35,7 +35,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.1/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -51,7 +51,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.1/application.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application.cmd**
 
 ```cmd
 @rem start
@@ -71,18 +71,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.1/file-items-service-4.3.1.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/file-server-4.3.1.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-items-service-4.3.2.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-server-4.3.2.jar
 
-# bash file-items-service-4.3.1.jar --spring.profiles.active=db-h2 # or just:
-bash file-items-service-4.3.1.jar
-bash file-server-4.3.1.jar --app.upload.path=./path/to/file-storage
+# bash file-items-service-4.3.2.jar --spring.profiles.active=db-h2 # or just:
+bash file-items-service-4.3.2.jar
+bash file-server-4.3.2.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.1/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -94,7 +94,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.1/application-h2.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application-h2.cmd**
 
 ```cmd
 @rem start
@@ -155,51 +155,42 @@ NOTE: if you feel that changes take no effect, clean docker
 ```bash
 # remove containers
 docker rm -v -f $(docker ps -a|grep -v CONTAINER|awk '{print $1}')
+
 # remove volumes
 docker volume rm -f $(docker volume ls|grep -v DRIVER|awk '{print $2}')
+
 # remove images
 docker rmi -f $(docker images -a | grep -v 'IMAGE ID'| awk '{print $3}')
+
 # remove everything
 docker system prune -af --volumes
 ```
 
-### known issues
+### known issues (deprecations)
 
-- SQLFeatureNotSupportedException: Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented.
-- static methods mocking using PowerMock
+- ~~SQLFeatureNotSupportedException: Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented.~~ [fixed](https://vkuzel.com/spring-boot-jpa-hibernate-atomikos-postgresql-exception)
+- static methods mocking using PowerMock (logs: BasicStaticClassTest.java uses or overrides a deprecated API.)
 
 ### todo
 
 - migrate ~~file-items-service and~~ file-server from mvc to reactive webflux
 - migrate from postgres to reactive postgres or some reactive NoSQL (mongodb, etc...)
-- add more advanced security...
+- add more (advanced) security...
 - improve files-db sync (replace FileSystem with GridFS or ...?)
 - backup, restore, migration
 - support removing files (rly..? as minimum from db)
 - p2p: bi-directional files synchronization with spring scheduling or batch
 
 ### stack
 
-- [spring](https://spring.io/)
-  - spring-boot 2.0.1.RELEASE ~~1.x~~
-  - spring-mvc ([mustache template engine](http://mustache.github.io/))
+- spring
+  - spring-boot 2.0.2.RELEASE ~~1.x~~
   - spring-data, ~~QueryDSL~~, ~~spring-data-rest,~~ spring-data, jpa
-  - apache fileUpload, [lombok](https://projectlombok.org/), [vavr](http://www.vavr.io/)
   - 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
   - ~~spring-social (facebook login required for upload ability)~~ replaced with basic spring-security for now
-  - ~~spring annotations (`@Get`, `@Post`, `@WebPage`)~~ (use `@GetMapping`, `@PostMapping`, etc...)
+  - ~~spring annotations (`@Get`, `@Post`, `@WebPage`)~~ (rmeove in order of embedded annotations: `@GetMapping`, `@PostMapping`, etc...)
   - ~~spring-data REST HAL browser~~ (removed)
 - code / architecture splitting into micro-services
 - migrate postgres from blocking to nonblocking (wrapped in Schedules.elastic())
 - migrate REST API from spring mvn to webflux
-- [bootstrap](http://getbootstrap.com/)
-- [bootstrap fileinput](http://plugins.krajee.com/file-input)
-- [jgiven](http://jgiven.org/)
-- [powermock](https://github.com/jayway/powermock/wiki)
-- [mockito](http://mockito.org/)
-- [h2](http://www.h2database.com/html/cheatSheet.html)
-- [postgres](https://www.postgresql.org/)
-- [docker](https://www.docker.com/)
-- [gradle](http://gradle.org/)
-- [travis CI](https://travis-ci.org/)

RELEASE.md

@@ -1,21 +1,15 @@
 # streaming-file-server
 
-_version: 4.3.1_
+_version: 4.3.2_
 
 ## Java file server 
 
 **Java file server** based on *spring-boot* with no memory, upload or download files size limitations
 
-- Update spring-boot version up to 2.0.2.RELEASE. Update some webjars
-- Fix docker-compose / docker files
-- Move application / docker modules into `modules/libraries`
-  just for example we are moving reusable modules:
-  - props `modules/libraries/props`
-  - web-security `modules/libraries/web-security` (potentially reusable, but will be replaces with reactive implementation)
-- Fix h2 / pg spring boot profiles:
-  now we are using h2 by default, unless needed will be specify:
-  - db-pg (postgres database)
-  - db-h2
+- Update gradle up to 4.8
+- Update asciidoctor documentation
+- Update JGiven test task
+- Fix postgresql issue: `SQLFeatureNotSupportedException: Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented`
 
 ## Installation
 
@@ -25,16 +19,16 @@ _version: 4.3.1_
 
 ```bash
 # docker compose file for postgres database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/docker-compose.yml
 docker-compose up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/file-items-service-4.3.1.jar
-java -jar file-items-service-4.3.1.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-items-service-4.3.2.jar
+java -jar file-items-service-4.3.2.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/file-server-4.3.1.jar
-java -jar file-server-4.3.1.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-server-4.3.2.jar
+java -jar file-server-4.3.2.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose down -v
@@ -44,7 +38,7 @@ docker-compose down -v
 
 ```bash
 # bash script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -64,7 +58,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.1/application.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application.cmd
 
 @rem start
 application.cmd start path\to\file-storage
@@ -85,18 +79,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.1/file-items-service-4.3.1.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/file-server-4.3.1.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-items-service-4.3.2.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/file-server-4.3.2.jar
 
-bash file-items-service-4.3.1.jar --spring.profiles.active=db-h2
-bash file-server-4.3.1.jar --app.upload.path=./path/to/file-storage
+bash file-items-service-4.3.2.jar --spring.profiles.active=db-h2
+bash file-server-4.3.2.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.1/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -112,7 +106,7 @@ bash application-h2.bash clean ./path/to/file-storage
 
 ```cmd
 @ cmd script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.1/application-h2.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.2/application-h2.cmd
 
 @rem start
 application-h2.cmd start path\to\file-storage

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   ext {
-    applicationVersion = "4.3.1"
+    applicationVersion = "4.3.2"
     applicationGroup = "daggerok"
     applicationName = "streaming-file-server"
 

docs/asciidoc.gradle

@@ -42,7 +42,7 @@ asciidoctor {
       'toc-title': 'Table of Contents',
       'root-project-name': rootProject.name,
       'build-gradle': project.file('build.gradle'),
-      "endpoint-url": "https://daggerok.github.io/$rootProject.name"
+      "github-url": "https://daggerok.github.io/$rootProject.name"
 
   logDocuments = true
   //backends 'pdf', 'html5'
@@ -62,7 +62,7 @@ task documentation(type: Copy, dependsOn: asciidoctor) {
   from "$asciidoctor.sourceDir/static", {
     into '.'
   }
-  into "$rootDir/docs"
+  into "$rootDir/public"
 }
 
 task docs(dependsOn: documentation)

docs/build.gradle

@@ -42,7 +42,7 @@ asciidoctor {
       'toc-title': 'Table of Contents',
       'root-project-name': rootProject.name,
       'build-gradle': project.file('build.gradle'),
-      "endpoint-url": "https://daggerok.github.io/$rootProject.name"
+      'github-url': "https://github.com/daggerok/$rootProject.name"
 
   logDocuments = true
   //backends 'pdf', 'html5'

docs/src/includes/links.adoc

@@ -0,0 +1,22 @@
+
+//tag::content[]
+links:
+
+- link:https://vkuzel.com/spring-boot-jpa-hibernate-atomikos-postgresql-exception[fix issue: SQLFeatureNotSupportedException: Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented.]
+- link:https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html[spring-mvc]
+- link:https://spring.io/[spring]
+- link:http://mustache.github.io/[mustache template engine]
+- link:https://commons.apache.org/proper/commons-fileupload/[apache fileUpload]
+- link:https://projectlombok.org/[lombok]
+- link:http://www.vavr.io/[vavr]
+- link:http://getbootstrap.com/[bootstrap]
+- link:http://plugins.krajee.com/file-input[bootstrap fileinput]
+- link:http://jgiven.org/[jgiven]
+- link:https://github.com/jayway/powermock/wiki[powermock]
+- link:http://mockito.org/[mockito]
+- link:http://www.h2database.com/html/cheatSheet.html[h2]
+- link:https://www.postgresql.org/[postgres]
+- link:https://www.docker.com/[docker]
+- link:http://gradle.org/[gradle]
+- link:https://travis-ci.org/[travis CI]
+//end::content[]

docs/src/index.adoc

@@ -12,7 +12,7 @@ Maksim Kostromin <daggerok@gmail.com>
 :example-caption!:
 
 Travis CI status:
-ifdef::backend-html5[image:https://travis-ci.org/daggerok/streaming-file-server.svg?branch=master["Build Status", link={github_url}]]
+ifdef::backend-html5[image:https://travis-ci.org/daggerok/{root-project-name}.svg?branch=master["Build Status", link={github-url}]]
 
 PDF:
 ifdef::backend-html5[link:./index.pdf["Documentation in PFD format"]]
@@ -57,5 +57,8 @@ include::./includes/run/windows.adoc[tags=content]
 == Create new release
 include::./includes/release/create-new.adoc[tags=content]
 
+---
+include::./includes/links.adoc[tags=content]
+
 ---
 Enjoy :)

modules/apps/build.gradle

@@ -1,9 +1,9 @@
 subprojects {
-
   apply from: "$project.rootDir/gradle/subprojects.gradle"
 
   dependencies {
     implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
   }
 
   bootJar {

modules/apps/file-items-service/src/main/java/daggerok/fileitems/rest/FileItemsRoutes.java

@@ -14,19 +14,12 @@ public class FileItemsRoutes {
 
   @Bean
   public RouterFunction<ServerResponse> routes(final FileItemsHandler handler) {
-
     return
-
         route(GET("/api/v1/file-items"), handler::getAll)
-
             .andRoute(GET("/api/v1/file-items/{id}"), handler::getById)
-
             .andRoute(GET("/api/v1/file-items/like/{filename}"), handler::searchAny)
-
             .andRoute(POST("/api/v1/file-items"), handler::save)
-
             .andRoute(POST("/api/v1/file-items/all"), handler::saveAll)
-
         ;
   }
 }

…n/resources/config/application-db-h2.yml …src/main/resources/application-db-h2.ymlmodules/apps/file-items-service/src/main/resources/config/application-db-h2.yml renamed to modules/apps/file-items-service/src/main/resources/application-db-h2.yml modules/apps/file-items-service/src/main/resources/config/application-db-h2.yml renamed to modules/apps/file-items-service/src/main/resources/application-db-h2.yml

@@ -1,21 +1,20 @@
 spring:
-  active:
-    profiles: db-h2
+  profiles:
+    active:
+    - db-h2
+
   datasource:
     url: jdbc:h2:mem:${db.name};MODE=PostgreSQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
     username: ${db.user}
     password: ${db.pass}
     driver-class-name: org.h2.Driver
     hikari:
       connection-test-query: 'SELECT 1'
+
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
     database: h2
     generate-ddl: true
     show-sql: true
     hibernate:
       ddl-auto: update
-  h2:
-    console:
-      enabled: true
-      path: /h2