From b7f60560325a7a50da3c69b9f551dd30ecff75dd Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Tue, 21 Feb 2023 15:42:07 +0200 Subject: [PATCH] - Improve an error-message. - Update Gradle. --- gradle/wrapper/gradle-wrapper.properties | 2 +- installAndRun.sh | 2 +- src/main/java/eu/openaire/urls_controller/util/FileUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 42defcc..fc10b60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/installAndRun.sh b/installAndRun.sh index 0c00435..78f7d11 100755 --- a/installAndRun.sh +++ b/installAndRun.sh @@ -26,7 +26,7 @@ if [[ justInstall -eq 1 && shouldRunInDocker -eq 1 ]]; then justInstall=0 fi -gradleVersion="8.0" +gradleVersion="8.0.1" if [[ justInstall -eq 0 ]]; then diff --git a/src/main/java/eu/openaire/urls_controller/util/FileUtils.java b/src/main/java/eu/openaire/urls_controller/util/FileUtils.java index 8174ca3..d4ecaed 100644 --- a/src/main/java/eu/openaire/urls_controller/util/FileUtils.java +++ b/src/main/java/eu/openaire/urls_controller/util/FileUtils.java @@ -180,7 +180,7 @@ public class FileUtils { // Extract the "fileNameWithExtension" to be added in the HashMultimap. Matcher matcher = FILENAME_ID_EXTENSION.matcher(fileLocation); if ( ! matcher.matches() ) { - logger.error("Failed to match the \"" + fileLocation + "\" with the regex: " + FILENAME_ID_EXTENSION); + logger.error("Failed to match the \"fileLocation\": \"" + fileLocation + "\", using this regex: " + FILENAME_ID_EXTENSION); return null; } String fileNameWithExtension = matcher.group(1);