ugly way to fix metadata load fail

Author: selcarpa

src/main/java/cn/aethli/mineauth/Mineauth.java

@@ -73,7 +73,7 @@ public class Mineauth {
   public Mineauth() throws IOException, ClassNotFoundException {
     initialInternalDatabase(DEFAULT_H2_DATABASE_FILE_RESOURCE_PATH);
     MetadataUtils.initMetadata();
-     ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, MineauthConfig.FORGE_CONFIG_SPEC);
+    ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, MineauthConfig.FORGE_CONFIG_SPEC);
     MinecraftForge.EVENT_BUS.register(this);
   }
 

src/main/java/cn/aethli/mineauth/common/utils/MetadataUtils.java

@@ -1,11 +1,10 @@
 package cn.aethli.mineauth.common.utils;
 
-import cn.aethli.mineauth.Mineauth;
-import cn.aethli.mineauth.annotation.MetadataScan;
 import cn.aethli.mineauth.common.model.EntityMapper;
+import cn.aethli.mineauth.entity.AuthPlayer;
 import cn.aethli.mineauth.entity.BaseEntity;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.ClassPath;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,11 +14,11 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 public class MetadataUtils {
   private static final Map<String, EntityMapper> ENTITY_MAPPER_MAP = new ConcurrentHashMap<>();
   private static final AtomicBoolean initFlag = new AtomicBoolean(false);
+  private static final Logger LOGGER = LogManager.getLogger();
 
   /**
    * init metadata, to cache entity-field map exclude abstract class and non-extends BaseEntity
@@ -37,7 +36,7 @@ public static void initMetadata(String packageName) throws IOException, ClassNot
     classes.forEach(
         aClass -> {
           if (!Modifier.isAbstract(aClass.getModifiers())
-              /*&& BaseEntity.class.isAssignableFrom(aClass)*/) {
+              && BaseEntity.class.isAssignableFrom(aClass)) {
             Set<Field> fields = new HashSet<>(Arrays.asList(aClass.getDeclaredFields()));
             fields.addAll(Arrays.asList(baseEntityFields));
             EntityMapper entityMapper = ENTITY_MAPPER_MAP.get(aClass.getTypeName());
@@ -56,12 +55,22 @@ public static void initMetadata() throws IOException, ClassNotFoundException {
       if (initFlag.get()) {
         return;
       }
-      Class<Mineauth> mineauthClass = Mineauth.class;
-      if (mineauthClass.isAnnotationPresent(MetadataScan.class)) {
-        MetadataScan metadataScan = mineauthClass.getAnnotation(MetadataScan.class);
-        for (String packageName : metadataScan.packageName()) {
-          MetadataUtils.initMetadata(packageName);
-        }
+      //      Class<Mineauth> mineauthClass = Mineauth.class;
+      //      if (mineauthClass.isAnnotationPresent(MetadataScan.class)) {
+      //        MetadataScan metadataScan = mineauthClass.getAnnotation(MetadataScan.class);
+      //        for (String packageName : metadataScan.packageName()) {
+      //          MetadataUtils.initMetadata(packageName);
+      //        }
+      //      }
+      Field[] baseEntityFields = BaseEntity.class.getDeclaredFields();
+      HashSet<Field> fields = new HashSet<>(Arrays.asList(AuthPlayer.class.getDeclaredFields()));
+      fields.addAll(Arrays.asList(baseEntityFields));
+      EntityMapper entityMapper = ENTITY_MAPPER_MAP.get(AuthPlayer.class.getTypeName());
+      if (entityMapper == null) {
+        entityMapper = new EntityMapper();
+        entityMapper.setClassName(AuthPlayer.class.getTypeName());
+        entityMapper.setFields(fields);
+        ENTITY_MAPPER_MAP.put(AuthPlayer.class.getTypeName(), entityMapper);
       }
       initFlag.set(true);
     }
@@ -87,26 +96,28 @@ public static EntityMapper getEntityMapperByTypeName(String typeName) {
    */
   private static <T extends BaseEntity> List<Class<T>> getClasses(String packageName)
       throws ClassNotFoundException, IOException {
+    // both not works with java -jar
+    //    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+    //    ClassPath classpath = ClassPath.from(classLoader); // scans the class path used by
+    // classloader
+    //    ImmutableSet<ClassPath.ClassInfo> topLevelClasses =
+    // classpath.getTopLevelClasses(packageName);
+    //    List<? extends Class<?>> collect =
+    //        topLevelClasses.stream().map(ClassPath.ClassInfo::load).collect(Collectors.toList());
+    //    return (List<Class<T>>) collect;
     ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-    ClassPath classpath = ClassPath.from(classLoader); // scans the class path used by classloader
-    ImmutableSet<ClassPath.ClassInfo> topLevelClasses = classpath.getTopLevelClasses(packageName);
-    List<? extends Class<?>> collect =
-        topLevelClasses.stream().map(ClassPath.ClassInfo::load).collect(Collectors.toList());
-    return (List<Class<T>>) collect;
-//not works on produce
-//    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-//    String path = packageName.replace('.', '/');
-//    Enumeration<URL> resources = classLoader.getResources(path);
-//    List<File> dirs = new ArrayList<>();
-//    while (resources.hasMoreElements()) {
-//      URL resource = resources.nextElement();
-//      dirs.add(new File(resource.getFile()));
-//    }
-//    ArrayList<Class<T>> classes = new ArrayList<>();
-//    for (File directory : dirs) {
-//      classes.addAll(findClasses(directory, packageName));
-//    }
-//    return classes;
+    String path = packageName.replace('.', '/');
+    Enumeration<URL> resources = classLoader.getResources(path);
+    List<File> dirs = new ArrayList<>();
+    while (resources.hasMoreElements()) {
+      URL resource = resources.nextElement();
+      dirs.add(new File(resource.getFile()));
+    }
+    ArrayList<Class<T>> classes = new ArrayList<>();
+    for (File directory : dirs) {
+      classes.addAll(findClasses(directory, packageName));
+    }
+    return classes;
   }
 
   /**

src/test/java/cn/aethli/test/mineauth/DataBaseTest.java

@@ -40,7 +40,8 @@ public void databaseInit() throws SQLException, IOException, ClassNotFoundExcept
         "root",
         "admin",
         2);
-    metadataInit();
+//    metadataInit();
+    MetadataUtils.initMetadata();
     DataUtils.DatabaseInit();
   }