293

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/ResourceType.kt

@@ -63,7 +63,6 @@ interface ResourceType {
     @JsonProperty
     fun metaData(): Map<String, String>
 
-//    @JvmDefault
     fun metaData(uri: Uri): List<Metadata> {
         return metaData().entries
                 .map { e -> Metadata(e.key, e.value) }

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt

@@ -84,15 +84,11 @@ class FsResourceType(
     }
 
     override fun read(uri: Uri): Flux<DbResource> {
-        try {
-            return Flux.merge(
-                    resourceTypes
-                            .filter { v -> v.name().matches(uri.type().replace("?", ".?").replace("*", ".*?").toRegex()) }
-                            .map { it.read(uri) }
-                            .toList())
-        } catch (e: Exception) {
-            throw BootException("Type not found", 404)
-        }
+        return Flux.merge(
+                resourceTypes
+                        .filter { v -> v.name().matches(uri.type().replace("?", ".?").replace("*", ".*?").toRegex()) }
+                        .map { it.read(uri) }
+                        .toList())
     }
 
     override fun metaData(): Map<String, String> {

src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt

@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl
 
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.connection.SimpleDbConnection
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.model.uri.impl.FakeUri
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -89,9 +90,17 @@ class FsResourceTypeTest {
         assertThrows(BootException::class.java) { FsResourceType(listOf(db), FakeUri()).path() }
     }
 
-    @Test
-    fun metaData() {
-//        assertThrows(BootException::class.java) { FsResourceType(listOf(db), FakeUri()).metaData() }
+    @ParameterizedTest
+    @CsvSource(
+            "prod/sessions,7",
+            "prod/schema,9",
+//            "prod/s*,5",
+//            "prod/tab*/bookings,5",
+            "prod/table/bookings,6",
+            "prod/table/bookings.airports,6")
+    fun metaData(uri: String, count: Int) {
+        val metaData: List<Metadata> = FsResourceType(listOf(db), DbUri(uri)).metaData(DbUri(uri))
+        assertEquals(count, metaData.count())
     }
 
 }