Removed setter for Collection fields, using reflection now

Petersil1998 · Petersil1998 · commit ffea98d4b754 · 2023-06-19T21:05:43.000+02:00
diff --git a/src/main/java/net/petersil98/thresh/collection/Challenges.java b/src/main/java/net/petersil98/thresh/collection/Challenges.java
@@ -15,8 +15,4 @@ public static Challenge getChallenge(int id) {
     public static List<Challenge> getChallenges() {
         return challenges;
     }
-
-    public static void setChallenges(List<Challenge> challenges) {
-        Challenges.challenges = challenges;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/Champions.java b/src/main/java/net/petersil98/thresh/collection/Champions.java
@@ -20,8 +20,4 @@ public static Champion getChampionByName(String name){
     public static List<Champion> getChampions() {
         return champions;
     }
-
-    public static void setChampions(List<Champion> champions) {
-        Champions.champions = champions;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/Items.java b/src/main/java/net/petersil98/thresh/collection/Items.java
@@ -15,8 +15,4 @@ public static Item getItem(int id){
     public static List<Item> getItems() {
         return items;
     }
-
-    public static void setItems(List<Item> items) {
-        Items.items = items;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/Maps.java b/src/main/java/net/petersil98/thresh/collection/Maps.java
@@ -15,8 +15,4 @@ public static Map getMap(int id){
     public static List<Map> getMaps() {
         return maps;
     }
-
-    public static void setMaps(List<Map> maps) {
-        Maps.maps = maps;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/QueueTypes.java b/src/main/java/net/petersil98/thresh/collection/QueueTypes.java
@@ -15,8 +15,4 @@ public static QueueType getQueueType(int id){
     public static List<QueueType> getQueueTypes() {
         return queueTypes;
     }
-
-    public static void setQueueTypes(List<QueueType> queueTypes) {
-        QueueTypes.queueTypes = queueTypes;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/RuneStats.java b/src/main/java/net/petersil98/thresh/collection/RuneStats.java
@@ -15,8 +15,4 @@ public static RuneStat getRuneStat(int id){
     public static List<RuneStat> getRuneStats() {
         return runeStats;
     }
-
-    public static void setRuneStats(List<RuneStat> runeStats) {
-        RuneStats.runeStats = runeStats;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/RuneStyles.java b/src/main/java/net/petersil98/thresh/collection/RuneStyles.java
@@ -15,8 +15,4 @@ public static RuneStyle getRuneStyle(int id){
     public static List<RuneStyle> getRuneStyles() {
         return runeStyles;
     }
-
-    public static void setRuneStyles(List<RuneStyle> runeStyles) {
-        RuneStyles.runeStyles = runeStyles;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/Runes.java b/src/main/java/net/petersil98/thresh/collection/Runes.java
@@ -15,8 +15,4 @@ public static Rune getRune(int id){
     public static List<Rune> getRunes() {
         return runes;
     }
-
-    public static void setRunes(List<Rune> runes) {
-        Runes.runes = runes;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/collection/SummonerSpells.java b/src/main/java/net/petersil98/thresh/collection/SummonerSpells.java
@@ -15,8 +15,4 @@ public static SummonerSpell getSummonerSpell(int id){
     public static List<SummonerSpell> getSummonerSpells() {
         return summonerSpells;
     }
-
-    public static void setSummonerSpells(List<SummonerSpell> summonerSpells) {
-        SummonerSpells.summonerSpells = summonerSpells;
-    }
 }
diff --git a/src/main/java/net/petersil98/thresh/util/LoLLoader.java b/src/main/java/net/petersil98/thresh/util/LoLLoader.java
@@ -9,6 +9,7 @@
 import net.petersil98.core.data.Sprite;
 import net.petersil98.core.util.Loader;
 import net.petersil98.core.util.settings.Settings;
+import net.petersil98.thresh.Thresh;
 import net.petersil98.thresh.collection.*;
 import net.petersil98.thresh.data.Challenge;
 import net.petersil98.thresh.data.Item;
@@ -21,6 +22,7 @@
 import org.apache.logging.log4j.core.util.IOUtils;
 
 import java.io.*;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -109,7 +111,7 @@ private void loadRuneStyles(){
                         runeStyle.get("key").asText())
                 );
             }
-            RuneStyles.setRuneStyles(runeStyles);
+            setFieldInCollection(RuneStyles.class, runeStyles);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -134,7 +136,7 @@ private void loadRunes(){
                     }
                 }
             }
-            Runes.setRunes(runes);
+            setFieldInCollection(Runes.class, runes);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -175,7 +177,7 @@ private void loadRuneStats(){
                         runeStyle.get("longDesc").asText())
                 );
             }
-            RuneStats.setRuneStats(runeStats);
+            setFieldInCollection(RuneStats.class, runeStats);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -211,7 +213,7 @@ private void loadMaps(){
                         sprite)
                 );
             }
-            Maps.setMaps(maps);
+            setFieldInCollection(Maps.class, maps);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -229,7 +231,7 @@ private void updateChampionsFile(){
     private void loadChampions(){
         try {
             String content = Files.readString(Paths.get(CHAMPIONS_FILE_PATH));
-            Champions.setChampions(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Champion.class)));
+            setFieldInCollection(Champions.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Champion.class)));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -250,7 +252,7 @@ private void updateQueueTypesFile(){
     private void loadQueueTypes(){
         try {
             String content = Files.readString(Paths.get(QUEUE_TYPES_FILE_PATH));
-            QueueTypes.setQueueTypes(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, QueueType.class)));
+            setFieldInCollection(QueueTypes.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, QueueType.class)));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -324,7 +326,7 @@ private void loadItems(){
                     ITEMS_SPECIAL_RECIPE.put(Integer.parseInt(entry.getKey()), node.get("specialRecipe").asInt());
                 }
             }
-            Items.setItems(items);
+            setFieldInCollection(Items.class, items);
             Items.getItems().forEach(Item::postInit);
         } catch (IOException e) {
             e.printStackTrace();
@@ -385,7 +387,7 @@ private void loadSummonerSpells(){
                         )
                 );
             }
-            SummonerSpells.setSummonerSpells(list);
+            setFieldInCollection(SummonerSpells.class, list);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -406,7 +408,7 @@ private void updateChallengesFile() {
     private void loadChallenges(){
         try {
             String content = Files.readString(Paths.get(CHALLENGES_FILE_PATH));
-            Challenges.setChallenges(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Challenge.class)));
+            setFieldInCollection(Challenges.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Challenge.class)));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -474,4 +476,17 @@ private void renameFieldInNode(ObjectNode node, String fieldName, String newFiel
         node.set(newFieldName, node.get(fieldName));
         node.remove(fieldName);
     }
+
+    private void setFieldInCollection(Class<?> collectionClass, List<?> elements) {
+        try {
+            char[] fieldName = collectionClass.getSimpleName().toCharArray();
+            fieldName[0] += 32;
+            Field field = collectionClass.getDeclaredField(new String(fieldName));
+            field.setAccessible(true);
+            field.set(null, elements);
+            field.setAccessible(false);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Thresh.LOGGER.error("Couldn't set collection Type of class " + collectionClass.getSimpleName(), e);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static Challenge getChallenge(int id) {`
`15`	`15`	`public static List<Challenge> getChallenges() {`
`16`	`16`	`return challenges;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setChallenges(List<Challenge> challenges) {`
`20`		`- Challenges.challenges = challenges;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,4 @@ public static Champion getChampionByName(String name){`
`20`	`20`	`public static List<Champion> getChampions() {`
`21`	`21`	`return champions;`
`22`	`22`	`}`
`23`		`-`
`24`		`- public static void setChampions(List<Champion> champions) {`
`25`		`- Champions.champions = champions;`
`26`		`- }`
`27`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static Item getItem(int id){`
`15`	`15`	`public static List<Item> getItems() {`
`16`	`16`	`return items;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setItems(List<Item> items) {`
`20`		`- Items.items = items;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static Map getMap(int id){`
`15`	`15`	`public static List<Map> getMaps() {`
`16`	`16`	`return maps;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setMaps(List<Map> maps) {`
`20`		`- Maps.maps = maps;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static QueueType getQueueType(int id){`
`15`	`15`	`public static List<QueueType> getQueueTypes() {`
`16`	`16`	`return queueTypes;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setQueueTypes(List<QueueType> queueTypes) {`
`20`		`- QueueTypes.queueTypes = queueTypes;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static RuneStat getRuneStat(int id){`
`15`	`15`	`public static List<RuneStat> getRuneStats() {`
`16`	`16`	`return runeStats;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setRuneStats(List<RuneStat> runeStats) {`
`20`		`- RuneStats.runeStats = runeStats;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static RuneStyle getRuneStyle(int id){`
`15`	`15`	`public static List<RuneStyle> getRuneStyles() {`
`16`	`16`	`return runeStyles;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setRuneStyles(List<RuneStyle> runeStyles) {`
`20`		`- RuneStyles.runeStyles = runeStyles;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static Rune getRune(int id){`
`15`	`15`	`public static List<Rune> getRunes() {`
`16`	`16`	`return runes;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setRunes(List<Rune> runes) {`
`20`		`- Runes.runes = runes;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,4 @@ public static SummonerSpell getSummonerSpell(int id){`
`15`	`15`	`public static List<SummonerSpell> getSummonerSpells() {`
`16`	`16`	`return summonerSpells;`
`17`	`17`	`}`
`18`		`-`
`19`		`- public static void setSummonerSpells(List<SummonerSpell> summonerSpells) {`
`20`		`- SummonerSpells.summonerSpells = summonerSpells;`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import net.petersil98.core.data.Sprite;`
`10`	`10`	`import net.petersil98.core.util.Loader;`
`11`	`11`	`import net.petersil98.core.util.settings.Settings;`
	`12`	`+import net.petersil98.thresh.Thresh;`
`12`	`13`	`import net.petersil98.thresh.collection.*;`
`13`	`14`	`import net.petersil98.thresh.data.Challenge;`
`14`	`15`	`import net.petersil98.thresh.data.Item;`
`@@ -21,6 +22,7 @@`
`21`	`22`	`import org.apache.logging.log4j.core.util.IOUtils;`
`22`	`23`
`23`	`24`	`import java.io.*;`
	`25`	`+import java.lang.reflect.Field;`
`24`	`26`	`import java.net.URL;`
`25`	`27`	`import java.nio.file.Files;`
`26`	`28`	`import java.nio.file.Paths;`
`@@ -109,7 +111,7 @@ private void loadRuneStyles(){`
`109`	`111`	`runeStyle.get("key").asText())`
`110`	`112`	`);`
`111`	`113`	`}`
`112`		`- RuneStyles.setRuneStyles(runeStyles);`
	`114`	`+ setFieldInCollection(RuneStyles.class, runeStyles);`
`113`	`115`	`} catch (IOException e) {`
`114`	`116`	`e.printStackTrace();`
`115`	`117`	`}`
`@@ -134,7 +136,7 @@ private void loadRunes(){`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`	`}`
`137`		`- Runes.setRunes(runes);`
	`139`	`+ setFieldInCollection(Runes.class, runes);`
`138`	`140`	`} catch (IOException e) {`
`139`	`141`	`e.printStackTrace();`
`140`	`142`	`}`
`@@ -175,7 +177,7 @@ private void loadRuneStats(){`
`175`	`177`	`runeStyle.get("longDesc").asText())`
`176`	`178`	`);`
`177`	`179`	`}`
`178`		`- RuneStats.setRuneStats(runeStats);`
	`180`	`+ setFieldInCollection(RuneStats.class, runeStats);`
`179`	`181`	`} catch (IOException e) {`
`180`	`182`	`e.printStackTrace();`
`181`	`183`	`}`
`@@ -211,7 +213,7 @@ private void loadMaps(){`
`211`	`213`	`sprite)`
`212`	`214`	`);`
`213`	`215`	`}`
`214`		`- Maps.setMaps(maps);`
	`216`	`+ setFieldInCollection(Maps.class, maps);`
`215`	`217`	`} catch (IOException e) {`
`216`	`218`	`e.printStackTrace();`
`217`	`219`	`}`
`@@ -229,7 +231,7 @@ private void updateChampionsFile(){`
`229`	`231`	`private void loadChampions(){`
`230`	`232`	`try {`
`231`	`233`	`String content = Files.readString(Paths.get(CHAMPIONS_FILE_PATH));`
`232`		`- Champions.setChampions(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Champion.class)));`
	`234`	`+ setFieldInCollection(Champions.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Champion.class)));`
`233`	`235`	`} catch (IOException e) {`
`234`	`236`	`e.printStackTrace();`
`235`	`237`	`}`
`@@ -250,7 +252,7 @@ private void updateQueueTypesFile(){`
`250`	`252`	`private void loadQueueTypes(){`
`251`	`253`	`try {`
`252`	`254`	`String content = Files.readString(Paths.get(QUEUE_TYPES_FILE_PATH));`
`253`		`- QueueTypes.setQueueTypes(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, QueueType.class)));`
	`255`	`+ setFieldInCollection(QueueTypes.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, QueueType.class)));`
`254`	`256`	`} catch (IOException e) {`
`255`	`257`	`e.printStackTrace();`
`256`	`258`	`}`
`@@ -324,7 +326,7 @@ private void loadItems(){`
`324`	`326`	`ITEMS_SPECIAL_RECIPE.put(Integer.parseInt(entry.getKey()), node.get("specialRecipe").asInt());`
`325`	`327`	`}`
`326`	`328`	`}`
`327`		`- Items.setItems(items);`
	`329`	`+ setFieldInCollection(Items.class, items);`
`328`	`330`	`Items.getItems().forEach(Item::postInit);`
`329`	`331`	`} catch (IOException e) {`
`330`	`332`	`e.printStackTrace();`
`@@ -385,7 +387,7 @@ private void loadSummonerSpells(){`
`385`	`387`	`)`
`386`	`388`	`);`
`387`	`389`	`}`
`388`		`- SummonerSpells.setSummonerSpells(list);`
	`390`	`+ setFieldInCollection(SummonerSpells.class, list);`
`389`	`391`	`} catch (IOException e) {`
`390`	`392`	`e.printStackTrace();`
`391`	`393`	`}`
`@@ -406,7 +408,7 @@ private void updateChallengesFile() {`
`406`	`408`	`private void loadChallenges(){`
`407`	`409`	`try {`
`408`	`410`	`String content = Files.readString(Paths.get(CHALLENGES_FILE_PATH));`
`409`		`- Challenges.setChallenges(MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Challenge.class)));`
	`411`	`+ setFieldInCollection(Challenges.class, MAPPER.readValue(content, TypeFactory.defaultInstance().constructCollectionType(List.class, Challenge.class)));`
`410`	`412`	`} catch (IOException e) {`
`411`	`413`	`e.printStackTrace();`
`412`	`414`	`}`
`@@ -474,4 +476,17 @@ private void renameFieldInNode(ObjectNode node, String fieldName, String newFiel`
`474`	`476`	`node.set(newFieldName, node.get(fieldName));`
`475`	`477`	`node.remove(fieldName);`
`476`	`478`	`}`
	`479`	`+`
	`480`	`+ private void setFieldInCollection(Class<?> collectionClass, List<?> elements) {`
	`481`	`+ try {`
	`482`	`+ char[] fieldName = collectionClass.getSimpleName().toCharArray();`
	`483`	`+ fieldName[0] += 32;`
	`484`	`+ Field field = collectionClass.getDeclaredField(new String(fieldName));`
	`485`	`+ field.setAccessible(true);`
	`486`	`+ field.set(null, elements);`
	`487`	`+ field.setAccessible(false);`
	`488`	`+ } catch (NoSuchFieldException \| IllegalAccessException e) {`
	`489`	`+ Thresh.LOGGER.error("Couldn't set collection Type of class " + collectionClass.getSimpleName(), e);`
	`490`	`+ }`
	`491`	`+ }`
`477`	`492`	`}`