From 3da21bc4f4250b3b3ac54fa8ff2fd1aad38616dc Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 26 Apr 2024 03:11:08 +0200 Subject: [PATCH] Fix merge --- .../message/updater/MigraterYamlFileResource.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/fr/xephi/authme/message/updater/MigraterYamlFileResource.java b/src/main/java/fr/xephi/authme/message/updater/MigraterYamlFileResource.java index b0122215..bb96aec7 100644 --- a/src/main/java/fr/xephi/authme/message/updater/MigraterYamlFileResource.java +++ b/src/main/java/fr/xephi/authme/message/updater/MigraterYamlFileResource.java @@ -2,6 +2,7 @@ package fr.xephi.authme.message.updater; import ch.jalu.configme.resource.PropertyReader; import ch.jalu.configme.resource.YamlFileResource; +import org.jetbrains.annotations.NotNull; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; @@ -19,12 +20,12 @@ public class MigraterYamlFileResource extends YamlFileResource { } @Override - public PropertyReader createReader() { + public @NotNull PropertyReader createReader() { return MessageMigraterPropertyReader.loadFromFile(getFile()); } @Override - protected Yaml createNewYaml() { + protected @NotNull Yaml createNewYaml() { if (singleQuoteYaml == null) { DumperOptions options = new DumperOptions(); options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); @@ -36,12 +37,4 @@ public class MigraterYamlFileResource extends YamlFileResource { } return singleQuoteYaml; } - - // Because we set the YAML object to put strings in single quotes, this method by default uses that YAML object - // and also puts all paths as single quotes. Override to just always return the same string since we know those - // are only message names (so never any conflicting strings like "true" or "0"). - @Override - protected String escapePathElementIfNeeded(String path) { - return path; - } }