From e1203eb5f4871d2fec2317665f62763e0f59d94d Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Sun, 27 Nov 2022 08:27:55 +0100 Subject: [PATCH] cleanup --- core/pom.xml | 2 +- core/src/main/java/jef/model/DbField.java | 19 ------------------- .../creator/MigrationBuilderGenerator.java | 1 - .../mysql/migration/MysqlMigrationTest.java | 13 +++++++------ 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c3718bb..6e46c13 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - jef jef + jef 0.1 4.0.0 diff --git a/core/src/main/java/jef/model/DbField.java b/core/src/main/java/jef/model/DbField.java index a615a2c..ed12415 100644 --- a/core/src/main/java/jef/model/DbField.java +++ b/core/src/main/java/jef/model/DbField.java @@ -73,25 +73,6 @@ public class DbField { return entity.getKeys().stream().anyMatch(u -> u.getFields().size() == 1 && u.getFields().get(0) == this); } - public DbField setModelField(boolean modelField) { - isModelField = modelField; - return this; - } - - public DbField setDatabaseField(boolean databaseField) { - isDatabaseField = databaseField; - return this; - } - - public DbField setNotNull(boolean notNull) { - this.notNull = notNull; - return this; - } - - public void setSqlType(String sqlType) { - this.sqlType = sqlType; - } - public void setGenerated(Generated.Type generated) { Check.notNull(generated, "generated"); this.generated = generated; diff --git a/migration-creator/src/main/java/jef/model/migration/creator/MigrationBuilderGenerator.java b/migration-creator/src/main/java/jef/model/migration/creator/MigrationBuilderGenerator.java index 6284737..62c0a1f 100644 --- a/migration-creator/src/main/java/jef/model/migration/creator/MigrationBuilderGenerator.java +++ b/migration-creator/src/main/java/jef/model/migration/creator/MigrationBuilderGenerator.java @@ -122,7 +122,6 @@ public class MigrationBuilderGenerator { private String addForeignKeyOp(AddForeignKeyOperation op) { imports.add(List.class); imports.add(ForeignKeyConstraint.class); - imports.add(ForeignKeyConstraint.Action.class); return "mb.addForeignKey(\"" + op.getName() + "\",\n" + " \"" + op.getTable() + "\",\n" + " List.of(" + op.getFields().stream().map(e -> "\"" + e + "\"").collect(Collectors.joining(", ")) + "),\n" diff --git a/mysql/src/test/java/jef/platform/mysql/migration/MysqlMigrationTest.java b/mysql/src/test/java/jef/platform/mysql/migration/MysqlMigrationTest.java index 320b9e5..795cb6a 100644 --- a/mysql/src/test/java/jef/platform/mysql/migration/MysqlMigrationTest.java +++ b/mysql/src/test/java/jef/platform/mysql/migration/MysqlMigrationTest.java @@ -39,6 +39,7 @@ public class MysqlMigrationTest { private static final String GENERATE_MIGRATIONS_FOLDER = "target/test-generated-migrations/"; private static final String GENERATE_MIGRATIONS_FOLDER_SRC = GENERATE_MIGRATIONS_FOLDER + "src/"; private static final String GENERATE_MIGRATIONS_FOLDER_TARGET = GENERATE_MIGRATIONS_FOLDER + "target/"; + private static final String PACKAGE_NAME = MysqlMigrationTest.class.getSimpleName(); @Test public void test() throws Exception { @@ -46,7 +47,7 @@ public class MysqlMigrationTest { generateInitialMigration(); compileInitialMigration(); Class.forName("com.mysql.cj.jdbc.Driver").getDeclaredConstructor().newInstance(); - var dboptions = new DatabaseOptions("jdbc:mysql://localhost/test", "test", "password", getClass().getSimpleName(), null); + var dboptions = new DatabaseOptions("jdbc:mysql://localhost/test", "test", "password", PACKAGE_NAME, null); var ctxoptions = new DbContextOptions(dboptions); var conn = DriverManager.getConnection(dboptions.getUrl(), dboptions.getUser(), dboptions.getPassword()); var sqlPlatform = new MysqlPlatform(); @@ -58,8 +59,8 @@ public class MysqlMigrationTest { } private void clearMigrationFolders() { - delRecursive(new File(GENERATE_MIGRATIONS_FOLDER_SRC + "MysqlMigrationTest")); - delRecursive(new File(GENERATE_MIGRATIONS_FOLDER_TARGET + "MysqlMigrationTest")); + delRecursive(new File(GENERATE_MIGRATIONS_FOLDER_SRC + PACKAGE_NAME)); + delRecursive(new File(GENERATE_MIGRATIONS_FOLDER_TARGET + PACKAGE_NAME)); } private void delRecursive(File f) { @@ -76,9 +77,9 @@ public class MysqlMigrationTest { var sqlPlatform = new MysqlPlatform(); var from = new ModelBuilder(); var to = ModelBuilder.from(Ctx.class); - var result = new MigrationCreator(sqlPlatform, from, to, "Initial", "MysqlMigrationTest", null).createMigration(); + var result = new MigrationCreator(sqlPlatform, from, to, "Initial", PACKAGE_NAME, null).createMigration(); - var dir = Path.of(GENERATE_MIGRATIONS_FOLDER_SRC, "MysqlMigrationTest").toFile(); + var dir = Path.of(GENERATE_MIGRATIONS_FOLDER_SRC, PACKAGE_NAME).toFile(); dir.mkdirs(); var fileOptions = new OpenOption[]{StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE}; @@ -104,7 +105,7 @@ public class MysqlMigrationTest { "-g", //debug symbols "-d", GENERATE_MIGRATIONS_FOLDER_TARGET //target )); - Arrays.stream(new File(GENERATE_MIGRATIONS_FOLDER_SRC + "MysqlMigrationTest").listFiles(File::isFile)).map(File::getPath).forEach(params::add); + Arrays.stream(new File(GENERATE_MIGRATIONS_FOLDER_SRC + PACKAGE_NAME).listFiles(File::isFile)).map(File::getPath).forEach(params::add); var process = new ProcessBuilder() .command(params.toArray(String[]::new)) .inheritIO()