Skip to content

Avoid InvalidPathException in RelationalOperator, fixes #600 #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2020
Merged

Avoid InvalidPathException in RelationalOperator, fixes #600 #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.jayway.jsonpath.InvalidPathException;

import java.util.Locale;

public enum RelationalOperator {

GTE(">="),
Expand Down Expand Up @@ -40,9 +42,10 @@ public enum RelationalOperator {
this.operatorString = operatorString;
}

public static RelationalOperator fromString(String operatorString){
public static RelationalOperator fromString(String operatorString) {
String upperCaseOperatorString = operatorString.toUpperCase(Locale.ROOT);
for (RelationalOperator operator : RelationalOperator.values()) {
if(operator.operatorString.equals(operatorString.toUpperCase()) ){
if(operator.operatorString.equals(upperCaseOperatorString) ){
return operator;
}
}
Expand Down
39 changes: 39 additions & 0 deletions json-path/src/test/java/com/jayway/jsonpath/internal/filter/RelationalOperatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.jayway.jsonpath.internal.filter;

import static org.junit.Assert.*;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import java.util.Locale;

public class RelationalOperatorTest {

Locale locale;

@Before
public void saveDefaultLocale() {
locale = Locale.getDefault();
}

@After
public void restoreDefaultLocale() {
Locale.setDefault(locale);
}

@Test
public void testFromStringWithEnglishLocale() {
Locale.setDefault(Locale.ENGLISH);
assertEquals(RelationalOperator.IN, RelationalOperator.fromString("in"));
assertEquals(RelationalOperator.IN, RelationalOperator.fromString("IN"));
}

@Test
public void testFromStringWithTurkishLocale() {
Locale.setDefault(new Locale("tr", "TR"));
assertEquals(RelationalOperator.IN, RelationalOperator.fromString("in"));
assertEquals(RelationalOperator.IN, RelationalOperator.fromString("IN"));
}

}