marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor getGroup method

Browse Source
This commit is contained in:
AsamK 2023-11-12 15:21:25 +01:00
parent fbcc1cfb50
commit f06eeb01b9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
View File

@ -150,23 +150,29 @@ public class GroupStore {
public GroupInfo getGroup(GroupId groupId) {
try (final var connection = database.getConnection()) {
if (groupId instanceof GroupIdV1 groupIdV1) {
return getGroup(connection, groupId);
} catch (SQLException e) {
throw new RuntimeException("Failed read from group store", e);
}
}
public GroupInfo getGroup(final Connection connection, final GroupId groupId) throws SQLException {
switch (groupId) {
case GroupIdV1 groupIdV1 -> {
final var group = getGroup(connection, groupIdV1);
if (group != null) {
return group;
}
return getGroupV2ByV1Id(connection, groupIdV1);
} else if (groupId instanceof GroupIdV2 groupIdV2) {
}
case GroupIdV2 groupIdV2 -> {
final var group = getGroup(connection, groupIdV2);
if (group != null) {
return group;
}
return getGroupV1ByV2Id(connection, groupIdV2);
}
} catch (SQLException e) {
throw new RuntimeException("Failed read from group store", e);
}
throw new AssertionError("Invalid group id type");
}
public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {