Browse Source

use bulkUpdate for unlock

tags/v0.5.2
Jonathan Cobb 4 years ago
parent
commit
a9161c76e5
3 changed files with 11 additions and 8 deletions
  1. +2
    -5
      bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
  2. +8
    -2
      bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java
  3. +1
    -1
      utils/cobbzilla-wizard

+ 2
- 5
bubble-server/src/main/java/bubble/dao/account/AccountDAO.java View File

@@ -350,11 +350,8 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
@Transactional
public void unlock() {
synchronized (unlocked) {
final List<Account> all = findAll();
for (Account account : all) {
update(account.setLocked(false));
}
log.info("unlock: " + all.size() + " accounts unlocked");
final int count = bulkUpdate("locked", false);
log.info("unlock: " + count + " accounts unlocked");
unlocked.set(true);
configuration.refreshPublicSystemConfigs();
}


+ 8
- 2
bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java View File

@@ -97,8 +97,14 @@ public class AppDataDAO extends AppTemplateEntityDAO<AppData> {
return list(criteria().add(and(crits.toArray(new Criterion[0]))));
}

public void deleteDevice(String uuid) { bulkDelete("device", uuid); }
public void deleteDevice(String uuid) {
final int count = bulkDelete("device", uuid);
log.info("deleteDevice: deleted "+count+" AppData records for device "+uuid);
}

public void deleteApp(String uuid) { bulkDelete("app", uuid); }
public void deleteApp(String uuid) {
final int count = bulkDelete("app", uuid);
log.info("deleteApp: deleted "+count+" AppData records for app "+uuid);
}

}

+ 1
- 1
utils/cobbzilla-wizard

@@ -1 +1 @@
Subproject commit 7ce51555339f93ec769066bf66b1a2831f298b22
Subproject commit 0f8abf0974a738ddbef7314cba462ff4f5ce287b

Loading…
Cancel
Save