summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-11-12 14:59:38 +0100
committerGitHub <noreply@github.com>2020-11-12 14:59:38 +0100
commit3745d5fdad9de2d229d6514637ab7faf4b8e3c97 (patch)
tree3fb30ed75a16ac5a3c7034bb96145f34ee30fa34
parent18cac1930b6abf1e6535307bfd13da2dec6c2fd8 (diff)
parentb72f67ab70b9a30bbf4f9134c3d3467d3b849966 (diff)
Merge pull request #15315 from vespa-engine/hmusum/update-throws-clause
Update throws clause for preprocess()
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java4
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index 45867eedb31..0d868057adb 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -250,9 +250,7 @@ public interface ApplicationPackage {
*
* @return A new application package instance pointing to a new location
*/
- // TODO: TransformerException, ParserConfigurationException, SAXException can be removed from 'throws' when 7.308 is latest version in use
- default ApplicationPackage preprocess(Zone zone, DeployLogger logger)
- throws IOException, TransformerException, ParserConfigurationException, SAXException {
+ default ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException {
throw new UnsupportedOperationException("This application package does not support preprocessing");
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 8b9f2f084e1..f84defce635 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -248,7 +248,7 @@ public class SessionPreparer {
void preprocess() {
try {
this.preprocessedApplicationPackage = applicationPackage.preprocess(properties.zone(), logger);
- } catch (IOException | TransformerException | ParserConfigurationException | SAXException | RuntimeException e) {
+ } catch (IOException | RuntimeException e) {
throw new IllegalArgumentException("Error preprocessing application package for " + applicationId, e);
}
checkTimeout("preprocess");