Upgraded Gradle; bumped dependencies; updated README; and added trade…

…able rights instrument type.

README.md

@@ -17,3 +17,9 @@ sorts them according to price-to-earning ratio or earnings per share to aid a ne
 `DEFAULT` (default), `PE_RATIO` or `EPS` e.g. https://beta-dog.vincenzolabs.org/api/v1/instruments?filter=EQUITIES&order=EPS.
 
 3. To view Swagger UI, go to https://beta-dog.vincenzolabs.org/api/v1/swagger-ui-custom.html.
+
+## Infrastructure
+
+Beta-Dog is Dockerized and hosted on a Kubernetes cluster provided by https://kubesail.com.
+
+DNS record is stored in Amazon Route 53 and SSL certificate is provided by AWS Certificate Manager.  

build.gradle

@@ -1,17 +1,17 @@
 plugins {
-    id 'org.springframework.boot' version '2.2.5.RELEASE'
+    id 'org.springframework.boot' version '2.2.6.RELEASE'
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'java'
-    id 'org.unbroken-dome.test-sets' version '2.2.1'
-    id 'org.owasp.dependencycheck' version '5.3.1'
+    id 'org.unbroken-dome.test-sets' version '3.0.1'
+    id 'org.owasp.dependencycheck' version '5.3.2.1'
     id 'com.github.ben-manes.versions' version '0.28.0'
 }
 
 ext {
-    springCloudVersion = 'Hoxton.SR1'
+    springCloudVersion = 'Hoxton.SR3'
     htmlToPojoVersion = '1.0.2'
-    commonsLangVersion = '3.9'
-    springdocOpenapiWebfluxVersion = '1.3.0'
+    commonsLangVersion = '3.10'
+    springdocOpenapiWebfluxVersion = '1.3.2'
     caffeineVersion = '2.8.1'
     httpcoreVersion = '4.4.13'
     httpclientVersion = '4.5.12'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

src/main/java/org/vincenzolabs/betadog/enumeration/InstrumentType.java

@@ -35,6 +35,10 @@ public enum InstrumentType {
      * Cumulative preference shares.
      */
     CUMULATIVE_PREFERENCE_SHARES("Cumulative Preference Shares"),
+    /**
+     * Tradeable rights issued by cash-strapped companies.
+     */
+    TRADEABLE_RIGHTS("Tradeable Rights"),
     /**
      * Unknown.
      */
@@ -73,6 +77,6 @@ public static InstrumentType getInstrumentType(final String description) {
             }
         }
 
-        throw new IllegalArgumentException("Description [" + description + "] is invalid");
+        throw new IllegalArgumentException("Instrument type [" + description + "] is invalid");
     }
 }