Skip to content

Commit 6322eb4

Browse files
committed
Drop unnecessary Type enum in JsonEncoder. (#458)
1 parent 060a6a6 commit 6322eb4

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

metafacture-json/src/main/java/org/metafacture/json/JsonEncoder.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -224,27 +224,22 @@ public void endEntity() {
224224
@Override
225225
public void literal(final String name, final String value) {
226226
try {
227-
final Type type = value == null ? Type.NULL :
228-
isMarkedName(name, booleanMarker) ? Type.BOOLEAN :
229-
isMarkedName(name, numberMarker) ? Type.NUMBER : Type.STRING;
230-
231227
final JsonStreamContext ctx = jsonGenerator.getOutputContext();
232228
if (ctx.inObject()) {
233229
jsonGenerator.writeFieldName(getUnmarkedName(name, booleanMarker, numberMarker));
234230
}
235231

236-
switch (type) {
237-
case NULL:
238-
jsonGenerator.writeNull();
239-
break;
240-
case BOOLEAN:
241-
jsonGenerator.writeBoolean(Boolean.parseBoolean(value));
242-
break;
243-
case NUMBER:
244-
jsonGenerator.writeNumber(value);
245-
break;
246-
default:
247-
jsonGenerator.writeString(value);
232+
if (value == null) {
233+
jsonGenerator.writeNull();
234+
}
235+
else if (isMarkedName(name, booleanMarker)) {
236+
jsonGenerator.writeBoolean(Boolean.parseBoolean(value));
237+
}
238+
else if (isMarkedName(name, numberMarker)) {
239+
jsonGenerator.writeNumber(value);
240+
}
241+
else {
242+
jsonGenerator.writeString(value);
248243
}
249244
}
250245
catch (final JsonGenerationException e) {
@@ -358,8 +353,4 @@ private String unicodeEscape(final char ch) {
358353
return String.format("\\u%4H", ch).replace(' ', '0');
359354
}
360355

361-
private enum Type {
362-
BOOLEAN, NULL, NUMBER, STRING
363-
}
364-
365356
}

0 commit comments

Comments
 (0)