use more general way to create source

ergon · Oct 8, 2024 · 033406b · 033406b
1 parent 1f3f1ea
commit 033406b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -13,7 +13,6 @@ sourceCompatibility = 21
 dependencies {
     implementation gradleApi()
     implementation project(':core')
-    implementation project(':yml')
     implementation group: 'org.jooq', name: 'jooq-codegen', version: '3.19.11'
 }
 

diff --git a/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/tasks/GenerateJooqMetamodelTask.java b/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/tasks/GenerateJooqMetamodelTask.java
@@ -22,11 +22,11 @@ public class GenerateJooqMetamodelTask extends DefaultTask {
 	private Path outputPath;
 
 	@Input
-	private String ymlSource;
+	private String source;
 
 	@TaskAction
 	public void generateJooqMetamodel() throws Exception {
-		AdamJooqMetamodelGenerator generator = new AdamJooqMetamodelGenerator(packageName, outputPath, ymlSource,
+		AdamJooqMetamodelGenerator generator = new AdamJooqMetamodelGenerator(packageName, outputPath, getSource(),
 				jooqConfig);
 		generator.run();
 	}
@@ -55,12 +55,12 @@ public void setOutputPath(Path outputPath) {
 		this.outputPath = outputPath;
 	}
 
-	public String getYmlSource() {
-		return ymlSource;
+	public String getSource() {
+		return source;
 	}
 
-	public void setYmlSource(String ymlSource) {
-		this.ymlSource = ymlSource;
+	public void setSource(String source) {
+		this.source = source;
 	}
 
 }
diff --git a/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/util/AdamDatabase.java b/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/util/AdamDatabase.java
@@ -23,15 +23,15 @@
 import org.jooq.meta.UDTDefinition;
 import org.jooq.meta.XMLSchemaCollectionDefinition;
 
+import ch.ergon.adam.core.db.SourceAndSinkFactory;
 import ch.ergon.adam.core.db.schema.Field;
 import ch.ergon.adam.core.db.schema.ForeignKey;
 import ch.ergon.adam.core.db.schema.Index;
 import ch.ergon.adam.core.db.schema.Schema;
 import ch.ergon.adam.core.db.schema.Table;
-import ch.ergon.adam.yml.YmlFactory;
 
 public class AdamDatabase extends AbstractDatabase {
-	public static final String YML_SOURCE_PROPERTY = "ymlSource";
+	public static final String SOURCE_PROPERTY = "source";
 	private Schema schema;
 	private SchemaDefinition schemaDefinition;
 
@@ -178,8 +178,8 @@ private <T> List<T> mutableList(T value) {
 
 	private void ensureSchema() {
 		if (schema == null) {
-			String source = (String) getProperties().get(YML_SOURCE_PROPERTY);
-			schema = new YmlFactory().createSource(source).getSchema();
+			String source = (String) getProperties().get(SOURCE_PROPERTY);
+			schema = SourceAndSinkFactory.getInstance().getSource(source).getSchema();
 			schemaDefinition = new SchemaDefinition(this, "", null);
 		}
 	}

diff --git a/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/util/AdamJooqMetamodelGenerator.java b/gradle-plugin/src/main/java/ch/ergon/adam/gradleplugin/util/AdamJooqMetamodelGenerator.java
@@ -16,13 +16,13 @@ public class AdamJooqMetamodelGenerator {
 
 	private String packageName;
 	private Path outputPath;
-	private String ymlSource;
+	private String source;
 	private String jooqConfig;
 
-	public AdamJooqMetamodelGenerator(String packageName, Path outputPath, String ymlSource, String jooqConfig) {
+	public AdamJooqMetamodelGenerator(String packageName, Path outputPath, String source, String jooqConfig) {
 		this.packageName = packageName;
 		this.outputPath = outputPath;
-		this.ymlSource = ymlSource;
+		this.source = source;
 		this.jooqConfig = jooqConfig;
 	}
 
@@ -43,7 +43,7 @@ private Configuration buildConfiguration() {
 		Generator generator = new Generator();
 		Database database = new Database();
 		database.setName(AdamDatabase.class.getName());
-		database.getProperties().add(new Property().withKey(AdamDatabase.YML_SOURCE_PROPERTY).withValue(ymlSource));
+		database.getProperties().add(new Property().withKey(AdamDatabase.SOURCE_PROPERTY).withValue(source));
 		generator.setDatabase(database);
 
 		Strategy strategy = new Strategy();