Skip to content

Commit 10de39a

Browse files
cwperkscwperks
authored
Upgrade to ktlint-cli 1.8.0 (#1962)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent e2737dd commit 10de39a

File tree

63 files changed

+2491
-1675
lines changed

Some content is hidden

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

63 files changed

+2491
-1675
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ dependencies {
231231
testImplementation "org.mockito:mockito-junit-jupiter:${versions.mockito}"
232232
testImplementation "com.google.code.gson:gson:2.8.9"
233233

234-
ktlint "com.pinterest:ktlint:0.47.1"
234+
ktlint "com.pinterest.ktlint:ktlint-cli:1.8.0"
235235
}
236236

237237
javadoc.enabled = false // turn off javadoc as it barfs on Kotlin code

‎src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ import java.util.function.Supplier
4343
* Entry point of the OpenSearch Observability plugin.
4444
* This class initializes the rest handlers.
4545
*/
46-
class ObservabilityPlugin : Plugin(), ActionPlugin, SystemIndexPlugin {
47-
46+
class ObservabilityPlugin :
47+
Plugin(),
48+
ActionPlugin,
49+
SystemIndexPlugin {
4850
companion object {
4951
const val PLUGIN_NAME = "opensearch-observability"
5052
const val LOG_PREFIX = "observability"
@@ -55,19 +57,16 @@ class ObservabilityPlugin : Plugin(), ActionPlugin, SystemIndexPlugin {
5557
/**
5658
* {@inheritDoc}
5759
*/
58-
override fun getSettings(): List<Setting<*>> {
59-
return PluginSettings.getAllSettings()
60-
}
60+
override fun getSettings(): List<Setting<*>> = PluginSettings.getAllSettings()
6161

6262
/**
6363
* {@inheritDoc}
6464
*/
65-
override fun getSystemIndexDescriptors(settings: Settings): Collection<SystemIndexDescriptor> {
66-
return listOf(
65+
override fun getSystemIndexDescriptors(settings: Settings): Collection<SystemIndexDescriptor> =
66+
listOf(
6767
SystemIndexDescriptor(ObservabilityIndex.INDEX_NAME, "Observability Plugin Configuration index"),
68-
SystemIndexDescriptor(ObservabilityIndex.NOTEBOOKS_INDEX_NAME, "Observability Plugin Notebooks index")
68+
SystemIndexDescriptor(ObservabilityIndex.NOTEBOOKS_INDEX_NAME, "Observability Plugin Notebooks index"),
6969
)
70-
}
7170

7271
/**
7372
* {@inheritDoc}
@@ -83,7 +82,7 @@ class ObservabilityPlugin : Plugin(), ActionPlugin, SystemIndexPlugin {
8382
nodeEnvironment: NodeEnvironment,
8483
namedWriteableRegistry: NamedWriteableRegistry,
8584
indexNameExpressionResolver: IndexNameExpressionResolver,
86-
repositoriesServiceSupplier: Supplier<RepositoriesService>
85+
repositoriesServiceSupplier: Supplier<RepositoriesService>,
8786
): Collection<Any> {
8887
PluginSettings.addSettingsUpdateConsumer(clusterService)
8988
ObservabilityIndex.initialize(client, clusterService)
@@ -100,35 +99,33 @@ class ObservabilityPlugin : Plugin(), ActionPlugin, SystemIndexPlugin {
10099
indexScopedSettings: IndexScopedSettings,
101100
settingsFilter: SettingsFilter,
102101
indexNameExpressionResolver: IndexNameExpressionResolver,
103-
nodesInCluster: Supplier<DiscoveryNodes>
104-
): List<RestHandler> {
105-
return listOf(
102+
nodesInCluster: Supplier<DiscoveryNodes>,
103+
): List<RestHandler> =
104+
listOf(
106105
ObservabilityRestHandler(),
107-
ObservabilityStatsRestHandler()
106+
ObservabilityStatsRestHandler(),
108107
)
109-
}
110108

111109
/**
112110
* {@inheritDoc}
113111
*/
114-
override fun getActions(): List<ActionPlugin.ActionHandler<out ActionRequest, out ActionResponse>> {
115-
return listOf(
112+
override fun getActions(): List<ActionPlugin.ActionHandler<out ActionRequest, out ActionResponse>> =
113+
listOf(
116114
ActionPlugin.ActionHandler(
117115
CreateObservabilityObjectAction.ACTION_TYPE,
118-
CreateObservabilityObjectAction::class.java
116+
CreateObservabilityObjectAction::class.java,
119117
),
120118
ActionPlugin.ActionHandler(
121119
DeleteObservabilityObjectAction.ACTION_TYPE,
122-
DeleteObservabilityObjectAction::class.java
120+
DeleteObservabilityObjectAction::class.java,
123121
),
124122
ActionPlugin.ActionHandler(
125123
GetObservabilityObjectAction.ACTION_TYPE,
126-
GetObservabilityObjectAction::class.java
124+
GetObservabilityObjectAction::class.java,
127125
),
128126
ActionPlugin.ActionHandler(
129127
UpdateObservabilityObjectAction.ACTION_TYPE,
130-
UpdateObservabilityObjectAction::class.java
131-
)
128+
UpdateObservabilityObjectAction::class.java,
129+
),
132130
)
133-
}
134131
}

‎src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ import org.opensearch.transport.client.Client
1616
/**
1717
* Create ObservabilityObject transport action
1818
*/
19-
internal class CreateObservabilityObjectAction @Inject constructor(
20-
transportService: TransportService,
21-
client: Client,
22-
actionFilters: ActionFilters,
23-
val xContentRegistry: NamedXContentRegistry
24-
) : PluginBaseAction<CreateObservabilityObjectRequest, CreateObservabilityObjectResponse>(
25-
NAME,
26-
transportService,
27-
client,
28-
actionFilters,
29-
::CreateObservabilityObjectRequest
30-
) {
31-
companion object {
32-
private const val NAME = "cluster:admin/opensearch/observability/create"
33-
internal val ACTION_TYPE = ActionType(NAME, ::CreateObservabilityObjectResponse)
34-
}
19+
internal class CreateObservabilityObjectAction
20+
@Inject
21+
constructor(
22+
transportService: TransportService,
23+
client: Client,
24+
actionFilters: ActionFilters,
25+
val xContentRegistry: NamedXContentRegistry,
26+
) : PluginBaseAction<CreateObservabilityObjectRequest, CreateObservabilityObjectResponse>(
27+
NAME,
28+
transportService,
29+
client,
30+
actionFilters,
31+
::CreateObservabilityObjectRequest,
32+
) {
33+
companion object {
34+
private const val NAME = "cluster:admin/opensearch/observability/create"
35+
internal val ACTION_TYPE = ActionType(NAME, ::CreateObservabilityObjectResponse)
36+
}
3537

36-
/**
37-
* {@inheritDoc}
38-
*/
39-
override fun executeRequest(
40-
request: CreateObservabilityObjectRequest,
41-
user: User?
42-
): CreateObservabilityObjectResponse {
43-
return ObservabilityActions.create(request, user)
38+
/**
39+
* {@inheritDoc}
40+
*/
41+
override fun executeRequest(
42+
request: CreateObservabilityObjectRequest,
43+
user: User?,
44+
): CreateObservabilityObjectResponse = ObservabilityActions.create(request, user)
4445
}
45-
}

‎src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import java.io.IOException
2626
/**
2727
* Action request for creating new configuration.
2828
*/
29-
internal class CreateObservabilityObjectRequest : ActionRequest, ToXContentObject {
29+
internal class CreateObservabilityObjectRequest :
30+
ActionRequest,
31+
ToXContentObject {
3032
val objectId: String?
3133
val type: ObservabilityObjectType
3234
val objectData: BaseObjectData?
@@ -46,21 +48,27 @@ internal class CreateObservabilityObjectRequest : ActionRequest, ToXContentObjec
4648
*/
4749
@JvmStatic
4850
@Throws(IOException::class)
49-
fun parse(parser: XContentParser, id: String? = null): CreateObservabilityObjectRequest {
51+
fun parse(
52+
parser: XContentParser,
53+
id: String? = null,
54+
): CreateObservabilityObjectRequest {
5055
var objectId: String? = id
5156
var type: ObservabilityObjectType? = null
5257
var baseObjectData: BaseObjectData? = null
5358

5459
XContentParserUtils.ensureExpectedToken(
5560
XContentParser.Token.START_OBJECT,
5661
parser.currentToken(),
57-
parser
62+
parser,
5863
)
5964
while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
6065
val fieldName = parser.currentName()
6166
parser.nextToken()
6267
when (fieldName) {
63-
OBJECT_ID_FIELD -> objectId = parser.text()
68+
OBJECT_ID_FIELD -> {
69+
objectId = parser.text()
70+
}
71+
6472
else -> {
6573
val objectTypeForTag = ObservabilityObjectType.fromTagOrDefault(fieldName)
6674
if (objectTypeForTag != ObservabilityObjectType.NONE && baseObjectData == null) {
@@ -82,9 +90,13 @@ internal class CreateObservabilityObjectRequest : ActionRequest, ToXContentObjec
8290
/**
8391
* {@inheritDoc}
8492
*/
85-
override fun toXContent(builder: XContentBuilder?, params: ToXContent.Params?): XContentBuilder {
93+
override fun toXContent(
94+
builder: XContentBuilder?,
95+
params: ToXContent.Params?,
96+
): XContentBuilder {
8697
builder!!
87-
return builder.startObject()
98+
return builder
99+
.startObject()
88100
.fieldIfNotNull(OBJECT_ID_FIELD, objectId)
89101
.field(type.tag, objectData)
90102
.endObject()
@@ -109,13 +121,14 @@ internal class CreateObservabilityObjectRequest : ActionRequest, ToXContentObjec
109121
constructor(input: StreamInput) : super(input) {
110122
objectId = input.readOptionalString()
111123
type = input.readEnum(ObservabilityObjectType::class.java)
112-
objectData = input.readOptionalWriteable(
113-
ObservabilityObjectDataProperties.getReaderForObjectType(
114-
input.readEnum(
115-
ObservabilityObjectType::class.java
116-
)
124+
objectData =
125+
input.readOptionalWriteable(
126+
ObservabilityObjectDataProperties.getReaderForObjectType(
127+
input.readEnum(
128+
ObservabilityObjectType::class.java,
129+
),
130+
),
117131
)
118-
)
119132
}
120133

121134
/**
@@ -133,7 +146,5 @@ internal class CreateObservabilityObjectRequest : ActionRequest, ToXContentObjec
133146
/**
134147
* {@inheritDoc}
135148
*/
136-
override fun validate(): ActionRequestValidationException? {
137-
return null
138-
}
149+
override fun validate(): ActionRequestValidationException? = null
139150
}

‎src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,16 @@ internal class CreateObservabilityObjectResponse : BaseResponse {
4343
XContentParserUtils.ensureExpectedToken(
4444
XContentParser.Token.START_OBJECT,
4545
parser.currentToken(),
46-
parser
46+
parser,
4747
)
4848
while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
4949
val fieldName = parser.currentName()
5050
parser.nextToken()
5151
when (fieldName) {
52-
OBJECT_ID_FIELD -> objectId = parser.text()
52+
OBJECT_ID_FIELD -> {
53+
objectId = parser.text()
54+
}
55+
5356
else -> {
5457
parser.skipChildren()
5558
log.info("Unexpected field: $fieldName, while parsing CreateObservabilityObjectResponse")
@@ -88,9 +91,13 @@ internal class CreateObservabilityObjectResponse : BaseResponse {
8891
/**
8992
* {@inheritDoc}
9093
*/
91-
override fun toXContent(builder: XContentBuilder?, params: ToXContent.Params?): XContentBuilder {
94+
override fun toXContent(
95+
builder: XContentBuilder?,
96+
params: ToXContent.Params?,
97+
): XContentBuilder {
9298
builder!!
93-
return builder.startObject()
99+
return builder
100+
.startObject()
94101
.field(OBJECT_ID_FIELD, objectId)
95102
.endObject()
96103
}

‎src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,30 @@ import org.opensearch.transport.client.Client
1616
/**
1717
* Delete ObservabilityObject transport action
1818
*/
19-
internal class DeleteObservabilityObjectAction @Inject constructor(
20-
transportService: TransportService,
21-
client: Client,
22-
actionFilters: ActionFilters,
23-
val xContentRegistry: NamedXContentRegistry
24-
) : PluginBaseAction<DeleteObservabilityObjectRequest, DeleteObservabilityObjectResponse>(
25-
NAME,
26-
transportService,
27-
client,
28-
actionFilters,
29-
::DeleteObservabilityObjectRequest
30-
) {
31-
companion object {
32-
private const val NAME = "cluster:admin/opensearch/observability/delete"
33-
internal val ACTION_TYPE = ActionType(NAME, ::DeleteObservabilityObjectResponse)
34-
}
19+
internal class DeleteObservabilityObjectAction
20+
@Inject
21+
constructor(
22+
transportService: TransportService,
23+
client: Client,
24+
actionFilters: ActionFilters,
25+
val xContentRegistry: NamedXContentRegistry,
26+
) : PluginBaseAction<DeleteObservabilityObjectRequest, DeleteObservabilityObjectResponse>(
27+
NAME,
28+
transportService,
29+
client,
30+
actionFilters,
31+
::DeleteObservabilityObjectRequest,
32+
) {
33+
companion object {
34+
private const val NAME = "cluster:admin/opensearch/observability/delete"
35+
internal val ACTION_TYPE = ActionType(NAME, ::DeleteObservabilityObjectResponse)
36+
}
3537

36-
/**
37-
* {@inheritDoc}
38-
*/
39-
override fun executeRequest(request: DeleteObservabilityObjectRequest, user: User?): DeleteObservabilityObjectResponse {
40-
return ObservabilityActions.delete(request, user)
38+
/**
39+
* {@inheritDoc}
40+
*/
41+
override fun executeRequest(
42+
request: DeleteObservabilityObjectRequest,
43+
user: User?,
44+
): DeleteObservabilityObjectResponse = ObservabilityActions.delete(request, user)
4145
}
42-
}

‎src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import java.io.IOException
2626
/**
2727
* Action request for creating new configuration.
2828
*/
29-
internal class DeleteObservabilityObjectRequest : ActionRequest, ToXContentObject {
29+
internal class DeleteObservabilityObjectRequest :
30+
ActionRequest,
31+
ToXContentObject {
3032
val objectIds: Set<String>
3133

3234
companion object {
@@ -50,13 +52,16 @@ internal class DeleteObservabilityObjectRequest : ActionRequest, ToXContentObjec
5052
XContentParserUtils.ensureExpectedToken(
5153
XContentParser.Token.START_OBJECT,
5254
parser.currentToken(),
53-
parser
55+
parser,
5456
)
5557
while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
5658
val fieldName = parser.currentName()
5759
parser.nextToken()
5860
when (fieldName) {
59-
OBJECT_ID_LIST_FIELD -> objectIds = parser.stringList().toSet()
61+
OBJECT_ID_LIST_FIELD -> {
62+
objectIds = parser.stringList().toSet()
63+
}
64+
6065
else -> {
6166
parser.skipChildren()
6267
log.info("$LOG_PREFIX:Skipping Unknown field $fieldName")
@@ -96,9 +101,13 @@ internal class DeleteObservabilityObjectRequest : ActionRequest, ToXContentObjec
96101
/**
97102
* {@inheritDoc}
98103
*/
99-
override fun toXContent(builder: XContentBuilder?, params: ToXContent.Params?): XContentBuilder {
104+
override fun toXContent(
105+
builder: XContentBuilder?,
106+
params: ToXContent.Params?,
107+
): XContentBuilder {
100108
builder!!
101-
return builder.startObject()
109+
return builder
110+
.startObject()
102111
.field(OBJECT_ID_LIST_FIELD, objectIds)
103112
.endObject()
104113
}

0 commit comments

Comments
 (0)