diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-07-15 11:51:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-15 11:51:01 +0200 |
commit | cd6bcb0a881cf7470ab84433e630870c5633fa12 (patch) | |
tree | b2cc303da6ec25557aa3d6241262ac757d814325 /controller-server | |
parent | 437a0f737d3636e23b0273dcd0a96aa2da56ff86 (diff) | |
parent | fe2b29420a5e758ac8d7358dd51ff6203b5271e1 (diff) |
Merge pull request #18595 from vespa-engine/bjorncs/restapi
Bjorncs/restapi
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java index bfcefecba0c..58afed4143f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java @@ -11,7 +11,6 @@ import com.yahoo.restapi.SlimeJsonResponse; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; -import com.yahoo.slime.SlimeUtils; import com.yahoo.slime.Type; import com.yahoo.vespa.hosted.controller.ApplicationController; import com.yahoo.vespa.hosted.controller.Controller; @@ -26,7 +25,6 @@ import com.yahoo.vespa.hosted.controller.tenant.CloudTenant; import com.yahoo.vespa.hosted.controller.tenant.Tenant; import javax.ws.rs.BadRequestException; -import java.io.IOException; import java.math.BigDecimal; import java.time.Clock; import java.time.Instant; @@ -34,8 +32,8 @@ import java.time.LocalDate; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Comparator; -import java.util.Optional; import java.util.List; +import java.util.Optional; /** * @author ogronnesby @@ -78,11 +76,6 @@ public class BillingApiHandlerV2 extends RestApiRequestHandler<BillingApiHandler .addRoute(RestApi.route("/billing/v2/accountant/preview/tenant/{tenant}") .get(self::previewBill) .post(Slime.class, self::createBill)) - /* - * Utility - map Slime.class => SlimeJsonResponse - */ - .addRequestMapper(Slime.class, BillingApiHandlerV2::slimeRequestMapper) - .addResponseMapper(Slime.class, BillingApiHandlerV2::slimeResponseMapper) .build(); } @@ -337,16 +330,4 @@ public class BillingApiHandlerV2 extends RestApiRequestHandler<BillingApiHandler return inspector.field(field).asString(); } - private static Optional<Slime> slimeRequestMapper(RestApi.RequestContext requestContext) { - try { - return Optional.of(SlimeUtils.jsonToSlime(requestContext.requestContentOrThrow().content().readAllBytes())); - } catch (IOException e) { - throw new IllegalArgumentException("Could not parse JSON input"); - } - } - - private static HttpResponse slimeResponseMapper(RestApi.RequestContext ctx, Slime slime) { - return new SlimeJsonResponse(slime); - } - } |