killbill-aplcache

Various fixes to overdue to get a beatrix test working end-to-end.

5/12/2012 3:25:08 PM

Details

diff --git a/api/src/main/java/com/ning/billing/glue/OverdueModule.java b/api/src/main/java/com/ning/billing/glue/OverdueModule.java
new file mode 100644
index 0000000..5866557
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/glue/OverdueModule.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.glue;
+
+public interface OverdueModule {
+
+    public abstract void installOverdueUserApi();
+
+}
\ No newline at end of file
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java
new file mode 100644
index 0000000..60f77d8
--- /dev/null
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.beatrix.integration.overdue;
+
+import com.ning.billing.overdue.OverdueService;
+import com.ning.billing.overdue.glue.DefaultOverdueModule;
+import com.ning.billing.overdue.wrapper.MockOverdueWrapperFactory;
+import com.ning.billing.overdue.wrapper.OverdueWrapperFactory;
+
+public class IntegrationTestOverdueModule extends DefaultOverdueModule {
+   
+    
+    protected void installOverdueService() {
+        bind(OverdueService.class).to(MockOverdueService.class);    
+    }
+
+    @Override
+    protected void installOverdueWrapperFactory() {
+       bind(OverdueWrapperFactory.class).to(MockOverdueWrapperFactory.class).asEagerSingleton();
+    }
+    
+    
+}
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java
new file mode 100644
index 0000000..059b0a2
--- /dev/null
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.beatrix.integration.overdue;
+
+import com.google.inject.Inject;
+import com.ning.billing.ovedue.notification.OverdueCheckNotifier;
+import com.ning.billing.overdue.OverdueProperties;
+import com.ning.billing.overdue.OverdueUserApi;
+import com.ning.billing.overdue.config.OverdueConfig;
+import com.ning.billing.overdue.listener.OverdueListener;
+import com.ning.billing.overdue.service.DefaultOverdueService;
+import com.ning.billing.util.bus.BusService;
+
+public class MockOverdueService extends DefaultOverdueService {
+    @Inject
+    public MockOverdueService(OverdueUserApi userApi, OverdueProperties properties, OverdueCheckNotifier notifier,
+            BusService busService, OverdueListener listener) {
+        super(userApi, properties, notifier, busService, listener);
+    }
+
+    public synchronized void loadConfig() throws ServiceException {
+       
+    }
+ 
+}
\ No newline at end of file
diff --git a/beatrix/src/test/java/com/ning/billing/overdue/wrapper/MockOverdueWrapperFactory.java b/beatrix/src/test/java/com/ning/billing/overdue/wrapper/MockOverdueWrapperFactory.java
new file mode 100644
index 0000000..d70b9d2
--- /dev/null
+++ b/beatrix/src/test/java/com/ning/billing/overdue/wrapper/MockOverdueWrapperFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.overdue.wrapper;
+
+import com.google.inject.Inject;
+import com.ning.billing.entitlement.api.user.EntitlementUserApi;
+import com.ning.billing.entitlement.api.user.SubscriptionBundle;
+import com.ning.billing.junction.api.BlockingApi;
+import com.ning.billing.overdue.applicator.OverdueStateApplicator;
+import com.ning.billing.overdue.calculator.BillingStateCalculatorBundle;
+import com.ning.billing.overdue.config.OverdueConfig;
+import com.ning.billing.util.clock.Clock;
+
+public class MockOverdueWrapperFactory extends OverdueWrapperFactory {
+
+    @Inject
+    public MockOverdueWrapperFactory(BlockingApi api, OverdueConfig config, Clock clock,
+            BillingStateCalculatorBundle billingStateCalcuatorBundle,
+            OverdueStateApplicator<SubscriptionBundle> overdueStateApplicatorBundle, EntitlementUserApi entitlementApi) {
+        super(api, config, clock, billingStateCalcuatorBundle, overdueStateApplicatorBundle, entitlementApi);
+    }
+
+    public void setOverdueConfig(OverdueConfig config) {
+        overdueConfig = config;
+    }
+}
diff --git a/overdue/src/main/java/com/ning/billing/overdue/glue/DefaultOverdueModule.java b/overdue/src/main/java/com/ning/billing/overdue/glue/DefaultOverdueModule.java
new file mode 100644
index 0000000..41b0d86
--- /dev/null
+++ b/overdue/src/main/java/com/ning/billing/overdue/glue/DefaultOverdueModule.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.overdue.glue;
+
+import org.skife.config.ConfigurationObjectFactory;
+
+import com.google.inject.AbstractModule;
+import com.ning.billing.glue.OverdueModule;
+import com.ning.billing.ovedue.notification.DefaultOverdueCheckNotifier;
+import com.ning.billing.ovedue.notification.DefaultOverdueCheckPoster;
+import com.ning.billing.ovedue.notification.OverdueCheckNotifier;
+import com.ning.billing.ovedue.notification.OverdueCheckPoster;
+import com.ning.billing.overdue.OverdueProperties;
+import com.ning.billing.overdue.OverdueService;
+import com.ning.billing.overdue.OverdueUserApi;
+import com.ning.billing.overdue.api.DefaultOverdueUserApi;
+import com.ning.billing.overdue.service.DefaultOverdueService;
+import com.ning.billing.overdue.service.ExtendedOverdueService;
+import com.ning.billing.overdue.wrapper.OverdueWrapperFactory;
+
+
+public class DefaultOverdueModule extends AbstractModule implements OverdueModule {
+
+    @Override
+    protected void configure() {
+        installOverdueUserApi();
+        
+        // internal bindings
+        installOverdueService();
+        installOverdueWrapperFactory();
+
+        final OverdueProperties config = new ConfigurationObjectFactory(System.getProperties()).build(OverdueProperties.class);
+        bind(OverdueProperties.class).toInstance(config);
+        bind(ExtendedOverdueService.class).to(DefaultOverdueService.class).asEagerSingleton();    
+        bind(OverdueCheckNotifier.class).to(DefaultOverdueCheckNotifier.class).asEagerSingleton();
+        bind(OverdueCheckPoster.class).to(DefaultOverdueCheckPoster.class).asEagerSingleton();
+   }
+
+    protected void installOverdueService() {
+        bind(OverdueService.class).to(DefaultOverdueService.class).asEagerSingleton();    
+    }
+
+    protected void installOverdueWrapperFactory() {
+        bind(OverdueWrapperFactory.class).to(OverdueWrapperFactory.class).asEagerSingleton();    
+    }
+
+    /* (non-Javadoc)
+     * @see com.ning.billing.overdue.glue.OverdueModule#installOverdueUserApi()
+     */
+    @Override
+    public void installOverdueUserApi() {
+        bind(OverdueUserApi.class).to(DefaultOverdueUserApi.class).asEagerSingleton();         
+    }
+    
+
+}
diff --git a/util/src/test/java/com/ning/billing/mock/glue/MockOverdueModule.java b/util/src/test/java/com/ning/billing/mock/glue/MockOverdueModule.java
new file mode 100644
index 0000000..7ab87d8
--- /dev/null
+++ b/util/src/test/java/com/ning/billing/mock/glue/MockOverdueModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.mock.glue;
+
+import com.google.inject.AbstractModule;
+import com.ning.billing.glue.OverdueModule;
+import com.ning.billing.mock.BrainDeadProxyFactory;
+import com.ning.billing.overdue.OverdueUserApi;
+
+public class MockOverdueModule extends AbstractModule implements OverdueModule {
+
+    @Override
+    public void installOverdueUserApi() {
+        bind(OverdueUserApi.class).toInstance(BrainDeadProxyFactory.createBrainDeadProxyFor(OverdueUserApi.class));
+    }
+
+    @Override
+    protected void configure() {
+        installOverdueUserApi();
+    }
+
+}