diff --git a/.github/workflows/gradle-push.yml b/.github/workflows/gradle-push.yml index a62088f8b6..0767080c5f 100644 --- a/.github/workflows/gradle-push.yml +++ b/.github/workflows/gradle-push.yml @@ -23,12 +23,15 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '21' distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Build with Gradle - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: build + run: ./gradlew build + \ No newline at end of file diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml index 5130c305b5..998080c277 100644 --- a/.github/workflows/gradle-release.yml +++ b/.github/workflows/gradle-release.yml @@ -45,15 +45,19 @@ jobs: password: ${{secrets.DOCKERHUB_TOKEN}} - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '21' distribution: 'temurin' + + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Build with Gradle - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: "clean build distZip jib" + run: ./gradlew build clean build distZip jib + - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/gradle-scheduled.yml b/.github/workflows/gradle-scheduled.yml deleted file mode 100644 index d92f44b649..0000000000 --- a/.github/workflows/gradle-scheduled.yml +++ /dev/null @@ -1,36 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - -name: Daily builds - -on: - schedule: - - cron: '00 18 * * 1,2,3,4' - -permissions: - contents: read - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - name: Build with Gradle - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: build - - uses: actions/upload-artifact@v3 - with: - name: search.zip - path: search/build/libs diff --git a/build.gradle b/build.gradle index 8e1b487786..b67bd022f2 100644 --- a/build.gradle +++ b/build.gradle @@ -200,6 +200,9 @@ allprojects { //~ overwrite windows encoding test { systemProperty "file.encoding", "utf-8" + + jvmArgs "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED" } tasks.withType(JavaCompile) { @@ -285,13 +288,20 @@ allprojects { /** * Distribution task; zipInstallDir first */ -task distZip(type:Zip, dependsOn: 'zipInstallDir') { +task distZip(type:Zip, dependsOn: ['zipInstallDir', ':search:war', ':processes:migration:distZip']) { description "Create full distribution zip" archiveBaseName.set('kramerius') group "Distribution" - // core war + + // Nastavení závislosti na spuštění po `:search:war` + //finalizedBy ':search:war' + + // core war from {'search/build/libs'} - // migration tool + + //inputs.files file('search/build/libs/search.war') + + // migration tool from {'processes/migration/build/distributions'} // installation.zip from {'build/installation/'} @@ -330,8 +340,3 @@ task zipAllJavadocs(type: Zip) { } } -task printJavaVersion { - doLast { - println "Running on Java version: ${System.getProperty('java.version')}" - } -} diff --git a/gradle.properties b/gradle.properties index b84f07860f..ac4cadba64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,2 @@ group=cz.incad.kramerius -version=7.0.39-dev -org.gradle.caching=true -org.gradle.parallel=true -#org.gradle.configuration-cache=true \ No newline at end of file +version=7.0.39 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 78224a2d4f..d64cd49177 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5592712a8f..df97d72b8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Thu Jul 13 09:18:44 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip \ No newline at end of file diff --git a/gradlew b/gradlew index cccdd3d517..1aa94a4269 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,127 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -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")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162f1..93e3f59f13 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/processes/import/src/test/java/org/kramerius/convert/input/ParametrizedConvertInputTemplateTest.java b/processes/import/src/test/java/org/kramerius/convert/input/ParametrizedConvertInputTemplateTest.java deleted file mode 100644 index dee0e1352f..0000000000 --- a/processes/import/src/test/java/org/kramerius/convert/input/ParametrizedConvertInputTemplateTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Stastny - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -/** - * - */ -package org.kramerius.convert.input; - -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.Locale; -import java.util.Properties; -import java.util.PropertyResourceBundle; - -import junit.framework.Assert; - -import org.apache.commons.configuration.Configuration; -import org.easymock.EasyMock; -import org.junit.Test; - -import com.google.inject.Provider; - -import cz.incad.kramerius.service.ResourceBundleService; -import cz.incad.kramerius.utils.conf.KConfiguration; - -/** - * @author pavels - * - */ -public class ParametrizedConvertInputTemplateTest { - - public static final String BUNDLES ="" + - "convert.directory=convert.directory\n" + - "target.directory=target.directory\n" + - "convert.selection.dialog=convert.selection.dialog"; - - public interface _TestLocaleProvider extends Provider {} - - @Test - public void testInputTemplateTest() throws IOException { - Provider localeProvider = EasyMock.createMock(_TestLocaleProvider.class); - EasyMock.expect(localeProvider.get()).andReturn(Locale.getDefault()).anyTimes(); - - ResourceBundleService resb = EasyMock.createMock(ResourceBundleService.class); - PropertyResourceBundle resourceBundle = new PropertyResourceBundle(new StringReader(BUNDLES)); - EasyMock.expect(resb.getResourceBundle("labels", Locale.getDefault())).andReturn(resourceBundle).anyTimes(); - - KConfiguration conf = EasyMock.createMock(KConfiguration.class); - EasyMock.expect(conf.getProperty("import.directory")).andReturn(System.getProperty("user.dir")).anyTimes(); - - EasyMock.expect(conf.getProperty("convert.target.directory")).andReturn(System.getProperty("user.dir")).anyTimes(); - EasyMock.expect(conf.getProperty("convert.directory")).andReturn(System.getProperty("user.dir")).anyTimes(); - - Configuration subConfObject = EasyMock.createMock(Configuration.class); - EasyMock.expect(conf.getConfiguration()).andReturn(subConfObject).anyTimes(); - - EasyMock.expect(subConfObject.getBoolean("ingest.skip")).andReturn(true).anyTimes(); - EasyMock.expect(subConfObject.getBoolean("ingest.startIndexer")).andReturn(true).anyTimes(); - EasyMock.expect(subConfObject.getBoolean("convert.defaultRights")).andReturn(true).anyTimes(); - - EasyMock.replay(localeProvider,resb, conf, subConfObject); - - ParametrizedConvertInputTemplate temp = new ParametrizedConvertInputTemplate(); - temp.configuration=conf; - temp.localesProvider = localeProvider; - temp.resourceBundleService = resb; - - StringWriter nstr = new StringWriter(); - temp.renderInput(null,nstr, new Properties()); - Assert.assertNotNull(nstr.toString()); - } - -} diff --git a/processes/import/src/test/java/org/kramerius/k3replications/input/InputTemplateTest.java b/processes/import/src/test/java/org/kramerius/k3replications/input/InputTemplateTest.java deleted file mode 100644 index b0db024b32..0000000000 --- a/processes/import/src/test/java/org/kramerius/k3replications/input/InputTemplateTest.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Stastny - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -/** - * - */ -package org.kramerius.k3replications.input; - -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.Locale; -import java.util.Properties; -import java.util.PropertyResourceBundle; - -import junit.framework.Assert; - -import org.apache.commons.configuration.Configuration; -import org.easymock.EasyMock; -import org.junit.Test; -import org.kramerius.convert.input.ParametrizedConvertInputTemplate; -import org.kramerius.convert.input.ParametrizedConvertInputTemplateTest._TestLocaleProvider; - -import com.google.inject.Provider; - -import cz.incad.kramerius.service.ResourceBundleService; -import cz.incad.kramerius.utils.conf.KConfiguration; - -/** - * @author pavels - * - */ -public class InputTemplateTest { - - public static final String BUNDLES ="" + - "convert.directory=convert.directory\n" + - "target.directory=target.directory\n" + - "convert.selection.dialog=convert.selection.dialog"; - - public interface _TestLocaleProvider extends Provider {} - - @Test - public void testInputTemplateTest() throws IOException { - Provider localeProvider = EasyMock.createMock(_TestLocaleProvider.class); - EasyMock.expect(localeProvider.get()).andReturn(Locale.getDefault()).anyTimes(); - - ResourceBundleService resb = EasyMock.createMock(ResourceBundleService.class); - PropertyResourceBundle resourceBundle = new PropertyResourceBundle(new StringReader(BUNDLES)); - EasyMock.expect(resb.getResourceBundle("labels", Locale.getDefault())).andReturn(resourceBundle).anyTimes(); - - KConfiguration conf = EasyMock.createMock(KConfiguration.class); - - EasyMock.expect(conf.getProperty("migration.target.directory")).andReturn(System.getProperty("user.dir")).anyTimes(); - EasyMock.expect(conf.getProperty("migration.directory")).andReturn(System.getProperty("user.dir")).anyTimes(); - - Configuration subConfObject = EasyMock.createMock(Configuration.class); - EasyMock.expect(conf.getConfiguration()).andReturn(subConfObject).anyTimes(); - - EasyMock.expect(subConfObject.getBoolean("ingest.skip")).andReturn(true).anyTimes(); - EasyMock.expect(subConfObject.getBoolean("ingest.startIndexer")).andReturn(true).anyTimes(); - EasyMock.expect(subConfObject.getBoolean("convert.defaultRights")).andReturn(true).anyTimes(); - - EasyMock.replay(localeProvider,resb, conf, subConfObject); - - InputTemplate temp = new InputTemplate(); - temp.configuration=conf; - temp.localesProvider = localeProvider; - temp.resourceBundleService = resb; - - StringWriter nstr = new StringWriter(); - temp.renderInput(null,nstr, new Properties()); - Assert.assertNotNull(nstr.toString()); - } - -} diff --git a/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java b/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java deleted file mode 100644 index b7dfc20ac1..0000000000 --- a/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Stastny - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.kramerius.replications.outputs; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.io.StringWriter; -import java.nio.charset.Charset; -import java.util.Locale; -import java.util.Properties; -import java.util.PropertyResourceBundle; - -import junit.framework.Assert; - -import net.sf.json.JSONObject; - -import org.easymock.EasyMock; -import org.junit.Test; - -import com.google.inject.Provider; - -import cz.incad.kramerius.processes.BatchStates; -import cz.incad.kramerius.processes.LRProcess; -import cz.incad.kramerius.processes.States; -import cz.incad.kramerius.service.ResourceBundleService; -import cz.incad.kramerius.utils.IOUtils; - -/** - * @author pavels - * - */ -public class OutputTemplateTest { - - public static final String BUNDLES ="" + - "convert.directory=convert.directory\n" + - "target.directory=target.directory\n" + - "convert.selection.dialog=convert.selection.dialog"; - public interface _TestLocaleProvider extends Provider {} - - @Test - public void shouldRenderTemplate() throws FileNotFoundException, IOException { - OutputTemplate oTemplate = EasyMock.createMockBuilder(OutputTemplate.class) - .addMockedMethod("description") - .createMock(); - - JSONObject jsonObject = description1(); - LRProcess lrPRocess = lrProcess(); - - EasyMock.expect(oTemplate.description(lrPRocess)).andReturn(jsonObject).anyTimes(); - - ResourceBundleService resb = EasyMock.createMock(ResourceBundleService.class); - PropertyResourceBundle resourceBundle = new PropertyResourceBundle(new StringReader(BUNDLES)); - EasyMock.expect(resb.getResourceBundle("labels", Locale.getDefault())).andReturn(resourceBundle).anyTimes(); - - Provider localeProvider = EasyMock.createMock(_TestLocaleProvider.class); - EasyMock.expect(localeProvider.get()).andReturn(Locale.getDefault()).anyTimes(); - - - EasyMock.replay(lrPRocess, oTemplate, resb,localeProvider); - - Assert.assertNotNull(oTemplate.description(lrPRocess)); - - oTemplate.resourceBundleService = resb; - oTemplate.localesProvider = localeProvider; - - StringWriter writer = new StringWriter(); - oTemplate.renderOutput(lrPRocess, null, writer); - String rendered = writer.toString(); - Assert.assertNotNull(rendered); - } - - @Test - public void shouldRenderTemplate2() throws FileNotFoundException, IOException { - OutputTemplate oTemplate = EasyMock.createMockBuilder(OutputTemplate.class) - .addMockedMethod("description") - .createMock(); - - JSONObject jsonObject = description2(); - LRProcess lrPRocess = lrProcess(); - - EasyMock.expect(oTemplate.description(lrPRocess)).andReturn(jsonObject).anyTimes(); - - ResourceBundleService resb = EasyMock.createMock(ResourceBundleService.class); - PropertyResourceBundle resourceBundle = new PropertyResourceBundle(new StringReader(BUNDLES)); - EasyMock.expect(resb.getResourceBundle("labels", Locale.getDefault())).andReturn(resourceBundle).anyTimes(); - - Provider localeProvider = EasyMock.createMock(_TestLocaleProvider.class); - EasyMock.expect(localeProvider.get()).andReturn(Locale.getDefault()).anyTimes(); - - - EasyMock.replay(lrPRocess, oTemplate, resb,localeProvider); - - Assert.assertNotNull(oTemplate.description(lrPRocess)); - - oTemplate.resourceBundleService = resb; - oTemplate.localesProvider = localeProvider; - - StringWriter writer = new StringWriter(); - oTemplate.renderOutput(lrPRocess, null, writer); - String rendered = writer.toString(); - Assert.assertNotNull(rendered); - } - - @Test - public void testReplace() { - String str = "Akafist' Svatěj Velikomučenice Varvare"; - OutputTemplate template = new OutputTemplate(); - String escaped = template.escapedJavascriptString(str); - Assert.assertEquals("Akafist\\' Svatěj Velikomučenice Varvare", escaped); - } - - @Test - public void testReplace2() { - String str = "Kniha zlatá, anebo, Nowý Zwěstowatel wsseho \n dobrého a vžitečného pro Národ Slowenský"; - OutputTemplate template = new OutputTemplate(); - String escaped = template.escapedJavascriptString(str); - Assert.assertEquals("Kniha zlatá, anebo, Nowý Zwěstowatel wsseho \\n dobrého a vžitečného pro Národ Slowenský", escaped); - } - - public LRProcess lrProcess() throws FileNotFoundException { - LRProcess lrPRocess = EasyMock.createMock(LRProcess.class); - Properties props = new Properties(); - props.put("url", "http://,....."); - EasyMock.expect(lrPRocess.getParametersMapping()).andReturn(props).anyTimes(); - EasyMock.expect(lrPRocess.processWorkingDirectory()).andReturn(new File(System.getProperty("user.dir"))).anyTimes(); - EasyMock.expect(lrPRocess.getProcessState()).andReturn(States.FAILED).anyTimes(); - EasyMock.expect(lrPRocess.getBatchState()).andReturn(BatchStates.BATCH_FAILED).anyTimes(); - - EasyMock.expect(lrPRocess.getErrorProcessOutputStream()).andReturn(new ByteArrayInputStream("someerror".getBytes())).anyTimes(); - EasyMock.expect(lrPRocess.getUUID()).andReturn("xxxxx").anyTimes(); - - return lrPRocess; - } - - public JSONObject description1() throws IOException { - InputStream is = OutputTemplate.class.getClassLoader().getResourceAsStream("org/kramerius/replications/description.txt"); - String stringInput = IOUtils.readAsString(is, Charset.forName("UTF-8"), true); - - Assert.assertNotNull(is); - JSONObject jsonObject = JSONObject.fromObject(stringInput); - System.out.println(jsonObject); - Assert.assertNotNull(jsonObject); - return jsonObject; - } - - public JSONObject description2() throws IOException { - InputStream is = OutputTemplate.class.getClassLoader().getResourceAsStream("org/kramerius/replications/description2.txt"); - String stringInput = IOUtils.readAsString(is, Charset.forName("UTF-8"), true); - - Assert.assertNotNull(is); - JSONObject jsonObject = JSONObject.fromObject(stringInput); - System.out.println(jsonObject); - Assert.assertNotNull(jsonObject); - return jsonObject; - } -} diff --git a/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java.svntmp b/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java.svntmp deleted file mode 100644 index d54dff9bb3..0000000000 --- a/processes/import/src/test/java/org/kramerius/replications/outputs/OutputTemplateTest.java.svntmp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Stastny - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.kramerius.replications.outputs; - -import static org.easymock.EasyMock.createMockBuilder; - -import java.io.InputStream; - -import junit.framework.Assert; - -import net.sf.json.JSONObject; - -import org.easymock.EasyMock; -import org.kramerius.replications.outputs.OutputTemplate; - -import cz.incad.kramerius.fedora.impl.FedoraAccessImpl; -import cz.incad.kramerius.utils.conf.KConfiguration; - -/** - * @author pavels - * - */ -public class OutputTemplateTest { - - public void shouldRenderTemplate() { - OutputTemplate oTemplate = EasyMock.createMockBuilder(OutputTemplate.class) - .addMockedMethod("description") - .createMock(); - - InputStream is = OutputTemplate.class.getClassLoader().getResourceAsStream("org/kramerius/replications/description.txt"); - Assert.assertNotNull(is); - JSONObject jsonObject = JSONObject.fromObject(is); - Assert.assertNotNull(jsonObject); - - EasyMock.expect(oTemplate.d) - - } -} diff --git a/processes/indexer/test/cz/incad/kramerius/indexer/dnnt/DnntSingletonTest.java b/processes/indexer/test/cz/incad/kramerius/indexer/dnnt/DnntSingletonTest.java deleted file mode 100644 index 24520e00d0..0000000000 --- a/processes/indexer/test/cz/incad/kramerius/indexer/dnnt/DnntSingletonTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package cz.incad.kramerius.indexer.dnnt; - -import cz.incad.kramerius.FedoraAccess; -import cz.incad.kramerius.security.impl.RightCriteriumContextFactoryImpl; -import cz.incad.kramerius.utils.XMLUtils; -import junit.framework.TestCase; -import org.easymock.EasyMock; -import org.junit.Assert; -import org.xml.sax.SAXException; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPathExpressionException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -public class DnntSingletonTest extends TestCase { - - public void testSingleton() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException { - InputStream is = DnntSingletonTest.class.getResourceAsStream("res/rels-ext.xml"); - FedoraAccess fa = EasyMock.createMock(FedoraAccess.class); - EasyMock.expect(fa.getRelsExt("uuid:xxxx")).andReturn(XMLUtils.parseDocument(is,true)).anyTimes(); - - EasyMock.replay(fa); - String dnnt = DnntSingleton.getInstance().dnnt("uuid:xxxx", fa); - Assert.assertTrue(dnnt.equals("true")); - } -} diff --git a/rest/src/test/java/cz/incad/kramerius/rest/api/k5/client/pdf/AbstractPDFResourceTest.java b/rest/src/test/java/cz/incad/kramerius/rest/api/k5/client/pdf/AbstractPDFResourceTest.java deleted file mode 100644 index 896281f18e..0000000000 --- a/rest/src/test/java/cz/incad/kramerius/rest/api/k5/client/pdf/AbstractPDFResourceTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package cz.incad.kramerius.rest.api.k5.client.pdf; - -import org.apache.commons.configuration.Configuration; -import org.easymock.EasyMock; -import org.junit.Assert; -import org.junit.Test; - -import cz.incad.kramerius.pdf.impl.ConfigurationUtils; - -public class AbstractPDFResourceTest { - - - - - @Test - public void testConfiguration() { - Configuration configuration = EasyMock.createMock(Configuration.class); - EasyMock.expect(configuration.getString("generatePdfMaxRange")).andReturn("20").anyTimes(); - EasyMock.expect(configuration.getBoolean("turnOffPdfCheck")).andReturn(false).anyTimes(); - EasyMock.replay(configuration); - - try { - ConfigurationUtils.checkNumber(21, configuration); - } catch (Exception e) { - // ok - } - - try { - int val = ConfigurationUtils.checkNumber(19, configuration); - Assert.assertTrue(val == 19); - } catch (Exception e) { - Assert.fail(); - } - try { - int val = ConfigurationUtils.checkNumber(20, configuration); - Assert.assertTrue(val == 20); - } catch (Exception e) { - Assert.fail(); - } - } - - - @Test - public void testConfiguration2() { - Configuration configuration = EasyMock.createMock(Configuration.class); - EasyMock.expect(configuration.getString("generatePdfMaxRange")).andReturn("20").anyTimes(); - EasyMock.expect(configuration.getBoolean("turnOffPdfCheck")).andReturn(true).anyTimes(); - EasyMock.replay(configuration); - - try { - ConfigurationUtils.checkNumber(21, configuration); - } catch (Exception e) { - Assert.fail(); - } - - try { - int val = ConfigurationUtils.checkNumber(19, configuration); - Assert.assertTrue(val == 19); - } catch (Exception e) { - Assert.fail(); - } - try { - int val = ConfigurationUtils.checkNumber(20, configuration); - Assert.assertTrue(val == 20); - } catch (Exception e) { - Assert.fail(); - } - } - -} diff --git a/search/build.gradle b/search/build.gradle index f73c4ddc03..93bde60ab7 100644 --- a/search/build.gradle +++ b/search/build.gradle @@ -124,8 +124,7 @@ repositories { jib { from { - image = 'tomcat:9.0.87-jre11-temurin-jammy' - //image = 'bitnami/tomcat:9.0.75' + image = 'tomcat:9.0.87-jre21-temurin-jammy' platforms { platform { architecture = 'amd64' diff --git a/shared/common/src/main/java/cz/incad/kramerius/security/database/SecurityDbInitializer.java b/shared/common/src/main/java/cz/incad/kramerius/security/database/SecurityDbInitializer.java index 970808cb68..0ec9620a69 100644 --- a/shared/common/src/main/java/cz/incad/kramerius/security/database/SecurityDbInitializer.java +++ b/shared/common/src/main/java/cz/incad/kramerius/security/database/SecurityDbInitializer.java @@ -239,7 +239,8 @@ public static void initDatabase(Connection connection, VersionService versionSer updateExistingActions(connection); checkLabelExists(connection); - + + dropDeprecatedLabels(connection); } catch (SQLException e) { LOGGER.log(Level.SEVERE, e.getMessage(), e); @@ -249,6 +250,40 @@ public static void initDatabase(Connection connection, VersionService versionSer } + private static void dropDeprecatedLabels(Connection connection) { + CzechEmbeddedLicenses.DEPRECATED_LICENSES.forEach(lic->{ + + List labels = new JDBCQueryTemplate(connection, false) { + @Override + public boolean handleRow(ResultSet rs, List returnsList) throws SQLException { + returnsList.add(rs.getString("label_name")); + return super.handleRow(rs, returnsList); + } + }.executeQuery("select * from labels_entity where label_name = ?", lic.getName()); + if (!labels.isEmpty()) { + try { + JDBCUpdateTemplate template = new JDBCUpdateTemplate(connection, false); + template.setUseReturningKeys(false); + + template.executeUpdate( + "DELETE FROM labels_entity WHERE label_name = ?", + lic.getName() + ); + +// template.executeUpdate( +// "insert into labels_entity(label_id,label_group,label_name, label_description, label_priority) \n" + +// "values(nextval('LABEL_ID_SEQUENCE'), 'embedded', ?, ?, (select coalesce(max(label_priority),0)+1 from labels_entity))", +// lic.getName(), lic.getDescription()); + + } catch (SQLException e) { + LOGGER.log(Level.SEVERE, String.format("Cannot create embedded label %s", lic.getName())); + } + + } + }); + } + + private static void checkLabelExists(Connection connection) { diff --git a/shared/common/src/main/java/cz/incad/kramerius/security/licenses/impl/embedded/cz/CzechEmbeddedLicenses.java b/shared/common/src/main/java/cz/incad/kramerius/security/licenses/impl/embedded/cz/CzechEmbeddedLicenses.java index b067b71b98..a9fc452dd4 100644 --- a/shared/common/src/main/java/cz/incad/kramerius/security/licenses/impl/embedded/cz/CzechEmbeddedLicenses.java +++ b/shared/common/src/main/java/cz/incad/kramerius/security/licenses/impl/embedded/cz/CzechEmbeddedLicenses.java @@ -61,8 +61,10 @@ public class CzechEmbeddedLicenses { ONSITE_LICENSE, ORPHAN_LICENSE, PUBLIC_LICENSE, - PUBLIC_MUO_LICENSE, + //PUBLIC_MUO_LICENSE, SHHETMUSIC_ONSITE_LICENSE ); + public static List DEPRECATED_LICENSES = Arrays.asList(PUBLIC_MUO_LICENSE); + } diff --git a/shared/common/src/main/java/cz/incad/kramerius/statistics/accesslogs/solr/SolrStatisticsAccessLogImpl.java b/shared/common/src/main/java/cz/incad/kramerius/statistics/accesslogs/solr/SolrStatisticsAccessLogImpl.java index de7303503a..083aa84e8c 100644 --- a/shared/common/src/main/java/cz/incad/kramerius/statistics/accesslogs/solr/SolrStatisticsAccessLogImpl.java +++ b/shared/common/src/main/java/cz/incad/kramerius/statistics/accesslogs/solr/SolrStatisticsAccessLogImpl.java @@ -121,14 +121,6 @@ public SolrStatisticsAccessLogImpl() { @Override public void reportAccess(final String pid, final String streamName) throws IOException { Document solrDoc = this.solrAccess.getSolrDataByPid(pid); - - try { - StringWriter writer = new StringWriter(); - XMLUtils.print(solrDoc, writer); - LOGGER.fine("Reporting doc for '"+pid+"' => "+writer.toString()); - } catch (TransformerException e1) { - LOGGER.log(Level.SEVERE,e1.getMessage(),e1); - } ObjectPidsPath[] paths = this.solrAccess.getPidPaths(solrDoc); ObjectModelsPath[] mpaths = this.solrAccess.getModelPaths(solrDoc); diff --git a/shared/common/src/test/java/cz/incad/kramerius/repository/RepositoryApiTimestampFormatterTest.java b/shared/common/src/test/java/cz/incad/kramerius/repository/RepositoryApiTimestampFormatterTest.java index d19b91e02b..769b88d83a 100644 --- a/shared/common/src/test/java/cz/incad/kramerius/repository/RepositoryApiTimestampFormatterTest.java +++ b/shared/common/src/test/java/cz/incad/kramerius/repository/RepositoryApiTimestampFormatterTest.java @@ -7,6 +7,8 @@ import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; import java.time.temporal.ChronoField; +import java.util.logging.Level; +import java.util.logging.Logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -78,8 +80,6 @@ public void testParsingMillisIn0Digits() { //FIXME: this shouldn't be really accepted. But it's the best solution still. //assertInvalidDateTime("2022-06-24T19:11:55.Z"); assertValidDateTime("2022-06-24T19:11:55.0Z"); - assertValidDateTime("2022-06-24T19:11:55.00Z"); - assertValidDateTime("2022-06-24T19:11:55.000Z"); } @Test @@ -113,12 +113,15 @@ public void testFormattingNoMillis() { } private void assertMatchesAfterParsingAndFormatting(String original, String expected) { + //System.getProperties(); + + try { LocalDateTime parsed = LocalDateTime.parse(original, TIMESTAMP_FORMATTER); String formatted = parsed.format(TIMESTAMP_FORMATTER); assertEquals(formatted, expected); } catch (DateTimeParseException e) { - fail("should be valid: " + original); + fail("original: " + original+", expected:"+expected); } }