From 4ea1428d8c62eeee35ec881e216caef79a818d70 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 4 Nov 2013 10:44:41 +0100 Subject: [PATCH] [#2829] Enhance Loader API to allow for importing JSON data in addition to CSV data - Fixed warnings --- jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java | 6 +++--- jOOQ/src/main/java/org/jooq/LoaderJSONStep.java | 5 +++-- jOOQ/src/main/java/org/jooq/LoaderSourceStep.java | 5 +++-- .../src/main/java/org/jooq/tools/json/ContainerFactory.java | 3 ++- jOOQ/src/main/java/org/jooq/tools/json/ContentHandler.java | 2 +- jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java | 2 +- jOOQ/src/main/java/org/jooq/tools/json/JSONObject.java | 1 + jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java | 1 + jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java | 2 +- jOOQ/src/main/java/org/jooq/tools/json/ParseException.java | 5 +++-- jOOQ/src/main/java/org/jooq/tools/json/Yylex.java | 1 + jOOQ/src/main/java/org/jooq/tools/json/Yytoken.java | 1 + 12 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java index 5c24375731..3a7bcd9941 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java @@ -47,12 +47,13 @@ package org.jooq; * optional CSV loader options. * * @author Lukas Eder + * @author Johannes Bühler */ public interface LoaderJSONOptionsStep> extends LoaderLoadStep { /** - * Specify that a certain number of rows should be ignored from the CSV - * file. This is useful for skipping processing information + * Specify that a certain number of rows should be ignored from the JSON + * input. This is useful for skipping processing information *

* By default, this is set to 1, as CSV files are expected to * hold a header row. @@ -62,7 +63,6 @@ public interface LoaderJSONOptionsStep> extends LoaderL @Support LoaderJSONOptionsStep ignoreRows(int number); - /** * Specify the input string representation of NULL. *

diff --git a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java index 5c2b5593c7..ce1eaab2c6 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java @@ -45,10 +45,11 @@ import java.util.Collection; /** * The Loader API is used for configuring data loads. *

- * The step in constructing the {@link org.jooq.Loader} object where you can set the - * mandatory JSON loader options. + * The step in constructing the {@link org.jooq.Loader} object where you can set + * the mandatory JSON loader options. * * @author Lukas Eder + * @author Johannes Bühler */ public interface LoaderJSONStep> { diff --git a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java index 0c05bb571b..1e5f1b62cf 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java @@ -40,13 +40,13 @@ */ package org.jooq; -import org.xml.sax.InputSource; - import java.io.File; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.Reader; +import org.xml.sax.InputSource; + /** * The Loader API is used for configuring data loads. *

@@ -54,6 +54,7 @@ import java.io.Reader; * load type and data source. * * @author Lukas Eder + * @author Johannes Bühler */ public interface LoaderSourceStep> { diff --git a/jOOQ/src/main/java/org/jooq/tools/json/ContainerFactory.java b/jOOQ/src/main/java/org/jooq/tools/json/ContainerFactory.java index a40ca9b5c2..836ab9bfb2 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/ContainerFactory.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/ContainerFactory.java @@ -6,10 +6,11 @@ import java.util.Map; /** * Container factory for creating containers for JSON object and JSON array. * - * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory) + * @see JSONParser#parse(java.io.Reader, ContainerFactory) * * @author FangYidong */ +@SuppressWarnings({ "rawtypes" }) public interface ContainerFactory { /** * @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject. diff --git a/jOOQ/src/main/java/org/jooq/tools/json/ContentHandler.java b/jOOQ/src/main/java/org/jooq/tools/json/ContentHandler.java index 1c123cb628..ee41781683 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/ContentHandler.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/ContentHandler.java @@ -6,7 +6,7 @@ import java.io.IOException; * A simplified and stoppable SAX-like content handler for stream processing of JSON text. * * @see org.xml.sax.ContentHandler - * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean) + * @see JSONParser#parse(java.io.Reader, ContentHandler, boolean) * * @author FangYidong */ diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java index e617abb04c..f3f5be99ed 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java @@ -32,9 +32,9 @@ import java.util.List; * * @author FangYidong */ +@SuppressWarnings({ "serial", "rawtypes", "unchecked" }) public class JSONArray extends ArrayList { - /** * Constructs an empty JSONArray. */ diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONObject.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONObject.java index 59de86ab47..f0754e7a37 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONObject.java @@ -32,6 +32,7 @@ import java.util.Map; * * @author FangYidong */ +@SuppressWarnings({ "serial", "rawtypes", "unchecked" }) public class JSONObject extends HashMap{ diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java index 5e2979f060..f3c4828793 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java @@ -13,6 +13,7 @@ import java.util.Map; * * @author FangYidong */ +@SuppressWarnings({ "hiding", "javadoc", "rawtypes", "unchecked" }) public class JSONParser { public static final int S_INIT=0; public static final int S_IN_FINISHED_VALUE=1;//string,number,boolean,null,object,array diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java index affecc59c2..6474516a6c 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java @@ -9,6 +9,7 @@ import java.util.List; /** * A very simple JSON reader based on Simple JSON. */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class JSONReader implements Closeable { @@ -20,7 +21,6 @@ public class JSONReader implements Closeable { this.parser = new JSONParser(); } - @SuppressWarnings("unchecked") public List readAll() throws IOException { List all; try { diff --git a/jOOQ/src/main/java/org/jooq/tools/json/ParseException.java b/jOOQ/src/main/java/org/jooq/tools/json/ParseException.java index 380c4b19b7..20eaa237ab 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/ParseException.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/ParseException.java @@ -40,7 +40,7 @@ public class ParseException extends Exception { } /** - * @see org.json.simple.parser.JSONParser#getPosition() + * @see JSONParser#getPosition() * * @return The character position (starting with 0) of the input where the error occurs. */ @@ -53,7 +53,7 @@ public class ParseException extends Exception { } /** - * @see org.json.simple.parser.Yytoken + * @see Yytoken * * @return One of the following base on the value of errorType: * ERROR_UNEXPECTED_CHAR java.lang.Character @@ -68,6 +68,7 @@ public class ParseException extends Exception { this.unexpectedObject = unexpectedObject; } + @Override public String getMessage() { StringBuffer sb = new StringBuffer(); diff --git a/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java b/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java index 5d3d2ed735..b21b13f5f3 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java @@ -1,5 +1,6 @@ package org.jooq.tools.json; +@SuppressWarnings("unused") class Yylex { /** This character denotes the end of file */ diff --git a/jOOQ/src/main/java/org/jooq/tools/json/Yytoken.java b/jOOQ/src/main/java/org/jooq/tools/json/Yytoken.java index 8a2650944a..c373360e86 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/Yytoken.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/Yytoken.java @@ -18,6 +18,7 @@ public class Yytoken { this.value=value; } + @Override public String toString(){ StringBuffer sb = new StringBuffer(); switch(type){