Преглед на файлове

Fix indent and remove not needed code

tags/v0.10.5
Kristijan Mitrovic преди 4 години
родител
ревизия
1f913abdde
променени са 2 файла, в които са добавени 11 реда и са изтрити 17 реда
  1. +11
    -10
      bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
  2. +0
    -7
      bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java

+ 11
- 10
bubble-server/src/main/java/bubble/dao/account/AccountDAO.java Целия файл

@@ -348,23 +348,24 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
// stash the deletion policy for later use, the policy object will be deleted in deleteDependencies
final var deletionPolicy = policyDAO.findSingleByAccount(uuid).getDeletionPolicy();

log.info("delete ("+currentThread().getName()+"): starting to delete account-dependent objects");
log.info("delete: starting to delete account-dependent objects - " + currentThread().getName());
configuration.deleteDependencies(account);
log.info("delete: finished deleting account-dependent objects");
log.info("delete: finished deleting account-dependent objects - " + currentThread().getName());

switch (deletionPolicy) {
case full_delete:
super.delete(uuid);
return;
case block_delete: default:
default:
// includes case block_delete
update(account.setParent(null)
.setAdmin(null)
.setSuspended(null)
.setDescription(null)
.setDeleted()
.setUrl(null)
.setAutoUpdatePolicy(EMPTY_AUTO_UPDATE_POLICY)
.setHashedPassword(HashedPassword.DELETED));
.setAdmin(null)
.setSuspended(null)
.setDescription(null)
.setDeleted()
.setUrl(null)
.setAutoUpdatePolicy(EMPTY_AUTO_UPDATE_POLICY)
.setHashedPassword(HashedPassword.DELETED));
return;
}
}


+ 0
- 7
bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java Целия файл

@@ -29,13 +29,6 @@ import static org.cobbzilla.wizard.model.crypto.EncryptedTypes.ENC_PAD;
@Entity @Accessors(chain=true)
public class AccountPaymentArchived extends IdentifiableBase {

/**
* List of properties from AccountPayment class which will not be used in this class the same way. Those foreign
* keys (uuids) will not be available within referenced tables, and so here the other unique data from those
* elements is extracted.
*/
private static final String[] ALTERED_FIELDS = { "account", "paymentMethod", "plan", "accountPlan", "bill" };

public AccountPaymentArchived(@NonNull final String accountUuid, @NonNull final List<Bill> bills,
@NonNull final List<AccountPayment> payments,
@NonNull final List<AccountPaymentMethod> paymentMethods) {


Зареждане…
Отказ
Запис