Skip to content

Commit e59658d

Browse files
committed
#322 add host prop
1 parent c1a3350 commit e59658d

File tree

8 files changed

+23
-25
lines changed

8 files changed

+23
-25
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ interface Endpoint {
3030

3131
fun name(): String
3232

33+
fun host(): String
34+
3335
@Deprecated("Move to properties")
3436
fun dialect(): String
3537

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@ import javax.sql.DataSource
2828

2929
class FakeEndpoint : Endpoint {
3030

31-
override fun dialect() = "h2"
31+
override fun name() = "Simple fake connection"
3232

33-
override fun properties(): Map<String, Any> {
33+
override fun host(): String {
3434
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
3535
}
3636

37-
override fun name(): String {
38-
return "Simple fake connection"
37+
override fun properties(): Map<String, Any> {
38+
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
3939
}
4040

41+
override fun dialect() = "h2"
42+
4143
override fun getDataSource(): DataSource {
4244
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
4345
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
package com.github.mgramin.sqlboot.model.connection
2626

2727
import com.fasterxml.jackson.annotation.JsonIgnore
28-
import org.apache.tomcat.jdbc.pool.DataSource
29-
import org.springframework.core.io.Resource
3028
import com.google.gson.Gson
3129
import com.google.gson.reflect.TypeToken
30+
import org.apache.tomcat.jdbc.pool.DataSource
31+
import org.springframework.core.io.Resource
3232

3333

3434
/**
@@ -47,10 +47,14 @@ open class SimpleEndpoint(
4747
var dialect: String? = null
4848
) : Endpoint {
4949

50-
override fun dialect() = this.dialect!!
51-
5250
override fun name() = this.name!!
5351

52+
override fun host(): String {
53+
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
54+
}
55+
56+
override fun dialect() = this.dialect!!
57+
5458
private var dataSource: DataSource? = null
5559

5660
override fun properties(): Map<String, Any> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.gson.Gson
55
import com.google.gson.JsonElement
66
import com.google.gson.JsonObject
77
import com.google.gson.reflect.TypeToken
8-
import java.util.HashMap
8+
import java.util.*
99

1010
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
1111
data class Metadata(
@@ -51,7 +51,7 @@ data class Metadata(
5151
*/
5252
fun toJson(): JsonObject {
5353
val jsonObject = JsonObject()
54-
val toJson: JsonElement = Gson().toJsonTree (properties)
54+
val toJson: JsonElement = Gson().toJsonTree(properties)
5555
jsonObject.addProperty("name", name.replace("@", ""))
5656
jsonObject.addProperty("description", description)
5757
jsonObject.add("properties", toJson)

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/CacheWrapper.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ class CacheWrapper(private val origin: ResourceType, private val parameterName:
7070
override fun metaData(uri: Uri): List<Metadata> {
7171
return origin.metaData(uri)
7272
}
73+
7374
override fun toJson() = origin.toJson()
7475
}

src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/DbConnectionsController.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired
3131
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
3232
import org.springframework.context.annotation.ComponentScan
3333
import org.springframework.http.MediaType
34-
import org.springframework.web.bind.annotation.CrossOrigin
35-
import org.springframework.web.bind.annotation.GetMapping
36-
import org.springframework.web.bind.annotation.RequestMapping
37-
import org.springframework.web.bind.annotation.ResponseBody
38-
import org.springframework.web.bind.annotation.RestController
34+
import org.springframework.web.bind.annotation.*
3935
import reactor.core.publisher.Flux
4036
import reactor.core.publisher.toFlux
4137
import reactor.core.scheduler.Schedulers

src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SwaggerController.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ package com.github.mgramin.sqlboot.rest.controllers
2727
import com.fasterxml.jackson.core.JsonProcessingException
2828
import com.github.mgramin.sqlboot.model.connection.EndpointList
2929
import com.github.mgramin.sqlboot.model.resourcetype.impl.FsResourceType
30-
import io.swagger.models.Info
31-
import io.swagger.models.ModelImpl
32-
import io.swagger.models.Operation
33-
import io.swagger.models.Path
34-
import io.swagger.models.Response
35-
import io.swagger.models.Scheme
36-
import io.swagger.models.Swagger
30+
import io.swagger.models.*
3731
import io.swagger.models.parameters.Parameter
3832
import io.swagger.models.parameters.PathParameter
3933
import io.swagger.models.parameters.QueryParameter
@@ -48,8 +42,7 @@ import org.springframework.web.bind.annotation.PathVariable
4842
import org.springframework.web.bind.annotation.RequestMapping
4943
import org.springframework.web.bind.annotation.RequestMethod
5044
import org.springframework.web.bind.annotation.RequestParam
51-
import java.util.ArrayList
52-
import java.util.Arrays
45+
import java.util.*
5346
import java.util.stream.Collectors
5447
import javax.servlet.http.HttpServletRequest
5548

src/main/kotlin/com/github/mgramin/sqlboot/tools/files/file/impl/MarkdownFile.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.commonmark.node.FencedCodeBlock
3030
import org.commonmark.node.Heading
3131
import org.commonmark.node.Text
3232
import org.commonmark.parser.Parser
33-
import java.util.LinkedHashMap
33+
import java.util.*
3434

3535
/**
3636
* @author Maksim Gramin (mgramin@gmail.com)

0 commit comments

Comments
 (0)