-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace Guava net module with JDK equivalents (#225)
- Loading branch information
Showing
8 changed files
with
166 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/main/java/com/treasuredata/client/UrlPathSegmentEscaper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.treasuredata.client; | ||
|
|
||
| import java.io.UnsupportedEncodingException; | ||
| import java.net.URLEncoder; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Escape URL path segment in a compatible way with com.google.common.net.UrlEscapers.urlPathSegmentEscaper; | ||
| */ | ||
| final class UrlPathSegmentEscaper | ||
| { | ||
| private UrlPathSegmentEscaper() | ||
| { | ||
| } | ||
|
|
||
| private static String replaceAllMatched(String text, Pattern pattern) | ||
| { | ||
| Matcher matcher = pattern.matcher(text); | ||
| if (!matcher.find()) { | ||
| return text; | ||
| } | ||
| StringBuilder sb = new StringBuilder(); | ||
| int previousEnd = 0; | ||
| do { | ||
| sb.append(text.subSequence(previousEnd, matcher.start())); | ||
| sb.append(replace(matcher.group())); | ||
| previousEnd = matcher.end(); | ||
| } while (matcher.find()); | ||
| sb.append(text.subSequence(previousEnd, text.length())); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| private static final Pattern GUAVA_INCOMPATIBLE = Pattern.compile("\\+|%(?:2[146789BC]|3[ABD]|7E|40)"); | ||
|
|
||
| private static String replace(String token) | ||
| { | ||
| switch (token) { | ||
| case "+": return "%20"; | ||
| case "%21": return "!"; | ||
| case "%24": return "$"; | ||
| case "%26": return "&"; | ||
| case "%27": return "'"; | ||
| case "%28": return "("; | ||
| case "%29": return ")"; | ||
| case "%2B": return "+"; | ||
| case "%2C": return ","; | ||
| case "%3A": return ":"; | ||
| case "%3B": return ";"; | ||
| case "%3D": return "="; | ||
| case "%7E": return "~"; | ||
| case "%40": return "@"; | ||
| default: throw new IllegalStateException("Unknown token: " + token); | ||
| } | ||
| } | ||
|
|
||
| static String escape(String s) | ||
| { | ||
| try { | ||
| String encoded = URLEncoder.encode(s, "UTF-8"); | ||
| return replaceAllMatched(encoded, GUAVA_INCOMPATIBLE); | ||
| } | ||
| catch (UnsupportedEncodingException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/test/java/com/treasuredata/client/TestUrlPathSegmentEscaper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.treasuredata.client; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| /** | ||
| * Ensure compatibility with com.google.common.net.UrlEscapers.urlPathSegmentEscaper; | ||
| */ | ||
| public class TestUrlPathSegmentEscaper | ||
| { | ||
| @Test | ||
| public void nonAscii() | ||
| { | ||
| String v = UrlPathSegmentEscaper.escape("あ漢ü🇸🇨"); | ||
| assertEquals("%E3%81%82%E6%BC%A2%C3%BC%F0%9F%87%B8%F0%9F%87%A8", v); | ||
| } | ||
|
|
||
| @Test | ||
| public void space() | ||
| { | ||
| String v = UrlPathSegmentEscaper.escape(" "); | ||
| assertEquals("%20", v); | ||
| } | ||
|
|
||
| @Test | ||
| public void specialCharsUnescaped() | ||
| { | ||
| String v = UrlPathSegmentEscaper.escape("-_.~!*'();:@&=+$,"); | ||
| assertEquals("-_.~!*'();:@&=+$,", v); | ||
| } | ||
|
|
||
| @Test | ||
| public void specialCharsEscaped() | ||
| { | ||
| String v = UrlPathSegmentEscaper.escape("/?%#[]^¥|{}\\<>"); | ||
| assertEquals("%2F%3F%25%23%5B%5D%5E%C2%A5%7C%7B%7D%5C%3C%3E", v); | ||
| } | ||
|
|
||
| @Test | ||
| public void alphaNum() | ||
| { | ||
| String v = UrlPathSegmentEscaper.escape("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"); | ||
| assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", v); | ||
| } | ||
| } |