diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-02 16:11:32 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:26 +0200 |
| commit | da36b1957fad0b49ba53de7c35b859a3b55bc501 (patch) | |
| tree | e19b0cb0e4d0b211fb67154ba3c769b3943b4985 /configserver | |
| parent | dcddd40a4e24b004f00d3be7d9c0e66cf1e2d9a1 (diff) | |
Don't provide Jetty bundles from 'container' artifact
Add dependency on 'jetty-http' with scope test instead of adding false dependencies with 'container-test'.
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/pom.xml | 7 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index cee178c0405..755e2b662df 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -279,6 +279,13 @@ <artifactId>http-utils</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <!-- TODO Remove dependency on Jetty once no longer required for multi-part response parsing --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java index db3c8d0d165..6ffd26478c3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java @@ -80,6 +80,7 @@ public class ApplicationApiHandler extends SessionHandler { .orElse(false); if (multipartRequest) { try { + // TODO Remove direct dependency on Jetty for parsing multi-part response (add helper in container-core) MultiPartFormInputStream multiPartFormInputStream = new MultiPartFormInputStream(request.getData(), request.getHeader(CONTENT_TYPE), /* config */null, /* contextTmpDir */null); Map<String, Part> parts = multiPartFormInputStream.getParts().stream() .collect(Collectors.toMap(Part::getName, p -> p)); |