Skip to content

Commit b967abc

Browse files
committed
lint: add rules and apply formatting
Signed-off-by: Rohit Ashiwal <rashiwal@amazon.com>
1 parent a5193a7 commit b967abc

File tree

465 files changed

+3778
-3525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

465 files changed

+3778
-3525
lines changed

.editorconfig

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
root = true
44

55
[*.{kt,kts}]
6+
ktlint_code_style = intellij_idea
67
# we have detekt also checking for max line length. Disable the linter and use only one tool to check for max line length.
7-
88
# See https://github.com/arturbosch/detekt
9-
max_line_length=off
9+
ktlint_standard_max-line-length = disabled
10+
ktlint_ignore_back_ticked_identifier = true
11+
12+
ktlint_standard_function-naming = disabled
13+
ktlint_standard_property-naming = disabled
14+
ktlint_standard_function-signature = disabled
15+
ktlint_standard_value-argument-comment = disabled
16+
ktlint_standard_argument-list-wrapping = disabled
17+
ktlint_standard_value-parameter-comment = disabled
1018

11-
disabled_rules=import-ordering

detekt.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ style:
1111
ForbiddenComment:
1212
active: false
1313
MaxLineLength:
14-
maxLineLength: 150
14+
maxLineLength: 160
1515
excludes: ['**/test/**']
1616
FunctionOnlyReturningConstant:
1717
active: false
@@ -20,6 +20,7 @@ complexity:
2020
LargeClass:
2121
excludes: ['**/test/**']
2222
LongMethod:
23+
threshold: 80
2324
excludes: ['**/test/**']
2425
LongParameterList:
2526
excludes: ['**/test/**']

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.time.Instant
1919

2020
abstract class Action(
2121
val type: String,
22-
val actionIndex: Int
22+
val actionIndex: Int,
2323
) : ToXContentObject, Writeable {
2424

2525
var configTimeout: ActionTimeout? = null

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/StatusChecker.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ interface StatusChecker {
1919

2020
enum class Status(private val value: String) {
2121
ENABLED("enabled"),
22-
DISABLED("disabled");
22+
DISABLED("disabled"),
23+
;
2324

2425
override fun toString(): String {
2526
return value

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Step.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ abstract class Step(val name: String, val isSafeToDisableOn: Boolean = true) {
5656
STARTING("starting"),
5757
CONDITION_NOT_MET("condition_not_met"),
5858
FAILED("failed"),
59-
COMPLETED("completed");
59+
COMPLETED("completed"),
60+
;
6061

6162
override fun toString(): String {
6263
return status

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Validate.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

88
import org.opensearch.cluster.service.ClusterService
9+
import org.opensearch.common.settings.Settings
910
import org.opensearch.core.common.io.stream.StreamInput
1011
import org.opensearch.core.common.io.stream.StreamOutput
1112
import org.opensearch.core.common.io.stream.Writeable
12-
import org.opensearch.common.settings.Settings
1313
import org.opensearch.monitor.jvm.JvmService
1414
import java.util.Locale
1515

1616
abstract class Validate(
1717
val settings: Settings,
1818
val clusterService: ClusterService,
19-
val jvmService: JvmService
19+
val jvmService: JvmService,
2020
) {
2121

2222
var validationStatus = ValidationStatus.PASSED
@@ -27,7 +27,8 @@ abstract class Validate(
2727
enum class ValidationStatus(val status: String) : Writeable {
2828
PASSED("passed"),
2929
RE_VALIDATING("re_validating"),
30-
FAILED("failed");
30+
FAILED("failed"),
31+
;
3132

3233
override fun toString(): String {
3334
return status

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionMetaData.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8+
import org.opensearch.common.xcontent.LoggingDeprecationHandler
9+
import org.opensearch.common.xcontent.XContentType
810
import org.opensearch.core.common.Strings
911
import org.opensearch.core.common.io.stream.StreamInput
1012
import org.opensearch.core.common.io.stream.StreamOutput
1113
import org.opensearch.core.common.io.stream.Writeable
12-
import org.opensearch.common.xcontent.LoggingDeprecationHandler
1314
import org.opensearch.core.xcontent.NamedXContentRegistry
1415
import org.opensearch.core.xcontent.ToXContent
1516
import org.opensearch.core.xcontent.ToXContentFragment
1617
import org.opensearch.core.xcontent.XContentBuilder
1718
import org.opensearch.core.xcontent.XContentParser
18-
import org.opensearch.common.xcontent.XContentType
1919
import org.opensearch.core.xcontent.XContentParserUtils
2020
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME
2121
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME
@@ -29,7 +29,7 @@ data class ActionMetaData(
2929
val failed: Boolean,
3030
val consumedRetries: Int,
3131
val lastRetryTime: Long?,
32-
val actionProperties: ActionProperties?
32+
val actionProperties: ActionProperties?,
3333
) : Writeable, ToXContentFragment {
3434

3535
override fun writeTo(out: StreamOutput) {
@@ -89,7 +89,7 @@ data class ActionMetaData(
8989
requireNotNull(failed) { "$FAILED is null" },
9090
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" },
9191
lastRetryTime,
92-
actionProperties
92+
actionProperties,
9393
)
9494
}
9595

@@ -139,7 +139,7 @@ data class ActionMetaData(
139139
requireNotNull(failed) { "$FAILED is null" },
140140
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" },
141141
lastRetryTime,
142-
actionProperties
142+
actionProperties,
143143
)
144144
}
145145
}

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionProperties.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data class ActionProperties(
2424
val rollupId: String? = null,
2525
val hasRollupFailed: Boolean? = null,
2626
val shrinkActionProperties: ShrinkActionProperties? = null,
27-
val transformActionProperties: TransformActionProperties? = null
27+
val transformActionProperties: TransformActionProperties? = null,
2828
) : Writeable, ToXContentFragment {
2929

3030
override fun writeTo(out: StreamOutput) {
@@ -94,6 +94,6 @@ data class ActionProperties(
9494
MAX_NUM_SEGMENTS("max_num_segments"),
9595
SNAPSHOT_NAME("snapshot_name"),
9696
ROLLUP_ID("rollup_id"),
97-
HAS_ROLLUP_FAILED("has_rollup_failed")
97+
HAS_ROLLUP_FAILED("has_rollup_failed"),
9898
}
9999
}

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionRetry.kt

+12-9
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

88
import org.apache.logging.log4j.LogManager
9+
import org.opensearch.common.unit.TimeValue
910
import org.opensearch.core.common.io.stream.StreamInput
1011
import org.opensearch.core.common.io.stream.StreamOutput
1112
import org.opensearch.core.common.io.stream.Writeable
12-
import org.opensearch.common.unit.TimeValue
1313
import org.opensearch.core.xcontent.ToXContent
1414
import org.opensearch.core.xcontent.ToXContentFragment
1515
import org.opensearch.core.xcontent.XContentBuilder
@@ -23,10 +23,12 @@ import kotlin.math.pow
2323
data class ActionRetry(
2424
val count: Long,
2525
val backoff: Backoff = Backoff.EXPONENTIAL,
26-
val delay: TimeValue = TimeValue.timeValueMinutes(1)
26+
val delay: TimeValue = TimeValue.timeValueMinutes(1),
2727
) : ToXContentFragment, Writeable {
2828

29-
init { require(count >= 0) { "Count for ActionRetry must be a non-negative number" } }
29+
init {
30+
require(count >= 0) { "Count for ActionRetry must be a non-negative number" }
31+
}
3032

3133
override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
3234
builder
@@ -42,7 +44,7 @@ data class ActionRetry(
4244
constructor(sin: StreamInput) : this(
4345
count = sin.readLong(),
4446
backoff = sin.readEnum(Backoff::class.java),
45-
delay = sin.readTimeValue()
47+
delay = sin.readTimeValue(),
4648
)
4749

4850
@Throws(IOException::class)
@@ -80,7 +82,7 @@ data class ActionRetry(
8082
return ActionRetry(
8183
count = requireNotNull(count) { "ActionRetry count is null" },
8284
backoff = backoff,
83-
delay = delay
85+
delay = delay,
8486
)
8587
}
8688
}
@@ -90,20 +92,21 @@ data class ActionRetry(
9092
"exponential",
9193
{ consumedRetries, timeValue ->
9294
(2.0.pow(consumedRetries - 1)).toLong() * timeValue.millis
93-
}
95+
},
9496
),
9597
CONSTANT(
9698
"constant",
9799
{ _, timeValue ->
98100
timeValue.millis
99-
}
101+
},
100102
),
101103
LINEAR(
102104
"linear",
103105
{ consumedRetries, timeValue ->
104106
consumedRetries * timeValue.millis
105-
}
106-
);
107+
},
108+
),
109+
;
107110

108111
private val logger = LogManager.getLogger(javaClass)
109112

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionTimeout.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8+
import org.opensearch.common.unit.TimeValue
89
import org.opensearch.core.common.io.stream.StreamInput
910
import org.opensearch.core.common.io.stream.StreamOutput
1011
import org.opensearch.core.common.io.stream.Writeable
11-
import org.opensearch.common.unit.TimeValue
1212
import org.opensearch.core.xcontent.ToXContent
1313
import org.opensearch.core.xcontent.ToXContentFragment
1414
import org.opensearch.core.xcontent.XContentBuilder
@@ -23,7 +23,7 @@ data class ActionTimeout(val timeout: TimeValue) : ToXContentFragment, Writeable
2323

2424
@Throws(IOException::class)
2525
constructor(sin: StreamInput) : this(
26-
timeout = sin.readTimeValue()
26+
timeout = sin.readTimeValue(),
2727
)
2828

2929
@Throws(IOException::class)

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ManagedIndexMetaData.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8+
import org.opensearch.common.xcontent.XContentFactory
9+
import org.opensearch.common.xcontent.XContentHelper
10+
import org.opensearch.common.xcontent.json.JsonXContent
811
import org.opensearch.core.common.io.stream.StreamInput
912
import org.opensearch.core.common.io.stream.StreamOutput
1013
import org.opensearch.core.common.io.stream.Writeable
1114
import org.opensearch.core.xcontent.ToXContent
1215
import org.opensearch.core.xcontent.ToXContentFragment
1316
import org.opensearch.core.xcontent.XContentBuilder
14-
import org.opensearch.common.xcontent.XContentFactory
15-
import org.opensearch.common.xcontent.XContentHelper
1617
import org.opensearch.core.xcontent.XContentParser
1718
import org.opensearch.core.xcontent.XContentParserUtils
18-
import org.opensearch.common.xcontent.json.JsonXContent
1919
import org.opensearch.index.seqno.SequenceNumbers
2020
import org.opensearch.indexmanagement.spi.indexstatemanagement.addObject
2121
import java.io.IOException
@@ -43,7 +43,7 @@ data class ManagedIndexMetaData(
4343

4444
@Suppress("ComplexMethod")
4545
fun toMap(): Map<String, String> {
46-
val resultMap = mutableMapOf<String, String> ()
46+
val resultMap = mutableMapOf<String, String>()
4747
resultMap[INDEX] = index
4848
resultMap[INDEX_UUID] = indexUuid
4949
resultMap[POLICY_ID] = policyID
@@ -220,7 +220,7 @@ data class ManagedIndexMetaData(
220220
actionMetaData = action,
221221
stepMetaData = step,
222222
policyRetryInfo = retryInfo,
223-
info = info
223+
info = info,
224224
)
225225
}
226226

@@ -232,7 +232,7 @@ data class ManagedIndexMetaData(
232232
xcp: XContentParser,
233233
id: String = NO_ID,
234234
seqNo: Long = SequenceNumbers.UNASSIGNED_SEQ_NO,
235-
primaryTerm: Long = SequenceNumbers.UNASSIGNED_PRIMARY_TERM
235+
primaryTerm: Long = SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
236236
): ManagedIndexMetaData {
237237
var index: String? = null
238238
var indexUuid: String? = null
@@ -314,7 +314,7 @@ data class ManagedIndexMetaData(
314314
xcp: XContentParser,
315315
id: String = NO_ID,
316316
seqNo: Long = SequenceNumbers.UNASSIGNED_SEQ_NO,
317-
primaryTerm: Long = SequenceNumbers.UNASSIGNED_PRIMARY_TERM
317+
primaryTerm: Long = SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
318318
): ManagedIndexMetaData {
319319
XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.nextToken(), xcp)
320320
XContentParserUtils.ensureExpectedToken(XContentParser.Token.FIELD_NAME, xcp.nextToken(), xcp)
@@ -340,7 +340,7 @@ data class ManagedIndexMetaData(
340340
actionMetaData = ActionMetaData.fromManagedIndexMetaDataMap(map),
341341
stepMetaData = StepMetaData.fromManagedIndexMetaDataMap(map),
342342
policyRetryInfo = PolicyRetryInfoMetaData.fromManagedIndexMetaDataMap(map),
343-
info = map[INFO]?.let { XContentHelper.convertToMap(JsonXContent.jsonXContent, it, false) }
343+
info = map[INFO]?.let { XContentHelper.convertToMap(JsonXContent.jsonXContent, it, false) },
344344
)
345345
}
346346
}

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/PolicyRetryInfoMetaData.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8+
import org.opensearch.common.xcontent.LoggingDeprecationHandler
9+
import org.opensearch.common.xcontent.XContentType
810
import org.opensearch.core.common.Strings
911
import org.opensearch.core.common.io.stream.StreamInput
1012
import org.opensearch.core.common.io.stream.StreamOutput
1113
import org.opensearch.core.common.io.stream.Writeable
12-
import org.opensearch.common.xcontent.LoggingDeprecationHandler
1314
import org.opensearch.core.xcontent.NamedXContentRegistry
1415
import org.opensearch.core.xcontent.ToXContent
1516
import org.opensearch.core.xcontent.ToXContentFragment
1617
import org.opensearch.core.xcontent.XContentBuilder
1718
import org.opensearch.core.xcontent.XContentParser
1819
import org.opensearch.core.xcontent.XContentParserUtils
19-
import org.opensearch.common.xcontent.XContentType
2020
import java.io.ByteArrayInputStream
2121
import java.nio.charset.StandardCharsets
2222

2323
data class PolicyRetryInfoMetaData(
2424
val failed: Boolean,
25-
val consumedRetries: Int
25+
val consumedRetries: Int,
2626
) : Writeable, ToXContentFragment {
2727

2828
override fun writeTo(out: StreamOutput) {
@@ -49,7 +49,7 @@ data class PolicyRetryInfoMetaData(
4949

5050
return PolicyRetryInfoMetaData(
5151
requireNotNull(failed) { "$FAILED is null" },
52-
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" }
52+
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" },
5353
)
5454
}
5555

@@ -82,7 +82,7 @@ data class PolicyRetryInfoMetaData(
8282

8383
return PolicyRetryInfoMetaData(
8484
requireNotNull(failed) { "$FAILED is null" },
85-
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" }
85+
requireNotNull(consumedRetries) { "$CONSUMED_RETRIES is null" },
8686
)
8787
}
8888
}

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ShrinkActionProperties.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data class ShrinkActionProperties(
2323
val lockEpochSecond: Long,
2424
val lockDurationSecond: Long,
2525
// Used to store the original index allocation and write block setting to reapply after shrink
26-
val originalIndexSettings: Map<String, String>
26+
val originalIndexSettings: Map<String, String>,
2727
) : Writeable, ToXContentFragment {
2828

2929
override fun writeTo(out: StreamOutput) {
@@ -63,7 +63,7 @@ data class ShrinkActionProperties(
6363
val originalIndexSettings: Map<String, String> = si.readMap({ it.readString() }, { it.readString() })
6464

6565
return ShrinkActionProperties(
66-
nodeName, targetIndexName, targetNumShards, lockPrimaryTerm, lockSeqNo, lockEpochSecond, lockDurationSecond, originalIndexSettings
66+
nodeName, targetIndexName, targetNumShards, lockPrimaryTerm, lockSeqNo, lockEpochSecond, lockDurationSecond, originalIndexSettings,
6767
)
6868
}
6969

@@ -102,7 +102,7 @@ data class ShrinkActionProperties(
102102
requireNotNull(lockSeqNo),
103103
requireNotNull(lockEpochSecond),
104104
requireNotNull(lockDurationSecond),
105-
requireNotNull(originalIndexSettings)
105+
requireNotNull(originalIndexSettings),
106106
)
107107
}
108108
}
@@ -115,6 +115,6 @@ data class ShrinkActionProperties(
115115
LOCK_PRIMARY_TERM("lock_primary_term"),
116116
LOCK_EPOCH_SECOND("lock_epoch_second"),
117117
LOCK_DURATION_SECOND("lock_duration_second"),
118-
ORIGINAL_INDEX_SETTINGS("original_index_settings")
118+
ORIGINAL_INDEX_SETTINGS("original_index_settings"),
119119
}
120120
}

0 commit comments

Comments
 (0)