github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4141] Add support for specifying the encoding when loading CSV or JSON with the Loader API

Browse Source
This commit is contained in:
lukaseder 2015-03-17 10:31:19 +01:00
parent a27940fc48
commit 05514b7f2d
2 changed files with 233 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
jOOQ/src/main/java/org/jooq/LoaderSourceStep.java
View File

@ -44,6 +44,9 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import org.xml.sax.InputSource;
@ -64,6 +67,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderCSVStep<R> loadCSV(File file) throws FileNotFoundException;
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException;
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(File file, Charset cs) throws FileNotFoundException;
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(File file, CharsetDecoder dec) throws FileNotFoundException;
/**
* Load CSV data
*/
@ -76,6 +97,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderCSVStep<R> loadCSV(InputStream stream);
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(InputStream stream, String charsetName) throws UnsupportedEncodingException;
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(InputStream stream, Charset cs);
/**
* Load CSV data
*/
@Support
LoaderCSVStep<R> loadCSV(InputStream stream, CharsetDecoder dec);
/**
* Load CSV data
*/
@ -88,6 +127,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderXMLStep<R> loadXML(File file) throws FileNotFoundException;
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException;
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(File file, Charset cs) throws FileNotFoundException;
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(File file, CharsetDecoder dec) throws FileNotFoundException;
/**
* Load XML data
*/
@ -100,6 +157,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderXMLStep<R> loadXML(InputStream stream);
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(InputStream stream, String charsetName) throws UnsupportedEncodingException;
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(InputStream stream, Charset cs);
/**
* Load XML data
*/
@Support
LoaderXMLStep<R> loadXML(InputStream stream, CharsetDecoder dec);
/**
* Load XML data
*/
@ -118,6 +193,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderJSONStep<R> loadJSON(File file) throws FileNotFoundException;
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException;
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(File file, Charset cs) throws FileNotFoundException;
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(File file, CharsetDecoder dec) throws FileNotFoundException;
/**
* Load JSON data
*/
@ -130,6 +223,24 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
@Support
LoaderJSONStep<R> loadJSON(InputStream stream);
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(InputStream stream, String charsetName) throws UnsupportedEncodingException;
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(InputStream stream, Charset cs);
/**
* Load JSON data
*/
@Support
LoaderJSONStep<R> loadJSON(InputStream stream, CharsetDecoder dec);
/**
* Load JSON data
*/

166
jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
View File

@ -42,6 +42,7 @@ package org.jooq.impl;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
@ -49,6 +50,9 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@ -269,23 +273,47 @@ class LoaderImpl<R extends TableRecord<R>> implements
@Override
public final LoaderImpl<R> loadCSV(File file) throws FileNotFoundException {
content = CONTENT_CSV;
data = new BufferedReader(new FileReader(file));
return this;
return loadCSV(new FileReader(file));
}
@Override
public final LoaderImpl<R> loadCSV(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException {
return loadCSV(new FileInputStream(file), charsetName);
}
@Override
public final LoaderImpl<R> loadCSV(File file, Charset cs) throws FileNotFoundException {
return loadCSV(new FileInputStream(file), cs);
}
@Override
public final LoaderImpl<R> loadCSV(File file, CharsetDecoder dec) throws FileNotFoundException {
return loadCSV(new FileInputStream(file), dec);
}
@Override
public final LoaderImpl<R> loadCSV(String csv) {
content = CONTENT_CSV;
data = new BufferedReader(new StringReader(csv));
return this;
return loadCSV(new StringReader(csv));
}
@Override
public final LoaderImpl<R> loadCSV(InputStream stream) {
content = CONTENT_CSV;
data = new BufferedReader(new InputStreamReader(stream));
return this;
return loadCSV(new InputStreamReader(stream));
}
@Override
public final LoaderImpl<R> loadCSV(InputStream stream, String charsetName) throws UnsupportedEncodingException {
return loadCSV(new InputStreamReader(stream, charsetName));
}
@Override
public final LoaderImpl<R> loadCSV(InputStream stream, Charset cs) {
return loadCSV(new InputStreamReader(stream, cs));
}
@Override
public final LoaderImpl<R> loadCSV(InputStream stream, CharsetDecoder dec) {
return loadCSV(new InputStreamReader(stream, dec));
}
@Override
@ -297,20 +325,47 @@ class LoaderImpl<R extends TableRecord<R>> implements
@Override
public final LoaderImpl<R> loadXML(File file) throws FileNotFoundException {
content = CONTENT_XML;
throw new UnsupportedOperationException("This is not yet implemented");
return loadXML(new FileReader(file));
}
@Override
public final LoaderImpl<R> loadXML(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException {
return loadXML(new FileInputStream(file), charsetName);
}
@Override
public final LoaderImpl<R> loadXML(File file, Charset cs) throws FileNotFoundException {
return loadXML(new FileInputStream(file), cs);
}
@Override
public final LoaderImpl<R> loadXML(File file, CharsetDecoder dec) throws FileNotFoundException {
return loadXML(new FileInputStream(file), dec);
}
@Override
public final LoaderImpl<R> loadXML(String xml) {
content = CONTENT_XML;
throw new UnsupportedOperationException("This is not yet implemented");
return loadXML(new StringReader(xml));
}
@Override
public final LoaderImpl<R> loadXML(InputStream stream) {
content = CONTENT_XML;
throw new UnsupportedOperationException("This is not yet implemented");
return loadXML(new InputStreamReader(stream));
}
@Override
public final LoaderImpl<R> loadXML(InputStream stream, String charsetName) throws UnsupportedEncodingException {
return loadXML(new InputStreamReader(stream, charsetName));
}
@Override
public final LoaderImpl<R> loadXML(InputStream stream, Charset cs) {
return loadXML(new InputStreamReader(stream, cs));
}
@Override
public final LoaderImpl<R> loadXML(InputStream stream, CharsetDecoder dec) {
return loadXML(new InputStreamReader(stream, dec));
}
@Override
@ -325,6 +380,58 @@ class LoaderImpl<R extends TableRecord<R>> implements
throw new UnsupportedOperationException("This is not yet implemented");
}
@Override
public final LoaderImpl<R> loadJSON(File file) throws FileNotFoundException {
return loadJSON(new FileReader(file));
}
@Override
public final LoaderImpl<R> loadJSON(File file, String charsetName) throws FileNotFoundException, UnsupportedEncodingException {
return loadJSON(new FileInputStream(file), charsetName);
}
@Override
public final LoaderImpl<R> loadJSON(File file, Charset cs) throws FileNotFoundException {
return loadJSON(new FileInputStream(file), cs);
}
@Override
public final LoaderImpl<R> loadJSON(File file, CharsetDecoder dec) throws FileNotFoundException {
return loadJSON(new FileInputStream(file), dec);
}
@Override
public final LoaderImpl<R> loadJSON(String json) {
return loadJSON(new StringReader(json));
}
@Override
public final LoaderImpl<R> loadJSON(InputStream stream) {
return loadJSON(new InputStreamReader(stream));
}
@Override
public final LoaderImpl<R> loadJSON(InputStream stream, String charsetName) throws UnsupportedEncodingException {
return loadJSON(new InputStreamReader(stream, charsetName));
}
@Override
public final LoaderImpl<R> loadJSON(InputStream stream, Charset cs) {
return loadJSON(new InputStreamReader(stream, cs));
}
@Override
public final LoaderImpl<R> loadJSON(InputStream stream, CharsetDecoder dec) {
return loadJSON(new InputStreamReader(stream, dec));
}
@Override
public final LoaderImpl<R> loadJSON(Reader reader) {
content = CONTENT_JSON;
data = new BufferedReader(reader);
return this;
}
// -------------------------------------------------------------------------
// CSV configuration
// -------------------------------------------------------------------------
@ -376,35 +483,6 @@ class LoaderImpl<R extends TableRecord<R>> implements
return this;
}
@Override
public final LoaderJSONStep<R> loadJSON(File file) throws FileNotFoundException {
content = CONTENT_JSON;
data = new BufferedReader(new FileReader(file));
return this;
}
@Override
public final LoaderJSONStep<R> loadJSON(String json) {
content = CONTENT_JSON;
data = new BufferedReader(new StringReader(json));
return this;
}
@Override
public final LoaderJSONStep<R> loadJSON(InputStream stream) {
content = CONTENT_JSON;
data = new BufferedReader(new InputStreamReader(stream));
return this;
}
@Override
public final LoaderJSONStep<R> loadJSON(Reader reader) {
content = CONTENT_JSON;
data = new BufferedReader(reader);
return this;
}
// -------------------------------------------------------------------------
// XML configuration
// -------------------------------------------------------------------------