Skip to content

Commit 123282b

Browse files
committed
Convert FormUser to a record
1 parent fdd328e commit 123282b

File tree

2 files changed

+17
-40
lines changed

2 files changed

+17
-40
lines changed

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/SubmissionsExportFormSubcommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public void execute(SlashCommandInteractionEvent event) {
6161
JsonArray users = new JsonArray();
6262
for (Entry<FormUser, Integer> entry : submissions.entrySet()) {
6363
JsonObject uobj = new JsonObject();
64-
uobj.addProperty("username", entry.getKey().getUsername());
64+
uobj.addProperty("username", entry.getKey().username());
6565
uobj.addProperty("submissions", entry.getValue());
66-
details.add(Long.toString(entry.getKey().getId()), uobj);
67-
users.add(entry.getKey().getUsername());
66+
details.add(Long.toString(entry.getKey().id()), uobj);
67+
users.add(entry.getKey().username());
6868
}
6969
root.add("users", users);
7070
root.add("details", details);
Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,21 @@
11
package net.discordjug.javabot.systems.staff_commands.forms.model;
22

3-
import java.util.Objects;
4-
53
/**
64
* Represents a user who submitted a form.
75
*/
8-
public class FormUser {
9-
private final long id;
10-
private final String username;
11-
12-
/**
13-
* The main constructor.
14-
*
15-
* @param id user's id
16-
* @param username user's username
17-
*/
18-
public FormUser(long id, String username) {
19-
this.id = id;
20-
this.username = username;
21-
}
22-
23-
@Override
24-
public boolean equals(Object obj) {
25-
if (this == obj) return true;
26-
if (obj == null || getClass() != obj.getClass()) return false;
27-
FormUser other = (FormUser) obj;
28-
return id == other.id && Objects.equals(username, other.username);
29-
}
30-
31-
public long getId() {
32-
return id;
33-
}
34-
35-
public String getUsername() {
36-
return username;
37-
}
38-
39-
@Override
40-
public int hashCode() {
41-
return Objects.hash(id, username);
42-
}
6+
public record FormUser(long id, String username) {
7+
8+
// @Override
9+
// public boolean equals(Object obj) {
10+
// if (this == obj) return true;
11+
// if (obj == null || getClass() != obj.getClass()) return false;
12+
// FormUser other = (FormUser) obj;
13+
// return id == other.id && Objects.equals(username, other.username);
14+
// }
15+
16+
// @Override
17+
// public int hashCode() {
18+
// return Objects.hash(id, username);
19+
// }
4320

4421
}

0 commit comments

Comments
 (0)