Merge pull request #73 from SpigotMC/master

Implicitly convert Map to Configuration
HexagonMC · Aug 25, 2016 · 1f65678 · 1f65678
2 parents f5be0e0 + 98e3c70
commit 1f65678
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java
@@ -108,6 +108,11 @@ public Object getDefault(String path)
 
     public void set(String path, Object value)
     {
+        if ( value instanceof Map )
+        {
+            value = new Configuration( (Map) value, ( defaults == null ) ? null : defaults.getSection( path ) );
+        }
+
         Configuration section = getSectionFor( path );
         if ( section == this )
         {

diff --git a/config/src/test/java/net/md_5/bungee/config/YamlConfigurationTest.java b/config/src/test/java/net/md_5/bungee/config/YamlConfigurationTest.java
@@ -2,6 +2,7 @@
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.junit.Assert;
@@ -125,4 +126,18 @@ public void testNull()
         Assert.assertEquals( null, conf.get( "null.object" ) );
         Assert.assertEquals( "", conf.getString( "null.object" ) );
     }
+
+    @Test
+    public void testMapAddition()
+    {
+        Configuration conf = ConfigurationProvider.getProvider( YamlConfiguration.class ).load( TEST_DOCUMENT );
+
+        conf.set( "addition", Collections.singletonMap( "foo", "bar" ) );
+
+        // Order matters
+        Assert.assertEquals( "bar", conf.getSection( "addition" ).getString( "foo" ) );
+        Assert.assertEquals( "bar", conf.getString( "addition.foo" ) );
+
+        Assert.assertTrue( conf.get( "addition" ) instanceof Configuration );
+    }
 }