killbill-memoizeit

diff --git a/account/src/main/java/com/ning/billing/account/api/AccountUserApi.java b/account/src/main/java/com/ning/billing/account/api/AccountUserApi.java
new file mode 100644
index 0000000..804812c
--- /dev/null
+++ b/account/src/main/java/com/ning/billing/account/api/AccountUserApi.java
@@ -0,0 +1,54 @@
+/*
+ * 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.account.api;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.dao.IAccountDao;
+
+public class AccountUserApi implements IAccountUserApi {
+
+    private final IAccountDao dao;
+
+    @Inject
+    public AccountUserApi(IAccountDao dao) {
+        this.dao = dao;
+    }
+
+    @Override
+    public IAccount createAccount(IAccountData data) {
+        return dao.createAccount((IAccount) data);
+    }
+
+    @Override
+    public IAccount getAccountByKey(String key) {
+        return dao.getAccountByKey(key);
+    }
+
+    @Override
+    public IAccount getAccountFromId(UUID uid) {
+        return dao.getAccountFromId(uid);
+    }
+
+    @Override
+    public List<IAccount> getAccounts() {
+        return dao.getAccounts();
+    }
+
+}

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
index 58369c6..7476e44 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
@@ -23,6 +23,7 @@ import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Transaction;
 
 import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.IAccount;
 
 public class AccountDao implements IAccountDao {
@@ -35,8 +36,10 @@ public class AccountDao implements IAccountDao {
     }
 
     @Override
-    public void createAccount(IAccount account) {
-        dao.insertAccount(account);
+    public IAccount createAccount(IAccount account) {
+        IAccount result = new Account(account.getKey());
+        dao.insertAccount(result);
+        return result;
     }
 
     @Override

diff --git a/account/src/main/java/com/ning/billing/account/dao/IAccountDao.java b/account/src/main/java/com/ning/billing/account/dao/IAccountDao.java
index ed9693e..8475d42 100644
--- a/account/src/main/java/com/ning/billing/account/dao/IAccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/IAccountDao.java
@@ -23,7 +23,7 @@ import com.ning.billing.account.api.IAccount;
 
 public interface IAccountDao {
 
-    public void createAccount(IAccount account);
+    public IAccount createAccount(IAccount account);
 
     public IAccount getAccountByKey(String key);
 

diff --git a/account/src/main/java/com/ning/billing/account/glue/AccountModule.java b/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
index 0311d60..4f0ec7a 100644
--- a/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
+++ b/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
@@ -19,6 +19,8 @@ package com.ning.billing.account.glue;
 import org.skife.config.ConfigurationObjectFactory;
 
 import com.google.inject.AbstractModule;
+import com.ning.billing.account.api.AccountUserApi;
+import com.ning.billing.account.api.IAccountUserApi;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.dao.IAccountDao;
 
@@ -33,10 +35,15 @@ public class AccountModule extends AbstractModule {
         bind(IAccountDao.class).to(AccountDao.class).asEagerSingleton();
     }
 
+    protected void installAccountUserApi() {
+        bind(IAccountUserApi.class).to(AccountUserApi.class).asEagerSingleton();
+    }
+
     @Override
     protected void configure() {
         installConfig();
         installAccountDao();
+        installAccountUserApi();
     }
 
 }