From c60433d147f7ae33e6850034f00976dabf7fb4bd Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Mon, 10 Jul 2023 10:19:56 -0700 Subject: [PATCH] Java 17 string usage and dependency fix. --- .../org/opencadc/alma/data/DataJobRunner.java | 18 ++++++++++-------- tap/build.gradle | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/data/src/main/java/org/opencadc/alma/data/DataJobRunner.java b/data/src/main/java/org/opencadc/alma/data/DataJobRunner.java index cdf5237..7b9024f 100644 --- a/data/src/main/java/org/opencadc/alma/data/DataJobRunner.java +++ b/data/src/main/java/org/opencadc/alma/data/DataJobRunner.java @@ -148,14 +148,16 @@ public void run() { void throwUsageError() { final String requestURI = this.job.getRequestPath(); throw new IllegalArgumentException( - String.format("\nUsage: \n" - + "%s?file=[ABSOLUTE_FILE_PATH]\n" - + "OR for a sub-region:\n" - + "%s?file=[ABSOLUTE_FILE_PATH]&[SODA_PARAM]=[CUTOUT_SPEC]\n" - + "OR for headers only:\n%s" - + "?file=[ABSOLUTE_FILE_PATH]&headers=true\n\n" - + "See https://www.ivoa.net/documents/SODA/20170517/REC-SODA-1.0.html#tth_sEc3.3 for " - + "SODA_PARAM values.", + String.format(""" + + Usage:\s + %s?file=[ABSOLUTE_FILE_PATH] + OR for a sub-region: + %s?file=[ABSOLUTE_FILE_PATH]&[SODA_PARAM]=[CUTOUT_SPEC] + OR for headers only: + %s?file=[ABSOLUTE_FILE_PATH]&headers=true + + See https://www.ivoa.net/documents/SODA/20170517/REC-SODA-1.0.html#tth_sEc3.3 for SODA_PARAM values.""", requestURI, requestURI, requestURI)); diff --git a/tap/build.gradle b/tap/build.gradle index 8927cde..5a9cb67 100644 --- a/tap/build.gradle +++ b/tap/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation 'org.opencadc:cadc-log:[1.1.7,1.2.0)' implementation 'org.opencadc:cadc-rest:[1.3.11,1.4.0)' implementation 'org.opencadc:cadc-tap-server:[1.1.21,1.2.0)' - implementation 'org.opencadc:cadc-tap-server-oracle:[1.2.12,1.3.0)' + implementation 'org.opencadc:cadc-tap-server-oracle:[1.2.11,1.3.0)' implementation 'org.opencadc:cadc-tap-tmp:[1.1.0,1.2.0)' implementation 'org.opencadc:cadc-util:[1.6.1,1.7.0)' implementation 'org.opencadc:cadc-uws:[1.0.5,1.1.0)'