diff --git a/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java b/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java index 536284ce..4b9a3964 100644 --- a/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java +++ b/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java @@ -38,6 +38,7 @@ import org.killbill.billing.control.plugin.api.PaymentControlPluginApi; import org.killbill.billing.currency.plugin.api.CurrencyPluginApi; import org.killbill.billing.entitlement.plugin.api.EntitlementPluginApi; +import org.killbill.billing.invoice.plugin.api.InvoiceFormatterFactory; import org.killbill.billing.invoice.plugin.api.InvoicePluginApi; import org.killbill.billing.osgi.api.Healthcheck; import org.killbill.billing.osgi.api.OSGIConfigProperties; @@ -139,6 +140,11 @@ public void addCurrencyPluginApiOSGIServiceRegistration(@Nullable final OSGIServ allRegistrationHandlers.add(currencyProviderPluginRegistry); } + @Inject + public void addInvoiceFormatterFactoryOSGIServiceRegistration(@Nullable final OSGIServiceRegistration invoiceFormatterFactoryRegistry) { + allRegistrationHandlers.add(invoiceFormatterFactoryRegistry); + } + @Inject public void addPaymentControlPluginApiOSGIServiceRegistration(@Nullable final OSGIServiceRegistration paymentControlProviderPluginRegistry) { allRegistrationHandlers.add(paymentControlProviderPluginRegistry); diff --git a/platform-api/pom.xml b/platform-api/pom.xml index a3993d7e..e0e8f0f9 100644 --- a/platform-api/pom.xml +++ b/platform-api/pom.xml @@ -28,5 +28,5 @@ killbill-platform-api jar killbill-platform-api - + diff --git a/platform-test/pom.xml b/platform-test/pom.xml index 4d357935..16efe8c4 100644 --- a/platform-test/pom.xml +++ b/platform-test/pom.xml @@ -278,8 +278,8 @@ initialize - - + + diff --git a/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/glue/TestIntegrationModule.java b/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/glue/TestIntegrationModule.java index 7cd80935..a241449c 100644 --- a/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/glue/TestIntegrationModule.java +++ b/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/glue/TestIntegrationModule.java @@ -33,6 +33,7 @@ import org.killbill.billing.entitlement.api.SubscriptionApi; import org.killbill.billing.entitlement.plugin.api.EntitlementPluginApi; import org.killbill.billing.invoice.api.InvoiceUserApi; +import org.killbill.billing.invoice.plugin.api.InvoiceFormatterFactory; import org.killbill.billing.invoice.plugin.api.InvoicePluginApi; import org.killbill.billing.osgi.api.Healthcheck; import org.killbill.billing.osgi.api.OSGIServiceDescriptor; @@ -116,6 +117,7 @@ protected void bindOsgiServiceRegistration() { bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(PaymentPluginApi.class)); bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(CurrencyPluginApi.class)); bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(InvoicePluginApi.class)); + bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(InvoiceFormatterFactory.class)); bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(PaymentControlPluginApi.class)); bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(CatalogPluginApi.class)); bind(new TypeLiteral>() {}).toInstance(new TestPlatformPaymentProviderPluginRegistry<>(EntitlementPluginApi.class)); @@ -135,6 +137,8 @@ public TestPlatformPaymentProviderPluginRegistry(final Class serviceType) { this.serviceType = serviceType; } + + @Override public void registerService(final OSGIServiceDescriptor desc, final T service) { pluginsByName.put(desc.getRegistrationName(), service); diff --git a/pom.xml b/pom.xml index 9709d659..30fb1020 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.24 + 0.146.28 killbill-platform 0.41.7-SNAPSHOT