zontreck/LibAC
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a annotation marker for lists and maps

Browse source
This commit is contained in:
Aria 2023-06-16 03:20:17 -07:00
parent 76f9d93a8b
commit b01bf6e129
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/dev/zontreck/ariaslib/json/DynamicSerializer.java
View file

@ -56,12 +56,15 @@ public class DynamicSerializer {
String fieldName = field.getName ( ); String fieldName = field.getName ( );
if (field.isAnnotationPresent ( ListOrMap.class )) {
// Special handling for List and Map types
ret.put(fieldName, serializeCollectionOrMap(fieldVal));
continue;
}
if ( ! ( fieldVal.getClass ( ).isAnnotationPresent ( DynSerial.class ) ) ) { if ( ! ( fieldVal.getClass ( ).isAnnotationPresent ( DynSerial.class ) ) ) {
// Special handler for List and Map is needed right here. // Special handler for List and Map is needed right here.
if (fieldVal instanceof List || fieldVal instanceof Map) { if(fieldVal instanceof List || fieldVal instanceof Map) continue;
// Special handling for List and Map types
fieldVal = serializeCollectionOrMap(fieldVal);
}
ret.put ( fieldName , fieldVal ); ret.put ( fieldName , fieldVal );
} }
else { else {
@ -81,8 +84,7 @@ public class DynamicSerializer {
@SuppressWarnings ("unchecked") @SuppressWarnings ("unchecked")
private static Object serializeCollectionOrMap ( Object collectionOrMap ) throws InvocationTargetException, IllegalAccessException { private static Object serializeCollectionOrMap ( Object collectionOrMap ) throws InvocationTargetException, IllegalAccessException {
if ( collectionOrMap instanceof List ) { if ( collectionOrMap instanceof List<?> list ) {
List<Object> list = ( List<Object> ) collectionOrMap;
List<Object> serializedList = new ArrayList<> ( ); List<Object> serializedList = new ArrayList<> ( );
for ( Object item : list ) { for ( Object item : list ) {
if ( item.getClass ( ).isAnnotationPresent ( DynSerial.class ) ) { if ( item.getClass ( ).isAnnotationPresent ( DynSerial.class ) ) {
@ -94,8 +96,8 @@ public class DynamicSerializer {
} }
return serializedList; return serializedList;
} }
else if ( collectionOrMap instanceof Map ) { else if ( collectionOrMap instanceof Map<?,?> mp ) {
Map<String, Object> map = ( Map<String, Object> ) collectionOrMap; Map<String,Object> map = (Map<String, Object> ) mp;
Map<String, Object> serializedMap = new HashMap<> ( ); Map<String, Object> serializedMap = new HashMap<> ( );
for ( Map.Entry<String, Object> entry : map.entrySet ( ) ) { for ( Map.Entry<String, Object> entry : map.entrySet ( ) ) {
String key = entry.getKey ( ); String key = entry.getKey ( );

8
src/main/java/dev/zontreck/ariaslib/json/ListOrMap.java Normal file
View file

@ -0,0 +1,8 @@
package dev.zontreck.ariaslib.json;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention ( RetentionPolicy.RUNTIME )
public @interface ListOrMap {
}