summaryrefslogtreecommitdiffstats
path: root/hosted-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 12:58:31 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 16:37:07 +0200
commitcf9751079b459f463ddacfd895ec778e27cc5b68 (patch)
treeb2fea8ba669299015bc5d1910a23cfd87a295065 /hosted-api
parent354888e4bd140a57facd7149d1bbf62d23896fe3 (diff)
Name change, doc change, unused import GC
Diffstat (limited to 'hosted-api')
-rw-r--r--hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java5
-rw-r--r--hosted-api/src/main/java/ai/vespa/hosted/api/Signatures.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index fecc0aad3aa..5a2c8f2dc23 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -12,7 +12,6 @@ import com.yahoo.slime.Slime;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.URI;
import java.net.http.HttpClient;
@@ -52,7 +51,7 @@ public class ControllerHttpClient {
HttpRequest request = signer.signed(HttpRequest.newBuilder(applicationPath(id.tenant(), id.application()).resolve("submit"))
.timeout(Duration.ofMinutes(30)),
POST,
- new MultiPartStreamer().addJson("submitOptions", metaToSlime(submission))
+ new MultiPartStreamer().addJson("submitOptions", metoToJson(submission))
.addFile("applicationZip", submission.applicationZip())
.addFile("applicationTestZip", submission.applicationTestZip()));
try {
@@ -84,7 +83,7 @@ public class ControllerHttpClient {
}
/** Returns a JSON representation of the submission meta data. */
- private static String metaToSlime(Submission submission) {
+ private static String metaToJson(Submission submission) {
try {
Slime slime = new Slime();
Cursor rootObject = slime.setObject();
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/Signatures.java b/hosted-api/src/main/java/ai/vespa/hosted/api/Signatures.java
index 74a4bb6099f..55a08eb0283 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/Signatures.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/Signatures.java
@@ -19,7 +19,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
public class Signatures {
- /** Returns the SHA-256 hash of the content in the implied input stream, consuming it in the process. */
+ /** Returns the SHA-256 hash of the content in the implied input stream. */
public static byte[] sha256Digest(Callable<InputStream> in) {
try (DigestInputStream digester = sha256Digester(in.call())) {
byte[] buffer = new byte[1 << 10];