Skip to content

Commit dadabf5

Browse files
committed
Fix(CDI): For Migrate program
1 parent 33e4a6b commit dadabf5

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

src/main/kotlin/org/duangsuse/geekapk/GeekApkApplication.kt

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
1313
import org.springframework.boot.runApplication
1414
import org.springframework.boot.web.servlet.ServletComponentScan
1515
import org.springframework.context.annotation.Bean
16+
import org.springframework.stereotype.Component
1617
import java.io.BufferedInputStream
1718
import java.io.IOException
1819
import java.util.*
1920

2021
/**
2122
* Database source CDI consumer
2223
*/
24+
@Component
2325
class DbDataSource {
24-
@Autowired lateinit var apps: AppRepository
25-
@Autowired lateinit var revs: AppUpdateRepository
26-
@Autowired lateinit var comments: CommentRepository
27-
@Autowired lateinit var users: UserRepository
28-
@Autowired lateinit var timeline: TimelineRepository
29-
@Autowired lateinit var notifications: NotificationRepository
30-
@Autowired lateinit var categories: CategoryRepository
31-
@Autowired lateinit var collaborators: CollabRelRepository
32-
@Autowired lateinit var follow: FollowRelRepository
33-
@Autowired lateinit var star: StarRelRepository
34-
fun dumpDb() {
35-
val rel = RelationMigrationRepositories(collaborators, follow, star)
36-
37-
val a = MigrationRepositoriesA(apps, revs, comments)
38-
val b = MigrationRepositoriesB(users, timeline, notifications)
39-
val c = MigrationRepositoriesC(categories, rel)
40-
26+
fun dumpDb(a: MigrationRepositoriesA, b: MigrationRepositoriesB, c: MigrationRepositoriesC) {
4127
val migration = Migrates.Migration(a, b, c)
4228
Migrates.dumpAll(migration)
4329
}
@@ -53,6 +39,23 @@ class DbDataSource {
5339
@SpringBootApplication
5440
@EnableAutoConfiguration
5541
class GeekApkApplication {
42+
@Autowired(required = false) lateinit var apps: AppRepository
43+
@Autowired(required = false) lateinit var revs: AppUpdateRepository
44+
@Autowired(required = false) lateinit var comments: CommentRepository
45+
@Autowired(required = false) lateinit var users: UserRepository
46+
@Autowired(required = false) lateinit var timeline: TimelineRepository
47+
@Autowired(required = false) lateinit var notifications: NotificationRepository
48+
@Autowired(required = false) lateinit var categories: CategoryRepository
49+
@Autowired(required = false) lateinit var collaborators: CollabRelRepository
50+
@Autowired(required = false) lateinit var follow: FollowRelRepository
51+
@Autowired(required = false) lateinit var star: StarRelRepository
52+
53+
fun rel() = RelationMigrationRepositories(collaborators, follow, star)
54+
55+
fun a() = MigrationRepositoriesA(apps, revs, comments)
56+
fun b() = MigrationRepositoriesB(users, timeline, notifications)
57+
fun c() = MigrationRepositoriesC(categories, rel())
58+
5659
/**
5760
* Print welcome message and (may process initialization files)
5861
*/
@@ -91,7 +94,7 @@ class GeekApkApplication {
9194
"--help", "help" -> println("Program usage: geekapk [version|help|licence]" +
9295
"Find help at https://github.com/duangsuse/GeekApk")
9396
"--licence", "licence" -> println("Copyright (C) 2019 duangsuse, GeekApk Spring, licenced under GNU AGPL-3.0")
94-
"dump!" -> DbDataSource().dumpDb()
97+
"dump!" -> DbDataSource().dumpDb(a(), b(), c())
9598
else -> println("Warning: unknown operation")
9699
}
97100
else -> println("Warning: unexpected argument vector length: ${args.size}")

src/main/kotlin/org/duangsuse/geekapk/controller/LimitController.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ class LimitController {
1111
@GetMapping("/limit")
1212
@ResponseBody
1313
fun getMyLimit(): LimitMap {
14-
TODO()
14+
return limitMap
15+
}
16+
17+
companion object {
18+
val limitMap: LimitMap = mutableMapOf()
1519
}
1620
}

src/main/kotlin/org/duangsuse/geekapk/middleware/ServerAdminAuthenticationFilter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse
1212
@WebFilter("/admin/*")
1313
class ServerAdminAuthenticationFilter: OncePerRequestFilter() {
1414
override fun doFilterInternal(request: HttpServletRequest, response: HttpServletResponse, filterChain: FilterChain) {
15-
1615
filterChain.doFilter(request, response)
1716
}
1817
}

0 commit comments

Comments
 (0)