fix code

hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java

@@ -31,11 +31,11 @@ public class PropsTest {
 	@Test
 	public void propTest() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		Props props = new Props("test.properties");
-		String user = props.getProperty("user");
+		final Props props = new Props("test.properties");
+		final String user = props.getProperty("user");
 		Assert.assertEquals(user, "root");
 
-		String driver = props.getStr("driver");
+		final String driver = props.getStr("driver");
 		Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
 	}
 
@@ -43,19 +43,19 @@ public class PropsTest {
 	@Ignore
 	public void propTestForAbsPAth() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		Props props = new Props("d:/test.properties");
-		String user = props.getProperty("user");
+		final Props props = new Props("d:/test.properties");
+		final String user = props.getProperty("user");
 		Assert.assertEquals(user, "root");
 
-		String driver = props.getStr("driver");
+		final String driver = props.getStr("driver");
 		Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
 	}
 
 	@Test
 	public void toBeanTest() {
-		Props props = Props.getProp("to_bean_test.properties");
+		final Props props = Props.getProp("to_bean_test.properties");
 
-		ConfigProperties cfg = props.toBean(ConfigProperties.class, "mail");
+		final ConfigProperties cfg = props.toBean(ConfigProperties.class, "mail");
 		Assert.assertEquals("mailer@mail.com", cfg.getHost());
 		Assert.assertEquals(9000, cfg.getPort());
 		Assert.assertEquals("mailer@mail.com", cfg.getFrom());
@@ -73,14 +73,14 @@ public class PropsTest {
 
 	@Test
 	public void toBeanWithNullPrefixTest(){
-		Props configProp = new Props();
+		final Props configProp = new Props();
 
 		configProp.setProperty("createTime", Objects.requireNonNull(DateUtil.parse("2020-01-01")));
 		configProp.setProperty("isInit", true);
 		configProp.setProperty("stairPlan", 1);
 		configProp.setProperty("stageNum", 2);
 		configProp.setProperty("version", 3);
-		SystemConfig systemConfig = configProp.toBean(SystemConfig.class);
+		final SystemConfig systemConfig = configProp.toBean(SystemConfig.class);
 
 		Assert.assertEquals(DateUtil.parse("2020-01-01"), systemConfig.getCreateTime());
 		Assert.assertEquals(true, systemConfig.getIsInit());

hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java

@@ -10,13 +10,13 @@ public class PropsUtilTest {
 
 	@Test
 	public void getTest() {
-		String driver = PropsUtil.get("test").getStr("driver");
+		final String driver = PropsUtil.get("test").getStr("driver");
 		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 
 	@Test
 	public void getFirstFoundTest() {
-		String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
+		final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
 		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 }

hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java

@@ -15,21 +15,21 @@ public class SettingTest {
 	@Test
 	public void settingTest() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		Setting setting = new Setting("test.setting", true);
+		final Setting setting = new Setting("test.setting", true);
 
-		String driver = setting.getByGroup("driver", "demo");
+		final String driver = setting.getByGroup("driver", "demo");
 		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
 
 		//本分组变量替换
-		String user = setting.getByGroup("user", "demo");
+		final String user = setting.getByGroup("user", "demo");
 		Assert.assertEquals("rootcom.mysql.jdbc.Driver", user);
 
 		//跨分组变量替换
-		String user2 = setting.getByGroup("user2", "demo");
+		final String user2 = setting.getByGroup("user2", "demo");
 		Assert.assertEquals("rootcom.mysql.jdbc.Driver", user2);
 
 		//默认值测试
-		String value = setting.getStr("keyNotExist", "defaultTest");
+		final String value = setting.getStr("keyNotExist", "defaultTest");
 		Assert.assertEquals("defaultTest", value);
 	}
 
@@ -37,13 +37,13 @@ public class SettingTest {
 	@Ignore
 	public void settingTestForAbsPath() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		Setting setting = new Setting("d:\\excel-plugin\\other.setting", true);
+		final Setting setting = new Setting("d:\\excel-plugin\\other.setting", true);
 		Console.log(setting.getStr("a"));
 	}
 
 	@Test
 	public void settingTestForCustom() {
-		Setting setting = new Setting();
+		final Setting setting = new Setting();
 
 		setting.setByGroup("user", "group1", "root");
 		setting.setByGroup("user", "group2", "root2");
@@ -61,7 +61,7 @@ public class SettingTest {
 	 */
 	@Test
 	public void storeTest() {
-		Setting setting = new Setting("test.setting");
+		final Setting setting = new Setting("test.setting");
 		setting.set("testKey", "testValue");
 
 		setting.store();

hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java

@@ -7,20 +7,20 @@ public class SettingUtilTest {
 
 	@Test
 	public void getTest() {
-		String driver = SettingUtil.get("test").get("demo", "driver");
+		final String driver = SettingUtil.get("test").get("demo", "driver");
 		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 
 	@Test
 	public void getTest2() {
-		String driver = SettingUtil.get("example/example").get("demo", "key");
+		final String driver = SettingUtil.get("example/example").get("demo", "key");
 		Assert.assertEquals("value", driver);
 	}
 
 	@Test
 	public void getFirstFoundTest() {
 		//noinspection ConstantConditions
-		String driver = SettingUtil.getFirstFound("test2", "test")
+		final String driver = SettingUtil.getFirstFound("test2", "test")
 				.get("demo", "driver");
 		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
 	}

hutool-setting/src/test/resources/example/example.setting

@@ -8,13 +8,13 @@ key = value
 
 #中括表示一个分组，其下面的所有属性归属于这个分组，在此分组名为demo，也可以没有分组
 #分组后的键值对在Setting对象中表现形式是：demo.key，也可以使用相应的方法取值
-[demo]
+[demo]=
 # 类似于Properties的键值对
 key = value
 # 支持变量替换（在new Setting的时候需要设置isUseVariable为true）
 key2 = value${key}
 
 #中括号开始表示新的分组开始，分组相互独立，键值与其他分组互不影响
-[demo2]
+[demo2]=
 key = value2
-key2 = value
+key2 = value

hutool-setting/src/test/resources/test.setting

@@ -4,7 +4,7 @@
 # -------------------------------------------------------------
 
 #中括表示一个分组，其下面的所有属性归属于这个分组，在此分组名为demo，也可以没有分组
-[demo]
+[demo]=
 #数据库驱动名，如果不指定，则会根据url自动判定
 driver = com.mysql.jdbc.Driver
 #JDBC url，必须
@@ -12,5 +12,5 @@ url = jdbc:mysql://fedora.vmware:3306/extractor
 #用户名，必须
 user = root${driver}
 user2 = root${demo.driver}
-#密码，必须，如果密码为空，请填写 pass = 
-pass = 123456
+#密码，必须，如果密码为空，请填写 pass =
+pass = 123456