You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/11/03 00:56:07 UTC
svn commit: r1814129 - in
/pivot/trunk/core/src/org/apache/pivot/serialization: BinarySerializer.java
ByteArraySerializer.java CSVSerializer.java PropertiesSerializer.java
StringSerializer.java
Author: rwhitcomb
Date: Fri Nov 3 00:56:07 2017
New Revision: 1814129
URL: http://svn.apache.org/viewvc?rev=1814129&view=rev
Log:
Code cleanup: Use "Utils" methods in the various Serializer classes for
parameter checks; some code layout cleanup; increase buffer sizes for
reading files in bigger chunks.
Modified:
pivot/trunk/core/src/org/apache/pivot/serialization/BinarySerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/ByteArraySerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/StringSerializer.java
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/BinarySerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/BinarySerializer.java?rev=1814129&r1=1814128&r2=1814129&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/BinarySerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/BinarySerializer.java Fri Nov 3 00:56:07 2017
@@ -22,6 +22,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import org.apache.pivot.util.Utils;
+
/**
* Implementation of the {@link Serializer} interface that uses Java's internal
* serialization mechanism to read and write values. All values in the object
@@ -36,9 +38,7 @@ public class BinarySerializer implements
*/
@Override
public Object readObject(InputStream inputStream) throws IOException, SerializationException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream is null.");
- }
+ Utils.checkNull(inputStream, "inputStream");
Object object = null;
@@ -58,13 +58,8 @@ public class BinarySerializer implements
@Override
public void writeObject(Object object, OutputStream outputStream) throws IOException,
SerializationException {
- if (object == null) {
- throw new IllegalArgumentException("object is null.");
- }
-
- if (outputStream == null) {
- throw new IllegalArgumentException("outputStream is null.");
- }
+ Utils.checkNull(object, "object");
+ Utils.checkNull(outputStream, "outputStream");
ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream);
objectOutputStream.writeObject(object);
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/ByteArraySerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/ByteArraySerializer.java?rev=1814129&r1=1814128&r2=1814129&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/ByteArraySerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/ByteArraySerializer.java Fri Nov 3 00:56:07 2017
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.pivot.util.Utils;
+
/**
* Implementation of the {@link Serializer} interface that reads and writes a
* byte array.
@@ -32,16 +34,14 @@ import java.io.OutputStream;
public class ByteArraySerializer implements Serializer<byte[]> {
public static final String MIME_TYPE = "application/octet-stream";
- public static final int BUFFER_SIZE = 2048;
+ public static final int BUFFER_SIZE = 16384;
/**
* Reads a byte array from an input stream.
*/
@Override
public byte[] readObject(InputStream inputStream) throws IOException, SerializationException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream is null.");
- }
+ Utils.checkNull(inputStream, "inputStream");
byte[] result = null;
@@ -72,13 +72,8 @@ public class ByteArraySerializer impleme
@Override
public void writeObject(byte[] bytes, OutputStream outputStream) throws IOException,
SerializationException {
- if (bytes == null) {
- throw new IllegalArgumentException("byte array is null.");
- }
-
- if (outputStream == null) {
- throw new IllegalArgumentException("outputStream is null.");
- }
+ Utils.checkNull(bytes, "byte array");
+ Utils.checkNull(outputStream, "outputStream");
try {
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream);
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=1814129&r1=1814128&r2=1814129&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java Fri Nov 3 00:56:07 2017
@@ -40,6 +40,7 @@ import org.apache.pivot.collections.Sequ
import org.apache.pivot.io.EchoReader;
import org.apache.pivot.io.EchoWriter;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
/**
* Implementation of the {@link Serializer} interface that reads data from and
@@ -87,7 +88,7 @@ public class CSVSerializer implements Se
public static final String CSV_EXTENSION = "csv";
public static final String MIME_TYPE = "text/csv";
- public static final int BUFFER_SIZE = 2048;
+ public static final int BUFFER_SIZE = 16384;
public CSVSerializer() {
this(Charset.forName(DEFAULT_CHARSET_NAME), DEFAULT_ITEM_TYPE);
@@ -102,13 +103,8 @@ public class CSVSerializer implements Se
}
public CSVSerializer(Charset charset, Type itemType) {
- if (charset == null) {
- throw new IllegalArgumentException("charset is null.");
- }
-
- if (itemType == null) {
- throw new IllegalArgumentException("itemType is null.");
- }
+ Utils.checkNull(charset, "charset");
+ Utils.checkNull(itemType, "itemType");
this.charset = charset;
this.itemType = itemType;
@@ -146,9 +142,7 @@ public class CSVSerializer implements Se
* @throws IllegalArgumentException for {@code null} input.
*/
public void setKeys(Sequence<String> keys) {
- if (keys == null) {
- throw new IllegalArgumentException();
- }
+ Utils.checkNull(keys, "keys");
this.keys = new ArrayList<>(keys);
}
@@ -160,9 +154,7 @@ public class CSVSerializer implements Se
* @throws IllegalArgumentException for {@code null} input.
*/
public void setKeys(String... keys) {
- if (keys == null) {
- throw new IllegalArgumentException();
- }
+ Utils.checkNull(keys, "keys");
setKeys(new ArrayAdapter<>(keys));
}
@@ -219,9 +211,7 @@ public class CSVSerializer implements Se
@SuppressWarnings("resource")
@Override
public List<?> readObject(InputStream inputStream) throws IOException, SerializationException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream is null.");
- }
+ Utils.checkNull(inputStream, "inputStream");
Reader reader = new BufferedReader(new InputStreamReader(inputStream, charset), BUFFER_SIZE);
if (verbose) {
@@ -245,9 +235,7 @@ public class CSVSerializer implements Se
* @throws IllegalArgumentException for {@code null} input reader.
*/
public List<?> readObject(Reader reader) throws IOException, SerializationException {
- if (reader == null) {
- throw new IllegalArgumentException("reader is null.");
- }
+ Utils.checkNull(reader, "reader");
LineNumberReader lineNumberReader = new LineNumberReader(reader);
@@ -419,8 +407,7 @@ public class CSVSerializer implements Se
value = valueBuilder.toString();
// Move to the next character after ',' (don't automatically advance
- // to
- // the next line)
+ // to the next line)
if (c == ',') {
c = reader.read();
}
@@ -448,13 +435,8 @@ public class CSVSerializer implements Se
@Override
public void writeObject(List<?> items, OutputStream outputStream) throws IOException,
SerializationException {
- if (items == null) {
- throw new IllegalArgumentException("items is null.");
- }
-
- if (outputStream == null) {
- throw new IllegalArgumentException("outputStream is null.");
- }
+ Utils.checkNull(items, "items");
+ Utils.checkNull(outputStream, "outputStream");
Writer writer = new BufferedWriter(new OutputStreamWriter(outputStream, charset),
BUFFER_SIZE);
@@ -477,13 +459,8 @@ public class CSVSerializer implements Se
*/
@SuppressWarnings("unchecked")
public void writeObject(List<?> items, Writer writer) throws IOException {
- if (items == null) {
- throw new IllegalArgumentException("items is null.");
- }
-
- if (writer == null) {
- throw new IllegalArgumentException("writer is null.");
- }
+ Utils.checkNull(items, "items");
+ Utils.checkNull(writer, "writer");
if (writeKeys) {
// Write keys as first line
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java?rev=1814129&r1=1814128&r2=1814129&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java Fri Nov 3 00:56:07 2017
@@ -23,6 +23,7 @@ import java.util.Properties;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.adapter.MapAdapter;
+import org.apache.pivot.util.Utils;
/**
* Implementation of the {@link Serializer} interface that reads data from and
@@ -41,9 +42,7 @@ public class PropertiesSerializer implem
*/
@Override
public Map<?, ?> readObject(InputStream inputStream) throws IOException, SerializationException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream is null.");
- }
+ Utils.checkNull(inputStream, "inputStream");
Properties properties = new Properties();
properties.load(inputStream);
@@ -63,13 +62,8 @@ public class PropertiesSerializer implem
@Override
public void writeObject(Map<?, ?> object, OutputStream outputStream) throws IOException,
SerializationException {
- if (object == null) {
- throw new IllegalArgumentException("object is null.");
- }
-
- if (outputStream == null) {
- throw new IllegalArgumentException("outputStream is null.");
- }
+ Utils.checkNull(object, "object");
+ Utils.checkNull(outputStream, "outputStream");
Map<Object, Object> map = (Map<Object, Object>) object;
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/StringSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/StringSerializer.java?rev=1814129&r1=1814128&r2=1814129&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/StringSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/StringSerializer.java Fri Nov 3 00:56:07 2017
@@ -25,6 +25,8 @@ import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import org.apache.pivot.util.Utils;
+
/**
* Implementation of the {@link Serializer} interface that reads data from and
* writes data to Java Strings. The text data is interpreted using either the
@@ -39,16 +41,14 @@ public class StringSerializer implements
public static final String TEXT_EXTENSION = "txt";
public static final String MIME_TYPE = "text/plain";
- public static final int BUFFER_SIZE = 2048;
+ public static final int BUFFER_SIZE = 16384;
public StringSerializer() {
this(StandardCharsets.UTF_8);
}
public StringSerializer(Charset charset) {
- if (charset == null) {
- throw new IllegalArgumentException("charset is null.");
- }
+ Utils.checkNull(charset, "charset");
this.charset = charset;
}
@@ -67,9 +67,7 @@ public class StringSerializer implements
*/
@Override
public String readObject(InputStream inputStream) throws IOException, SerializationException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream is null.");
- }
+ Utils.checkNull(inputStream, "inputStream");
String result = null;
@@ -103,13 +101,8 @@ public class StringSerializer implements
@Override
public void writeObject(String text, OutputStream outputStream) throws IOException,
SerializationException {
- if (text == null) {
- throw new IllegalArgumentException("text is null.");
- }
-
- if (outputStream == null) {
- throw new IllegalArgumentException("outputStream is null.");
- }
+ Utils.checkNull(text, "text");
+ Utils.checkNull(outputStream, "outputStream");
try {
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream);