Reformat project with default IntelliJ settings

10 files changed, 301 insertions, 309 deletions

diff --git a/src/main/java/com/iciql/adapter/GsonTypeAdapter.java b/src/main/java/com/iciql/adapter/GsonTypeAdapter.java
index 8d23cfd..83cbe51 100644
--- a/src/main/java/com/iciql/adapter/GsonTypeAdapter.java
+++ b/src/main/java/com/iciql/adapter/GsonTypeAdapter.java
@@ -26,13 +26,13 @@ import com.iciql.Iciql.Mode;
  * <p>
  * You use this by creating a subclass which defines your object class.
  * </p>
- *
+ * <p>
  * <pre>
  * public class CustomObjectAdapter extends GsonTypeAdapter&lt;CustomObject&gt; {
  *
  * 	public Class&lt;CustomObject&gt; getJavaType() {
  * 		return CustomObject.class;
- * 	}
+ *    }
  * }
  * </pre>
  *
@@ -40,32 +40,32 @@ import com.iciql.Iciql.Mode;
  */
 public abstract class GsonTypeAdapter<T> implements DataTypeAdapter<T> {
 
-	protected Mode mode;
+    protected Mode mode;
 
-	protected Gson gson() {
-		return new GsonBuilder().create();
-	}
+    protected Gson gson() {
+        return new GsonBuilder().create();
+    }
 
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
 
-	@Override
-	public String getDataType() {
-		return "TEXT";
-	}
+    @Override
+    public String getDataType() {
+        return "TEXT";
+    }
 
-	@Override
-	public Object serialize(T value) {
-		return gson().toJson(value);
-	}
+    @Override
+    public Object serialize(T value) {
+        return gson().toJson(value);
+    }
 
-	@Override
-	public T deserialize(Object value) {
-		String json = value.toString();
-		Gson gson = gson();
-		T t = gson.fromJson(json, getJavaType());
-		return t;
-	}
+    @Override
+    public T deserialize(Object value) {
+        String json = value.toString();
+        Gson gson = gson();
+        T t = gson.fromJson(json, getJavaType());
+        return t;
+    }
 }
diff --git a/src/main/java/com/iciql/adapter/JavaSerializationTypeAdapter.java b/src/main/java/com/iciql/adapter/JavaSerializationTypeAdapter.java
index df24495..bebb8fa 100644
--- a/src/main/java/com/iciql/adapter/JavaSerializationTypeAdapter.java
+++ b/src/main/java/com/iciql/adapter/JavaSerializationTypeAdapter.java
@@ -16,6 +16,10 @@
 
 package com.iciql.adapter;
 
+import com.iciql.Iciql.DataTypeAdapter;
+import com.iciql.Iciql.Mode;
+import com.iciql.IciqlException;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,10 +29,6 @@ import java.io.ObjectOutputStream;
 import java.sql.Blob;
 import java.sql.SQLException;
 
-import com.iciql.Iciql.DataTypeAdapter;
-import com.iciql.Iciql.Mode;
-import com.iciql.IciqlException;
-
 /**
  * Base class for inserting/retrieving a Java Object as a BLOB field using Java Serialization.
  * <p>You use this by creating a subclass which defines your object class.</p>
@@ -40,68 +40,69 @@ import com.iciql.IciqlException;
  *    }
  * }
  * </pre>
+ *
  * @param <T>
  */
 public abstract class JavaSerializationTypeAdapter<T> implements DataTypeAdapter<T> {
 
-	protected Mode mode;
+    protected Mode mode;
 
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
 
-	@Override
-	public final String getDataType() {
-		return "BLOB";
-	}
+    @Override
+    public final String getDataType() {
+        return "BLOB";
+    }
 
-	@Override
-	public final Object serialize(T value) {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		try {
-			new ObjectOutputStream(os).writeObject(value);
-			return os.toByteArray();
-		} catch (IOException e) {
-			throw new IciqlException(e);
-		} finally {
-			try {
-				os.close();
-			} catch (IOException e) {
-				throw new IciqlException (e);
-			}
-		}
-	}
+    @Override
+    public final Object serialize(T value) {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        try {
+            new ObjectOutputStream(os).writeObject(value);
+            return os.toByteArray();
+        } catch (IOException e) {
+            throw new IciqlException(e);
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+                throw new IciqlException(e);
+            }
+        }
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public final T deserialize(Object value) {
-		InputStream is = null;
-		if (value instanceof Blob) {
-			Blob blob = (Blob) value;
-			try {
-				is = blob.getBinaryStream();
-			} catch (SQLException e) {
-				throw new IciqlException(e);
-			}
-		} else if (value instanceof byte[]) {
-			byte [] bytes = (byte []) value;
-			is = new ByteArrayInputStream(bytes);
-		}
+    @SuppressWarnings("unchecked")
+    @Override
+    public final T deserialize(Object value) {
+        InputStream is = null;
+        if (value instanceof Blob) {
+            Blob blob = (Blob) value;
+            try {
+                is = blob.getBinaryStream();
+            } catch (SQLException e) {
+                throw new IciqlException(e);
+            }
+        } else if (value instanceof byte[]) {
+            byte[] bytes = (byte[]) value;
+            is = new ByteArrayInputStream(bytes);
+        }
 
-		try {
-			T object = (T) new ObjectInputStream(is).readObject();
-			return object;
-		} catch (Exception e) {
-			throw new IciqlException(e);
-		} finally {
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					throw new IciqlException (e);
-				}
-			}
-		}
-	}
+        try {
+            T object = (T) new ObjectInputStream(is).readObject();
+            return object;
+        } catch (Exception e) {
+            throw new IciqlException(e);
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    throw new IciqlException(e);
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/iciql/adapter/SnakeYamlTypeAdapter.java b/src/main/java/com/iciql/adapter/SnakeYamlTypeAdapter.java
index da3b20b..f96afcb 100644
--- a/src/main/java/com/iciql/adapter/SnakeYamlTypeAdapter.java
+++ b/src/main/java/com/iciql/adapter/SnakeYamlTypeAdapter.java
@@ -16,48 +16,47 @@
 
 package com.iciql.adapter;
 
+import com.iciql.Iciql.DataTypeAdapter;
+import com.iciql.Iciql.Mode;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.nodes.Tag;
 
-import com.iciql.Iciql.DataTypeAdapter;
-import com.iciql.Iciql.Mode;
-
 /**
  * Base class for inserting/retrieving a Java Object (de)serialized as YAML using SnakeYaml.
  */
 public abstract class SnakeYamlTypeAdapter<T> implements DataTypeAdapter<T> {
 
-	protected Mode mode;
-
-	protected Yaml yaml() {
-		return new Yaml();
-	}
-
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@Override
-	public String getDataType() {
-		return "TEXT";
-	}
-
-	@Override
-	public abstract Class<T> getJavaType();
-
-	@Override
-	public Object serialize(Object value) {
-		return yaml().dumpAs(value, Tag.MAP, FlowStyle.BLOCK);
-	}
-
-	@Override
-	public T deserialize(Object value) {
-		String yaml = value.toString();
-		Yaml processor = yaml();
-		T t = processor.loadAs(yaml, getJavaType());
-		return t;
-	}
+    protected Mode mode;
+
+    protected Yaml yaml() {
+        return new Yaml();
+    }
+
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public String getDataType() {
+        return "TEXT";
+    }
+
+    @Override
+    public abstract Class<T> getJavaType();
+
+    @Override
+    public Object serialize(Object value) {
+        return yaml().dumpAs(value, Tag.MAP, FlowStyle.BLOCK);
+    }
+
+    @Override
+    public T deserialize(Object value) {
+        String yaml = value.toString();
+        Yaml processor = yaml();
+        T t = processor.loadAs(yaml, getJavaType());
+        return t;
+    }
 
 }
diff --git a/src/main/java/com/iciql/adapter/XStreamTypeAdapter.java b/src/main/java/com/iciql/adapter/XStreamTypeAdapter.java
index a554724..224e7bb 100644
--- a/src/main/java/com/iciql/adapter/XStreamTypeAdapter.java
+++ b/src/main/java/com/iciql/adapter/XStreamTypeAdapter.java
@@ -25,38 +25,38 @@ import com.thoughtworks.xstream.XStream;
  */
 public class XStreamTypeAdapter implements DataTypeAdapter<Object> {
 
-	protected Mode mode;
-
-	protected XStream xstream() {
-		return new XStream();
-	}
-
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@Override
-	public String getDataType() {
-		return "TEXT";
-	}
-
-	@Override
-	public Class<Object> getJavaType() {
-		return Object.class;
-	}
-
-	@Override
-	public Object serialize(Object value) {
-		return xstream().toXML(value);
-	}
-
-	@Override
-	public Object deserialize(Object value) {
-		String xml = value.toString();
-		XStream xstream = xstream();
-		Object t = xstream.fromXML(xml);
-		return t;
-	}
+    protected Mode mode;
+
+    protected XStream xstream() {
+        return new XStream();
+    }
+
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public String getDataType() {
+        return "TEXT";
+    }
+
+    @Override
+    public Class<Object> getJavaType() {
+        return Object.class;
+    }
+
+    @Override
+    public Object serialize(Object value) {
+        return xstream().toXML(value);
+    }
+
+    @Override
+    public Object deserialize(Object value) {
+        String xml = value.toString();
+        XStream xstream = xstream();
+        Object t = xstream.fromXML(xml);
+        return t;
+    }
 
 }
diff --git a/src/main/java/com/iciql/adapter/postgresql/JsonObjectAdapter.java b/src/main/java/com/iciql/adapter/postgresql/JsonObjectAdapter.java
index 118cfc1..91f989a 100644
--- a/src/main/java/com/iciql/adapter/postgresql/JsonObjectAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/JsonObjectAdapter.java
@@ -15,38 +15,36 @@
  */
 package com.iciql.adapter.postgresql;
 
-import java.sql.SQLException;
-
+import com.iciql.adapter.GsonTypeAdapter;
 import org.postgresql.util.PGobject;
 
-import com.iciql.adapter.GsonTypeAdapter;
+import java.sql.SQLException;
 
 /**
  * Postgres JSON data type adapter maps a JSON column to a domain object using
  * Google GSON.
  *
- * @author James Moger
- *
  * @param <T>
+ * @author James Moger
  */
 public abstract class JsonObjectAdapter<T> extends GsonTypeAdapter<T> {
 
-	@Override
-	public String getDataType() {
-		return "json";
-	}
+    @Override
+    public String getDataType() {
+        return "json";
+    }
 
-	@Override
-	public Object serialize(T value) {
+    @Override
+    public Object serialize(T value) {
 
-		String json = gson().toJson(value);
-		PGobject pg = new PGobject();
-		pg.setType(getDataType());
-		try {
-			pg.setValue(json);
-		} catch (SQLException e) {
-			// not thrown on base PGobject
-		}
-		return pg;
-	}
+        String json = gson().toJson(value);
+        PGobject pg = new PGobject();
+        pg.setType(getDataType());
+        try {
+            pg.setValue(json);
+        } catch (SQLException e) {
+            // not thrown on base PGobject
+        }
+        return pg;
+    }
 }
diff --git a/src/main/java/com/iciql/adapter/postgresql/JsonStringAdapter.java b/src/main/java/com/iciql/adapter/postgresql/JsonStringAdapter.java
index 01d2834..5295d52 100644
--- a/src/main/java/com/iciql/adapter/postgresql/JsonStringAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/JsonStringAdapter.java
@@ -15,49 +15,48 @@
  */
 package com.iciql.adapter.postgresql;
 
-import java.sql.SQLException;
-
-import org.postgresql.util.PGobject;
-
 import com.iciql.Iciql.DataTypeAdapter;
 import com.iciql.Iciql.Mode;
+import org.postgresql.util.PGobject;
+
+import java.sql.SQLException;
 
 /**
  * Handles transforming raw strings to/from the Postgres JSON data type.
  */
 public class JsonStringAdapter implements DataTypeAdapter<String> {
 
-	protected Mode mode;
-
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@Override
-	public String getDataType() {
-		return "json";
-	}
-
-	@Override
-	public Class<String> getJavaType() {
-		return String.class;
-	}
-
-	@Override
-	public Object serialize(String value) {
-		PGobject pg = new PGobject();
-		pg.setType(getDataType());
-		try {
-			pg.setValue(value);
-		} catch (SQLException e) {
-			// not thrown on base PGobject
-		}
-		return pg;
-	}
-
-	@Override
-	public String deserialize(Object value) {
-		return value.toString();
-	}
+    protected Mode mode;
+
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public String getDataType() {
+        return "json";
+    }
+
+    @Override
+    public Class<String> getJavaType() {
+        return String.class;
+    }
+
+    @Override
+    public Object serialize(String value) {
+        PGobject pg = new PGobject();
+        pg.setType(getDataType());
+        try {
+            pg.setValue(value);
+        } catch (SQLException e) {
+            // not thrown on base PGobject
+        }
+        return pg;
+    }
+
+    @Override
+    public String deserialize(Object value) {
+        return value.toString();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/iciql/adapter/postgresql/JsonbObjectAdapter.java b/src/main/java/com/iciql/adapter/postgresql/JsonbObjectAdapter.java
index 6d8ad2c..947778b 100644
--- a/src/main/java/com/iciql/adapter/postgresql/JsonbObjectAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/JsonbObjectAdapter.java
@@ -15,38 +15,36 @@
  */
 package com.iciql.adapter.postgresql;
 
-import java.sql.SQLException;
-
+import com.iciql.adapter.GsonTypeAdapter;
 import org.postgresql.util.PGobject;
 
-import com.iciql.adapter.GsonTypeAdapter;
+import java.sql.SQLException;
 
 /**
  * Postgres JSONB data type adapter maps a JSONB column to a domain object using
  * Google GSON.
  *
- * @author James Moger
- *
  * @param <T>
+ * @author James Moger
  */
 public abstract class JsonbObjectAdapter<T> extends GsonTypeAdapter<T> {
 
-	@Override
-	public String getDataType() {
-		return "jsonb";
-	}
+    @Override
+    public String getDataType() {
+        return "jsonb";
+    }
 
-	@Override
-	public Object serialize(T value) {
+    @Override
+    public Object serialize(T value) {
 
-		String json = gson().toJson(value);
-		PGobject pg = new PGobject();
-		pg.setType(getDataType());
-		try {
-			pg.setValue(json);
-		} catch (SQLException e) {
-			// not thrown on base PGobject
-		}
-		return pg;
-	}
+        String json = gson().toJson(value);
+        PGobject pg = new PGobject();
+        pg.setType(getDataType());
+        try {
+            pg.setValue(json);
+        } catch (SQLException e) {
+            // not thrown on base PGobject
+        }
+        return pg;
+    }
 }
diff --git a/src/main/java/com/iciql/adapter/postgresql/JsonbStringAdapter.java b/src/main/java/com/iciql/adapter/postgresql/JsonbStringAdapter.java
index 9d7388b..88d69c6 100644
--- a/src/main/java/com/iciql/adapter/postgresql/JsonbStringAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/JsonbStringAdapter.java
@@ -15,49 +15,48 @@
  */
 package com.iciql.adapter.postgresql;
 
-import java.sql.SQLException;
-
-import org.postgresql.util.PGobject;
-
 import com.iciql.Iciql.DataTypeAdapter;
 import com.iciql.Iciql.Mode;
+import org.postgresql.util.PGobject;
+
+import java.sql.SQLException;
 
 /**
  * Handles transforming raw strings to/from the Postgres JSONB data type.
  */
 public class JsonbStringAdapter implements DataTypeAdapter<String> {
 
-	protected Mode mode;
-
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@Override
-	public String getDataType() {
-		return "jsonb";
-	}
-
-	@Override
-	public Class<String> getJavaType() {
-		return String.class;
-	}
-
-	@Override
-	public Object serialize(String value) {
-		PGobject pg = new PGobject();
-		pg.setType(getDataType());
-		try {
-			pg.setValue(value);
-		} catch (SQLException e) {
-			// not thrown on base PGobject
-		}
-		return pg;
-	}
-
-	@Override
-	public String deserialize(Object value) {
-		return value.toString();
-	}
+    protected Mode mode;
+
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public String getDataType() {
+        return "jsonb";
+    }
+
+    @Override
+    public Class<String> getJavaType() {
+        return String.class;
+    }
+
+    @Override
+    public Object serialize(String value) {
+        PGobject pg = new PGobject();
+        pg.setType(getDataType());
+        try {
+            pg.setValue(value);
+        } catch (SQLException e) {
+            // not thrown on base PGobject
+        }
+        return pg;
+    }
+
+    @Override
+    public String deserialize(Object value) {
+        return value.toString();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/iciql/adapter/postgresql/XmlObjectAdapter.java b/src/main/java/com/iciql/adapter/postgresql/XmlObjectAdapter.java
index eba7c06..f5160d3 100644
--- a/src/main/java/com/iciql/adapter/postgresql/XmlObjectAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/XmlObjectAdapter.java
@@ -23,13 +23,12 @@ import com.iciql.adapter.XStreamTypeAdapter;
  * XStream.
  *
  * @author James Moger
- *
  */
 public abstract class XmlObjectAdapter extends XStreamTypeAdapter {
 
-	@Override
-	public String getDataType() {
-		return "xml";
-	}
+    @Override
+    public String getDataType() {
+        return "xml";
+    }
 
 }
diff --git a/src/main/java/com/iciql/adapter/postgresql/XmlStringAdapter.java b/src/main/java/com/iciql/adapter/postgresql/XmlStringAdapter.java
index 0aea77e..a795e4f 100644
--- a/src/main/java/com/iciql/adapter/postgresql/XmlStringAdapter.java
+++ b/src/main/java/com/iciql/adapter/postgresql/XmlStringAdapter.java
@@ -15,49 +15,48 @@
  */
 package com.iciql.adapter.postgresql;
 
-import java.sql.SQLException;
-
-import org.postgresql.util.PGobject;
-
 import com.iciql.Iciql.DataTypeAdapter;
 import com.iciql.Iciql.Mode;
+import org.postgresql.util.PGobject;
+
+import java.sql.SQLException;
 
 /**
  * Handles transforming raw strings to/from the Postgres XML data type.
  */
 public class XmlStringAdapter implements DataTypeAdapter<String> {
 
-	protected Mode mode;
-
-	@Override
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	@Override
-	public String getDataType() {
-		return "xml";
-	}
-
-	@Override
-	public Class<String> getJavaType() {
-		return String.class;
-	}
-
-	@Override
-	public Object serialize(String value) {
-		PGobject pg = new PGobject();
-		pg.setType(getDataType());
-		try {
-			pg.setValue(value);
-		} catch (SQLException e) {
-			// not thrown on base PGobject
-		}
-		return pg;
-	}
-
-	@Override
-	public String deserialize(Object value) {
-		return value.toString();
-	}
+    protected Mode mode;
+
+    @Override
+    public void setMode(Mode mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public String getDataType() {
+        return "xml";
+    }
+
+    @Override
+    public Class<String> getJavaType() {
+        return String.class;
+    }
+
+    @Override
+    public Object serialize(String value) {
+        PGobject pg = new PGobject();
+        pg.setType(getDataType());
+        try {
+            pg.setValue(value);
+        } catch (SQLException e) {
+            // not thrown on base PGobject
+        }
+        return pg;
+    }
+
+    @Override
+    public String deserialize(Object value) {
+        return value.toString();
+    }
 }
\ No newline at end of file