Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow JS Keywords as field name. These names are quoted anyways (and are valid according to the JSON spec) so it should not cause any issues.

Browse Source
This commit is contained in:
Joel Leitch 2009-05-19 17:59:32 +00:00
parent abf4ab2d78
commit cd9bd71092
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gson/src/main/java/com/google/gson/JsonFieldNameValidator.java
View File

@ -16,10 +16,6 @@
package com.google.gson;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -34,18 +30,10 @@ import java.util.regex.Pattern;
* @author Joel Leitch
*/
class JsonFieldNameValidator {
private static final String[] JS_KEYWORDS = {
"break", "case", "catch", "class", "comment", "const", "continue", "debugger", "default", "delete", "do",
"else", "enum", "export", "extends", "finally", "for", "function", "if", "import", "in", "label", "new",
"return", "super", "switch", "this", "throw", "try", "typeof", "var", "void", "while", "with"
};
private static final Pattern JSON_FIELD_NAME_PATTERN =
Pattern.compile("(^[a-zA-Z][a-zA-Z0-9\\$_]*$)|(^[\\$_][a-zA-Z][a-zA-Z0-9\\$_]*$)");
private static final Set<String> KEYWORDS = Collections.unmodifiableSet(
new HashSet<String>(Arrays.asList(JS_KEYWORDS)));
/**
* Performs validation on the JSON field name to ensure it is a valid field name.
*
@ -56,7 +44,6 @@ class JsonFieldNameValidator {
public String validate(String fieldName) {
Preconditions.checkNotNull(fieldName);
Preconditions.checkArgument(!"".equals(fieldName.trim()));
Preconditions.checkArgument(!KEYWORDS.contains(fieldName));
Matcher matcher = JSON_FIELD_NAME_PATTERN.matcher(fieldName);
if (!matcher.matches()) {

8
gson/src/test/java/com/google/gson/JsonFieldNameValidatorTest.java
View File

@ -81,11 +81,9 @@ public class JsonFieldNameValidatorTest extends TestCase {
} catch (IllegalArgumentException expected) { }
}
public void testKeywordAsFieldName() throws Exception {
try {
validator.validate("break");
fail("Json field name can not be a reserved word");
} catch (IllegalArgumentException expected) { }
public void testJavaAndJsKeywordAsFieldName() throws Exception {
String fieldName = "break";
assertEquals(fieldName, validator.validate(fieldName));
}
public void testInvalidCharacters() throws Exception {