Skip to content

Commit

Permalink
Make some static fields final (#2803)
Browse files Browse the repository at this point in the history
Make some static fields final, and avoid unnecessary boxing in UnicodeUtils.
  • Loading branch information
kilink committed Apr 29, 2022
1 parent 5e7d856 commit 7086a3e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/main/java/graphql/parser/ParserOptions.java
Expand Up @@ -21,7 +21,7 @@ public class ParserOptions {
* If you want to allow more, then {@link #setDefaultParserOptions(ParserOptions)} allows you to change this
* JVM wide.
*/
public static int MAX_QUERY_TOKENS = 15000;
public static final int MAX_QUERY_TOKENS = 15000;

private static ParserOptions defaultJvmParserOptions = newParserOptions()
.captureIgnoredChars(false)
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/graphql/parser/UnicodeUtil.java
Expand Up @@ -13,11 +13,11 @@
*/
@Internal
public class UnicodeUtil {
public static int MAX_UNICODE_CODE_POINT = 0x10FFFF;
public static int LEADING_SURROGATE_LOWER_BOUND = 0xD800;
public static int LEADING_SURROGATE_UPPER_BOUND = 0xDBFF;
public static int TRAILING_SURROGATE_LOWER_BOUND = 0xDC00;
public static int TRAILING_SURROGATE_UPPER_BOUND = 0xDFFF;
public static final int MAX_UNICODE_CODE_POINT = 0x10FFFF;
public static final int LEADING_SURROGATE_LOWER_BOUND = 0xD800;
public static final int LEADING_SURROGATE_UPPER_BOUND = 0xDBFF;
public static final int TRAILING_SURROGATE_LOWER_BOUND = 0xDC00;
public static final int TRAILING_SURROGATE_UPPER_BOUND = 0xDFFF;

public static int parseAndWriteUnicode(StringWriter writer, String string, int i, SourceLocation sourceLocation) {
// Unicode code points can either be:
Expand All @@ -31,7 +31,7 @@ public static int parseAndWriteUnicode(StringWriter writer, String string, int i
int continueIndex = isBracedEscape(string, i) ? endIndexExclusive : endIndexExclusive - 1;

String hexStr = string.substring(startIndex, endIndexExclusive);
Integer codePoint = Integer.parseInt(hexStr, 16);
int codePoint = Integer.parseInt(hexStr, 16);

if (isTrailingSurrogateValue(codePoint)) {
throw new InvalidSyntaxException(sourceLocation, "Invalid unicode - trailing surrogate must be preceded with a leading surrogate -", null, string.substring(i - 1, continueIndex + 1), null);
Expand All @@ -45,7 +45,7 @@ public static int parseAndWriteUnicode(StringWriter writer, String string, int i
int trailingStartIndex = isBracedEscape(string, i) ? i + 2 : i + 1;
int trailingEndIndexExclusive = getEndIndexExclusive(string, i, sourceLocation);
String trailingHexStr = string.substring(trailingStartIndex, trailingEndIndexExclusive);
Integer trailingCodePoint = Integer.parseInt(trailingHexStr, 16);
int trailingCodePoint = Integer.parseInt(trailingHexStr, 16);
continueIndex = isBracedEscape(string, i) ? trailingEndIndexExclusive : trailingEndIndexExclusive - 1;

if (isTrailingSurrogateValue(trailingCodePoint)) {
Expand Down

0 comments on commit 7086a3e

Please sign in to comment.