From 3c20ceb740162d4a880e21048341dd91bd93caf0 Mon Sep 17 00:00:00 2001
From: DevDrizzy <fistergaming123@gmail.com>
Date: Sat, 18 Feb 2023 19:48:23 +0500
Subject: [PATCH] Fix null pointers

Signed-off-by: DevDrizzy <fistergaming123@gmail.com>
---
 StorageAPI.iml                                    |  1 -
 pom.xml                                           |  9 ++++++++-
 .../api/storage/impl/ParentYamlStorage.java       | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/StorageAPI.iml b/StorageAPI.iml
index 574de5b..88c4fa0 100644
--- a/StorageAPI.iml
+++ b/StorageAPI.iml
@@ -12,7 +12,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.github.paperspigot:1.8.8:1.8.8" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb:mongo-java-driver:3.12.10" level="project" />
     <orderEntry type="library" name="Maven: me.carleslc.Simple-YAML:Simple-Yaml:1.8.3" level="project" />
-    <orderEntry type="library" name="Maven: me.carleslc.Simple-YAML:Simple-Configuration:1.8.3" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f9be95a..37853c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>xyz.refinedev.api</groupId>
     <artifactId>StorageAPI</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -122,6 +122,13 @@
             <groupId>me.carleslc.Simple-YAML</groupId>
             <artifactId>Simple-Yaml</artifactId>
             <version>1.8.3</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>me.carleslc.Simple-YAML</groupId>
+                    <artifactId>Simple-Configuration</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/xyz/refinedev/api/storage/impl/ParentYamlStorage.java b/src/main/java/xyz/refinedev/api/storage/impl/ParentYamlStorage.java
index 755e436..deaafc7 100644
--- a/src/main/java/xyz/refinedev/api/storage/impl/ParentYamlStorage.java
+++ b/src/main/java/xyz/refinedev/api/storage/impl/ParentYamlStorage.java
@@ -1,6 +1,9 @@
 package xyz.refinedev.api.storage.impl;
 
+import com.google.common.base.Preconditions;
+
 import org.bukkit.plugin.java.JavaPlugin;
+
 import xyz.refinedev.api.storage.YamlStorage;
 import xyz.refinedev.api.storage.annotations.ConfigValue;
 
@@ -13,7 +16,7 @@ public abstract class ParentYamlStorage extends YamlStorage {
      * Set based cache for child storages of this Parent Storage
      * We keep it concurrent to allow asynchronous file I/O
      */
-    private final Set<ChildYamlStorage> childStorages = Collections.synchronizedSet(new HashSet<>());
+    private Set<ChildYamlStorage> childStorages;
 
     /**
      * Initiation method for a config file
@@ -31,6 +34,13 @@ public ParentYamlStorage(JavaPlugin plugin, String name) {
      * @param storage {@link ChildYamlStorage storage}
      */
     public void addChildStorage(ChildYamlStorage storage) {
+        Preconditions.checkNotNull(storage, "[StorageAPI] Child Storage can not be null!");
+
+        // Bypass for constructor being called before default variable initialization
+        if (childStorages == null) {
+            this.childStorages = Collections.synchronizedSet(new HashSet<>());
+        }
+
         this.childStorages.add(storage);
     }
 
@@ -46,6 +56,9 @@ public List<Field> getConfigFields() {
         // Add child fields
         this.childStorages.stream().map(ChildYamlStorage::getConfigFields).forEach(annotatedFields::addAll);
 
+        Preconditions.checkArgument(annotatedFields.stream().allMatch(field -> field.isAnnotationPresent(ConfigValue.class)),
+                "[Storage-API] One of your field is missing annotation!");
+
         // Sort according to priority
         annotatedFields.sort(Comparator.comparingInt(field -> field.getAnnotation(ConfigValue.class).priority()));