From 5f8ff7aa9b0e2cd02700d43b7fff257eb806f8bf Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Mon, 2 Jun 2025 16:03:00 +0300 Subject: [PATCH] Remove target; Set up INDIC and SIGNAL datasources --- .gitattributes | 2 + .gitignore | 33 +++ .idea/compiler.xml | 2 +- .idea/vcs.xml | 4 +- .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 83 ++++++ .../CreditTrackerApplication.java | 13 + .../datasource/IndicDataSourceConfig.java | 57 ++++ .../datasource/SignalDataSourceConfig.java | 55 ++++ .../settings/CreditTrackerSettings.java | 18 ++ .../config/settings/DataSourceSettings.java | 8 + .../main/resources}/application.properties | 3 +- .../CreditTrackerApplicationTests.java | 13 + target/classes/credit_tracker_db.ddl | 42 --- .../CreditTrackerApplication.class | Bin 772 -> 0 bytes .../datasource/IndicDataSourceConfig.class | Bin 4008 -> 0 bytes .../datasource/SignalDataSourceConfig.class | Bin 4010 -> 0 bytes .../settings/CreditTrackerSettings.class | Bin 1462 -> 0 bytes .../config/settings/DataSourceSettings.class | Bin 1988 -> 0 bytes 21 files changed, 714 insertions(+), 46 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java create mode 100644 src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java create mode 100644 src/main/java/ru/nbch/credit_tracker/config/datasource/SignalDataSourceConfig.java create mode 100644 src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java create mode 100644 src/main/java/ru/nbch/credit_tracker/config/settings/DataSourceSettings.java rename {target/classes => src/main/resources}/application.properties (92%) create mode 100644 src/test/java/ru/nbch/credit_tracker/CreditTrackerApplicationTests.java delete mode 100644 target/classes/credit_tracker_db.ddl delete mode 100644 target/classes/ru/nbch/credit_tracker/CreditTrackerApplication.class delete mode 100644 target/classes/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.class delete mode 100644 target/classes/ru/nbch/credit_tracker/config/datasource/SignalDataSourceConfig.class delete mode 100644 target/classes/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.class delete mode 100644 target/classes/ru/nbch/credit_tracker/config/settings/DataSourceSettings.class diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/.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/.idea/compiler.xml b/.idea/compiler.xml index 7f597d6..54ffd50 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d843f34..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 +# +# http://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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@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 http://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 Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a691e60 --- /dev/null +++ b/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.6 + + + ru.nbch + credit_tracker + 1.0 + credit_tracker + Credit Tracker Application + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 3.0.4 + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mybatis.spring.boot + mybatis-spring-boot-starter-test + 3.0.4 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java b/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java new file mode 100644 index 0000000..bee1ecb --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java @@ -0,0 +1,13 @@ +package ru.nbch.credit_tracker; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CreditTrackerApplication { + + public static void main(String[] args) { + SpringApplication.run(CreditTrackerApplication.class, args); + } + +} diff --git a/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java new file mode 100644 index 0000000..a19a918 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java @@ -0,0 +1,57 @@ +package ru.nbch.credit_tracker.config.datasource; + +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.Resource; +import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.SQLException; + +@Slf4j +@Configuration +@MapperScan( + basePackages = "ru.nbch.credit_tracker.mapper.indic", + sqlSessionFactoryRef = "sqlSessionIndic" +) +public class IndicDataSourceConfig { + + @Value("classpath:mybatis/mapper/indic/*.xml") + private Resource[] resources; + + @Bean(name = "indicDataSource") + public DataSource dataSource(CreditTrackerSettings config) throws SQLException { + DataSourceBuilder dataSourceBuilder = (DataSourceBuilder) DataSourceBuilder.create(); + dataSourceBuilder.driverClassName(config.getIndicDataSourceSettings().driver()); + dataSourceBuilder.url(config.getIndicDataSourceSettings().url()); + dataSourceBuilder.username(config.getIndicDataSourceSettings().username()); + dataSourceBuilder.password(config.getIndicDataSourceSettings().password()); + HikariDataSource dataSource = dataSourceBuilder.build(); + try (Connection connection = dataSource.getConnection()) { + connection.isValid(3); + } catch (SQLException e) { + log.error("Unable to connect to Indic url={}", config.getIndicDataSourceSettings().url(), e); + throw e; + } + log.info("Connected to Indic: url={}", config.getIndicDataSourceSettings().url()); + return dataSource; + } + + @Bean(name = "sqlSessionIndic") + public SqlSessionFactory sqlSessionFactory(@Qualifier("indicDataSource") DataSource dataSource) throws Exception { + SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); + sqlSessionFactoryBean.setDataSource(dataSource); + sqlSessionFactoryBean.setMapperLocations(resources); + return sqlSessionFactoryBean.getObject(); + } +} + diff --git a/src/main/java/ru/nbch/credit_tracker/config/datasource/SignalDataSourceConfig.java b/src/main/java/ru/nbch/credit_tracker/config/datasource/SignalDataSourceConfig.java new file mode 100644 index 0000000..e05025a --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/config/datasource/SignalDataSourceConfig.java @@ -0,0 +1,55 @@ +package ru.nbch.credit_tracker.config.datasource; + +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.Resource; +import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.SQLException; + +@Slf4j +@Configuration +@MapperScan( + basePackages = "ru.nbch.credit_tracker.mapper.signal", + sqlSessionFactoryRef = "sqlSessionSignal" +) +public class SignalDataSourceConfig { + @Value("classpath:mybatis/mapper/signal/*.xml") + private Resource[] resources; + + @Bean(name = "signalDataSource") + public DataSource dataSource(CreditTrackerSettings config) throws SQLException { + DataSourceBuilder dataSourceBuilder = (DataSourceBuilder) DataSourceBuilder.create(); + dataSourceBuilder.driverClassName(config.getSignalDataSourceSettings().driver()); + dataSourceBuilder.url(config.getSignalDataSourceSettings().url()); + dataSourceBuilder.username(config.getSignalDataSourceSettings().username()); +// dataSourceBuilder.password(config.getSignalDataSourceSettings().password()); TODO uncomment whe password will be set + HikariDataSource dataSource = dataSourceBuilder.build(); + try (Connection connection = dataSource.getConnection()) { + connection.isValid(3); + } catch (SQLException e) { + log.error("Unable to connect to Signal url={}", config.getSignalDataSourceSettings().url(), e); + throw e; + } + log.info("Connected to Signal: url={}", config.getSignalDataSourceSettings().url()); + return dataSource; + } + + @Bean(name = "sqlSessionSignal") + public SqlSessionFactory sqlSessionFactory(@Qualifier("signalDataSource") DataSource dataSource) throws Exception { + SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); + sqlSessionFactoryBean.setDataSource(dataSource); + sqlSessionFactoryBean.setMapperLocations(resources); + return sqlSessionFactoryBean.getObject(); + } +} diff --git a/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java new file mode 100644 index 0000000..42f8815 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java @@ -0,0 +1,18 @@ +package ru.nbch.credit_tracker.config.settings; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConfigurationProperties(prefix = "ct") +@Getter +@Setter +public class CreditTrackerSettings { + @NestedConfigurationProperty + private DataSourceSettings indicDataSourceSettings; + @NestedConfigurationProperty + private DataSourceSettings signalDataSourceSettings; +} diff --git a/src/main/java/ru/nbch/credit_tracker/config/settings/DataSourceSettings.java b/src/main/java/ru/nbch/credit_tracker/config/settings/DataSourceSettings.java new file mode 100644 index 0000000..101c08d --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/config/settings/DataSourceSettings.java @@ -0,0 +1,8 @@ +package ru.nbch.credit_tracker.config.settings; + +public record DataSourceSettings( + String username, + String password, + String url, + String driver +) {} \ No newline at end of file diff --git a/target/classes/application.properties b/src/main/resources/application.properties similarity index 92% rename from target/classes/application.properties rename to src/main/resources/application.properties index 2e2b862..0d627c2 100644 --- a/target/classes/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,5 @@ spring.application.name=credit_tracker - # datasources # indic ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver @@ -12,4 +11,4 @@ ct.indic-data-source-settings.password=R0s9Appl ct.signal-data-source-settings.driver=org.postgresql.Driver ct.signal-data-source-settings.url=jdbc:postgresql://10.200.200.133:5432/credit_tracker ct.signal-data-source-settings.username=credit_tracker_user -ct.signal-data-source-settings.password= +ct.signal-data-source-settings.password= \ No newline at end of file diff --git a/src/test/java/ru/nbch/credit_tracker/CreditTrackerApplicationTests.java b/src/test/java/ru/nbch/credit_tracker/CreditTrackerApplicationTests.java new file mode 100644 index 0000000..53c2444 --- /dev/null +++ b/src/test/java/ru/nbch/credit_tracker/CreditTrackerApplicationTests.java @@ -0,0 +1,13 @@ +package ru.nbch.credit_tracker; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CreditTrackerApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/target/classes/credit_tracker_db.ddl b/target/classes/credit_tracker_db.ddl deleted file mode 100644 index 3fc3c32..0000000 --- a/target/classes/credit_tracker_db.ddl +++ /dev/null @@ -1,42 +0,0 @@ --- Create signals_user_packages --- Хранит основную информацию о каждом пакете мониторинга, установленном клиентом -CREATE TABLE signals_user_packages ( - id SERIAL PRIMARY KEY, -- внутренний идентификатор в таблице - membercode VARCHAR(255), -- логин клиента - package_name VARCHAR(255), -- имя пакета - created_at TIMESTAMP, -- дата и время первичной регистрации пакета - status VARCHAR(255), -- статус пакета: ON_MONITORING, REJECTED, PROCESSING, DELETED, ERROR - deactivated_at TIMESTAMP, -- дата и время удаления пакета - last_downloaded_report VARCHAR(255) -- имя последнего успешно загруженного отчёта из оф. сервиса по пакету -); - --- Create signals_phone_fid_map -CREATE TABLE signals_phone_fid_map ( - id SERIAL PRIMARY KEY, -- внутренний идентификатор в таблице - package_id INTEGER NOT NULL, -- идентификатор пакета - subject_id VARCHAR(255), -- идентификатор субъекта из XML - phone VARCHAR(255), -- номер телефона - fid VARCHAR(255), -- найденный FID или NULL - flag_debt5000 SMALLINT, -- 1, если есть активная просрочка > 5000 руб., иначе 0 - flag_90_12 SMALLINT, -- 1, если по субъекту когда-либо была просрочка 90+ дней за последний год, иначе – 0 - calculated_at TIMESTAMP, -- дата последнего расчёта флагов - CONSTRAINT fk_signals_user_packages - FOREIGN KEY (package_id) - REFERENCES signals_user_packages(id) -); - --- Create signals_hits -CREATE TABLE signals_hits ( - id SERIAL PRIMARY KEY, -- внутренний идентификатор в таблице - package_id INTEGER NOT NULL, -- идентификатор пакета - subject_id VARCHAR(255), -- идентификатор субъекта, по которому сработал сигнал - signal_type INTEGER, -- тип сигнала - response_sent_at TIMESTAMP, -- дата и время формирования отчета с данным сигналом - report_file_name VARCHAR(255), -- имя XML-файла отчёта, в который вошел данный сигнал - CONSTRAINT fk_signals_user_packages - FOREIGN KEY (package_id) - REFERENCES signals_user_packages(id) -); - --- Create index on response_sent_at -CREATE INDEX idx_signals_hits_response_sent_at ON signals_hits(response_sent_at); \ No newline at end of file diff --git a/target/classes/ru/nbch/credit_tracker/CreditTrackerApplication.class b/target/classes/ru/nbch/credit_tracker/CreditTrackerApplication.class deleted file mode 100644 index 6607eff8e685194f7b960224facad0488704ae26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 772 zcmb7CO-~y!5Pc2_8$u{Fd{a1Z3pv#4rI%2o5{c9DA%enzL*?C=jbUR)UN7*sdTPai zAJ89#7%xcdAso8W&S+*lZ|wKx-}B=WfFIatpn{nI)h23~WmviqcY>!vC;T+Jk+EZ# z-B((<1BRLQ-XK7of!mzxC?4_H%As<=aLVWg8ki5zY+?bQ z7&^u#JeydhlWQx+^4{269vS0!zetukX{gOLL(~r6FV;&%mUXX6nZEO2-Mw%ca%{Ad z503YYzE(+YMU=|Y2uk~Mm!aA-L&>lhDlJd)aU|`9Kg-YxO)S!Zu*%18$*LQvjNx1O zpJez!W1;9#Ywc-o7*Ji~~RKBJ0bbmd|9HuLsb=GDUM(!773H=I;dR diff --git a/target/classes/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.class b/target/classes/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.class deleted file mode 100644 index b9099c5fe1f86a91ccb8264520c0065ae199bdcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4008 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 Xh3tp8dW+w`=lc(#^?$^leBAyYonn4d diff --git a/target/classes/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.class b/target/classes/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.class deleted file mode 100644 index 29f4a666f22ac47db2cbae30a282bac9d9992f65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1462 zcmbtTZEq4m5S~5WEFRLL))st!3)IB@<_Bp>48DW}Yf~D&n!URPw!kjgTWbARnrKY? z;1BRe8E5a%1~?*#xn%ctXXlw`o|*ai>-!G?IDp4_a3Ga~v`l}wa+gs_4b;`%g%Mn@rnyYOK>L?eaS}4uL$fOPo)uK z-W8$nM*M}8$}l683<Wy!nF}Rq=!5-JZMHa zPj!TG6k9*m38b4U-~@_oA^G8S>~Vd@sZz0tqzM%|B6Dj9Tt< z(^{qOLAACn{<3liUYSYPl4l9xmD(dU_SBHR;gX{qJg_dvr?avaW$cudY#Y`8AY1EV zQ@`bApn@Z2D`~h!eJdDnHJyCij<1C+Q#n!Mr*=>XJWFhpKRv?!_7t7#4%FjSqT{L# zoAaLa7Iq%uWG9;U#5n=SH*gO--@&8%G#@h_R!zRr0yps%HSQkF7 e!3@5*0PnzEjO$<_ZQ+XecOUl$DAL0a9{mRJ!e=c2 diff --git a/target/classes/ru/nbch/credit_tracker/config/settings/DataSourceSettings.class b/target/classes/ru/nbch/credit_tracker/config/settings/DataSourceSettings.class deleted file mode 100644 index cb979ab6dae58e7f988a5641e36cf48e89887847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1988 zcmbtVTT|0e5dIFmq?BMwxk*Jp1#QD6qIkg|Dxf1H3L^{;`rxGLkp@aqPf{HJlMgZ@ z;|ve}0DqL@o+gDbREB|vbkFYDZ*OOJ`{(cBZvap6GL1IG6vR~|kYvbin|r2SHJvT} zJ-1v@W=PK2j_uDg#0tgDcBIg*Ag!VUD#NU(>rTn4=$7DR+yCSX)7s%ew_NA5y`_8H z_ibm()0a%&TzBij;_IP^AyxOdaLirKkXt!+yY35u7}C)d6&dLzRWm*BD+MEkT`F=? z7^{n_SRRSXc$cLQq-tA&*dhiVj0hbP@!Q!$9^_ZTx^)7YU5d5%dBpi!j^m}jQbUvvNA659@M69xnFV1Yo?(7@wp&_J%tv})M(me zhTdqxkwP%{Wb=hr4C$a-U)eH`{?qL{B^#C=sW~Ls1=saGYX4dgnU_i8ei}1)px~j3 zM|jLIeB9)s?)dgD*8_hcgrU9Ew8F3-4cT_~+#Rk5imy$lT;<;AitFywYsQ%m7XmlF z)%X(kEMeDtS41I;Rhq4+AZ&+^5wk74pO}fTYAHNn7;H|p(HvTX2Gt0LGsB?J*GXTN zzHSC}*>SjN1i?K8FBry-tJK18GiwEl3`1wD((?o*!ZhuPHkz$Ctq$5-bjr!i(x9|V z8kCj@(G(ah!keUhi?}M$1kt?q3rrh7fTB$tpi`SXKvo-wAE0}mZrd; oI