diff --git a/gsrs-service-utilities/.gitignore b/gsrs-service-utilities/.gitignore
new file mode 100644
index 00000000..549e00a2
--- /dev/null
+++ b/gsrs-service-utilities/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/gsrs-service-utilities/.mvn/wrapper/MavenWrapperDownloader.java b/gsrs-service-utilities/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 00000000..a45eb6ba
--- /dev/null
+++ b/gsrs-service-utilities/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.jar b/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 00000000..2cc7d4a5
Binary files /dev/null and b/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.properties b/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..642d572c
--- /dev/null
+++ b/gsrs-service-utilities/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/gsrs-service-utilities/mvnw b/gsrs-service-utilities/mvnw
new file mode 100755
index 00000000..a16b5431
--- /dev/null
+++ b/gsrs-service-utilities/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/gsrs-service-utilities/mvnw.cmd b/gsrs-service-utilities/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/gsrs-service-utilities/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/gsrs-service-utilities/pom.xml b/gsrs-service-utilities/pom.xml
new file mode 100644
index 00000000..8fff32d5
--- /dev/null
+++ b/gsrs-service-utilities/pom.xml
@@ -0,0 +1,78 @@
+
+
+
+ gsrs-spring-boot
+ gov.nih.ncats
+ 3.1.1-SNAPSHOT
+
+ 4.0.0
+
+ gsrs-service-utilities
+
+
+ 8
+ 8
+
+
+
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+ pl.jalokim.propertiestojson
+ java-properties-to-json
+ 5.3.0
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+
+
+
diff --git a/gsrs-service-utilities/src/main/java/gsrs/config/ConfigurationPropertiesChecker2.java b/gsrs-service-utilities/src/main/java/gsrs/config/ConfigurationPropertiesChecker2.java
new file mode 100644
index 00000000..daab1c69
--- /dev/null
+++ b/gsrs-service-utilities/src/main/java/gsrs/config/ConfigurationPropertiesChecker2.java
@@ -0,0 +1,122 @@
+package gsrs.config;
+
+// import gsrs.security.GsrsSecurityUtils;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import java.util.*;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverter;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverterBuilder;
+
+// import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
+
+// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-properties
+// https://www.adam-bien.com/roller/abien/entry/java_ee_8_converting_java
+// https://github.com/mikolajmitura/java-properties-to-json
+
+// https://stackoverflow.com/questions/23506471/access-all-environment-properties-as-a-map-or-properties-object
+// https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/env/ConfigurableEnvironment.html
+
+@Slf4j
+@Data
+public class ConfigurationPropertiesChecker2 {
+
+ public boolean enabled;
+
+ public String getActivePropertiesAsJson(ConfigurableEnvironment configurableEnvironment) {
+
+ // Aside from password, this is temporary to prevent exceptions.
+ List omissionFragments = Arrays.asList("password", "pattern", "regex", "relaxed");
+
+ // CONSIDER how to handle security
+ // having problems calling this from gateway because it does not have gsrs-core-entities and including it
+ // makes it want to have a database.
+ boolean isAdmin = true;
+ // boolean isAdmin = GsrsSecurityUtils.isAdmin();
+
+ if (enabled && isAdmin) {
+ List propertySources = new ArrayList();
+ configurableEnvironment.getPropertySources().forEach(it -> {
+ //&& it.getName().contains("applicationConfig")
+ if (it instanceof MapPropertySource) {
+ propertySources.add((MapPropertySource) it);
+ }
+ });
+ Map properties = new HashMap<>();
+
+ propertySources.stream()
+ .map(propertySource -> propertySource.getSource().keySet())
+ .flatMap(Collection::stream)
+ .distinct()
+ .sorted()
+ .forEach(key -> {
+ // this if then is temporary
+ if(!key.equals("java.version.date") && !key.contains("java.vendor")) {
+ try {
+ if (omissionFragments.stream().map(s -> s.toLowerCase()).anyMatch(key.toLowerCase()::contains)) {
+ properties.put(key, "[OMITTED VALUE]");
+ } else {
+ properties.put(key, configurableEnvironment.getProperty(key));
+ }
+ } catch (Exception e) {
+ log.warn("{} -> {}", key, e.getMessage());
+ }
+ }
+ });
+ PropertiesToJsonConverter converter = PropertiesToJsonConverterBuilder.builder().build();
+ String json = converter.convertFromValuesAsObjectMap(properties, false);
+ return json;
+ } else {
+ return "{ \"message\": \"Unauthorized\"}";
+ }
+ }
+
+ public String getActivePropertiesAsTextBlock(ConfigurableEnvironment configurableEnvironment) {
+
+ List omissionFragments = Arrays.asList("password");
+
+ // CONSIDER how to handle security
+ boolean isAdmin = true;
+ // isAdmin = GsrsSecurityUtils.isAdmin();
+
+ if (enabled && isAdmin) {
+ StringBuilder sb = new StringBuilder();
+ List propertySources = new ArrayList();
+
+ sb.append("**** BEGIN ACTIVE APP PROPERTIES ****").append("\n\n");
+ sb.append("enabled: ").append(enabled).append("\n");
+ sb.append("Groups:").append("\n\n");
+
+ configurableEnvironment.getPropertySources().forEach(it -> {
+ // it.getName().equals("systemEnvironment") &&
+ if (it instanceof MapPropertySource) {
+ sb.append(it.getName()).append("\n");
+ propertySources.add((MapPropertySource) it);
+ }
+ });
+ sb.append("\n\nProperties:").append("\n\n");
+ propertySources.stream()
+ .map(propertySource -> propertySource.getSource().keySet())
+ .flatMap(Collection::stream)
+ .distinct()
+ .sorted()
+ .forEach(key -> {
+ try {
+ if(omissionFragments.stream().map(s->s.toLowerCase()).anyMatch(key.toLowerCase()::contains)) {
+ sb.append(key + "=").append("[OMITTED VALUE]\n");
+ } else {
+ sb.append(key + "=" + configurableEnvironment.getProperty(key)).append("\n");
+ }
+ } catch (Exception e) {
+ log.warn("{} -> {}", key, e.getMessage());
+ }
+ });
+ sb.append("**** END ACTIVE APP PROPERTIES ****");
+ return sb.toString();
+ } else {
+ return "Unauthorized.";
+ }
+ }
+}
+
diff --git a/gsrs-service-utilities/src/main/java/gsrs/config/ExampleEndpointController2.java b/gsrs-service-utilities/src/main/java/gsrs/config/ExampleEndpointController2.java
new file mode 100644
index 00000000..978196c7
--- /dev/null
+++ b/gsrs-service-utilities/src/main/java/gsrs/config/ExampleEndpointController2.java
@@ -0,0 +1,24 @@
+package gsrs.config;
+
+
+
+import lombok.Data;
+import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RestControllerEndpoint(id = "stuff")
+public class ExampleEndpointController2 {
+
+ @Data
+ class Information {
+ String one = "One";
+ String two = "Two";
+ }
+
+ @GetMapping("/xinfo")
+ public Information getHello() {
+ return new Information();
+ }
+}
diff --git a/gsrs-service-utilities/src/main/java/serviceutilities/GsrsServiceUtilitiesConfiguration.java b/gsrs-service-utilities/src/main/java/serviceutilities/GsrsServiceUtilitiesConfiguration.java
new file mode 100644
index 00000000..e61c700b
--- /dev/null
+++ b/gsrs-service-utilities/src/main/java/serviceutilities/GsrsServiceUtilitiesConfiguration.java
@@ -0,0 +1,18 @@
+package serviceutilities;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GsrsServiceUtilitiesConfiguration {
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ @Bean
+ public String testing() {
+ String s = "I am here ...... XXX ... XXX";
+ System.out.println();
+ return s;
+ }
+}
diff --git a/gsrs-spring-boot-autoconfigure/pom.xml b/gsrs-spring-boot-autoconfigure/pom.xml
index c82f3dff..6d7db7a5 100644
--- a/gsrs-spring-boot-autoconfigure/pom.xml
+++ b/gsrs-spring-boot-autoconfigure/pom.xml
@@ -13,6 +13,8 @@
${maven.build.timestamp}
yyyy-MM-dd HH:mm:ss
+ 2.13.4
+ 2.13.4.2
@@ -229,6 +231,47 @@
${gsrs.version}
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.databind.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-properties
+ ${jackson.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+
+
+
+
+
+ pl.jalokim.propertiestojson
+ java-properties-to-json
+ 5.3.0
+
+
+
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/EnableGsrsServiceUtilities.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/EnableGsrsServiceUtilities.java
new file mode 100644
index 00000000..df3ba8c8
--- /dev/null
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/EnableGsrsServiceUtilities.java
@@ -0,0 +1,15 @@
+package gsrs;
+
+import gsrs.akka.GsrsAkkaSelector;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Import( { GsrsAkkaSelector.class})
+public @interface EnableGsrsServiceUtilities {
+}
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsApiSelector.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsApiSelector.java
index 90922437..3b629092 100644
--- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsApiSelector.java
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsApiSelector.java
@@ -1,5 +1,6 @@
package gsrs;
+import gsrs.config.PropertiesReporter;
import gsrs.controller.*;
import gsrs.controller.hateoas.HttpLoopBackConfig;
import gsrs.controller.hateoas.LoopbackWebRequestHelper;
@@ -64,8 +65,10 @@ public String[] selectImports(AnnotationMetadata annotationMetadata) {
componentsToInclude.add(StaticContextAccessor.class);
componentsToInclude.add(ReindexEventListener.class);
componentsToInclude.add(BuildInfoController.class);
+ componentsToInclude.add(PropertiesReporterController.class);
componentsToInclude.add(UserController.class);
componentsToInclude.add(HealthController.class);
+ componentsToInclude.add(PropertiesReporter.class);
componentsToInclude.add(RelativePathController.class);
switch(indexerType){
case LEGACY: {
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/actuator/ExampleEndpointController.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/actuator/ExampleEndpointController.java
new file mode 100644
index 00000000..013ca686
--- /dev/null
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/actuator/ExampleEndpointController.java
@@ -0,0 +1,25 @@
+package gsrs.actuator;
+
+
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RestControllerEndpoint(id = "stuff")
+public class ExampleEndpointController {
+
+ @Data
+ class Information {
+ String one = "One";
+ String two = "Two";
+ }
+
+ @GetMapping("/xinfo")
+ public Information getHello() {
+ return new Information();
+ }
+}
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/ApplicationContextChecker.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/ApplicationContextChecker.java
new file mode 100644
index 00000000..581c164c
--- /dev/null
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/ApplicationContextChecker.java
@@ -0,0 +1,49 @@
+package gsrs.config;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.beans.factory.config.SingletonBeanRegistry;
+import org.springframework.context.ApplicationContext;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+@Data
+
+public class ApplicationContextChecker {
+
+ // JUST trying something out in this class
+
+ public boolean enabled;
+
+ public String getBeanDefinitionNames(ApplicationContext ctx) {
+ List omissionFragments = Arrays.asList("password","abc");
+ boolean isAdmin = true;
+ if (enabled && isAdmin) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Beans provided by Spring Boot:\n\n");
+ String[] beanNames = ctx.getBeanDefinitionNames();
+ Arrays.sort(beanNames);
+ for (String beanName : beanNames) {
+ sb.append(beanName).append("\n");
+ }
+ return sb.toString();
+ } else {
+ return "Unauthorized.";
+ }
+ }
+
+ public String getSingletonNames(ApplicationContext applicationContext) {
+ StringBuilder sb = new StringBuilder();
+ AutowireCapableBeanFactory autowireCapableBeanFactory = applicationContext.getAutowireCapableBeanFactory();
+ if (autowireCapableBeanFactory instanceof SingletonBeanRegistry) {
+ String[] singletonNames = ((SingletonBeanRegistry) autowireCapableBeanFactory).getSingletonNames();
+ for (String singleton : singletonNames) {
+ sb.append(singleton).append("\n");
+ }
+ }
+ return sb.toString();
+ }
+}
+
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/PropertiesReporter.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/PropertiesReporter.java
new file mode 100644
index 00000000..6878efd4
--- /dev/null
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/config/PropertiesReporter.java
@@ -0,0 +1,90 @@
+package gsrs.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import java.util.*;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverter;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverterBuilder;
+
+// import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
+// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-properties
+// https://www.adam-bien.com/roller/abien/entry/java_ee_8_converting_java
+// https://github.com/mikolajmitura/java-properties-to-json
+// https://stackoverflow.com/questions/23506471/access-all-environment-properties-as-a-map-or-properties-object
+// https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/env/ConfigurableEnvironment.html
+
+@Slf4j
+public class PropertiesReporter {
+
+ // IMPORTANT: In this class, we assume all security has been handled apriori.
+
+ public static String getConfigurationPropertiesAsJson(ConfigurableEnvironment configurableEnvironment) {
+ // Aside from password, this is temporary to prevent exceptions.
+ List omissionFragments = Arrays.asList("password", "pattern", "regex", "relaxed");
+ List propertySources = new ArrayList();
+ configurableEnvironment.getPropertySources().forEach(it -> {
+ //&& it.getName().contains("applicationConfig")
+ if (it instanceof MapPropertySource) {
+ propertySources.add((MapPropertySource) it);
+ }
+ });
+ Map properties = new HashMap<>();
+ propertySources.stream()
+ .map(propertySource -> propertySource.getSource().keySet())
+ .flatMap(Collection::stream)
+ .distinct()
+ .sorted()
+ .forEach(key -> {
+ // this if then is temporary
+ if(!key.equals("java.version.date") && !key.contains("java.vendor")) {
+ try {
+ if (omissionFragments.stream().map(s -> s.toLowerCase()).anyMatch(key.toLowerCase()::contains)) {
+ properties.put(key, "[OMITTED VALUE]");
+ } else {
+ properties.put(key, configurableEnvironment.getProperty(key));
+ }
+ } catch (Exception e) {
+ log.warn("{} -> {}", key, e.getMessage());
+ }
+ }
+ });
+ PropertiesToJsonConverter converter = PropertiesToJsonConverterBuilder.builder().build();
+ return converter.convertFromValuesAsObjectMap(properties, false);
+ }
+
+ public static String getConfigurationPropertiesAsText(ConfigurableEnvironment configurableEnvironment) {
+ List omissionFragments = Arrays.asList("password");
+ StringBuilder sb = new StringBuilder();
+ List propertySources = new ArrayList();
+ sb.append("**** BEGIN ACTIVE APP PROPERTIES ****").append("\n\n");
+ sb.append("Groups:").append("\n\n");
+ configurableEnvironment.getPropertySources().forEach(it -> {
+ // it.getName().equals("systemEnvironment") &&
+ if (it instanceof MapPropertySource) {
+ sb.append(it.getName()).append("\n");
+ propertySources.add((MapPropertySource) it);
+ }
+ });
+ sb.append("\n\nProperties:").append("\n\n");
+ propertySources.stream()
+ .map(propertySource -> propertySource.getSource().keySet())
+ .flatMap(Collection::stream)
+ .distinct()
+ .sorted()
+ .forEach(key -> {
+ try {
+ if (omissionFragments.stream().map(s -> s.toLowerCase()).anyMatch(key.toLowerCase()::contains)) {
+ sb.append(key + "=").append("[OMITTED VALUE]\n");
+ } else {
+ sb.append(key + "=" + configurableEnvironment.getProperty(key)).append("\n");
+ }
+ } catch (Exception e) {
+ log.warn("{} -> {}", key, e.getMessage());
+ }
+ });
+ sb.append("**** END ACTIVE APP PROPERTIES ****");
+ return sb.toString();
+ }
+}
+
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/HealthController.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/HealthController.java
index 61e297e4..96141bf2 100644
--- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/HealthController.java
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/HealthController.java
@@ -9,7 +9,6 @@
import java.util.stream.Collectors;
import javax.sql.DataSource;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.jdbc.metadata.HikariDataSourcePoolMetadata;
@@ -53,12 +52,9 @@ public void startTime(ApplicationReadyEvent event){
@Data
public static class UpStatus{
public static UpStatus INSTANCE = new UpStatus();
-
public String status = "UP";
-
-
-
}
+
@GetMapping("api")
public ResponseEntity landingPage(){
//String script = "var _w=window;_w.$||(_w.$=function(e){var n={off:function(){},remove:function(){for(var n=document.getElementsByTagName(e),o=0;o knownServices;
+
+ private final String NOT_A_KNOWN_SERVICE = "The context specified in the URL is not a known service.";
+ private final String REPORT_NOT_ENABLED = "This report is not enabled in the services configuration.";
+ private final String PlEASE_CHECK_LOG_FOR_PROPERTIES = "Please check log to view the service's configuration properties as %s";
+
+
+// @RequestMapping(value = "/process/{json}", method = RequestMethod.GET)
+// public ResponseEntity process(@PathVariable("json") boolean processJson) {
+// if (processJson) {
+// return new ResponseEntity<>("someJSONObject", headers, HttpStatus.OK);
+// } else {
+// final HttpHeaders headers = new HttpHeaders();
+// headers.setContentType(MediaType.APPLICATION_XML);
+// return new ResponseEntity<>("someXMLObject", headers, HttpStatus.OK);
+// }
+// }
+
+// @hasAdminRole
+// @GetMapping(value = "service-info/api/v1/{context}/@configurationProperties")
+// public String apiGetConfigurationPropertiesReport(
+// @PathVariable(value="context") String context,
+// @RequestParam(defaultValue = "text", required = false) String format
+// ) {
+// final HttpHeaders headers = new HttpHeaders();
+// if (format.equals("json")) {
+// headers.setContentType(MediaType.valueOf(MediaType.TEXT_PLAIN_VALUE));
+// if (propertiesApiReportEnabled) {
+// return PropertiesReporter.getConfigurationPropertiesAsText(configurableEnvironment);
+// }
+// return "This report is not enabled in the service's configuration.";
+// } else {
+// headers.setContentType(MediaType.valueOf(MediaType.APPLICATION_JSON_VALUE));
+// if (propertiesApiReportEnabled) {
+// return PropertiesReporter.getConfigurationPropertiesAsJson(configurableEnvironment);
+// }
+// return "{\"message\": \"This report is not enabled in the services configuration.\"}";
+// }
+// }
+
+
+ @hasAdminRole
+ @GetMapping(value = "service-info/api/v1/{context}/@configurationPropertiesAsText", produces = MediaType.TEXT_PLAIN_VALUE)
+ public @ResponseBody
+ String apiGetConfigurationPropertiesReportAsText(@PathVariable(value="context") String context) {
+ if (!inKnownServicesCheck(context)) {
+ return NOT_A_KNOWN_SERVICE;
+ }
+ if (propertiesApiReportEnabled) {
+ return PropertiesReporter.getConfigurationPropertiesAsText(configurableEnvironment);
+ }
+ return REPORT_NOT_ENABLED;
+ }
+
+ @hasAdminRole
+ @GetMapping(value="/service-info/api/v1/{context}/@configurationPropertiesAsJson", produces = MediaType.APPLICATION_JSON_VALUE)
+ public @ResponseBody
+ String apiGetConfigurationPropertiesReportAsJson(@PathVariable(value="context") String context) {
+ if (!inKnownServicesCheck(context)) {
+ return "{\"message\":" + NOT_A_KNOWN_SERVICE + "}";
+ }
+ if (propertiesApiReportEnabled) {
+ return PropertiesReporter.getConfigurationPropertiesAsJson(configurableEnvironment);
+ }
+ return "{\"message\":" + REPORT_NOT_ENABLED + "}";
+ }
+
+ @hasAdminRole
+ @GetMapping(value="service-info/api/v1/{context}/@logConfigurationPropertiesAsText", produces = MediaType.TEXT_PLAIN_VALUE)
+ public @ResponseBody
+ String logConfigurationPropertiesAsText(@PathVariable(value="context") String context) {
+ if (!inKnownServicesCheck(context)) {
+ return NOT_A_KNOWN_SERVICE;
+ }
+ if (propertiesLogReportEnabled) {
+ log.info(PropertiesReporter.getConfigurationPropertiesAsText(configurableEnvironment));
+ return "{\"message\":" +String.format(PlEASE_CHECK_LOG_FOR_PROPERTIES, "text") +"}";
+ }
+ return REPORT_NOT_ENABLED;
+ }
+
+ @hasAdminRole
+ @GetMapping(value="service-info/api/v1/{context}/@logConfigurationPropertiesAsJson", produces = MediaType.APPLICATION_JSON_VALUE)
+ public @ResponseBody
+ String logConfigurationPropertiesAsJson(@PathVariable(value="context") String context) {
+ if (!inKnownServicesCheck(context)) {
+ return NOT_A_KNOWN_SERVICE;
+ }
+ if (propertiesLogReportEnabled) {
+ String message = String.format(PlEASE_CHECK_LOG_FOR_PROPERTIES, "JSON");
+ log.info( message + "\n" + PropertiesReporter.getConfigurationPropertiesAsJson(configurableEnvironment));
+ return "{\"message\":" + message + "}";
+ }
+ return "{\"message\":" + REPORT_NOT_ENABLED + "}";
+ }
+
+ public boolean inKnownServicesCheck(String service) {
+ if (knownServices==null || knownServices.isEmpty()) return false;
+ return knownServices.contains(service);
+ }
+}
diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/serviceutilities/GsrsServiceUtilitiesSelector.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/serviceutilities/GsrsServiceUtilitiesSelector.java
new file mode 100644
index 00000000..20349092
--- /dev/null
+++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/serviceutilities/GsrsServiceUtilitiesSelector.java
@@ -0,0 +1,15 @@
+package gsrs.serviceutilities;
+
+
+import org.springframework.context.annotation.ImportSelector;
+import org.springframework.core.type.AnnotationMetadata;
+//. import serviceutilities.GsrsServiceUtilitiesConfiguration;
+
+public class GsrsServiceUtilitiesSelector implements ImportSelector {
+ @Override
+ public String[] selectImports(AnnotationMetadata annotationMetadata) {
+ return new String[]{
+// GsrsServiceUtilitiesConfiguration.class.getName()
+ };
+ }
+}
diff --git a/gsrs-spring-boot-autoconfigure/src/main/resources/gsrs-core.conf b/gsrs-spring-boot-autoconfigure/src/main/resources/gsrs-core.conf
index f1950de8..1400d66a 100644
--- a/gsrs-spring-boot-autoconfigure/src/main/resources/gsrs-core.conf
+++ b/gsrs-spring-boot-autoconfigure/src/main/resources/gsrs-core.conf
@@ -16,6 +16,21 @@ eureka.instance.hostname=localhost
#This is so we can set an enviornment variable to change the eureka server url which we will do for docker
#EUREKA_SERVER = "http://localhost:8761/eureka"
+gsrs.services.knownServices = [
+ "adverse-events",
+ "applications",
+ "clincial-trials",
+ "discovery"
+ "gateway",
+ "impurities",
+ "invitro-pharmacology",
+ "frontend",
+ "products",
+ "ssg4m",
+ "substances"
+]
+
+
gsrs.sessions.sessionCookieName="ix.session"
# Sessions expire in 6 hours
gsrs.sessions.sessionExpirationMS=21600000
diff --git a/pom.xml b/pom.xml
index 2dfd7ddb..8ea5271c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
gsrs-spring-akka
gsrs-scheduled-tasks
gsrs-rest-api
+ gsrs-service-utilities
gsrs-controlled-vocabulary-api
gsrs-controlled-vocabulary
gsrs-data-exchange
@@ -43,13 +44,17 @@
https://github.com/ncats/gsrs-spring-starter.git
-
+
org.springframework.boot
spring-boot-starter-test
-
+
+ org.projectlombok
+ lombok
+
+