lsmyrnaios
/
UrlsWorker
1
0
Fork 1
Code Issues Pull Requests Releases 17 Wiki Activity

- In case a faulty "assignmentsCounter" was given to the "addReportResultToWorker"-endpoint, then return an explanatory error-message along with the HTTP-404 error. 

- Update Gradle.
This commit is contained in:
Lampros Smyrnaios 2023-10-06 15:45:53 +03:00
parent 01e378ea66
commit 1b45f384a7
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
installAndRun.sh
View File

@ -22,7 +22,7 @@ elif [[ $# -gt 2 ]]; then
echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>"; exit 2 echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>"; exit 2
fi fi
gradleVersion="8.3" gradleVersion="8.4"
shouldBeCarefulWithMaxHeap=0 # This is NOT a cmd-arg. shouldBeCarefulWithMaxHeap=0 # This is NOT a cmd-arg.

5
src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java
View File

@ -102,8 +102,9 @@ public class GeneralController {
public ResponseEntity<?> addReportResultToWorker(@PathVariable long assignmentsCounter, @RequestBody(required=false) String errorMsg) public ResponseEntity<?> addReportResultToWorker(@PathVariable long assignmentsCounter, @RequestBody(required=false) String errorMsg)
{ {
if ( ! AssignmentsHandler.handledAssignmentsCounters.contains(assignmentsCounter) ) { if ( ! AssignmentsHandler.handledAssignmentsCounters.contains(assignmentsCounter) ) {
logger.error("The \"addReportResultToWorker\"-endpoint was called for an unknown \"assignmentsCounter\": " + assignmentsCounter); errorMsg = "The \"addReportResultToWorker\"-endpoint was called for an unknown \"assignmentsCounter\": " + assignmentsCounter;
return ResponseEntity.notFound().build(); logger.error(errorMsg);
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorMsg);
} }
if ( errorMsg == null ) { if ( errorMsg == null ) {