mirror of
https://github.com/plexusorg/toml4j.git
synced 2025-02-11 11:40:27 +00:00
Removed ValueWriter#isTable()
This commit is contained in:
parent
121db7ef05
commit
9968add0ae
8 changed files with 14 additions and 47 deletions
|
@ -1,12 +1,12 @@
|
||||||
package com.moandjiezana.toml;
|
package com.moandjiezana.toml;
|
||||||
|
|
||||||
|
|
||||||
|
import static com.moandjiezana.toml.ValueWriters.WRITERS;
|
||||||
|
|
||||||
import java.lang.reflect.Array;
|
import java.lang.reflect.Array;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import static com.moandjiezana.toml.ValueWriters.WRITERS;
|
|
||||||
|
|
||||||
abstract class ArrayValueWriter implements ValueWriter {
|
abstract class ArrayValueWriter implements ValueWriter {
|
||||||
static protected boolean isArrayish(Object value) {
|
static protected boolean isArrayish(Object value) {
|
||||||
return value instanceof Collection || value.getClass().isArray();
|
return value instanceof Collection || value.getClass().isArray();
|
||||||
|
@ -17,11 +17,6 @@ abstract class ArrayValueWriter implements ValueWriter {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean isArrayOfPrimitive(Object array) {
|
static boolean isArrayOfPrimitive(Object array) {
|
||||||
Object first = peek(array);
|
Object first = peek(array);
|
||||||
if (first != null) {
|
if (first != null) {
|
||||||
|
|
|
@ -39,11 +39,6 @@ class BooleanConverter implements ValueConverter, ValueWriter {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private BooleanConverter() {}
|
private BooleanConverter() {}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -113,11 +113,6 @@ class DateConverter implements ValueConverter, ValueWriter {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private DateConverter() {}
|
private DateConverter() {}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package com.moandjiezana.toml;
|
package com.moandjiezana.toml;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import static com.moandjiezana.toml.PrimitiveArrayValueWriter.PRIMITIVE_ARRAY_VALUE_WRITER;
|
import static com.moandjiezana.toml.PrimitiveArrayValueWriter.PRIMITIVE_ARRAY_VALUE_WRITER;
|
||||||
import static com.moandjiezana.toml.TableArrayValueWriter.TABLE_ARRAY_VALUE_WRITER;
|
import static com.moandjiezana.toml.TableArrayValueWriter.TABLE_ARRAY_VALUE_WRITER;
|
||||||
import static com.moandjiezana.toml.ValueWriters.WRITERS;
|
import static com.moandjiezana.toml.ValueWriters.WRITERS;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
class MapValueWriter implements ValueWriter {
|
class MapValueWriter implements ValueWriter {
|
||||||
static final ValueWriter MAP_VALUE_WRITER = new MapValueWriter();
|
static final ValueWriter MAP_VALUE_WRITER = new MapValueWriter();
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ class MapValueWriter implements ValueWriter {
|
||||||
}
|
}
|
||||||
|
|
||||||
ValueWriter valueWriter = WRITERS.findWriterFor(fromValue);
|
ValueWriter valueWriter = WRITERS.findWriterFor(fromValue);
|
||||||
if (valueWriter.isTable() || valueWriter == TABLE_ARRAY_VALUE_WRITER) {
|
if (valueWriter == this || valueWriter == ObjectValueWriter.OBJECT_VALUE_WRITER || valueWriter == TABLE_ARRAY_VALUE_WRITER) {
|
||||||
valueWriter.write(fromValue, context.pushTable(quoteKey(key)));
|
valueWriter.write(fromValue, context.pushTable(quoteKey(key)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,11 +67,6 @@ class MapValueWriter implements ValueWriter {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String quoteKey(Object key) {
|
private static String quoteKey(Object key) {
|
||||||
String stringKey = key.toString();
|
String stringKey = key.toString();
|
||||||
Matcher matcher = requiredQuotingPattern.matcher(stringKey);
|
Matcher matcher = requiredQuotingPattern.matcher(stringKey);
|
||||||
|
|
|
@ -98,11 +98,6 @@ class NumberConverter implements ValueConverter, ValueWriter {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "number";
|
return "number";
|
||||||
|
|
|
@ -1,10 +1,14 @@
|
||||||
package com.moandjiezana.toml;
|
package com.moandjiezana.toml;
|
||||||
|
|
||||||
|
import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.util.*;
|
import java.util.Arrays;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER;
|
import java.util.LinkedHashSet;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
class ObjectValueWriter implements ValueWriter {
|
class ObjectValueWriter implements ValueWriter {
|
||||||
static final ValueWriter OBJECT_VALUE_WRITER = new ObjectValueWriter();
|
static final ValueWriter OBJECT_VALUE_WRITER = new ObjectValueWriter();
|
||||||
|
@ -30,11 +34,6 @@ class ObjectValueWriter implements ValueWriter {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static private Set<Field> getFieldsForClass(Class cls) {
|
static private Set<Field> getFieldsForClass(Class cls) {
|
||||||
Set<Field> fields = new LinkedHashSet<Field>(Arrays.asList(cls.getDeclaredFields()));
|
Set<Field> fields = new LinkedHashSet<Field>(Arrays.asList(cls.getDeclaredFields()));
|
||||||
|
|
||||||
|
|
|
@ -106,11 +106,6 @@ class StringConverter implements ValueConverter, ValueWriter {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isTable() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void escapeUnicode(String in, StringBuilder out) {
|
private void escapeUnicode(String in, StringBuilder out) {
|
||||||
for (int i = 0; i < in.length(); i++) {
|
for (int i = 0; i < in.length(); i++) {
|
||||||
int codePoint = in.codePointAt(i);
|
int codePoint = in.codePointAt(i);
|
||||||
|
|
|
@ -6,6 +6,4 @@ interface ValueWriter {
|
||||||
void write(Object value, WriterContext context);
|
void write(Object value, WriterContext context);
|
||||||
|
|
||||||
boolean isPrimitiveType();
|
boolean isPrimitiveType();
|
||||||
|
|
||||||
boolean isTable();
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue