Renamed classes

This commit is contained in:
david-harley 2021-01-07 15:22:13 +10:30
parent 38a2da4855
commit 06ea285d14

View file

@ -110,11 +110,11 @@ public class ListGroupsCommand implements LocalCommand {
jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
if (detailed) { if (detailed) {
List<JsonListGroupDetailed> objects = new ArrayList<>(); List<JsonGroupDetailed> objects = new ArrayList<>();
for (GroupInfo group : groups) { for (GroupInfo group : groups) {
final GroupInviteLinkUrl groupInviteLink = group.getGroupInviteLink(); final GroupInviteLinkUrl groupInviteLink = group.getGroupInviteLink();
objects.add(new JsonListGroupDetailed(group.getGroupId().toBase64(), objects.add(new JsonGroupDetailed(group.getGroupId().toBase64(),
group.getTitle(), group.getTitle(),
group.isMember(m.getSelfAddress()), group.isMember(m.getSelfAddress()),
group.isBlocked(), group.isBlocked(),
@ -126,8 +126,8 @@ public class ListGroupsCommand implements LocalCommand {
return printGroupsJson(jsonProcessor, objects); return printGroupsJson(jsonProcessor, objects);
} else { } else {
List<JsonListGroup> objects = groups.stream().map( List<JsonGroup> objects = groups.stream().map(
group -> new JsonListGroup(group.getGroupId().toBase64(), group -> new JsonGroup(group.getGroupId().toBase64(),
group.getTitle(), group.getTitle(),
group.isMember(m.getSelfAddress()), group.isMember(m.getSelfAddress()),
group.isBlocked())) group.isBlocked()))
@ -144,14 +144,14 @@ public class ListGroupsCommand implements LocalCommand {
return 0; return 0;
} }
private static final class JsonListGroup { private static final class JsonGroup {
public String id; public String id;
public String name; public String name;
public boolean isMember; public boolean isMember;
public boolean isBlocked; public boolean isBlocked;
public JsonListGroup(String id, String name, boolean isMember, boolean isBlocked) { public JsonGroup(String id, String name, boolean isMember, boolean isBlocked) {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.isMember = isMember; this.isMember = isMember;
@ -159,7 +159,7 @@ public class ListGroupsCommand implements LocalCommand {
} }
} }
private static final class JsonListGroupDetailed { private static final class JsonGroupDetailed {
public String id; public String id;
public String name; public String name;
@ -171,9 +171,9 @@ public class ListGroupsCommand implements LocalCommand {
public Set<String> requestingMembers; public Set<String> requestingMembers;
public String groupInviteLink; public String groupInviteLink;
public JsonListGroupDetailed(String id, String name, boolean isMember, boolean isBlocked, public JsonGroupDetailed(String id, String name, boolean isMember, boolean isBlocked,
Set<String> members, Set<String> pendingMembers, Set<String> members, Set<String> pendingMembers,
Set<String> requestingMembers, String groupInviteLink) Set<String> requestingMembers, String groupInviteLink)
{ {
this.id = id; this.id = id;
this.name = name; this.name = name;