From 956d87d9093c2c5426b6583ecd5b4d653bf3d2a3 Mon Sep 17 00:00:00 2001
From: npedot <nicola.pedot@gmail.com>
Date: Sat, 4 Apr 2020 22:17:56 +0200
Subject: [PATCH] adds yaml serializer, meta views to db
---
.../adapter/file/FileIOAdapter.kt | 4 +-
.../repository/MetaSchemaJdbcAdapter.kt | 13 ++--
.../service/XMLSerializerJacksonAdapter.kt | 5 +-
.../service/XSLTransformerJaxpAdapter.kt | 4 +-
.../service/YAMLSerializerJacksonAdapter.kt | 72 +++++++++++++++++++
.../usecase/common/ApplyChangeSetUseCase.kt | 4 +-
.../usecase/common/MetaSchemaReadUseCase.kt | 4 +-
.../usecase/common/XMLSerializeUseCase.kt | 4 +-
.../usecase/common/XPathTransformUseCase.kt | 4 +-
.../usecase/common/XSLTrasformUseCase.kt | 4 +-
.../usecase/current/TransformerVUseCase.kt | 7 +-
.../usecase/current/TransformerXUseCase.kt | 11 ++-
.../{FileIOService.kt => FileIOServiceI.kt} | 2 +-
...alizerService.kt => SerializerServiceI.kt} | 2 +-
...erService.kt => XSLTransformerServiceI.kt} | 2 +-
.../usecase/ApplyChangeSetUseCaseTest.kt | 1 -
.../serialize/XMLDeserializerDatabaseTest.kt | 1 -
.../usecase/serialize/XStreamTest.kt | 2 +-
.../serialize/YAMLSerializerDatabaseTest.kt | 1 -
19 files changed, 106 insertions(+), 41 deletions(-)
create mode 100644 src/main/kotlin/unibz.cs.semint.kprime/adapter/service/YAMLSerializerJacksonAdapter.kt
rename src/main/kotlin/unibz.cs.semint.kprime/usecase/service/{FileIOService.kt => FileIOServiceI.kt} (98%)
rename src/main/kotlin/unibz.cs.semint.kprime/usecase/service/{IXMLSerializerService.kt => SerializerServiceI.kt} (96%)
rename src/main/kotlin/unibz.cs.semint.kprime/usecase/service/{IXSLTransformerService.kt => XSLTransformerServiceI.kt} (74%)
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/adapter/file/FileIOAdapter.kt b/src/main/kotlin/unibz.cs.semint.kprime/adapter/file/FileIOAdapter.kt
index efc8acb..88d18f5 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/adapter/file/FileIOAdapter.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/adapter/file/FileIOAdapter.kt
@@ -1,10 +1,10 @@
package unibz.cs.semint.kprime.adapter.file
-import unibz.cs.semint.kprime.usecase.service.FileIOService
+import unibz.cs.semint.kprime.usecase.service.FileIOServiceI
import java.io.*
-class FileIOAdapter : FileIOService {
+class FileIOAdapter : FileIOServiceI {
override fun writeOnWorkingFilePath(db: String, fileName: String): String {
val writer = BufferedWriter(FileWriter(fileName));
writer.write(db);
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/adapter/repository/MetaSchemaJdbcAdapter.kt b/src/main/kotlin/unibz.cs.semint.kprime/adapter/repository/MetaSchemaJdbcAdapter.kt
index 65b2a30..0894e91 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/adapter/repository/MetaSchemaJdbcAdapter.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/adapter/repository/MetaSchemaJdbcAdapter.kt
@@ -33,13 +33,13 @@ class MetaSchemaJdbcAdapter : IMetaSchemaRepository {
db.id=UUID.randomUUID().toString()
db.schema.name="sourceName"
db.schema.id=UUID.randomUUID().toString()
- var tableNames :List<String>
+ var tableNames = mutableListOf<String>()
if (table!=null && table.isNotEmpty()) {
- tableNames= listOf(table)
+ tableNames= mutableListOf(table)
} else {
- tableNames = readTables(metaData,db)
+ tableNames.addAll(readTables(metaData,db))
}
- readViews(metaData,db)
+ tableNames.addAll(readViews(metaData,db))
readColumns(metaData, tableNames,db)
readPrimaryKeys(metaData, tableNames,db)
readForeignKeys(metaData, tableNames,db)
@@ -63,11 +63,12 @@ class MetaSchemaJdbcAdapter : IMetaSchemaRepository {
private fun readViews(metaData: DatabaseMetaData, db: Database):List<String> {
val views = metaData.getTables(null, null, null, arrayOf("VIEW"))
val viewNames = mutableListOf<String>()
- println("++++++++++++++++++++++++++++++++++++++++++++++++")
- QueryJdbcAdapter().printResultSet(views)
+ //println("++++++++++++++++++++++++++++++++++++++++++++++++")
+ //QueryJdbcAdapter().printResultSet(views)
println("++++++++++++++++++++++++++++++++++++++++++++++++")
while (views.next()) {
val viewName = "${views.getString("TABLE_NAME")}"
+ println(viewName)
viewNames.add(viewName)
val table = Table()
table.name=viewName
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XMLSerializerJacksonAdapter.kt b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XMLSerializerJacksonAdapter.kt
index ceabed6..e2c95d7 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XMLSerializerJacksonAdapter.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XMLSerializerJacksonAdapter.kt
@@ -10,10 +10,9 @@ import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.ddl.Table
import unibz.cs.semint.kprime.domain.dml.ChangeSet
import unibz.cs.semint.kprime.domain.dql.Query
-import unibz.cs.semint.kprime.domain.dql.Select
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
-class XMLSerializerJacksonAdapter : IXMLSerializerService {
+class XMLSerializerJacksonAdapter : SerializerServiceI {
// table
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XSLTransformerJaxpAdapter.kt b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XSLTransformerJaxpAdapter.kt
index 87964f2..d886495 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XSLTransformerJaxpAdapter.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/XSLTransformerJaxpAdapter.kt
@@ -1,13 +1,13 @@
package unibz.cs.semint.kprime.adapter.service
-import unibz.cs.semint.kprime.usecase.service.IXSLTransformerService
+import unibz.cs.semint.kprime.usecase.service.XSLTransformerServiceI
import java.io.FileOutputStream
import javax.xml.transform.OutputKeys
import javax.xml.transform.TransformerFactory
import javax.xml.transform.stream.StreamResult
import javax.xml.transform.stream.StreamSource
-class XSLTransformerJaxpAdapter:IXSLTransformerService {
+class XSLTransformerJaxpAdapter:XSLTransformerServiceI {
override fun trasform(xsl: String, xml: String, out: String) {
val tFactory = TransformerFactory.newInstance()
val fileOutputStream = FileOutputStream(out)
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/YAMLSerializerJacksonAdapter.kt b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/YAMLSerializerJacksonAdapter.kt
new file mode 100644
index 0000000..c1bec0d
--- /dev/null
+++ b/src/main/kotlin/unibz.cs.semint.kprime/adapter/service/YAMLSerializerJacksonAdapter.kt
@@ -0,0 +1,72 @@
+package unibz.cs.semint.kprime.adapter.service
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+import unibz.cs.semint.kprime.domain.Transformer
+import unibz.cs.semint.kprime.domain.ddl.Constraint
+import unibz.cs.semint.kprime.domain.ddl.Database
+import unibz.cs.semint.kprime.domain.ddl.Table
+import unibz.cs.semint.kprime.domain.dml.ChangeSet
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
+import java.io.StringWriter
+
+class YAMLSerializerJacksonAdapter : SerializerServiceI {
+ override fun serializeTable(table: Table): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun deserializeTable(s: String): Table {
+ TODO("Not yet implemented")
+ }
+
+ override fun prettyTable(table: Table): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun serializeDatabase(database: Database): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun deserializeDatabase(s: String): Database {
+ TODO("Not yet implemented")
+ }
+
+ override fun prettyDatabase(db: Database): String {
+ val objectMapper = ObjectMapper(YAMLFactory())
+ val outWriter = StringWriter()
+ objectMapper.writeValue(outWriter,db)
+ return outWriter.toString()
+ }
+
+ override fun serializeConstraint(constraint: Constraint): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun deserializeConstraint(s: String): Constraint {
+ TODO("Not yet implemented")
+ }
+
+ override fun serializeChangeSet(changeset: ChangeSet): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun deserializeChangeSet(changeset: String): ChangeSet {
+ TODO("Not yet implemented")
+ }
+
+ override fun prettyChangeSet(table: ChangeSet): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun serializeTransfomer(transformer: Transformer): String {
+ TODO("Not yet implemented")
+ }
+
+ override fun deserializeTransformer(transformer: String): Transformer {
+ TODO("Not yet implemented")
+ }
+
+ override fun deepclone(database: Database): Database {
+ TODO("Not yet implemented")
+ }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/ApplyChangeSetUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/ApplyChangeSetUseCase.kt
index 9ed0b42..f6afed4 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/ApplyChangeSetUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/ApplyChangeSetUseCase.kt
@@ -4,12 +4,12 @@ import unibz.cs.semint.kprime.domain.ddl.Column
import unibz.cs.semint.kprime.domain.ddl.Constraint
import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.dml.*
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
/**
* Given a Databse will apply changes following a given changeSet modification.
*/
-class ApplyChangeSetUseCase(serializer : IXMLSerializerService) {
+class ApplyChangeSetUseCase(serializer : SerializerServiceI) {
val serializer = serializer
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/MetaSchemaReadUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/MetaSchemaReadUseCase.kt
index 9056678..7d6e3f3 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/MetaSchemaReadUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/MetaSchemaReadUseCase.kt
@@ -4,7 +4,7 @@ import unibz.cs.semint.kprime.domain.*
import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.usecase.UseCaseResult
import unibz.cs.semint.kprime.usecase.repository.IMetaSchemaRepository
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
import java.util.*
@@ -32,7 +32,7 @@ class MetaSchemaReadUseCase() {
""".trimIndent()
}
- fun doit(datasource: DataSource,line: String, metaSchemaRepository: IMetaSchemaRepository, xmlSerializer:IXMLSerializerService) : UseCaseResult<Database> {
+ fun doit(datasource: DataSource,line: String, metaSchemaRepository: IMetaSchemaRepository, xmlSerializer:SerializerServiceI) : UseCaseResult<Database> {
val tokens = tokenize(line)
if (tokens.size<2) { return UseCaseResult("Usage:" + usage(), null);}
if (tokens[1] == "?") { return UseCaseResult(oneline(), null);}
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XMLSerializeUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XMLSerializeUseCase.kt
index 6d2e53e..5bab633 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XMLSerializeUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XMLSerializeUseCase.kt
@@ -6,9 +6,9 @@ import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.ddl.Table
import unibz.cs.semint.kprime.domain.dml.ChangeSet
import unibz.cs.semint.kprime.usecase.UseCaseResult
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
-class XMLSerializeUseCase(val xmlSerializerService: IXMLSerializerService) {
+class XMLSerializeUseCase(val xmlSerializerService: SerializerServiceI) {
// table
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XPathTransformUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XPathTransformUseCase.kt
index 6e10c0b..98f7965 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XPathTransformUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XPathTransformUseCase.kt
@@ -7,7 +7,7 @@ import org.w3c.dom.NodeList
import unibz.cs.semint.kprime.adapter.service.XMLSerializerJacksonAdapter
import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.dml.ChangeSet
-import unibz.cs.semint.kprime.usecase.service.FileIOService
+import unibz.cs.semint.kprime.usecase.service.FileIOServiceI
import java.io.File
import java.io.StringWriter
import javax.xml.parsers.DocumentBuilderFactory
@@ -55,7 +55,7 @@ class XPathTransformUseCase {
val changeSet = compute(dbFilePath, templateFilePath, xPaths, tranformerParmeters)
//val dbXml = XPathTransformUseCase::class.java.getResource("/${dbFilePath}").readText()
- val dbXml = FileIOService.readString(FileIOService.inputStreamFromPath(dbFilePath))
+ val dbXml = FileIOServiceI.readString(FileIOServiceI.inputStreamFromPath(dbFilePath))
val serializer = XMLSerializerJacksonAdapter()
val db = serializer.deserializeDatabase(dbXml)
val newdb = ApplyChangeSetUseCase(serializer).apply(db, changeSet)
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XSLTrasformUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XSLTrasformUseCase.kt
index 60176ff..fa8347e 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XSLTrasformUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/common/XSLTrasformUseCase.kt
@@ -1,9 +1,9 @@
package unibz.cs.semint.kprime.usecase.common
import unibz.cs.semint.kprime.usecase.UseCaseResult
-import unibz.cs.semint.kprime.usecase.service.IXSLTransformerService
+import unibz.cs.semint.kprime.usecase.service.XSLTransformerServiceI
-class XSLTrasformUseCase (val transformer:IXSLTransformerService){
+class XSLTrasformUseCase (val transformer:XSLTransformerServiceI){
fun transform(xsl: String, xml: String, out: String): UseCaseResult<Unit> {
return UseCaseResult("done", transformer.trasform(xsl, xml, out))
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerVUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerVUseCase.kt
index 315914b..13bd9bb 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerVUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerVUseCase.kt
@@ -7,13 +7,12 @@ import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.usecase.common.ApplyChangeSetUseCase
import unibz.cs.semint.kprime.usecase.TransformerUseCase
import unibz.cs.semint.kprime.usecase.common.XPathTransformUseCase
-import unibz.cs.semint.kprime.usecase.service.FileIOService
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
-import java.io.StringWriter
+import unibz.cs.semint.kprime.usecase.service.FileIOServiceI
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
-class TransformerVUseCase(val serializer: IXMLSerializerService, val fileIOAdapter: FileIOService) : TransformerUseCase {
+class TransformerVUseCase(val serializer: SerializerServiceI, val fileIOAdapter: FileIOServiceI) : TransformerUseCase {
override fun decompose(db: Database, params:Map<String,Any>): Transformation {
val tranformerParmeters = mutableMapOf<String,Any>()
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerXUseCase.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerXUseCase.kt
index 3e4c8b9..4667f68 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerXUseCase.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/current/TransformerXUseCase.kt
@@ -7,14 +7,11 @@ import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.usecase.TransformerUseCase
import unibz.cs.semint.kprime.usecase.common.ApplyChangeSetUseCase
import unibz.cs.semint.kprime.usecase.common.XPathTransformUseCase
-import unibz.cs.semint.kprime.usecase.service.FileIOService
-import unibz.cs.semint.kprime.usecase.service.IXMLSerializerService
+import unibz.cs.semint.kprime.usecase.service.FileIOServiceI
+import unibz.cs.semint.kprime.usecase.service.SerializerServiceI
import java.io.File
-import java.io.FileInputStream
-import java.io.FileReader
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
-import java.util.*
/**
* Usage e.g.:
@@ -30,8 +27,8 @@ import java.util.*
*
*/
class TransformerXUseCase(
- val serializer: IXMLSerializerService,
- val fileIOAdapter: FileIOService,
+ val serializer: SerializerServiceI,
+ val fileIOAdapter: FileIOServiceI,
val workingDir:String,
val docoTemplateFilePath:String,
val decoXPathsFilePath:String,
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOService.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOServiceI.kt
similarity index 98%
rename from src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOService.kt
rename to src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOServiceI.kt
index 39dee08..3e6fef3 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOService.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/FileIOServiceI.kt
@@ -7,7 +7,7 @@ import java.io.FileInputStream
import java.io.InputStream
import java.nio.charset.StandardCharsets
-interface FileIOService {
+interface FileIOServiceI {
fun writeOnWorkingFilePath(db: String, fileName: String): String
companion object {
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXMLSerializerService.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/SerializerServiceI.kt
similarity index 96%
rename from src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXMLSerializerService.kt
rename to src/main/kotlin/unibz.cs.semint.kprime/usecase/service/SerializerServiceI.kt
index 716669b..8276b9b 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXMLSerializerService.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/SerializerServiceI.kt
@@ -6,7 +6,7 @@ import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.ddl.Table
import unibz.cs.semint.kprime.domain.dml.ChangeSet
-interface IXMLSerializerService {
+interface SerializerServiceI {
fun serializeTable(table: Table): String
fun deserializeTable(s: String): Table
fun prettyTable(table: Table): String
diff --git a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXSLTransformerService.kt b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/XSLTransformerServiceI.kt
similarity index 74%
rename from src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXSLTransformerService.kt
rename to src/main/kotlin/unibz.cs.semint.kprime/usecase/service/XSLTransformerServiceI.kt
index 04962e9..d17dec7 100644
--- a/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/IXSLTransformerService.kt
+++ b/src/main/kotlin/unibz.cs.semint.kprime/usecase/service/XSLTransformerServiceI.kt
@@ -1,5 +1,5 @@
package unibz.cs.semint.kprime.usecase.service
-interface IXSLTransformerService {
+interface XSLTransformerServiceI {
fun trasform(xsl:String,xml:String,out:String)
}
\ No newline at end of file
diff --git a/src/test/kotlin/unibz.cs.semint.kprime/usecase/ApplyChangeSetUseCaseTest.kt b/src/test/kotlin/unibz.cs.semint.kprime/usecase/ApplyChangeSetUseCaseTest.kt
index 343e231..a513a68 100644
--- a/src/test/kotlin/unibz.cs.semint.kprime/usecase/ApplyChangeSetUseCaseTest.kt
+++ b/src/test/kotlin/unibz.cs.semint.kprime/usecase/ApplyChangeSetUseCaseTest.kt
@@ -35,7 +35,6 @@ class ApplyChangeSetUseCaseTest {
val db = setUpPersonDb()
//db.mappings = mutableListOf()
val serializeDb = serializer.serializeDatabase(db)
- println(serializeDb)
val newDb = serializer.deserializeDatabase(serializeDb)
//newDb.mappings = mutableListOf()
val serializeNewDb = serializer.serializeDatabase(newDb)
diff --git a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XMLDeserializerDatabaseTest.kt b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XMLDeserializerDatabaseTest.kt
index d077ba8..4549f08 100644
--- a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XMLDeserializerDatabaseTest.kt
+++ b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XMLDeserializerDatabaseTest.kt
@@ -101,7 +101,6 @@ class XMLDeserializerDatabaseTest {
FROM alias
""".trimIndent()))
- println(serializer.prettyDatabase(db))
assertEquals(3, db.mappings().size)
assertNotNull(database.mapping("query2"))
assertEquals("*",deserialized!!.ok!!.mapping("query2")!!.select!!.attributes[0]?.name)
diff --git a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XStreamTest.kt b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XStreamTest.kt
index 300be90..629fb51 100644
--- a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XStreamTest.kt
+++ b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/XStreamTest.kt
@@ -52,7 +52,7 @@ class XStreamTest {
val db: Database = xstream.fromXML(dbxml) as Database
// then
val prettyDatabase = XMLSerializerJacksonAdapter().prettyDatabase(db)
- println(prettyDatabase)
+ //println(prettyDatabase)
assertEquals(db.schema.tables().size,0)
}
}
\ No newline at end of file
diff --git a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/YAMLSerializerDatabaseTest.kt b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/YAMLSerializerDatabaseTest.kt
index 2016fff..73d6e55 100644
--- a/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/YAMLSerializerDatabaseTest.kt
+++ b/src/test/kotlin/unibz.cs.semint.kprime/usecase/serialize/YAMLSerializerDatabaseTest.kt
@@ -6,7 +6,6 @@ import org.junit.Test
import unibz.cs.semint.kprime.domain.ddl.Database
import unibz.cs.semint.kprime.domain.ddl.Schema
import unibz.cs.semint.kprime.domain.ddl.Table
-import java.io.File
import java.io.StringWriter
import kotlin.test.assertEquals
--
GitLab