Back-port fix for empty documents

A248 · Feb 2, 2021 · 8653429 · 8653429
1 parent eb2a0ab
commit 8653429
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/gson/src/main/java/space/arim/dazzleconf/ext/gson/GsonConfigurationFactory.java b/gson/src/main/java/space/arim/dazzleconf/ext/gson/GsonConfigurationFactory.java
@@ -18,10 +18,12 @@
  */
 package space.arim.dazzleconf.ext.gson;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -99,6 +101,9 @@ protected Map<String, Object> loadMapFromReader(Reader reader) throws IOExceptio
 			throw new IOException(ex);
 		} catch (JsonSyntaxException | MalformedJsonException ex) {
 			throw new ConfigFormatSyntaxException(ex);
+		} catch (EOFException ex) {
+			// JsonReader throws EOFException on empty documents
+			return Collections.emptyMap();
 		}
 	}
 

diff --git a/...yaml/src/main/java/space/arim/dazzleconf/ext/snakeyaml/SnakeYamlConfigurationFactory.java b/...yaml/src/main/java/space/arim/dazzleconf/ext/snakeyaml/SnakeYamlConfigurationFactory.java
@@ -22,6 +22,7 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -85,15 +86,18 @@ protected Charset charset() {
 
 	@Override
 	protected Map<String, Object> loadMapFromReader(Reader reader) throws IOException, ConfigFormatSyntaxException {
+		Map<String, Object> map;
 		try {
-			return yamlOptions.yamlSupplier().get().load(reader);
+			map = yamlOptions.yamlSupplier().get().load(reader);
 		} catch (YAMLException ex) {
 			Throwable cause = ex.getCause();
 			if (cause instanceof IOException) {
 				throw (IOException) cause;
 			}
 			throw new ConfigFormatSyntaxException(ex);
 		}
+		// SnakeYAML returns a null object for an empty document
+		return (map == null) ? Collections.emptyMap() : map;
 	}
 
 	@Override