wea_ondara/JEF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
wea_ondara
2022-11-23 17:30:13 +01:00
parent c11e1b09f1
commit 8b9659e867
1 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cli/src/main/java/jef/main/MigrationCommandHandler.java
View File

@@ -1,11 +1,9 @@
package jef.main; package jef.main;
import jef.Database;
import jef.model.DbContext; import jef.model.DbContext;
import jef.model.DbContextOptions;
import jef.model.ModelBuilder; import jef.model.ModelBuilder;
import jef.model.migration.creator.MigrationCreator; import jef.model.migration.creator.MigrationCreator;
import jef.mysql.MysqlDatabase; import jef.platform.nul.NullPlatform;
import jef.util.Util; import jef.util.Util;
import java.io.BufferedReader; import java.io.BufferedReader;
@@ -18,16 +16,15 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.net.URLConnection; import java.net.URLConnection;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.function.Supplier;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@@ -69,6 +66,7 @@ public class MigrationCommandHandler {
String migrationPackage = null; String migrationPackage = null;
String targetFolder = null; String targetFolder = null;
String name = null; String name = null;
String platformType = null;
var classPath = new ArrayList<String>(); var classPath = new ArrayList<String>();
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
@@ -93,6 +91,13 @@ public class MigrationCommandHandler {
} }
targetFolder = args[++i]; targetFolder = args[++i];
break; break;
case "--platform":
case "-p":
if (i + 1 >= args.length) {
Main.printHelp();
}
platformType = args[++i];
break;
default: default:
if (name != null) { if (name != null) {
Main.printHelp(); Main.printHelp();
@@ -119,6 +124,7 @@ public class MigrationCommandHandler {
var targetFolderFile = new File(targetFolder); var targetFolderFile = new File(targetFolder);
targetFolderFile.mkdirs(); targetFolderFile.mkdirs();
migrationPackage = findMigrationPackageName(targetFolder); migrationPackage = findMigrationPackageName(targetFolder);
var sqlPlatform = new NullPlatform();//TODO find out from migrations or -p param
//find data //find data
var currentSnapshotFile = new File(targetFolderFile, "CurrentSnapshot.java"); var currentSnapshotFile = new File(targetFolderFile, "CurrentSnapshot.java");
@@ -132,12 +138,13 @@ public class MigrationCommandHandler {
var date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); var date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
var className = "M" + date + "_" + name; var className = "M" + date + "_" + name;
var creator = new MigrationCreator(); var creator = new MigrationCreator(sqlPlatform, from, to, className, migrationPackage, currentSnapshotFile.isFile() ? Files.readString(currentSnapshotFile.toPath()) : null);
var result = creator.createMigration(from, to, className, migrationPackage, currentSnapshotFile.isFile() ? Files.readString(currentSnapshotFile.toPath()) : null); var result = creator.createMigration();
Files.writeString(new File(targetFolder, className + ".java").toPath(), result.getMigration(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); var fileOptions = new OpenOption[]{StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE};
Files.writeString(new File(targetFolder, className + "Snapshot.java").toPath(), result.getMigrationSnapshot(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); Files.writeString(new File(targetFolder, result.getMigrationClassName() + ".java").toPath(), result.getMigration(), fileOptions);
Files.writeString(new File(targetFolder, "CurrentSnapshot.java").toPath(), result.getCurrentSnapshot(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); Files.writeString(new File(targetFolder, result.getMigrationSnapshotClassName() + ".java").toPath(), result.getMigrationSnapshot(), fileOptions);
Files.writeString(new File(targetFolder, result.getCurrentSnapshotClassName() + ".java").toPath(), result.getCurrentSnapshot(), fileOptions);
System.exit(0); System.exit(0);
} }
@@ -147,35 +154,13 @@ public class MigrationCommandHandler {
private static Optional<DbContext> findContextByName(URLClassLoader cl, String contextName) { private static Optional<DbContext> findContextByName(URLClassLoader cl, String contextName) {
Util.ThrowableFunction<String, DbContext> finder = (String entryName) -> { Util.ThrowableFunction<String, DbContext> finder = (String entryName) -> {
var cls = cl.loadClass(entryName.substring(0, entryName.length() - ".class".length()).replace("/", ".")); var cls = (Class<? extends DbContext>) cl.loadClass(entryName.substring(0, entryName.length() - ".class".length()).replace("/", "."));
var parent = cls; var parent = (Class<?>) cls;
// var interfaces = cls.getInterfaces();
// while (parent != Object.class && !Set.of(interfaces).contains(DbContext.class)) {
while (parent != Object.class && parent != DbContext.class) { while (parent != Object.class && parent != DbContext.class) {
parent = parent.getSuperclass(); parent = parent.getSuperclass();
// interfaces = cls.getInterfaces();
} }
// if (Set.of(interfaces).contains(DbContext.class)) {
if (parent == DbContext.class) { if (parent == DbContext.class) {
var paramInitializer = new HashMap<Class<?>, Supplier<?>>(); return Util.tryGet(() -> cls.getDeclaredConstructor().newInstance()).orElse(null);
paramInitializer.put(Database.class, () -> new MysqlDatabase(null, null));
paramInitializer.put(DbContextOptions.class, () -> new DbContextOptions(null));
var ctors = cls.getDeclaredConstructors();//TODO create a function for initializing db contexts
if (ctors.length == 0) {
System.err.println("No constructor found in " + cls.getName());
return null;
}
var ctor = Arrays.stream(ctors)
.filter(e -> Arrays.stream(e.getParameterTypes())
.allMatch(p -> Database.class.isAssignableFrom(p) || DbContextOptions.class.isAssignableFrom(p)))
.findFirst().orElse(null);
if (ctor == null) {
return null;
}
var args = Arrays.stream(ctor.getParameterTypes()).map(p -> paramInitializer.get(p).get()).toArray();
return Util.tryGet(() -> (DbContext) ctor.newInstance(args)).orElse(null);
} }
return null; return null;
}; };