Skip to content

Commit 9d538e6

Browse files
committed
Annotate some nullables
1 parent a909600 commit 9d538e6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/org/jsoup/helper/DataUtil.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ public static Document load(File in, @Nullable String charsetName, String baseUr
8080
/**
8181
* Parses a Document from an input steam.
8282
* @param in input stream to parse. The stream will be closed after reading.
83-
* @param charsetName character set of input
83+
* @param charsetName character set of input (optional)
8484
* @param baseUri base URI of document, to resolve relative links against
8585
* @return Document
8686
* @throws IOException on IO error
8787
*/
88-
public static Document load(InputStream in, String charsetName, String baseUri) throws IOException {
88+
public static Document load(InputStream in, @Nullable String charsetName, String baseUri) throws IOException {
8989
return parseInputStream(in, charsetName, baseUri, Parser.htmlParser());
9090
}
9191

9292
/**
9393
* Parses a Document from an input steam, using the provided Parser.
9494
* @param in input stream to parse. The stream will be closed after reading.
95-
* @param charsetName character set of input
95+
* @param charsetName character set of input (optional)
9696
* @param baseUri base URI of document, to resolve relative links against
9797
* @param parser alternate {@link Parser#xmlParser() parser} to use.
9898
* @return Document
9999
* @throws IOException on IO error
100100
*/
101-
public static Document load(InputStream in, String charsetName, String baseUri, Parser parser) throws IOException {
101+
public static Document load(InputStream in, @Nullable String charsetName, String baseUri, Parser parser) throws IOException {
102102
return parseInputStream(in, charsetName, baseUri, parser);
103103
}
104104

src/main/java/org/jsoup/internal/StringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public static boolean isAscii(String string) {
260260
return true;
261261
}
262262

263-
private static Pattern extraDotSegmentsPattern = Pattern.compile("^/((\\.{1,2}/)+)");
263+
private static final Pattern extraDotSegmentsPattern = Pattern.compile("^/((\\.{1,2}/)+)");
264264
/**
265265
* Create a new absolute URL, from a provided existing absolute URL and a relative URL component.
266266
* @param base the existing absolute base URL

0 commit comments

Comments
 (0)