Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid read(URL) throwing NPE for invalid URLs #1272

Merged
merged 6 commits into from
Jan 3, 2025
Merged

Avoid read(URL) throwing NPE for invalid URLs #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
020e8d8
Avoid read(URL) throwing NPE for invalid URLs
ccleva Dec 23, 2024
7be3bff
Update core/src/main/java/tech/tablesaw/io/DataFrameReader.java
ccleva Jan 3, 2025
5d57aa7
Update core/src/main/java/tech/tablesaw/io/DataFrameReader.java
ccleva Jan 3, 2025
b2c3482
Update core/src/main/java/tech/tablesaw/io/DataFrameReader.java
ccleva Jan 3, 2025
c315b81
Update core/src/test/java/tech/tablesaw/io/DataFrameReaderTest.java
ccleva Jan 3, 2025
36a4bca
Update core/src/test/java/tech/tablesaw/io/DataFrameReaderTest.java
ccleva Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions core/src/main/java/tech/tablesaw/io/DataFrameReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@ public Table url(String url) {
* mime-type Use {@link #usingOptions(ReadOptions) usingOptions} to use non-default options
*/
public Table url(URL url) {
URLConnection connection = null;
try {
connection = url.openConnection();
URLConnection connection = url.openConnection();
String contentType = connection.getContentType();
return url(url, getCharset(contentType), getMimeType(contentType));
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeIOException(e);
}
String contentType = connection.getContentType();
return url(url, getCharset(contentType), getMimeType(contentType));
}

private Table url(URL url, Charset charset, String mimeType) {
Expand All @@ -87,11 +86,17 @@ private Table readUrl(URL url, Charset charset, DataReader<?> reader) {
}

private String getMimeType(String contentType) {
if (contentType == null) {
return null;
}
String[] pair = contentType.split(";");
return pair[0].trim();
}

private Charset getCharset(String contentType) {
if (contentType == null) {
return Charset.defaultCharset();
}
String[] pair = contentType.split(";");
return pair.length == 1
? Charset.defaultCharset()
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/tech/tablesaw/io/DataFrameReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.google.common.jimfs.Configuration;
import com.google.common.jimfs.Jimfs;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.FileSystem;
import java.nio.file.Files;
Expand Down Expand Up @@ -81,4 +82,16 @@ public void readUrlUnknownMimeTypeNoExtension() throws Exception {
.getMessage()
.contains("No reader registered for mime-type application/octet-stream"));
}

@Test
void readInvalidURL() throws MalformedURLException {
URL url = new URL("ftp://not-a-host/data.csv");
assertThrows(RuntimeIOException.class, () -> Table.read().url(url));
}

@Test
void readInvalidURLNoExtension() throws MalformedURLException {
URL url = new URL("ftp://not-a-host/data/csv");
assertThrows(IllegalArgumentException.class, () -> Table.read().url(url));
}
}
Loading