From 8ddc36485e9a2bc22436a5f9424dd582a70fcf13 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 4 May 2021 14:40:16 +0200 Subject: [PATCH] [jOOQ/jOOQ#11818] Avoid new Integer(...) calls in JSON Parser --- .../java/org/jooq/tools/json/JSONParser.java | 36 +++++++++---------- .../main/java/org/jooq/tools/json/Yylex.java | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java index 7b1a52b30c..23c67f8400 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java @@ -115,17 +115,17 @@ public class JSONParser { switch(token.type){ case Yytoken.TYPE_VALUE: status=S_IN_FINISHED_VALUE; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(token.value); break; case Yytoken.TYPE_LEFT_BRACE: status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(createObjectContainer(containerFactory)); break; case Yytoken.TYPE_LEFT_SQUARE: status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(createArrayContainer(containerFactory)); break; default: @@ -148,7 +148,7 @@ public class JSONParser { String key=(String)token.value; valueStack.addFirst(key); status=S_PASSED_PAIR_KEY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); } else{ status=S_IN_ERROR; @@ -188,7 +188,7 @@ public class JSONParser { List newArray=createArrayContainer(containerFactory); parent.put(key,newArray); status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(newArray); break; case Yytoken.TYPE_LEFT_BRACE: @@ -198,7 +198,7 @@ public class JSONParser { Map newObject=createObjectContainer(containerFactory); parent.put(key,newObject); status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(newObject); break; default: @@ -229,7 +229,7 @@ public class JSONParser { Map newObject=createObjectContainer(containerFactory); val.add(newObject); status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(newObject); break; case Yytoken.TYPE_LEFT_SQUARE: @@ -237,7 +237,7 @@ public class JSONParser { List newArray=createArrayContainer(containerFactory); val.add(newArray); status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); valueStack.addFirst(newArray); break; default: @@ -344,19 +344,19 @@ public class JSONParser { switch(token.type){ case Yytoken.TYPE_VALUE: status=S_IN_FINISHED_VALUE; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.primitive(token.value)) return; break; case Yytoken.TYPE_LEFT_BRACE: status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startObject()) return; break; case Yytoken.TYPE_LEFT_SQUARE: status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startArray()) return; break; @@ -386,7 +386,7 @@ public class JSONParser { if(token.value instanceof String){ String key=(String)token.value; status=S_PASSED_PAIR_KEY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startObjectEntry(key)) return; } @@ -426,17 +426,17 @@ public class JSONParser { break; case Yytoken.TYPE_LEFT_SQUARE: statusStack.removeFirst(); - statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); + statusStack.addFirst(S_IN_PAIR_VALUE); status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startArray()) return; break; case Yytoken.TYPE_LEFT_BRACE: statusStack.removeFirst(); - statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); + statusStack.addFirst(S_IN_PAIR_VALUE); status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startObject()) return; break; @@ -478,13 +478,13 @@ public class JSONParser { break; case Yytoken.TYPE_LEFT_BRACE: status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startObject()) return; break; case Yytoken.TYPE_LEFT_SQUARE: status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); + statusStack.addFirst(status); if(!contentHandler.startArray()) return; break; diff --git a/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java b/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java index b21b13f5f3..2dcd86f0c6 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/Yylex.java @@ -606,7 +606,7 @@ class Yylex { } case 33: break; case 1: - { throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR, new Character(yycharat(0))); + { throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR, yycharat(0)); } case 34: break; case 8: