Update gradle, more tests, update checkstyle max line length, optimization and other minor changes.

Author: mdxd44

.config/checkstyle/checkstyle.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC
           "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
           "https://checkstyle.org/dtds/configuration_1_3.dtd">
@@ -42,7 +42,7 @@
 
   <module name="LineLength">
     <property name="fileExtensions" value="java"/>
-    <property name="max" value="155"/>
+    <property name="max" value="205"/>
     <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
   </module>
 
@@ -129,14 +129,14 @@
                     NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
                     SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
       <message key="ws.notFollowed"
-               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
+               may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
       <message key="ws.notPreceded"
                value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
     </module>
     <module name="OneStatementPerLine"/>
     <module name="MultipleVariableDeclarations"/>
     <module name="ArrayTypeStyle"/>
-    <module name="MissingSwitchDefault"/>
     <module name="FallThrough"/>
     <module name="UpperEll"/>
     <module name="ModifierOrder"/>
@@ -186,7 +186,7 @@
                value="Type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="MemberName">
-      <property name="format" value="^[a-z][a-z0-9]{0,1}[a-zA-Z0-9]*$"/>
+      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
       <message key="name.invalidPattern"
                value="Member name ''{0}'' must match pattern ''{1}''."/>
     </module>
@@ -253,15 +253,15 @@
     </module>
     <module name="Indentation">
       <property name="basicOffset" value="2"/>
-      <property name="braceAdjustment" value="2"/>
+      <property name="braceAdjustment" value="0"/>
       <property name="caseIndent" value="2"/>
       <property name="throwsIndent" value="4"/>
       <property name="lineWrappingIndentation" value="4"/>
       <property name="arrayInitIndent" value="2"/>
     </module>
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false"/>
-      <property name="allowedAbbreviationLength" value="2"/>
+      <property name="allowedAbbreviationLength" value="3"/>
       <property name="tokens"
                 value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
                     PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,

.config/checkstyle/suppressions.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suppressions PUBLIC
-        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-        "http://checkstyle.org/dtds/suppressions_1_2.dtd">
+          "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+          "http://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="SummaryJavadoc"/>
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="MissingJavadocType"/>
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="MissingJavadocMethod"/>
+  <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="SummaryJavadoc"/>
+  <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="MissingJavadocType"/>
+  <suppress files=".*[\\/]net[\\/]elytrium[\\/].*" checks="MissingJavadocMethod"/>
 
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*[\\/]YamlConfigTest.java" checks="TypeName"/>
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*[\\/]YamlConfigTest.java" checks="MemberName"/>
-    <suppress files=".*[\\/]net[\\/]elytrium[\\/].*[\\/]YamlConfigTest.java" checks="AbbreviationAsWordInName"/>
+  <suppress files=".*[\\/]net[\\/]elytrium[\\/].*[\\/]SerializerTest.java" checks="MemberName"/>
 </suppressions>

.gitattributes

@@ -7,3 +7,4 @@
 # These are Windows script files and should use crlf
 *.bat           text eol=crlf
 
+*.yml           text eol=lf

README.md

@@ -48,13 +48,13 @@ Elytrium Java Serializer is uploaded to the Maven Central repository, so you can
 2) Create YamlWriter
     ```java
     Settings settings = new Settings();
-    YamlWriter writer = new YamlWriter(Files.newBufferedWriter(Path.of("/config.yml")));
+    YamlWriter writer = new YamlWriter(Files.newBufferedWriter(Path.of("config.yml")));
     writer.writeNode(settings, null);
     ```
 3) Create YamlReader
     ```java
     Settings settings = new Settings();
-    YamlReader reader = new YamlReader(Files.newBufferedReader(Path.of("./config.yml")));
+    YamlReader reader = new YamlReader(Files.newBufferedReader(Path.of("config.yml")));
     reader.readSerializableObject(settings, Settings.class);
    ```
 
@@ -76,7 +76,7 @@ Elytrium Java Serializer is uploaded to the Maven Central repository, so you can
 2) Instantiate it.
     ```java
     Settings settings = new Settings();
-    settings.reload(Path.of("./config.yml"));
+    settings.reload(Path.of("config.yml"));
     ```
 3) Done!
 

build.gradle

@@ -13,8 +13,8 @@ this.group = "net.elytrium"
 this.version = "1.0.3-SNAPSHOT"
 
 compileJava() {
-  sourceCompatibility = "17"
-  targetCompatibility = "17"
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
   options.getRelease().set(8)
 
   options.setEncoding("UTF-8")
@@ -31,6 +31,8 @@ dependencies() {
   compileOnly("com.github.spotbugs:spotbugs-annotations:$spotbugsVersion")
   testCompileOnly("com.github.spotbugs:spotbugs-annotations:$spotbugsVersion")
 
+  testImplementation("it.unimi.dsi:fastutil-core:8.5.12")
+
   testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
   testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
 }
@@ -51,7 +53,7 @@ checkstyle() {
 spotbugsMain() {
   reports.register("html") {
     required = true
-    outputLocation.fileValue(file("$buildDir/reports/spotbugs/main/spotbugs.html"))
+    outputLocation.value(layout.buildDirectory.file("reports/spotbugs/main/spotbugs.html"))
     stylesheet = "fancy-hist.xsl"
   }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -112,32 +112,38 @@ public String toFieldName(String field, NameStyle overriddenFieldNameStyle, Name
       overriddenNodeNameStyle = this.nodeNameStyle;
     }
 
-    return overriddenFieldNameStyle == overriddenNodeNameStyle
-        ? field
-        : overriddenFieldNameStyle.fromMacroCase(overriddenNodeNameStyle.toMacroCase(field));
+    return overriddenFieldNameStyle == overriddenNodeNameStyle ? field : overriddenFieldNameStyle.fromMacroCase(overriddenNodeNameStyle.toMacroCase(field));
   }
 
-  public PlaceholderReplacer<?, ?> getAndCacheReplacer(Class<? extends PlaceholderReplacer<?, ?>> replacerClass) throws ReflectiveOperationException {
-    PlaceholderReplacer<?, ?> replacer = this.cachedReplacers.get(replacerClass);
+  public PlaceholderReplacer<?, ?> getAndCacheReplacer(Class<? extends PlaceholderReplacer<?, ?>> clazz) throws ReflectiveOperationException {
+    PlaceholderReplacer<?, ?> replacer = this.cachedReplacers.get(clazz);
     if (replacer == null) {
-      Constructor<? extends PlaceholderReplacer<?, ?>> constructor = replacerClass.getDeclaredConstructor();
+      replacer = this.registeredReplacers.get(clazz);
+    }
+
+    if (replacer == null) {
+      Constructor<? extends PlaceholderReplacer<?, ?>> constructor = clazz.getDeclaredConstructor();
       constructor.setAccessible(true);
       replacer = constructor.newInstance();
-      this.cachedReplacers.put(replacerClass, replacer);
+      this.cachedReplacers.put(clazz, replacer);
     }
 
     return replacer;
   }
 
   @SuppressWarnings("unchecked")
   public <T, F> ClassSerializer<T, F> getAndCacheSerializer(Serializer serializer) throws ReflectiveOperationException {
-    Class<? extends ClassSerializer<?, ?>> serializerClass = serializer.value();
-    var configSerializer = (ClassSerializer<T, F>) this.cachedSerializers.get(serializerClass);
+    Class<? extends ClassSerializer<?, ?>> clazz = serializer.value();
+    var configSerializer = (ClassSerializer<T, F>) this.cachedSerializers.get(clazz);
+    if (configSerializer == null) {
+      configSerializer = (ClassSerializer<T, F>) this.registeredSerializers.get(clazz);
+    }
+
     if (configSerializer == null) {
-      Constructor<? extends ClassSerializer<?, ?>> constructor = serializerClass.getDeclaredConstructor();
+      Constructor<? extends ClassSerializer<?, ?>> constructor = clazz.getDeclaredConstructor();
       constructor.setAccessible(true);
       configSerializer = (ClassSerializer<T, F>) constructor.newInstance();
-      this.cachedSerializers.put(serializerClass, configSerializer);
+      this.cachedSerializers.put(clazz, configSerializer);
     }
 
     return configSerializer;
@@ -250,16 +256,6 @@ public static class Builder {
     private boolean backupOnErrors = true;
     private int commentValueIndent = 0;
 
-    public Builder registerSerializer(Collection<ClassSerializer<?, ?>> serializers) {
-      serializers.forEach(serializer -> this.registeredSerializers.put(serializer.getToType(), serializer));
-      return this;
-    }
-
-    public Builder registerSerializer(ClassSerializer<?, ?> serializer) {
-      this.registeredSerializers.put(serializer.getToType(), serializer);
-      return this;
-    }
-
     public Builder registerReplacer(Collection<PlaceholderReplacer<?, ?>> replacers) {
       replacers.forEach(this::registerReplacer);
       return this;
@@ -275,9 +271,7 @@ public Builder registerReplacer(PlaceholderReplacer<?, ?> serializer) {
       }
 
       if (valueClass == null) {
-        throw new IllegalStateException(
-            "Failed to determine value class, please use SerializerConfig.Builder#registerPlaceholder(Class, PlaceholderReplacer)"
-        );
+        throw new IllegalStateException("Failed to determine value class, please use SerializerConfig.Builder#registerPlaceholder(Class, PlaceholderReplacer)");
       }
 
       return this.registerReplacer(valueClass, serializer);
@@ -293,6 +287,16 @@ public Builder registerReplacer(Class<?> valueClass, PlaceholderReplacer<?, ?> s
       return this;
     }
 
+    public Builder registerSerializer(Collection<ClassSerializer<?, ?>> serializers) {
+      serializers.forEach(this::registerSerializer);
+      return this;
+    }
+
+    public Builder registerSerializer(ClassSerializer<?, ?> serializer) {
+      this.registeredSerializers.put(serializer.getToType(), serializer);
+      return this;
+    }
+
     public Builder setFieldNameStyle(NameStyle fieldNameStyle) {
       this.fieldNameStyle = fieldNameStyle;
       return this;

src/main/java/net/elytrium/serializer/SerializerConfig.java

@@ -25,12 +25,12 @@
 import java.util.Collection;
 
 /**
- * Changes collection type
+ * Specifies which collection type to use.
  */
-@SuppressWarnings("rawtypes")
 @Documented
+@Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD})
+@SuppressWarnings("rawtypes")
 public @interface CollectionType {
 
   /**