diff --git a/labkey-client-api/CHANGELOG.md b/labkey-client-api/CHANGELOG.md index 96add7c5..b36a360e 100644 --- a/labkey-client-api/CHANGELOG.md +++ b/labkey-client-api/CHANGELOG.md @@ -1,8 +1,14 @@ # The LabKey Remote API Library for Java - Change Log +## version TBD +*Released*: TBD +* [Issue 43380](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=43380): ImportDataCommand missing options supported by query-import.api +* Remove `CheckForStudyReloadCommand.java` +* Remove `URISyntaxException` from one `Connection` constructor + ## version 1.4.0 *Released*: 16 June 2021 -* Issue 43246: Lineage query NPE while processing an UploadedFile +* [Issue 43246](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=43246): Lineage query NPE while processing an UploadedFile * Additional lineage options and support additional properties in response * Update dependency version numbers * Update to Gradle 7.1 diff --git a/labkey-client-api/src/org/labkey/remoteapi/Connection.java b/labkey-client-api/src/org/labkey/remoteapi/Connection.java index 15c7b63f..80f133d5 100644 --- a/labkey-client-api/src/org/labkey/remoteapi/Connection.java +++ b/labkey-client-api/src/org/labkey/remoteapi/Connection.java @@ -142,7 +142,7 @@ public Connection(URI baseURI, CredentialsProvider credentialsProvider) { if (baseURI.getHost() == null || baseURI.getScheme() == null) { - throw new IllegalArgumentException("Invalid server URL: " + baseURI.toString()); + throw new IllegalArgumentException("Invalid server URL: " + baseURI); } _baseURI = baseURI; _credentialsProvider = credentialsProvider; @@ -541,4 +541,4 @@ private static URI toURI(String baseUrl) throw new IllegalArgumentException("Invalid target server URL: " + baseUrl); } } -} \ No newline at end of file +} diff --git a/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java b/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java index 6a6462d0..202f8f76 100644 --- a/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java +++ b/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataCommand.java @@ -32,6 +32,7 @@ import java.io.InputStreamReader; import java.io.StringWriter; import java.net.URI; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Objects; import java.util.stream.Collectors; @@ -580,7 +581,7 @@ private static void printUsage() private static String readFully(InputStream in) throws IOException { StringWriter sw = new StringWriter(); - try (BufferedReader buf = new BufferedReader(new InputStreamReader(in))) + try (BufferedReader buf = new BufferedReader(new InputStreamReader(in, Charset.defaultCharset()))) { String line; do