#269

Author: mgramin

pom.xml

@@ -62,9 +62,6 @@
     </developers>
 
     <properties>
-        <!--<project.bujava.versionild.sourceEncoding>UTF-8</project.bujava.versionild.sourceEncoding>-->
-        <!--<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
-        <!--<dbh2.version>1.4.187</dbh2.version>-->
         <docker.image.prefix>mgramin</docker.image.prefix>
 
         <github.global.server>github</github.global.server>
@@ -78,7 +75,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M1</version>
+        <version>2.1.3.RELEASE</version>
         <relativePath/>
     </parent>
 

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/DbConnectionList.kt

@@ -38,11 +38,8 @@ import org.springframework.stereotype.Service
 @ConfigurationProperties(prefix = "conf")
 open class DbConnectionList(val connections: List<SimpleDbConnection>) {
 
-    fun getConnectionByName(name: String): SimpleDbConnection {
-        return connections.first { v -> v.getName().equals(name, ignoreCase = true) }
-    }
+    fun getConnectionByName(name: String) = connections.first { v -> v.getName().equals(name, ignoreCase = true) }
+
+    fun getConnectionsByMask(name: String) = connections.filter { v -> v.getName().matches(name.toRegex()) }
 
-    fun getConnectionsByMask(name: String): List<SimpleDbConnection> {
-        return connections.filter { v -> v.getName().matches(name.toRegex()) }
-    }
 }

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

@@ -89,7 +89,7 @@ class SqlResourceTypeTest {
                         aliases = arrayListOf("column"),
                         sql = sql,
                         connections = listOf(db))
-        assertEquals(356, type.read(DbUri("column/main_schema.users")).count().block())
+        assertEquals(347, type.read(DbUri("column/main_schema.users")).count().block())
     }
 
     @Test