Resolve critical thread safety issues in format configurers

core-test/src/test/java/eu/okaeri/configs/format/json/JsonConfigurerFeaturesTest.java

@@ -9,17 +9,14 @@
 import eu.okaeri.configs.json.simple.JsonSimpleConfigurer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.json.simple.parser.JSONParser;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.ByteArrayInputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -163,14 +160,6 @@ void testJsonSimple_DefaultConstructor() {
         assertThat(configurer).isNotNull();
     }
 
-    @Test
-    void testJsonSimple_ConstructorWithParser() {
-        JSONParser parser = new JSONParser();
-        JsonSimpleConfigurer configurer = new JsonSimpleConfigurer(parser);
-        assertThat(configurer).isNotNull();
-    }
-
-
     @Test
     void testJsonSimple_GetExtensions() {
         JsonSimpleConfigurer configurer = new JsonSimpleConfigurer();

core/src/main/java/eu/okaeri/configs/schema/FieldDeclaration.java

@@ -24,7 +24,7 @@ public class FieldDeclaration {
 
     private static final Logger LOGGER = Logger.getLogger(FieldDeclaration.class.getSimpleName());
     private static final Map<CacheEntry, FieldDeclaration> DECLARATION_CACHE = new ConcurrentHashMap<>();
-    private static final Set<String> FINAL_WARNS = new HashSet<>();
+    private static final Set<String> FINAL_WARNS = ConcurrentHashMap.newKeySet();
 
     private Object startingValue;
     private String name;

json-simple/src/main/java/eu/okaeri/configs/json/simple/JsonSimpleConfigurer.java

@@ -31,16 +31,6 @@ public List creatArrayContainer() {
         }
     };
 
-    private JSONParser parser;
-
-    public JsonSimpleConfigurer() {
-        this.parser = new JSONParser();
-    }
-
-    public JsonSimpleConfigurer(@NonNull JSONParser parser) {
-        this.parser = parser;
-    }
-
     @Override
     public List<String> getExtensions() {
         return Collections.singletonList("json");
@@ -65,7 +55,7 @@ public Object simplify(Object value, GenericsDeclaration genericType, @NonNull S
     @SuppressWarnings("unchecked")
     public Map<String, Object> load(@NonNull InputStream inputStream, @NonNull ConfigDeclaration declaration) throws Exception {
         String data = ConfigPostprocessor.of(inputStream).getContext();
-        return (Map<String, Object>) this.parser.parse(data, CONTAINER_FACTORY);
+        return (Map<String, Object>) new JSONParser().parse(data, CONTAINER_FACTORY);
     }
 
     @Override

yaml-snakeyaml/src/main/java/eu/okaeri/configs/yaml/snakeyaml/YamlSnakeYamlConfigurer.java

@@ -1,13 +1,9 @@
 package eu.okaeri.configs.yaml.snakeyaml;
 
 import eu.okaeri.configs.configurer.Configurer;
-import eu.okaeri.configs.format.SourceWalker;
 import eu.okaeri.configs.format.yaml.YamlSourceWalker;
 import eu.okaeri.configs.postprocessor.ConfigPostprocessor;
 import eu.okaeri.configs.schema.ConfigDeclaration;
-import eu.okaeri.configs.schema.FieldDeclaration;
-import eu.okaeri.configs.schema.GenericsDeclaration;
-import eu.okaeri.configs.serdes.SerdesContext;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -20,21 +16,23 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
 
 @Accessors(chain = true)
 public class YamlSnakeYamlConfigurer extends Configurer {
 
-    private Yaml yaml;
+    private final Supplier<Yaml> yaml;
+    private @Setter String commentPrefix = "# ";
 
-    @Setter private String commentPrefix = "# ";
-
-    public YamlSnakeYamlConfigurer(@NonNull Yaml yaml) {
-        this.yaml = yaml;
+    public YamlSnakeYamlConfigurer() {
+        this(YamlSnakeYamlConfigurer::createYaml);
     }
 
-    public YamlSnakeYamlConfigurer() {
-        this(createYaml());
+    public YamlSnakeYamlConfigurer(@NonNull Supplier<Yaml> yaml) {
+        this.yaml = yaml;
     }
 
     private static Yaml createYaml() {
@@ -65,12 +63,12 @@ public boolean isCommentLine(String line) {
 
     @Override
     public Map<String, Object> load(@NonNull InputStream inputStream, @NonNull ConfigDeclaration declaration) throws Exception {
-        return this.yaml.load(inputStream);
+        return this.yaml.get().load(inputStream);
     }
 
     @Override
     public void write(@NonNull OutputStream outputStream, @NonNull Map<String, Object> data, @NonNull ConfigDeclaration declaration) throws Exception {
-        ConfigPostprocessor.of(this.yaml.dump(data))
+        ConfigPostprocessor.of(this.yaml.get().dump(data))
             .removeLines(line -> line.startsWith(this.commentPrefix.trim()))
             .updateContext(ctx -> YamlSourceWalker.of(ctx).insertComments(declaration, this.commentPrefix))
             .write(outputStream);

yaml-snakeyaml/src/test/java/eu/okaeri/configs/yaml/snakeyaml/YamlSnakeYamlConfigurerFeaturesTest.java

@@ -48,7 +48,7 @@ void testDefaultConstructor() {
     @Test
     void testConstructorWithYaml() {
         Yaml yaml = new Yaml();
-        YamlSnakeYamlConfigurer configurer = new YamlSnakeYamlConfigurer(yaml);
+        YamlSnakeYamlConfigurer configurer = new YamlSnakeYamlConfigurer(() -> yaml);
         assertThat(configurer).isNotNull();
     }