Make the FormField into a record

Author: Defective4

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/FormInteractionManager.java

@@ -268,7 +268,7 @@ private static MessageEmbed createSubmissionEmbed(FormData form, List<ModalMappi
 			ModalMapping mapping = values.get(i);
 			FormField field = form.getFields().get(i);
 			String value = mapping.getAsString();
-			builder.addField(field.getLabel(), value == null ? "*Empty*" : "```\n" + value + "\n```", false);
+			builder.addField(field.label(), value == null ? "*Empty*" : "```\n" + value + "\n```", false);
 		}
 
 		return builder.build();

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

@@ -40,8 +40,7 @@ public AddFieldFormSubcommand(FormsRepository formsRepo) {
 				.addOption(OptionType.BOOLEAN, "required",
 						"Whether or not the user has to input data in this field. Default: false")
 				.addOption(OptionType.STRING, "style", "Input style. Default: SHORT", false, true)
-				.addOption(OptionType.STRING, "value", "Initial field value")
-				.addOption(OptionType.INTEGER, "index", "Index to insert the field at"));
+				.addOption(OptionType.STRING, "value", "Initial field value"));
 	}
 
 	@Override
@@ -60,12 +59,6 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 
-		int index = event.getOption("index", -1, OptionMapping::getAsInt);
-		if (index < -1 || index >= form.getFields().size()) {
-			event.getHook().sendMessage("Field index out of bounds").queue();
-			return;
-		}
-
 		formsRepo.addField(form, createFormFieldFromEvent(event));
 		event.getHook().sendMessage("Added a new field to the form.").queue();
 	}

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

@@ -61,7 +61,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
 		formsRepo.removeField(form, index);
 
-		event.getHook().sendMessage("Removed field `" + form.getFields().get(index).getLabel() + "` from the form.")
+		event.getHook().sendMessage("Removed field `" + form.getFields().get(index).label() + "` from the form.")
 				.queue();
 	}
 
@@ -79,7 +79,7 @@ public void handleAutoComplete(CommandAutoCompleteInteractionEvent event, AutoCo
 						List<Choice> choices = new ArrayList<>();
 						List<FormField> fields = form.get().getFields();
 						for (int i = 0; i < fields.size(); i++) {
-							choices.add(new Choice(fields.get(i).getLabel(), i));
+							choices.add(new Choice(fields.get(i).label(), i));
 						}
 						event.replyChoices(choices).queue();
 						return;

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/dao/FormsRepository.java

@@ -43,8 +43,8 @@ public void addField(FormData form, FormField field) {
 		jdbcTemplate.update(
 				"INSERT INTO FORM_FIELDS (FORM_ID, LABEL, MIN, MAX, PLACEHOLDER, REQUIRED, \"style\", INITIAL) "
 						+ "VALUES(?, ?, ?, ?, ?, ?, ?, ?)",
-				form.getId(), field.getLabel(), field.getMin(), field.getMax(), field.getPlaceholder(),
-				field.isRequired(), field.getStyle().name(), field.getValue());
+				form.getId(), field.label(), field.min(), field.max(), field.placeholder(), field.required(),
+				field.style().name(), field.value());
 	}
 
 	/**
@@ -241,7 +241,7 @@ public void addSubmission(User user, FormData form, Message message) {
 	public void removeField(FormData form, int index) {
 		List<FormField> fields = form.getFields();
 		if (index < 0 || index >= fields.size()) return;
-		jdbcTemplate.update("delete from `form_fields` where `id` = ?", fields.get(index).getId());
+		jdbcTemplate.update("delete from `form_fields` where `id` = ?", fields.get(index).id());
 	}
 
 	/**

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/model/FormField.java

@@ -6,40 +6,8 @@
 /**
  * Represents a form field.
  */
-public class FormField {
-	private final long id;
-	private final String label;
-	private final int max;
-	private final int min;
-	private final String placeholder;
-	private final boolean required;
-	private final TextInputStyle style;
-	private final String value;
-
-	/**
-	 * Main constructor.
-	 *
-	 * @param label       text field lable.
-	 * @param max         maximum characters allowed.
-	 * @param min         minimum characters allowed.
-	 * @param placeholder text field placeholder.
-	 * @param required    whether or not this field is required.
-	 * @param style       text field style. One of {@link TextInputStyle} values.
-	 *                    Case insensitive.
-	 * @param value       initial value of this text field.
-	 * @param id          unique ID of this field.
-	 */
-	public FormField(String label, int max, int min, String placeholder, boolean required, TextInputStyle style,
-			String value, long id) {
-		this.id = id;
-		this.label = label;
-		this.max = max;
-		this.min = min;
-		this.placeholder = placeholder;
-		this.required = required;
-		this.style = style;
-		this.value = value;
-	}
+public record FormField(String label, int max, int min, String placeholder, boolean required,
+		TextInputStyle style, String value, long id) {
 
 	/**
 	 * Create a standalone text input from this field.
@@ -48,50 +16,8 @@ public FormField(String label, int max, int min, String placeholder, boolean req
 	 * @return text input ready to use in a modal.
 	 */
 	public TextInput createTextInput(String id) {
-		return TextInput.create(id, getLabel(), getStyle()).setRequiredRange(getMin(), getMax())
-				.setPlaceholder(getPlaceholder()).setRequired(isRequired()).setValue(getValue()).build();
-	}
-
-	/**
-	 * Get this field's unique ID.
-	 *
-	 * @return unique ID of the field.
-	 */
-	public long getId() {
-		return id;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public int getMax() {
-		return max <= 0 ? 64 : max;
-	}
-
-	public int getMin() {
-		return Math.max(0, min);
-	}
-
-	public String getPlaceholder() {
-		return placeholder;
-	}
-
-	/**
-	 * Get the style of this field's text input.
-	 *
-	 * @return one of {@link TextInputStyle} values.
-	 */
-	public TextInputStyle getStyle() {
-		return style;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public boolean isRequired() {
-		return required;
+		return TextInput.create(id, label(), style()).setRequiredRange(min(), max()).setPlaceholder(placeholder())
+				.setRequired(required()).setValue(value()).build();
 	}
 
 	@Override