From 9968add0ae40053bb37a5b13c8dd9bb7d37dee67 Mon Sep 17 00:00:00 2001 From: "moandji.ezana" Date: Mon, 29 Jun 2015 09:57:05 +0200 Subject: [PATCH] Removed ValueWriter#isTable() --- .../com/moandjiezana/toml/ArrayValueWriter.java | 9 ++------- .../com/moandjiezana/toml/BooleanConverter.java | 5 ----- .../java/com/moandjiezana/toml/DateConverter.java | 5 ----- .../com/moandjiezana/toml/MapValueWriter.java | 15 +++++---------- .../com/moandjiezana/toml/NumberConverter.java | 5 ----- .../com/moandjiezana/toml/ObjectValueWriter.java | 15 +++++++-------- .../com/moandjiezana/toml/StringConverter.java | 5 ----- .../java/com/moandjiezana/toml/ValueWriter.java | 2 -- 8 files changed, 14 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/moandjiezana/toml/ArrayValueWriter.java b/src/main/java/com/moandjiezana/toml/ArrayValueWriter.java index c2449a7..29e4f5f 100644 --- a/src/main/java/com/moandjiezana/toml/ArrayValueWriter.java +++ b/src/main/java/com/moandjiezana/toml/ArrayValueWriter.java @@ -1,12 +1,12 @@ package com.moandjiezana.toml; +import static com.moandjiezana.toml.ValueWriters.WRITERS; + import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; -import static com.moandjiezana.toml.ValueWriters.WRITERS; - abstract class ArrayValueWriter implements ValueWriter { static protected boolean isArrayish(Object value) { return value instanceof Collection || value.getClass().isArray(); @@ -17,11 +17,6 @@ abstract class ArrayValueWriter implements ValueWriter { return false; } - @Override - public boolean isTable() { - return false; - } - static boolean isArrayOfPrimitive(Object array) { Object first = peek(array); if (first != null) { diff --git a/src/main/java/com/moandjiezana/toml/BooleanConverter.java b/src/main/java/com/moandjiezana/toml/BooleanConverter.java index 88bf0f0..64225de 100644 --- a/src/main/java/com/moandjiezana/toml/BooleanConverter.java +++ b/src/main/java/com/moandjiezana/toml/BooleanConverter.java @@ -39,11 +39,6 @@ class BooleanConverter implements ValueConverter, ValueWriter { return true; } - @Override - public boolean isTable() { - return false; - } - private BooleanConverter() {} @Override diff --git a/src/main/java/com/moandjiezana/toml/DateConverter.java b/src/main/java/com/moandjiezana/toml/DateConverter.java index 1e43a43..b44f7b7 100644 --- a/src/main/java/com/moandjiezana/toml/DateConverter.java +++ b/src/main/java/com/moandjiezana/toml/DateConverter.java @@ -113,11 +113,6 @@ class DateConverter implements ValueConverter, ValueWriter { return true; } - @Override - public boolean isTable() { - return false; - } - private DateConverter() {} @Override diff --git a/src/main/java/com/moandjiezana/toml/MapValueWriter.java b/src/main/java/com/moandjiezana/toml/MapValueWriter.java index 8bdceaf..8a08eaf 100644 --- a/src/main/java/com/moandjiezana/toml/MapValueWriter.java +++ b/src/main/java/com/moandjiezana/toml/MapValueWriter.java @@ -1,13 +1,13 @@ 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.TableArrayValueWriter.TABLE_ARRAY_VALUE_WRITER; 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 { static final ValueWriter MAP_VALUE_WRITER = new MapValueWriter(); @@ -56,7 +56,7 @@ class MapValueWriter implements ValueWriter { } 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))); } } @@ -67,11 +67,6 @@ class MapValueWriter implements ValueWriter { return false; } - @Override - public boolean isTable() { - return true; - } - private static String quoteKey(Object key) { String stringKey = key.toString(); Matcher matcher = requiredQuotingPattern.matcher(stringKey); diff --git a/src/main/java/com/moandjiezana/toml/NumberConverter.java b/src/main/java/com/moandjiezana/toml/NumberConverter.java index efea438..156f6e1 100644 --- a/src/main/java/com/moandjiezana/toml/NumberConverter.java +++ b/src/main/java/com/moandjiezana/toml/NumberConverter.java @@ -98,11 +98,6 @@ class NumberConverter implements ValueConverter, ValueWriter { return true; } - @Override - public boolean isTable() { - return false; - } - @Override public String toString() { return "number"; diff --git a/src/main/java/com/moandjiezana/toml/ObjectValueWriter.java b/src/main/java/com/moandjiezana/toml/ObjectValueWriter.java index 369e187..b0474a2 100644 --- a/src/main/java/com/moandjiezana/toml/ObjectValueWriter.java +++ b/src/main/java/com/moandjiezana/toml/ObjectValueWriter.java @@ -1,10 +1,14 @@ package com.moandjiezana.toml; +import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.*; - -import static com.moandjiezana.toml.MapValueWriter.MAP_VALUE_WRITER; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; class ObjectValueWriter implements ValueWriter { static final ValueWriter OBJECT_VALUE_WRITER = new ObjectValueWriter(); @@ -30,11 +34,6 @@ class ObjectValueWriter implements ValueWriter { return false; } - @Override - public boolean isTable() { - return true; - } - static private Set getFieldsForClass(Class cls) { Set fields = new LinkedHashSet(Arrays.asList(cls.getDeclaredFields())); diff --git a/src/main/java/com/moandjiezana/toml/StringConverter.java b/src/main/java/com/moandjiezana/toml/StringConverter.java index 409aafd..28b1cb4 100644 --- a/src/main/java/com/moandjiezana/toml/StringConverter.java +++ b/src/main/java/com/moandjiezana/toml/StringConverter.java @@ -106,11 +106,6 @@ class StringConverter implements ValueConverter, ValueWriter { return true; } - @Override - public boolean isTable() { - return false; - } - private void escapeUnicode(String in, StringBuilder out) { for (int i = 0; i < in.length(); i++) { int codePoint = in.codePointAt(i); diff --git a/src/main/java/com/moandjiezana/toml/ValueWriter.java b/src/main/java/com/moandjiezana/toml/ValueWriter.java index 6edae56..20ad0b1 100644 --- a/src/main/java/com/moandjiezana/toml/ValueWriter.java +++ b/src/main/java/com/moandjiezana/toml/ValueWriter.java @@ -6,6 +6,4 @@ interface ValueWriter { void write(Object value, WriterContext context); boolean isPrimitiveType(); - - boolean isTable(); }