Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion labkey-client-api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions labkey-client-api/src/org/labkey/remoteapi/Connection.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -541,4 +541,4 @@ private static URI toURI(String baseUrl)
throw new IllegalArgumentException("Invalid target server URL: " + baseUrl);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down