Skip to content

Commit

Permalink
Totally reworked classes separation to respect packaging conventions.
Browse files Browse the repository at this point in the history
Reworked FileConfiguration#addParsers method.
  • Loading branch information
Fulminazzo committed Jan 20, 2024
1 parent ab1be04 commit 08712ba
Show file tree
Hide file tree
Showing 31 changed files with 81 additions and 80 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = 'it.fulminazzo'
version = '1.4.3'
version = '1.5'

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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());
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"),

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit 08712ba

Please sign in to comment.