ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-04-23 12:38:23 +08:00
parent 1a82747d94
commit e7a7a477c3
3 changed files with 102 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
View File

@ -42,7 +42,7 @@ public class Toml {
* @param data TOML数据
* @param writer {@link Writer}
*/
public static void write(Map<String, Object> data, Writer writer){
public static void write(final Map<String, Object> data, final Writer writer){
new TomlWriter(writer).write(data);
}

196
hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
View File

@ -42,109 +42,20 @@ public class TomlReader {
private int line = 1;// current line
/**
* Creates a new TomlReader.
* 构造
* <pre>
* 严格模式：[A-Za-z0-9_-]
* 宽松模式：所有字符但是不包括. [ ] # =
* </pre>
*
* @param data the TOML data to read
* @param strictAsciiBareKeys {@code true} to allow only strict bare keys, {@code false} to allow lenient ones.
* @param data TOML数据
* @param strictAsciiBareKeys {@code true} 只允许严格的key格式, {@code false} 支持宽松格式.
*/
public TomlReader(final String data, final boolean strictAsciiBareKeys) {
this.data = data;
this.strictAsciiBareKeys = strictAsciiBareKeys;
}
private boolean hasNext() {
return pos < data.length();
}
private char next() {
return data.charAt(pos++);
}
private char nextUseful(final boolean skipComments) {
char c = ' ';
while (hasNext() && (c == ' ' || c == '\t' || c == '\r' || c == '\n' || (c == '#' && skipComments))) {
c = next();
if (skipComments && c == '#') {
final int nextLinebreak = data.indexOf('\n', pos);
if (nextLinebreak == -1) {
pos = data.length();
} else {
pos = nextLinebreak + 1;
line++;
}
} else if (c == '\n') {
line++;
}
}
return c;
}
private char nextUsefulOrLinebreak() {
char c = ' ';
while (c == ' ' || c == '\t' || c == '\r') {
if (!hasNext())// fixes error when no '\n' at the end of the file
return '\n';
c = next();
}
if (c == '\n')
line++;
return c;
}
private Object nextValue(final char firstChar) {
switch (firstChar) {
case '+':
case '-':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return nextNumberOrDate(firstChar);
case '"':
if (pos + 1 < data.length()) {
final char c2 = data.charAt(pos);
final char c3 = data.charAt(pos + 1);
if (c2 == '"' && c3 == '"') {
pos += 2;
return nextBasicMultilineString();
}
}
return nextBasicString();
case '\'':
if (pos + 1 < data.length()) {
final char c2 = data.charAt(pos);
final char c3 = data.charAt(pos + 1);
if (c2 == '\'' && c3 == '\'') {
pos += 2;
return nextLiteralMultilineString();
}
}
return nextLiteralString();
case '[':
return nextArray();
case '{':
return nextInlineTable();
case 't':// Must be "true"
if (pos + 3 > data.length() || next() != 'r' || next() != 'u' || next() != 'e') {
throw new SettingException("Invalid value at line " + line);
}
return true;
case 'f':// Must be "false"
if (pos + 4 > data.length() || next() != 'a' || next() != 'l' || next() != 's' || next() != 'e') {
throw new SettingException("Invalid value at line " + line);
}
return false;
default:
throw new SettingException("Invalid character '" + toString(firstChar) + "' at line " + line);
}
}
/**
* 读取TOML
*
@ -268,6 +179,99 @@ public class TomlReader {
return map;
}
private boolean hasNext() {
return pos < data.length();
}
private char next() {
return data.charAt(pos++);
}
private char nextUseful(final boolean skipComments) {
char c = ' ';
while (hasNext() && (c == ' ' || c == '\t' || c == '\r' || c == '\n' || (c == '#' && skipComments))) {
c = next();
if (skipComments && c == '#') {
final int nextLinebreak = data.indexOf('\n', pos);
if (nextLinebreak == -1) {
pos = data.length();
} else {
pos = nextLinebreak + 1;
line++;
}
} else if (c == '\n') {
line++;
}
}
return c;
}
private char nextUsefulOrLinebreak() {
char c = ' ';
while (c == ' ' || c == '\t' || c == '\r') {
if (!hasNext())// fixes error when no '\n' at the end of the file
return '\n';
c = next();
}
if (c == '\n')
line++;
return c;
}
private Object nextValue(final char firstChar) {
switch (firstChar) {
case '+':
case '-':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return nextNumberOrDate(firstChar);
case '"':
if (pos + 1 < data.length()) {
final char c2 = data.charAt(pos);
final char c3 = data.charAt(pos + 1);
if (c2 == '"' && c3 == '"') {
pos += 2;
return nextBasicMultilineString();
}
}
return nextBasicString();
case '\'':
if (pos + 1 < data.length()) {
final char c2 = data.charAt(pos);
final char c3 = data.charAt(pos + 1);
if (c2 == '\'' && c3 == '\'') {
pos += 2;
return nextLiteralMultilineString();
}
}
return nextLiteralString();
case '[':
return nextArray();
case '{':
return nextInlineTable();
case 't':// Must be "true"
if (pos + 3 > data.length() || next() != 'r' || next() != 'u' || next() != 'e') {
throw new SettingException("Invalid value at line " + line);
}
return true;
case 'f':// Must be "false"
if (pos + 4 > data.length() || next() != 'a' || next() != 'l' || next() != 's' || next() != 'e') {
throw new SettingException("Invalid value at line " + line);
}
return false;
default:
throw new SettingException("Invalid character '" + toString(firstChar) + "' at line " + line);
}
}
private List<Object> nextArray() {
final ArrayList<Object> list = new ArrayList<>();
while (true) {

1
hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
View File

@ -13,6 +13,7 @@
package org.dromara.hutool.setting.toml;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.Console;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;