diff --git a/build.gradle b/build.gradle index 3b4f28f..23edd05 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group = 'it.fulminazzo' -version = '1.4.3' +version = '1.5' repositories { mavenCentral() diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/ConfigurationSection.java b/src/main/java/it/fulminazzo/yamlparser/configurations/ConfigurationSection.java similarity index 85% rename from src/main/java/it/fulminazzo/yamlparser/objects/configurations/ConfigurationSection.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/ConfigurationSection.java index 808c90e..6583951 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/ConfigurationSection.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/ConfigurationSection.java @@ -1,6 +1,5 @@ -package it.fulminazzo.yamlparser.objects.configurations; +package it.fulminazzo.yamlparser.configurations; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; import lombok.Getter; import java.util.Map; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/FileConfiguration.java b/src/main/java/it/fulminazzo/yamlparser/configurations/FileConfiguration.java similarity index 90% rename from src/main/java/it/fulminazzo/yamlparser/objects/configurations/FileConfiguration.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/FileConfiguration.java index 8b368c4..02d68af 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/FileConfiguration.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/FileConfiguration.java @@ -1,12 +1,11 @@ -package it.fulminazzo.yamlparser.objects.configurations; +package it.fulminazzo.yamlparser.configurations; import it.fulminazzo.fulmicollection.exceptions.GeneralCannotBeNullException; import it.fulminazzo.fulmicollection.utils.ClassUtils; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; -import it.fulminazzo.yamlparser.objects.yamlelements.ArrayYAMLParser; -import it.fulminazzo.yamlparser.objects.yamlelements.EnumYAMLParser; -import it.fulminazzo.yamlparser.objects.yamlelements.SerializableYAMLParser; -import it.fulminazzo.yamlparser.objects.yamlelements.YAMLParser; +import it.fulminazzo.yamlparser.parsers.ArrayYAMLParser; +import it.fulminazzo.yamlparser.parsers.EnumYAMLParser; +import it.fulminazzo.yamlparser.parsers.SerializableYAMLParser; +import it.fulminazzo.yamlparser.parsers.YAMLParser; import it.fulminazzo.yamlparser.utils.FileUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -105,13 +104,10 @@ public void save() { } /** - * Add all the parsers present in the package: ../yamlelements + * Add all the parsers present in the package where {@link YAMLParser} is contained. */ public static void addParsers() { - String packageName = FileConfiguration.class.getPackage().getName(); - String[] tmp = packageName.split("\\."); - packageName = String.join(".", Arrays.copyOfRange(tmp, 0, tmp.length - 1)); - addParsers(packageName + ".yamlelements"); + addParsers(YAMLParser.class.getPackage().getName()); } /** diff --git a/src/main/java/it/fulminazzo/yamlparser/interfaces/IConfiguration.java b/src/main/java/it/fulminazzo/yamlparser/configurations/IConfiguration.java similarity index 98% rename from src/main/java/it/fulminazzo/yamlparser/interfaces/IConfiguration.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/IConfiguration.java index 322e05e..a496795 100644 --- a/src/main/java/it/fulminazzo/yamlparser/interfaces/IConfiguration.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/IConfiguration.java @@ -1,14 +1,12 @@ -package it.fulminazzo.yamlparser.interfaces; +package it.fulminazzo.yamlparser.configurations; import it.fulminazzo.fulmicollection.utils.EnumUtils; import it.fulminazzo.fulmicollection.utils.ReflectionUtils; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.CannotBeNullException; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.UnexpectedClassException; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.YAMLException; -import it.fulminazzo.yamlparser.objects.configurations.ConfigurationSection; -import it.fulminazzo.yamlparser.objects.configurations.FileConfiguration; -import it.fulminazzo.yamlparser.objects.configurations.checkers.ConfigurationChecker; -import it.fulminazzo.yamlparser.objects.yamlelements.YAMLParser; +import it.fulminazzo.yamlparser.configurations.checkers.ConfigurationChecker; +import it.fulminazzo.yamlparser.configurations.exceptions.CannotBeNullException; +import it.fulminazzo.yamlparser.configurations.exceptions.UnexpectedClassException; +import it.fulminazzo.yamlparser.exceptions.YAMLException; +import it.fulminazzo.yamlparser.parsers.YAMLParser; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfiguration.java b/src/main/java/it/fulminazzo/yamlparser/configurations/SimpleConfiguration.java similarity index 94% rename from src/main/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfiguration.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/SimpleConfiguration.java index de816b4..f09e614 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfiguration.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/SimpleConfiguration.java @@ -1,6 +1,5 @@ -package it.fulminazzo.yamlparser.objects.configurations; +package it.fulminazzo.yamlparser.configurations; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationChecker.java b/src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationChecker.java similarity index 96% rename from src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationChecker.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationChecker.java index 7b9a94e..47af43c 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationChecker.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationChecker.java @@ -1,9 +1,9 @@ -package it.fulminazzo.yamlparser.objects.configurations.checkers; +package it.fulminazzo.yamlparser.configurations.checkers; import it.fulminazzo.fulmicollection.objects.Printable; import it.fulminazzo.fulmicollection.utils.ReflectionUtils; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationInvalidType.java b/src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationInvalidType.java similarity index 92% rename from src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationInvalidType.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationInvalidType.java index b430292..cdcf903 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationInvalidType.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationInvalidType.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.configurations.checkers; +package it.fulminazzo.yamlparser.configurations.checkers; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/CannotBeNullException.java b/src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/CannotBeNullException.java similarity index 73% rename from src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/CannotBeNullException.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/CannotBeNullException.java index db17ab9..24d86ce 100644 --- a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/CannotBeNullException.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/CannotBeNullException.java @@ -1,6 +1,7 @@ -package it.fulminazzo.yamlparser.exceptions.yamlexceptions; +package it.fulminazzo.yamlparser.configurations.exceptions; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; +import it.fulminazzo.yamlparser.exceptions.YAMLException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/UnexpectedClassException.java b/src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/UnexpectedClassException.java similarity index 79% rename from src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/UnexpectedClassException.java rename to src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/UnexpectedClassException.java index 132d99b..2589908 100644 --- a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/UnexpectedClassException.java +++ b/src/main/java/it/fulminazzo/yamlparser/configurations/exceptions/UnexpectedClassException.java @@ -1,6 +1,7 @@ -package it.fulminazzo.yamlparser.exceptions.yamlexceptions; +package it.fulminazzo.yamlparser.configurations.exceptions; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; +import it.fulminazzo.yamlparser.exceptions.YAMLException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/YAMLException.java b/src/main/java/it/fulminazzo/yamlparser/exceptions/YAMLException.java similarity index 92% rename from src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/YAMLException.java rename to src/main/java/it/fulminazzo/yamlparser/exceptions/YAMLException.java index 870025d..f9eb937 100644 --- a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/YAMLException.java +++ b/src/main/java/it/fulminazzo/yamlparser/exceptions/YAMLException.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.exceptions.yamlexceptions; +package it.fulminazzo.yamlparser.exceptions; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/enums/LogMessage.java b/src/main/java/it/fulminazzo/yamlparser/logging/LogMessage.java similarity index 94% rename from src/main/java/it/fulminazzo/yamlparser/enums/LogMessage.java rename to src/main/java/it/fulminazzo/yamlparser/logging/LogMessage.java index df10250..63d90c3 100644 --- a/src/main/java/it/fulminazzo/yamlparser/enums/LogMessage.java +++ b/src/main/java/it/fulminazzo/yamlparser/logging/LogMessage.java @@ -1,9 +1,12 @@ -package it.fulminazzo.yamlparser.enums; +package it.fulminazzo.yamlparser.logging; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +/** + * An enum containing all the message errors printed by the program. + */ public enum LogMessage { GENERAL_CANNOT_BE_NULL("%object% cannot be null"), diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ArrayYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/ArrayYAMLParser.java similarity index 90% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ArrayYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/ArrayYAMLParser.java index d9f3907..0ebc06f 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ArrayYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/ArrayYAMLParser.java @@ -1,7 +1,7 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.EmptyArrayException; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.parsers.exceptions.EmptyArrayException; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CallableYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/CallableYAMLParser.java similarity index 91% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CallableYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/CallableYAMLParser.java index 8461b15..657d8ce 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CallableYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/CallableYAMLParser.java @@ -1,12 +1,12 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.FunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import it.fulminazzo.fulmicollection.utils.ReflectionUtils; -import it.fulminazzo.yamlparser.annotations.PreventSaving; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; -import it.fulminazzo.yamlparser.objects.configurations.ConfigurationSection; +import it.fulminazzo.yamlparser.parsers.annotations.PreventSaving; +import it.fulminazzo.yamlparser.configurations.IConfiguration; +import it.fulminazzo.yamlparser.configurations.ConfigurationSection; import it.fulminazzo.yamlparser.utils.FileUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CollectionYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/CollectionYAMLParser.java similarity index 94% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CollectionYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/CollectionYAMLParser.java index 6eb0093..b4e97de 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/CollectionYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/CollectionYAMLParser.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/DateYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/DateYAMLParser.java similarity index 90% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/DateYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/DateYAMLParser.java index dcf5c13..e6a17fb 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/DateYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/DateYAMLParser.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/EnumYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/EnumYAMLParser.java similarity index 90% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/EnumYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/EnumYAMLParser.java index a254217..bf88c36 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/EnumYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/EnumYAMLParser.java @@ -1,8 +1,8 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ListYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/ListYAMLParser.java similarity index 89% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ListYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/ListYAMLParser.java index 2e22624..fd2e1d3 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/ListYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/ListYAMLParser.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/MapYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/MapYAMLParser.java similarity index 93% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/MapYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/MapYAMLParser.java index 4630aa3..2fcb0f7 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/MapYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/MapYAMLParser.java @@ -1,11 +1,11 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import it.fulminazzo.fulmicollection.utils.ReflectionUtils; import it.fulminazzo.fulmicollection.utils.SerializeUtils; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; -import it.fulminazzo.yamlparser.objects.configurations.ConfigurationSection; +import it.fulminazzo.yamlparser.configurations.ConfigurationSection; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SerializableYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/SerializableYAMLParser.java similarity index 92% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SerializableYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/SerializableYAMLParser.java index 3938747..fe56c4f 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SerializableYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/SerializableYAMLParser.java @@ -1,7 +1,7 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; import it.fulminazzo.fulmicollection.utils.SerializeUtils; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SetYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/SetYAMLParser.java similarity index 89% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SetYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/SetYAMLParser.java index 6c873bd..ef51077 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/SetYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/SetYAMLParser.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/UUIDYAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/UUIDYAMLParser.java similarity index 90% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/UUIDYAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/UUIDYAMLParser.java index 575c97e..637d00e 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/UUIDYAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/UUIDYAMLParser.java @@ -1,6 +1,6 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParser.java b/src/main/java/it/fulminazzo/yamlparser/parsers/YAMLParser.java similarity index 95% rename from src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParser.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/YAMLParser.java index 2a3be2d..0f921d3 100644 --- a/src/main/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParser.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/YAMLParser.java @@ -1,7 +1,7 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; import it.fulminazzo.fulmicollection.exceptions.GeneralCannotBeNullException; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; +import it.fulminazzo.yamlparser.configurations.IConfiguration; import it.fulminazzo.fulmicollection.interfaces.functions.BiFunctionException; import it.fulminazzo.fulmicollection.interfaces.functions.TriConsumer; import lombok.Getter; diff --git a/src/main/java/it/fulminazzo/yamlparser/annotations/PreventSaving.java b/src/main/java/it/fulminazzo/yamlparser/parsers/annotations/PreventSaving.java similarity index 87% rename from src/main/java/it/fulminazzo/yamlparser/annotations/PreventSaving.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/annotations/PreventSaving.java index 6db289a..a94ca58 100644 --- a/src/main/java/it/fulminazzo/yamlparser/annotations/PreventSaving.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/annotations/PreventSaving.java @@ -1,4 +1,4 @@ -package it.fulminazzo.yamlparser.annotations; +package it.fulminazzo.yamlparser.parsers.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/EmptyArrayException.java b/src/main/java/it/fulminazzo/yamlparser/parsers/exceptions/EmptyArrayException.java similarity index 76% rename from src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/EmptyArrayException.java rename to src/main/java/it/fulminazzo/yamlparser/parsers/exceptions/EmptyArrayException.java index de69bb8..eb9390d 100644 --- a/src/main/java/it/fulminazzo/yamlparser/exceptions/yamlexceptions/EmptyArrayException.java +++ b/src/main/java/it/fulminazzo/yamlparser/parsers/exceptions/EmptyArrayException.java @@ -1,6 +1,7 @@ -package it.fulminazzo.yamlparser.exceptions.yamlexceptions; +package it.fulminazzo.yamlparser.parsers.exceptions; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; +import it.fulminazzo.yamlparser.exceptions.YAMLException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/fulminazzo/yamlparser/utils/FileUtils.java b/src/main/java/it/fulminazzo/yamlparser/utils/FileUtils.java index 43c5456..73638a3 100644 --- a/src/main/java/it/fulminazzo/yamlparser/utils/FileUtils.java +++ b/src/main/java/it/fulminazzo/yamlparser/utils/FileUtils.java @@ -1,6 +1,6 @@ package it.fulminazzo.yamlparser.utils; -import it.fulminazzo.yamlparser.enums.LogMessage; +import it.fulminazzo.yamlparser.logging.LogMessage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/FileConfigurationTest.java b/src/test/java/it/fulminazzo/yamlparser/configurations/FileConfigurationTest.java similarity index 96% rename from src/test/java/it/fulminazzo/yamlparser/objects/configurations/FileConfigurationTest.java rename to src/test/java/it/fulminazzo/yamlparser/configurations/FileConfigurationTest.java index 71a9eb2..79602f5 100644 --- a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/FileConfigurationTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/configurations/FileConfigurationTest.java @@ -1,10 +1,9 @@ -package it.fulminazzo.yamlparser.objects.configurations; +package it.fulminazzo.yamlparser.configurations; -import it.fulminazzo.yamlparser.enums.LogMessage; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.CannotBeNullException; -import it.fulminazzo.yamlparser.exceptions.yamlexceptions.EmptyArrayException; -import it.fulminazzo.yamlparser.interfaces.IConfiguration; -import it.fulminazzo.yamlparser.objects.yamlelements.*; +import it.fulminazzo.yamlparser.logging.LogMessage; +import it.fulminazzo.yamlparser.configurations.exceptions.CannotBeNullException; +import it.fulminazzo.yamlparser.parsers.exceptions.EmptyArrayException; +import it.fulminazzo.yamlparser.parsers.*; import it.fulminazzo.yamlparser.utils.FileUtils; import org.junit.jupiter.api.*; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/it/fulminazzo/yamlparser/interfaces/IConfigurationTest.java b/src/test/java/it/fulminazzo/yamlparser/configurations/IConfigurationTest.java similarity index 96% rename from src/test/java/it/fulminazzo/yamlparser/interfaces/IConfigurationTest.java rename to src/test/java/it/fulminazzo/yamlparser/configurations/IConfigurationTest.java index 8b0e9d3..467e0d9 100644 --- a/src/test/java/it/fulminazzo/yamlparser/interfaces/IConfigurationTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/configurations/IConfigurationTest.java @@ -1,7 +1,7 @@ -package it.fulminazzo.yamlparser.interfaces; +package it.fulminazzo.yamlparser.configurations; -import it.fulminazzo.yamlparser.objects.configurations.ConfigurationSection; -import it.fulminazzo.yamlparser.objects.configurations.FileConfiguration; +import it.fulminazzo.yamlparser.configurations.ConfigurationSection; +import it.fulminazzo.yamlparser.configurations.FileConfiguration; import org.junit.jupiter.api.*; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfigurationTest.java b/src/test/java/it/fulminazzo/yamlparser/configurations/SimpleConfigurationTest.java similarity index 78% rename from src/test/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfigurationTest.java rename to src/test/java/it/fulminazzo/yamlparser/configurations/SimpleConfigurationTest.java index 4460743..438276d 100644 --- a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/SimpleConfigurationTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/configurations/SimpleConfigurationTest.java @@ -1,5 +1,6 @@ -package it.fulminazzo.yamlparser.objects.configurations; +package it.fulminazzo.yamlparser.configurations; +import it.fulminazzo.yamlparser.configurations.SimpleConfiguration; import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; diff --git a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationCheckerTest.java b/src/test/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationCheckerTest.java similarity index 94% rename from src/test/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationCheckerTest.java rename to src/test/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationCheckerTest.java index 97f915c..51d2df3 100644 --- a/src/test/java/it/fulminazzo/yamlparser/objects/configurations/checkers/ConfigurationCheckerTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/configurations/checkers/ConfigurationCheckerTest.java @@ -1,7 +1,7 @@ -package it.fulminazzo.yamlparser.objects.configurations.checkers; +package it.fulminazzo.yamlparser.configurations.checkers; -import it.fulminazzo.yamlparser.enums.LogMessage; -import it.fulminazzo.yamlparser.objects.configurations.FileConfiguration; +import it.fulminazzo.yamlparser.logging.LogMessage; +import it.fulminazzo.yamlparser.configurations.FileConfiguration; import it.fulminazzo.yamlparser.utils.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/fulminazzo/yamlparser/enums/LogMessageTest.java b/src/test/java/it/fulminazzo/yamlparser/logging/LogMessageTest.java similarity index 98% rename from src/test/java/it/fulminazzo/yamlparser/enums/LogMessageTest.java rename to src/test/java/it/fulminazzo/yamlparser/logging/LogMessageTest.java index 76b8feb..f000e8b 100644 --- a/src/test/java/it/fulminazzo/yamlparser/enums/LogMessageTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/logging/LogMessageTest.java @@ -1,4 +1,4 @@ -package it.fulminazzo.yamlparser.enums; +package it.fulminazzo.yamlparser.logging; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParserTest.java b/src/test/java/it/fulminazzo/yamlparser/parsers/YAMLParserTest.java similarity index 81% rename from src/test/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParserTest.java rename to src/test/java/it/fulminazzo/yamlparser/parsers/YAMLParserTest.java index 815d00f..28caab2 100644 --- a/src/test/java/it/fulminazzo/yamlparser/objects/yamlelements/YAMLParserTest.java +++ b/src/test/java/it/fulminazzo/yamlparser/parsers/YAMLParserTest.java @@ -1,5 +1,8 @@ -package it.fulminazzo.yamlparser.objects.yamlelements; +package it.fulminazzo.yamlparser.parsers; +import it.fulminazzo.yamlparser.parsers.ArrayYAMLParser; +import it.fulminazzo.yamlparser.parsers.UUIDYAMLParser; +import it.fulminazzo.yamlparser.parsers.YAMLParser; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;