diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
index e2cc293..589a028 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 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
@@ -38,64 +38,30 @@ import com.ning.billing.util.entity.collection.dao.UpdatableEntityCollectionSqlD
@RegisterMapper(AccountEmailMapper.class)
public interface AccountEmailSqlDao extends UpdatableEntityCollectionSqlDao<AccountEmail>, Transactional<AccountEmailSqlDao>, Transmogrifier {
@Override
- @SqlBatch(transactional=false)
+ @SqlBatch
public void insertFromTransaction(@Bind("objectId") final String objectId,
@ObjectTypeBinder final ObjectType objectType,
@AccountEmailBinder final Collection<AccountEmail> entities,
@CallContextBinder final CallContext context);
@Override
- @SqlBatch(transactional=false)
+ @SqlBatch
public void updateFromTransaction(@Bind("objectId") final String objectId,
@ObjectTypeBinder final ObjectType objectType,
@AccountEmailBinder final Collection<AccountEmail> entities,
@CallContextBinder final CallContext context);
@Override
- @SqlBatch(transactional=false)
+ @SqlBatch
public void deleteFromTransaction(@Bind("objectId") final String objectId,
@ObjectTypeBinder final ObjectType objectType,
@AccountEmailBinder final Collection<AccountEmail> entities,
@CallContextBinder final CallContext context);
@Override
- @SqlBatch(transactional=false)
+ @SqlBatch
public void addHistoryFromTransaction(@Bind("objectId") final String objectId,
- @ObjectTypeBinder final ObjectType objectType,
- @AccountEmailHistoryBinder final List<EntityHistory<AccountEmail>> entities,
- @CallContextBinder final CallContext context);
-// @Override
-// @SqlUpdate
-// public void create(@AccountEmailBinder final AccountEmail accountEmail,
-// @CallContextBinder final CallContext context);
-
-// @SqlBatch(transactional = false)
-// public void create(@AccountEmailBinder final List<AccountEmail> accountEmailList,
-// @CallContextBinder final CallContext context);
-
-// @Override
-// @SqlUpdate
-// public void update(@AccountEmailBinder final AccountEmail accountEmail,
-// @CallContextBinder final CallContext context);
-//
-// @SqlBatch(transactional = false)
-// public void update(@AccountEmailBinder final List<AccountEmail> accountEmailList,
-// @CallContextBinder final CallContext context);
-//
-// @SqlUpdate
-// public void delete(@AccountEmailBinder final AccountEmail accountEmail,
-// @CallContextBinder final CallContext context);
-//
-// @SqlBatch(transactional = false)
-// public void delete(@AccountEmailBinder final List<AccountEmail> accountEmailList,
-// @CallContextBinder final CallContext context);
-//
-// @SqlBatch(transactional=false)
-// public void insertAccountEmailHistoryFromTransaction(@Bind("historyRecordId") final List<String> historyRecordIdList,
-// @AccountEmailBinder final List<AccountEmail> accountEmail,
-// @ChangeTypeBinder final ChangeType changeType,
-// @CallContextBinder final CallContext context);
-//
-// @SqlQuery
-// public List<AccountEmail> getByAccountId(@Bind("accountId") final String accountId);
+ @ObjectTypeBinder final ObjectType objectType,
+ @AccountEmailHistoryBinder final List<EntityHistory<AccountEmail>> entities,
+ @CallContextBinder final CallContext context);
}
diff --git a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountEmailDao.java b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountEmailDao.java
index 664d9cc..d8fb806 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountEmailDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountEmailDao.java
@@ -35,12 +35,12 @@ public class AuditedAccountEmailDao extends AuditedCollectionDaoBase<AccountEmai
private final AccountEmailSqlDao accountEmailSqlDao;
@Inject
- public AuditedAccountEmailDao(IDBI dbi) {
+ public AuditedAccountEmailDao(final IDBI dbi) {
this.accountEmailSqlDao = dbi.onDemand(AccountEmailSqlDao.class);
}
@Override
- protected AccountEmail getEquivalenceObjectFor(AccountEmail obj) {
+ protected AccountEmail getEquivalenceObjectFor(final AccountEmail obj) {
return obj;
}
@@ -55,7 +55,7 @@ public class AuditedAccountEmailDao extends AuditedCollectionDaoBase<AccountEmai
}
@Override
- public String getKey(AccountEmail entity) {
+ public String getKey(final AccountEmail entity) {
return entity.getEmail();
}
@@ -64,72 +64,6 @@ public class AuditedAccountEmailDao extends AuditedCollectionDaoBase<AccountEmai
accountEmailSqlDao.test();
}
-// @Override
-// public List<AccountEmail> getEmails(final UUID accountId) {
-// return accountEmailSqlDao.load(accountId.toString(), null);
-// //return accountEmailSqlDao.getByAccountId(accountId.toString());
-// }
-
-// @Override
-// public void saveEmails(final UUID accountId, final List<AccountEmail> emails, final CallContext context) {
-// final List<AccountEmail> existingEmails = accountEmailSqlDao.getByAccountId(accountId.toString());
-// final List<AccountEmail> updatedEmails = new ArrayList<AccountEmail>();
-//
-// Iterator<AccountEmail> existingEmailIterator = existingEmails.iterator();
-// while (existingEmailIterator.hasNext()) {
-// AccountEmail existingEmail = existingEmailIterator.next();
-//
-// Iterator<AccountEmail> newEmailIterator = emails.iterator();
-// while (newEmailIterator.hasNext()) {
-// AccountEmail newEmail = newEmailIterator.next();
-// if (newEmail.getId().equals(existingEmail.getId())) {
-// // check equality; if not equal, add to updated
-// if (!newEmail.equals(existingEmail)) {
-// updatedEmails.add(newEmail);
-// }
-//
-// // remove from both
-// newEmailIterator.remove();
-// existingEmailIterator.remove();
-// }
-// }
-// }
-//
-// // remaining emails in newEmail are inserts; remaining emails in existingEmail are deletes
-// accountEmailSqlDao.inTransaction(new Transaction<Void, AccountEmailSqlDao>() {
-// @Override
-// public Void inTransaction(AccountEmailSqlDao dao, TransactionStatus transactionStatus) throws Exception {
-// dao.create(emails, context);
-// dao.update(updatedEmails, context);
-// dao.delete(existingEmails, context);
-//
-// List<String> insertHistoryIdList = getIdList(emails.size());
-// List<String> updateHistoryIdList = getIdList(updatedEmails.size());
-// List<String> deleteHistoryIdList = getIdList(existingEmails.size());
-//
-// // insert histories
-// dao.insertAccountEmailHistoryFromTransaction(insertHistoryIdList, emails, ChangeType.INSERT, context);
-// dao.insertAccountEmailHistoryFromTransaction(updateHistoryIdList, updatedEmails, ChangeType.UPDATE, context);
-// dao.insertAccountEmailHistoryFromTransaction(deleteHistoryIdList, existingEmails, ChangeType.DELETE, context);
-//
-// // insert audits
-// auditSqlDao.insertAuditFromTransaction(TableName.ACCOUNT_EMAIL_HISTORY, insertHistoryIdList, ChangeType.INSERT, context);
-// auditSqlDao.insertAuditFromTransaction(TableName.ACCOUNT_EMAIL_HISTORY, updateHistoryIdList, ChangeType.UPDATE, context);
-// auditSqlDao.insertAuditFromTransaction(TableName.ACCOUNT_EMAIL_HISTORY, deleteHistoryIdList, ChangeType.DELETE, context);
-//
-// return null;
-// }
-// });
-// }
-//
-// private List<String> getIdList(int size) {
-// List<String> results = new ArrayList<String>();
-// for (int i = 0; i < size; i++) {
-// results.add(UUID.randomUUID().toString());
-// }
-// return results;
-// }
-
@Override
protected TableName getTableName() {
return TableName.ACCOUNT_EMAIL_HISTORY;
