Skip to content

Commit 4ceb9e7

Browse files
authored
fix(kotlin): spring config classes shouldn't use constructors (#3030)
1 parent 2444bf8 commit 4ceb9e7

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎orca/orca-core/src/main/java/com/netflix/spinnaker/orca/config/DefaultApplicationConfigurationProperties.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties
2222
* value will be used instead.
2323
*/
2424
@ConfigurationProperties("orca")
25-
data class DefaultApplicationConfigurationProperties(
25+
class DefaultApplicationConfigurationProperties {
2626
var defaultApplicationName: String = "spinnaker_unknown"
27-
)
27+
}

‎orca/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlProperties.kt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,38 @@ import java.util.concurrent.TimeUnit.SECONDS
2828
* @param batchReadSize Defines the internal page size for large select scans
2929
*/
3030
@ConfigurationProperties("sql")
31-
data class SqlProperties(
32-
var migration: MigrationProperties = MigrationProperties(),
33-
var connectionPool: ConnectionPoolProperties = ConnectionPoolProperties(),
34-
var transactionRetry: TransactionRetryProperties = TransactionRetryProperties(),
35-
var partitionName: String? = null,
36-
var batchReadSize: Int = 10,
31+
class SqlProperties {
32+
var migration: MigrationProperties = MigrationProperties()
33+
var connectionPool: ConnectionPoolProperties = ConnectionPoolProperties()
34+
var transactionRetry: TransactionRetryProperties = TransactionRetryProperties()
35+
var partitionName: String? = null
36+
var batchReadSize: Int = 10
3737
var stageReadSize: Int = 200
38-
)
38+
}
3939

40-
data class MigrationProperties(
41-
var jdbcUrl: String = "jdbc:mysql://localhost/orca",
42-
var user: String? = null,
43-
var password: String? = null,
44-
var driver: String? = null,
40+
class MigrationProperties {
41+
var jdbcUrl: String = "jdbc:mysql://localhost/orca"
42+
var user: String? = null
43+
var password: String? = null
44+
var driver: String? = null
4545
var additionalChangeLogs: List<String> = mutableListOf()
46-
)
46+
}
4747

48-
data class ConnectionPoolProperties(
49-
var dialect: SQLDialect = SQLDialect.MYSQL,
50-
var jdbcUrl: String = "jdbc:mysql://localhost/orca",
51-
var driver: String? = null,
52-
var user: String? = null,
53-
var password: String? = null,
54-
var connectionTimeoutMs: Long = SECONDS.toMillis(5),
55-
var validationTimeoutMs: Long = SECONDS.toMillis(5),
56-
var idleTimeoutMs: Long = MINUTES.toMillis(1),
57-
var maxLifetimeMs: Long = SECONDS.toMillis(30),
58-
var minIdle: Int = 5,
48+
class ConnectionPoolProperties {
49+
var dialect: SQLDialect = SQLDialect.MYSQL
50+
var jdbcUrl: String = "jdbc:mysql://localhost/orca"
51+
var driver: String? = null
52+
var user: String? = null
53+
var password: String? = null
54+
var connectionTimeoutMs: Long = SECONDS.toMillis(5)
55+
var validationTimeoutMs: Long = SECONDS.toMillis(5)
56+
var idleTimeoutMs: Long = MINUTES.toMillis(1)
57+
var maxLifetimeMs: Long = SECONDS.toMillis(30)
58+
var minIdle: Int = 5
5959
var maxPoolSize: Int = 20
60-
)
60+
}
6161

62-
data class TransactionRetryProperties(
63-
var maxRetries: Int = 5,
62+
class TransactionRetryProperties {
63+
var maxRetries: Int = 5
6464
var backoffMs: Long = 100
65-
)
65+
}

0 commit comments

Comments
 (0)