Anvilcraft/anvilauth-injector
2
0
Fork 0
forked from MirrorHub/authlib-injector
Code Pull requests Activity

[json-simple]change key type of JSONObject to String

Browse source
This commit is contained in:
yushijinhun 2018-04-15 09:17:07 +08:00
parent b31a31c644
commit b160f15420
No known key found for this signature in database
GPG key ID: 5BC167F73EA558E4
4 changed files with 62 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONObject.java
View file

@ -16,7 +16,7 @@ import java.util.Map;
*
* @author FangYidong<fangyidong@yahoo.com.cn>
*/
public class JSONObject extends HashMap<Object, Object> implements JSONAware, JSONStreamAware {
public class JSONObject extends HashMap<String, Object> implements JSONAware, JSONStreamAware {
private static final long serialVersionUID = -503443796854799292L;
@ -30,7 +30,7 @@ public class JSONObject extends HashMap<Object, Object> implements JSONAware, JS
*
* @param map
*/
public JSONObject(Map<?, ?> map) {
public JSONObject(Map<String, ?> map) {
super(map);
}
@ -43,14 +43,14 @@ public class JSONObject extends HashMap<Object, Object> implements JSONAware, JS
* @param map
* @param out
*/
public static void writeJSONString(Map<?, ?> map, Writer out) throws IOException {
public static void writeJSONString(Map<String, ?> map, Writer out) throws IOException {
if (map == null) {
out.write("null");
return;
}
boolean first = true;
Iterator<? extends Map.Entry<?, ?>> iter = map.entrySet().iterator();
Iterator<? extends Map.Entry<String, ?>> iter = map.entrySet().iterator();
out.write('{');
while (iter.hasNext()) {
@ -58,9 +58,9 @@ public class JSONObject extends HashMap<Object, Object> implements JSONAware, JS
first = false;
else
out.write(',');
Map.Entry<?, ?> entry = iter.next();
Map.Entry<String, ?> entry = iter.next();
out.write('\"');
out.write(escape(String.valueOf(entry.getKey())));
out.write(escape(entry.getKey()));
out.write('\"');
out.write(':');
JSONValue.writeJSONString(entry.getValue(), out);
@ -82,7 +82,7 @@ public class JSONObject extends HashMap<Object, Object> implements JSONAware, JS
* @param map
* @return JSON text, or "null" if map is null.
*/
public static String toJSONString(Map<?, ?> map) {
public static String toJSONString(Map<String, ?> map) {
final StringWriter writer = new StringWriter();
try {

4
src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONValue.java
View file

@ -166,7 +166,9 @@ public class JSONValue {
}
if (value instanceof Map) {
JSONObject.writeJSONString((Map<?, ?>) value, out);
@SuppressWarnings("unchecked")
Map<String, ?> objectValue = (Map<String, ?>) value;
JSONObject.writeJSONString(objectValue, out);
return;
}

2
src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java
View file

@ -14,7 +14,7 @@ public interface ContainerFactory {
/**
* @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject.
*/
Map<Object, Object> createObjectContainer();
Map<String, Object> createObjectContainer();
/**
* @return A List instance to store JSON array, or null if you want to use org.json.simple.JSONArray.

79
src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/JSONParser.java
View file

@ -116,39 +116,44 @@ public class JSONParser {
do {
nextToken();
switch (status) {
case S_INIT:
case S_INIT: {
switch (token.type) {
case Yytoken.TYPE_VALUE:
case Yytoken.TYPE_VALUE: {
status = S_IN_FINISHED_VALUE;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(token.value);
break;
case Yytoken.TYPE_LEFT_BRACE:
}
case Yytoken.TYPE_LEFT_BRACE: {
status = S_IN_OBJECT;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(createObjectContainer(containerFactory));
break;
case Yytoken.TYPE_LEFT_SQUARE:
}
case Yytoken.TYPE_LEFT_SQUARE: {
status = S_IN_ARRAY;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(createArrayContainer(containerFactory));
break;
}
default:
status = S_IN_ERROR;
}// inner switch
break;
}
case S_IN_FINISHED_VALUE:
case S_IN_FINISHED_VALUE: {
if (token.type == Yytoken.TYPE_EOF)
return valueStack.removeFirst();
else
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
}
case S_IN_OBJECT:
case S_IN_OBJECT: {
switch (token.type) {
case Yytoken.TYPE_COMMA:
break;
case Yytoken.TYPE_VALUE:
case Yytoken.TYPE_VALUE: {
if (token.value instanceof String) {
String key = (String) token.value;
valueStack.addFirst(key);
@ -158,7 +163,8 @@ public class JSONParser {
status = S_IN_ERROR;
}
break;
case Yytoken.TYPE_RIGHT_BRACE:
}
case Yytoken.TYPE_RIGHT_BRACE: {
if (valueStack.size() > 1) {
statusStack.removeFirst();
valueStack.removeFirst();
@ -167,57 +173,68 @@ public class JSONParser {
status = S_IN_FINISHED_VALUE;
}
break;
}
default:
status = S_IN_ERROR;
break;
}// inner switch
break;
}
case S_PASSED_PAIR_KEY:
case S_PASSED_PAIR_KEY: {
switch (token.type) {
case Yytoken.TYPE_COLON:
break;
case Yytoken.TYPE_VALUE:
case Yytoken.TYPE_VALUE: {
statusStack.removeFirst();
String key = (String) valueStack.removeFirst();
Map<Object, Object> parent = (Map<Object, Object>) valueStack.getFirst();
@SuppressWarnings("unchecked")
Map<String, Object> parent = (Map<String, Object>) valueStack.getFirst();
parent.put(key, token.value);
status = peekStatus(statusStack);
break;
case Yytoken.TYPE_LEFT_SQUARE:
}
case Yytoken.TYPE_LEFT_SQUARE: {
statusStack.removeFirst();
key = (String) valueStack.removeFirst();
parent = (Map<Object, Object>) valueStack.getFirst();
String key = (String) valueStack.removeFirst();
@SuppressWarnings("unchecked")
Map<String, Object> parent = (Map<String, Object>) valueStack.getFirst();
List<Object> newArray = createArrayContainer(containerFactory);
parent.put(key, newArray);
status = S_IN_ARRAY;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(newArray);
break;
case Yytoken.TYPE_LEFT_BRACE:
}
case Yytoken.TYPE_LEFT_BRACE: {
statusStack.removeFirst();
key = (String) valueStack.removeFirst();
parent = (Map<Object, Object>) valueStack.getFirst();
Map<Object, Object> newObject = createObjectContainer(containerFactory);
String key = (String) valueStack.removeFirst();
@SuppressWarnings("unchecked")
Map<String, Object> parent = (Map<String, Object>) valueStack.getFirst();
Map<String, Object> newObject = createObjectContainer(containerFactory);
parent.put(key, newObject);
status = S_IN_OBJECT;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(newObject);
break;
}
default:
status = S_IN_ERROR;
}
break;
}
case S_IN_ARRAY:
case S_IN_ARRAY: {
switch (token.type) {
case Yytoken.TYPE_COMMA:
break;
case Yytoken.TYPE_VALUE:
case Yytoken.TYPE_VALUE: {
@SuppressWarnings("unchecked")
List<Object> val = (List<Object>) valueStack.getFirst();
val.add(token.value);
break;
case Yytoken.TYPE_RIGHT_SQUARE:
}
case Yytoken.TYPE_RIGHT_SQUARE: {
if (valueStack.size() > 1) {
statusStack.removeFirst();
valueStack.removeFirst();
@ -226,26 +243,32 @@ public class JSONParser {
status = S_IN_FINISHED_VALUE;
}
break;
case Yytoken.TYPE_LEFT_BRACE:
val = (List<Object>) valueStack.getFirst();
Map<Object, Object> newObject = createObjectContainer(containerFactory);
}
case Yytoken.TYPE_LEFT_BRACE: {
@SuppressWarnings("unchecked")
List<Object> val = (List<Object>) valueStack.getFirst();
Map<String, Object> newObject = createObjectContainer(containerFactory);
val.add(newObject);
status = S_IN_OBJECT;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(newObject);
break;
case Yytoken.TYPE_LEFT_SQUARE:
val = (List<Object>) valueStack.getFirst();
}
case Yytoken.TYPE_LEFT_SQUARE: {
@SuppressWarnings("unchecked")
List<Object> val = (List<Object>) valueStack.getFirst();
List<Object> newArray = createArrayContainer(containerFactory);
val.add(newArray);
status = S_IN_ARRAY;
statusStack.addFirst(new Integer(status));
valueStack.addFirst(newArray);
break;
}
default:
status = S_IN_ERROR;
}// inner switch
break;
}
case S_IN_ERROR:
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
}// switch
@ -266,10 +289,10 @@ public class JSONParser {
token = new Yytoken(Yytoken.TYPE_EOF, null);
}
private Map<Object, Object> createObjectContainer(ContainerFactory containerFactory) {
private Map<String, Object> createObjectContainer(ContainerFactory containerFactory) {
if (containerFactory == null)
return new JSONObject();
Map<Object, Object> m = containerFactory.createObjectContainer();
Map<String, Object> m = containerFactory.createObjectContainer();
if (m == null)
return new JSONObject();