Merge remote-tracking branch 'runelite/master' into master

runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java

@@ -122,6 +122,18 @@ public class ConfigManagerTest
 
 		TestConfig conf = manager.getConfig(TestConfig.class);
 		ConfigDescriptor descriptor = manager.getConfigDescriptor(conf);
-		Assert.assertEquals(1, descriptor.getItems().size());
+		Assert.assertEquals(2, descriptor.getItems().size());
+	}
+
+	@Test
+	public void testResetNullDefaultConfig()
+	{
+		TestConfig conf = manager.getConfig(TestConfig.class);
+		ConfigDescriptor descriptor = manager.getConfigDescriptor(conf);
+		conf.nullDefaultKey("new value");
+
+		manager.unsetConfiguration(descriptor.getGroup().value(), "nullDefaultKey");
+		manager.setDefaultConfiguration(conf, false);
+		Assert.assertNull(conf.nullDefaultKey());
 	}
 }

runelite-client/src/test/java/net/runelite/client/config/TestConfig.java

@@ -43,4 +43,21 @@ public interface TestConfig extends Config
 		description = "value"
 	)
 	void key(String key);
+
+	@ConfigItem(
+			keyName = "nullDefaultKey",
+			name = "Key Name",
+			description = "value"
+	)
+	void nullDefaultKey(String key);
+
+	@ConfigItem(
+			keyName = "nullDefaultKey",
+			name = "Key Name",
+			description = "value"
+	)
+	default String nullDefaultKey()
+	{
+		return null;
+	}
 }