code cleanup and unification
diff --git a/core/org.eclipse.smila.datamodel/code/src/org/eclipse/smila/datamodel/json/JsonSerializationUtils.java b/core/org.eclipse.smila.datamodel/code/src/org/eclipse/smila/datamodel/json/JsonSerializationUtils.java
index d23e2cb..9b52ae9 100644
--- a/core/org.eclipse.smila.datamodel/code/src/org/eclipse/smila/datamodel/json/JsonSerializationUtils.java
+++ b/core/org.eclipse.smila.datamodel/code/src/org/eclipse/smila/datamodel/json/JsonSerializationUtils.java
@@ -205,31 +205,7 @@
* in case of conversion error
*/
public void map2JsonStream(final OutputStream stream, final AnyMap object) throws IOException {
- final IpcStreamWriter writer = _jsonFactory.newStreamWriter(stream);
- try {
- writeMap(writer, object);
- } finally {
- writer.closeWithoutStream(); // do not close underlying stream
- }
- }
-
- /**
- * Converts Any object to JSON stream.
- *
- * @param stream
- * output stream
- * @param object
- * input record
- * @throws IOException
- * in case of conversion error
- */
- public void any2JsonStream(final OutputStream stream, final Any object) throws IOException {
- final IpcStreamWriter writer = _jsonFactory.newStreamWriter(stream);
- try {
- writeAny(writer, object);
- } finally {
- writer.closeWithoutStream(); // do not close underlying stream
- }
+ any2JsonStream(stream, object);
}
/**
@@ -250,7 +226,41 @@
} finally {
IOUtils.closeQuietly(baos);
}
+ }
+ /**
+ * Converts Any object to JSON stream.
+ *
+ * @param stream
+ * output stream
+ * @param object
+ * input object
+ * @throws IOException
+ * in case of conversion error
+ */
+ public void any2JsonStream(final OutputStream stream, final Any object) throws IOException {
+ final IpcStreamWriter writer = _jsonFactory.newStreamWriter(stream);
+ try {
+ any2Stream(writer, object);
+ } finally {
+ writer.closeWithoutStream(); // do not close underlying stream
+ }
+ }
+
+ /**
+ * Converts Any object to IPC stream.
+ *
+ * @param writer
+ * an IPC writer
+ * @param object
+ * input object
+ * @throws IOException
+ * in case of conversion error
+ */
+ public void any2Stream(final IpcStreamWriter writer, final Any object) throws IOException {
+ writer.writeObjectStart();
+ writeAny(writer, object);
+ writer.writeObjectEnd();
}
/**
@@ -264,10 +274,7 @@
* in case of conversion error
*/
public void record2Stream(final IpcStreamWriter writer, final Record record) throws IOException {
- writer.writeObjectStart();
- final AnyMap metadata = record.getMetadata();
- writeMap(writer, metadata);
- writer.writeObjectEnd();
+ any2Stream(writer, record.getMetadata());
}
/**
