Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make getCharset to support null parameter.

master
Joe Zhou 2024-06-04 00:57:28 +08:00
parent 7d2d2244b3
commit d2aebc60a7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webmagic-core/src/main/java/us/codecraft/webmagic/utils/UrlUtils.java
View File

@ -116,6 +116,10 @@ public class UrlUtils {
private static final Pattern patternForCharset = Pattern.compile("charset\\s*=\\s*['\"]*([^\\s;'\"]*)", Pattern.CASE_INSENSITIVE); private static final Pattern patternForCharset = Pattern.compile("charset\\s*=\\s*['\"]*([^\\s;'\"]*)", Pattern.CASE_INSENSITIVE);
public static String getCharset(String contentType) { public static String getCharset(String contentType) {
if (contentType == null) {
return null;
}
Matcher matcher = patternForCharset.matcher(contentType); Matcher matcher = patternForCharset.matcher(contentType);
if (matcher.find()) { if (matcher.find()) {
String charset = matcher.group(1); String charset = matcher.group(1);

6
webmagic-core/src/test/java/us/codecraft/webmagic/utils/UrlUtilsTest.java
View File

@ -1,5 +1,7 @@
package us.codecraft.webmagic.utils; package us.codecraft.webmagic.utils;
import static org.junit.Assert.assertNull;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -43,5 +45,9 @@ public class UrlUtilsTest {
Assert.assertEquals("www.dianping.com",UrlUtils.getDomain(url)); Assert.assertEquals("www.dianping.com",UrlUtils.getDomain(url));
} }
@Test
public void testGetCharset() {
assertNull(UrlUtils.getCharset(null));
}
} }