bubblev
/
bubble
9
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 130 Wiki Activity
Labels Milestones
New Pull Request

#53 Fully forbid network owner deletion

Merged
jonathan merged 7 commits from kris/forbid_network_owner_deletion into master 4 years ago
Conversation 0 Commits 7 Files Changed 3
kris commented 4 years ago

@jonathan please review

Also included fix for Jenkins builds when utils submodules’ links are changed in PRs.

@jonathan please review Also included fix for Jenkins builds when utils submodules' links are changed in PRs.
jonathan was assigned by kris 4 years ago
jonathan requested changes 4 years ago
jonathan left a comment

some minor changes requested

bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
@@ -347,2 +349,4 @@
}

@Override
public int bulkDeleteWhere(@NonNull final String whereClause, @NonNull final Map<String, Object> parameters) {
jonathan commented 4 years ago

Please put @Override on the same line as the method declaration.

Please put `@Override` on the same line as the method declaration.
bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
@@ -349,0 +355,4 @@
}

@Override
public void delete(@Nullable final Collection<Account> accounts) {
jonathan commented 4 years ago

Please put @Override on the same line as the method declaration.

Please put `@Override` on the same line as the method declaration.
bubble-server/src/main/java/bubble/service/stream/AppDataCleaner.java
@@ -26,3 +28,3 @@
@Override protected void process() {
try {
final int ct = dataDAO.bulkDeleteWhere("expiration < " + now());
final int ct = dataDAO.bulkDeleteWhere("expiration < " + now(), new HashMap<>());
jonathan commented 4 years ago

If we keep the original bulkDeleteWhere we don’t need this change.

If we keep the original `bulkDeleteWhere` we don't need this change.
jonathan closed this pull request 4 years ago
jonathan deleted branch kris/forbid_network_owner_deletion 4 years ago

Reviewers

jonathan requested changes 4 years ago
The pull request has been merged as 189eda7d46.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
 jonathan
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
No Assignees
 jonathan
2 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'kris/forbid_network_owner_deletion'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes