summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-10-19 08:58:28 +0200
committerHarald Musum <musum@yahooinc.com>2023-10-19 08:58:28 +0200
commit22793212d17fa30b07ead20a25335bbf3bd9bc4f (patch)
tree1f0ac9bac5df18789446b445fb72c0907d0e99b6 /controller-server
parentad6f836120909bae6ef03b77e2b7c3dade1b8fbe (diff)
PricingController has move, injected as a component now
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
index 9a2a57359d7..8ca2936eee7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.billing.Plan;
import com.yahoo.vespa.hosted.controller.api.integration.pricing.ApplicationResources;
import com.yahoo.vespa.hosted.controller.api.integration.pricing.PriceInformation;
import com.yahoo.vespa.hosted.controller.api.integration.pricing.Prices;
+import com.yahoo.vespa.hosted.controller.api.integration.pricing.PricingController;
import com.yahoo.vespa.hosted.controller.api.integration.pricing.PricingInfo;
import com.yahoo.vespa.hosted.controller.restapi.ErrorResponses;
import com.yahoo.yolean.Exceptions;
@@ -48,11 +49,13 @@ public class PricingApiHandler extends ThreadedHttpRequestHandler {
private static final Logger log = Logger.getLogger(PricingApiHandler.class.getName());
private final Controller controller;
+ private final PricingController pricingController;
@Inject
- public PricingApiHandler(Context parentCtx, Controller controller) {
+ public PricingApiHandler(Context parentCtx, Controller controller, PricingController pricingController) {
super(parentCtx);
this.controller = controller;
+ this.pricingController = pricingController;
}
@Override
@@ -85,8 +88,7 @@ public class PricingApiHandler extends ThreadedHttpRequestHandler {
}
private Prices calculatePrice(PriceParameters priceParameters) {
- var priceCalculator = controller.serviceRegistry().pricingController();
- return priceCalculator.priceForApplications(priceParameters.appResources, priceParameters.pricingInfo, priceParameters.plan);
+ return pricingController.priceForApplications(priceParameters.appResources, priceParameters.pricingInfo, priceParameters.plan);
}
private PriceParameters parseQuery(String rawQuery) {