fix(text): 令 AbstractText#parse 返回值不得为null，避免在List类型循环parse时出现异常。

CarmJos · Jun 20, 2022 · 9a8e639 · 9a8e639
1 parent 7fa6fa1
commit 9a8e639
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 16 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java
@@ -28,16 +28,14 @@ public AbstractText(@NotNull Class<R> receiverClazz, @NotNull String message) {
         return this.message;
     }
 
-    public <M> @Nullable M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser,
-                                 @Nullable R receiver, @Nullable String[] params, @Nullable Object[] values) {
+    public <M> @NotNull M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser,
+                                @Nullable R receiver, @Nullable String[] params, @Nullable Object[] values) {
         return parse(parser, receiver, ParamsUtils.buildParams(params, values));
     }
 
-    public <M> @Nullable M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser,
-                                 @Nullable R receiver, @NotNull Map<String, Object> placeholders) {
-        String message = getMessage();
-        if (message.isEmpty()) return null; // No further processing
-        else return parser.apply(receiver, ParamsUtils.setPlaceholders(message, placeholders));
+    public <M> @NotNull M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser,
+                                @Nullable R receiver, @NotNull Map<String, Object> placeholders) {
+        return parser.apply(receiver, ParamsUtils.setPlaceholders(message, placeholders));
     }
 
 

diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java
@@ -1,10 +1,10 @@
 package cc.carm.lib.mineconfiguration.common.value;
 
-import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
-import cc.carm.lib.mineconfiguration.common.data.AbstractText;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.value.type.ConfiguredList;
+import cc.carm.lib.mineconfiguration.common.data.AbstractText;
+import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/platform/bukkit/base/pom.xml b/platform/bukkit/base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-bukkit-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/platform/bukkit/general/pom.xml b/platform/bukkit/general/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-bukkit-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/platform/spigot/pom.xml b/platform/spigot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>mineconfiguration-parent</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     </properties>
     <groupId>cc.carm.lib</groupId>
     <artifactId>mineconfiguration-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>