Skip to content

Commit 7c3633c

Browse files
committed
refactor: move GeminiTextModel to domain/model and remove Jackson annotations from DTOs
1 parent fc95ad1 commit 7c3633c

8 files changed

Lines changed: 8 additions & 15 deletions

File tree

src/main/kotlin/com/project/codereview/client/google/GoogleGeminiClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.genai.types.Content
55
import com.google.genai.types.GenerateContentConfig
66
import com.google.genai.types.Part
77
import com.google.genai.types.ThinkingConfig
8-
import com.project.codereview.client.util.GeminiTextModel
8+
import com.project.codereview.domain.model.GeminiTextModel
99
import kotlinx.coroutines.Dispatchers
1010
import kotlinx.coroutines.withContext
1111
import org.slf4j.LoggerFactory

src/main/kotlin/com/project/codereview/core/controller/CodeReviewController.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.project.codereview.core.controller
22

33
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
44
import com.fasterxml.jackson.module.kotlin.readValue
5+
import com.fasterxml.jackson.databind.DeserializationFeature
56
import com.project.codereview.domain.model.GithubEvent
67
import com.project.codereview.domain.model.GithubPayload
78
import com.project.codereview.core.service.CodeReviewFacade
@@ -21,7 +22,7 @@ class CodeReviewController(
2122
private val codeReviewFacade: CodeReviewFacade
2223
) {
2324
private val log = LoggerFactory.getLogger(CodeReviewController::class.java)
24-
private val mapper = jacksonObjectMapper()
25+
private val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
2526

2627
@PostMapping("/api/code/review")
2728
suspend fun webhook(

src/main/kotlin/com/project/codereview/core/service/CodeReviewFacade.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.project.codereview.core.service
33
import com.project.codereview.client.github.GithubDiffClient
44
import com.project.codereview.client.github.GithubDiffUtils
55
import com.project.codereview.domain.model.ReviewContext
6-
import com.project.codereview.client.util.GeminiTextModel
6+
import com.project.codereview.domain.model.GeminiTextModel
77
import com.project.codereview.domain.model.GithubActionType
88
import com.project.codereview.domain.model.GithubEvent
99
import com.project.codereview.domain.model.GithubPayload

src/main/kotlin/com/project/codereview/core/service/CodeReviewService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.project.codereview.client.github.GithubReviewClient
44
import com.project.codereview.domain.model.ReviewContext
55
import com.project.codereview.domain.model.ReviewType
66
import com.project.codereview.client.google.GoogleGeminiClient
7-
import com.project.codereview.client.util.GeminiTextModel
7+
import com.project.codereview.domain.model.GeminiTextModel
88
import com.project.codereview.client.util.REJECT_REVIEW
99
import com.project.codereview.client.util.SYSTEM_PROMPT_COMMON
1010
import com.project.codereview.domain.model.GithubPayload

src/main/kotlin/com/project/codereview/core/service/CodeSummaryService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.project.codereview.client.github.GithubReviewClient
44
import com.project.codereview.domain.model.ReviewContext
55
import com.project.codereview.domain.model.ReviewType
66
import com.project.codereview.client.google.GoogleGeminiClient
7-
import com.project.codereview.client.util.GeminiTextModel
7+
import com.project.codereview.domain.model.GeminiTextModel
88
import com.project.codereview.client.util.SUMMARY_PROMPT
99
import com.project.codereview.domain.model.GithubPayload
1010
import org.slf4j.LoggerFactory

src/main/kotlin/com/project/codereview/core/service/ReviewJobQueue.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.project.codereview.core.service
22

33
import com.project.codereview.domain.model.ReviewContext
4-
import com.project.codereview.client.util.GeminiTextModel
4+
import com.project.codereview.domain.model.GeminiTextModel
55
import com.project.codereview.domain.model.GithubPayload
66
import jakarta.annotation.PostConstruct
77
import jakarta.annotation.PreDestroy
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
package com.project.codereview.domain.model
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
43

5-
@JsonIgnoreProperties(ignoreUnknown = true)
64
data class GithubPayload(
75
val action: String,
86
val number: String,
97
val installation: InstallationPayload,
108
val pull_request: PullRequestPayload,
119
)
1210

13-
@JsonIgnoreProperties(ignoreUnknown = true)
1411
data class InstallationPayload(
1512
val id: String
1613
)
1714

18-
@JsonIgnoreProperties(ignoreUnknown = true)
1915
data class PullRequestPayload(
2016
val url: String,
2117
val labels: List<LabelPayload> = emptyList(),
@@ -31,23 +27,19 @@ data class PullRequestPayload(
3127
val isMergingToDefaultBranch get() = head.repo.default_branch == base.ref
3228
}
3329

34-
@JsonIgnoreProperties(ignoreUnknown = true)
3530
data class PullRequestHeadPayload(
3631
val sha: String,
3732
val repo: RepositoryPayload
3833
)
3934

40-
@JsonIgnoreProperties(ignoreUnknown = true)
4135
data class RepositoryPayload(
4236
val default_branch: String
4337
)
4438

45-
@JsonIgnoreProperties(ignoreUnknown = true)
4639
data class BasePayload(
4740
val ref: String
4841
)
4942

50-
@JsonIgnoreProperties(ignoreUnknown = true)
5143
data class LabelPayload(
5244
val name: String
5345
)

src/main/kotlin/com/project/codereview/client/util/ReviewModels.kt renamed to src/main/kotlin/com/project/codereview/domain/model/ReviewModels.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.project.codereview.client.util
1+
package com.project.codereview.domain.model
22

33
/**
44
* https://aistudio.google.com/usage?timeRange=last-28-days&tab=rate-limit&project=gen-lang-client-0257700374

0 commit comments

Comments
 (0)