Skip to content

Commit

Permalink
Fix expression pattern compilation on android (#2136)
Browse files Browse the repository at this point in the history
* Fix expression pattern compilation on android

* Add test cases

* Add license header

* Reformat
  • Loading branch information
iProdigy authored Jul 28, 2023
1 parent 4d9215a commit 59a568e
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/src/main/java/feign/template/Expressions.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public final class Expressions {
*
* This is not a complete implementation of the rfc
*
* <a href="https://www.rfc-editor.org/rfc/rfc6570#section-2.2>RFC 6570 Expressions</a>
* <a href="https://www.rfc-editor.org/rfc/rfc6570#section-2.2">RFC 6570 Expressions</a>
*/
private static final Pattern EXPRESSION_PATTERN =
Pattern.compile("^(\\{([+#./;?&=,!@|]?)(.+)})$");
static final Pattern EXPRESSION_PATTERN =
Pattern.compile("^(\\{([+#./;?&=,!@|]?)(.+)\\})$");

// Partially From:
// https://stackoverflow.com/questions/29494608/regex-for-uri-templates-rfc-6570-wanted -- I
Expand Down
36 changes: 36 additions & 0 deletions core/src/test/java/feign/template/ExpressionsTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright 2012-2023 The Feign Authors
*
* Licensed 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 feign.template;

import org.junit.jupiter.api.Test;
import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;

public class ExpressionsTest {

@Test
public void simpleExpression() {
Expression expression = Expressions.create("{foo}");
assertThat(expression).isNotNull();
String expanded = expression.expand(Collections.singletonMap("foo", "bar"), false);
assertThat(expanded).isEqualToIgnoringCase("foo=bar");
}

@Test
public void androidCompatibility() {
// To match close brace on Android, it must be escaped due to the simpler ICU regex engine
String pattern = Expressions.EXPRESSION_PATTERN.pattern();
assertThat(pattern.contains("}")).isEqualTo(pattern.contains("\\}"));
}
}

0 comments on commit 59a568e

Please sign in to comment.