Skip to content

Commit 2a07283

Browse files
rupal-bqrupal-bq
committed
merge 2.x
Signed-off-by: Rupal Mahajan <[email protected]>
2 parents 3760983 + b7c471d commit 2a07283

File tree

64 files changed

+360
-289
lines changed

Some content is hidden

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

64 files changed

+360
-289
lines changed

‎reports-scheduler/build.gradle

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ buildscript {
4040
classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"
4141
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
4242
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
43-
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0"
4443
classpath "org.jacoco:org.jacoco.agent:0.8.5"
4544
}
4645
}
@@ -57,7 +56,6 @@ apply plugin: 'idea'
5756
apply plugin: 'opensearch.opensearchplugin'
5857
apply plugin: 'opensearch.pluginzip'
5958
apply plugin: 'opensearch.testclusters'
60-
apply plugin: 'io.gitlab.arturbosch.detekt'
6159
apply plugin: 'org.jetbrains.kotlin.jvm'
6260
apply plugin: 'org.jetbrains.kotlin.plugin.allopen'
6361

@@ -107,11 +105,6 @@ configurations {
107105
testRuntime
108106
}
109107

110-
detekt {
111-
config = files("detekt.yml")
112-
buildUponDefaultConfig = true
113-
}
114-
115108
configurations.testCompile {
116109
exclude module: "securemock"
117110
}
@@ -164,7 +157,7 @@ dependencies {
164157
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
165158
implementation "org.json:json:20180813"
166159
implementation group: 'com.github.wnameless', name: 'json-flattener', version: '0.1.0'
167-
implementation 'org.jsoup:jsoup:1.14.3'
160+
implementation 'org.jsoup:jsoup:1.15.3'
168161
implementation 'com.google.code.gson:gson:2.8.9'
169162
implementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
170163

@@ -179,7 +172,7 @@ dependencies {
179172
testCompile "org.mockito:mockito-core:3.12.4"
180173
testCompile 'com.google.code.gson:gson:2.8.9'
181174

182-
ktlint "com.pinterest:ktlint:0.33.0"
175+
ktlint "com.pinterest:ktlint:0.45.1"
183176
}
184177

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

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,26 @@
55

66
package org.opensearch.reportsscheduler
77

8+
import org.opensearch.action.ActionRequest
9+
import org.opensearch.action.ActionResponse
10+
import org.opensearch.client.Client
11+
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
12+
import org.opensearch.cluster.node.DiscoveryNodes
13+
import org.opensearch.cluster.service.ClusterService
14+
import org.opensearch.common.io.stream.NamedWriteableRegistry
15+
import org.opensearch.common.settings.ClusterSettings
16+
import org.opensearch.common.settings.IndexScopedSettings
17+
import org.opensearch.common.settings.Setting
18+
import org.opensearch.common.settings.Settings
19+
import org.opensearch.common.settings.SettingsFilter
20+
import org.opensearch.common.xcontent.NamedXContentRegistry
21+
import org.opensearch.env.Environment
22+
import org.opensearch.env.NodeEnvironment
823
import org.opensearch.jobscheduler.spi.JobSchedulerExtension
924
import org.opensearch.jobscheduler.spi.ScheduledJobParser
1025
import org.opensearch.jobscheduler.spi.ScheduledJobRunner
26+
import org.opensearch.plugins.ActionPlugin
27+
import org.opensearch.plugins.Plugin
1128
import org.opensearch.reportsscheduler.action.CreateReportDefinitionAction
1229
import org.opensearch.reportsscheduler.action.DeleteReportDefinitionAction
1330
import org.opensearch.reportsscheduler.action.GetAllReportDefinitionsAction
@@ -30,24 +47,6 @@ import org.opensearch.reportsscheduler.resthandler.ReportStatsRestHandler
3047
import org.opensearch.reportsscheduler.scheduler.ReportDefinitionJobParser
3148
import org.opensearch.reportsscheduler.scheduler.ReportDefinitionJobRunner
3249
import org.opensearch.reportsscheduler.settings.PluginSettings
33-
34-
import org.opensearch.action.ActionRequest
35-
import org.opensearch.action.ActionResponse
36-
import org.opensearch.client.Client
37-
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
38-
import org.opensearch.cluster.node.DiscoveryNodes
39-
import org.opensearch.cluster.service.ClusterService
40-
import org.opensearch.common.io.stream.NamedWriteableRegistry
41-
import org.opensearch.common.settings.ClusterSettings
42-
import org.opensearch.common.settings.IndexScopedSettings
43-
import org.opensearch.common.settings.Setting
44-
import org.opensearch.common.settings.Settings
45-
import org.opensearch.common.settings.SettingsFilter
46-
import org.opensearch.common.xcontent.NamedXContentRegistry
47-
import org.opensearch.env.Environment
48-
import org.opensearch.env.NodeEnvironment
49-
import org.opensearch.plugins.ActionPlugin
50-
import org.opensearch.plugins.Plugin
5150
import org.opensearch.repositories.RepositoriesService
5251
import org.opensearch.rest.RestController
5352
import org.opensearch.rest.RestHandler

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/CreateReportDefinitionAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.CreateReportDefinitionRequest
10-
import org.opensearch.reportsscheduler.model.CreateReportDefinitionResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.CreateReportDefinitionRequest
15+
import org.opensearch.reportsscheduler.model.CreateReportDefinitionResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class CreateReportDefinitionAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<CreateReportDefinitionRequest, CreateReportDefinitionResponse>(NAME,
26+
) : PluginBaseAction<CreateReportDefinitionRequest, CreateReportDefinitionResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::CreateReportDefinitionRequest) {
31+
::CreateReportDefinitionRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/definition/create"
3335
internal val ACTION_TYPE = ActionType(NAME, ::CreateReportDefinitionResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/DeleteReportDefinitionAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.DeleteReportDefinitionRequest
10-
import org.opensearch.reportsscheduler.model.DeleteReportDefinitionResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.DeleteReportDefinitionRequest
15+
import org.opensearch.reportsscheduler.model.DeleteReportDefinitionResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class DeleteReportDefinitionAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<DeleteReportDefinitionRequest, DeleteReportDefinitionResponse>(NAME,
26+
) : PluginBaseAction<DeleteReportDefinitionRequest, DeleteReportDefinitionResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::DeleteReportDefinitionRequest) {
31+
::DeleteReportDefinitionRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/definition/delete"
3335
internal val ACTION_TYPE = ActionType(NAME, ::DeleteReportDefinitionResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/GetAllReportDefinitionsAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsRequest
10-
import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsRequest
15+
import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class GetAllReportDefinitionsAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<GetAllReportDefinitionsRequest, GetAllReportDefinitionsResponse>(NAME,
26+
) : PluginBaseAction<GetAllReportDefinitionsRequest, GetAllReportDefinitionsResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::GetAllReportDefinitionsRequest) {
31+
::GetAllReportDefinitionsRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/definition/list"
3335
internal val ACTION_TYPE = ActionType(NAME, ::GetAllReportDefinitionsResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/GetAllReportInstancesAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.GetAllReportInstancesRequest
10-
import org.opensearch.reportsscheduler.model.GetAllReportInstancesResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.GetAllReportInstancesRequest
15+
import org.opensearch.reportsscheduler.model.GetAllReportInstancesResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class GetAllReportInstancesAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<GetAllReportInstancesRequest, GetAllReportInstancesResponse>(NAME,
26+
) : PluginBaseAction<GetAllReportInstancesRequest, GetAllReportInstancesResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::GetAllReportInstancesRequest) {
31+
::GetAllReportInstancesRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/instance/list"
3335
internal val ACTION_TYPE = ActionType(NAME, ::GetAllReportInstancesResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/GetReportDefinitionAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.GetReportDefinitionRequest
10-
import org.opensearch.reportsscheduler.model.GetReportDefinitionResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.GetReportDefinitionRequest
15+
import org.opensearch.reportsscheduler.model.GetReportDefinitionResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class GetReportDefinitionAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<GetReportDefinitionRequest, GetReportDefinitionResponse>(NAME,
26+
) : PluginBaseAction<GetReportDefinitionRequest, GetReportDefinitionResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::GetReportDefinitionRequest) {
31+
::GetReportDefinitionRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/definition/get"
3335
internal val ACTION_TYPE = ActionType(NAME, ::GetReportDefinitionResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/GetReportInstanceAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.GetReportInstanceRequest
10-
import org.opensearch.reportsscheduler.model.GetReportInstanceResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.GetReportInstanceRequest
15+
import org.opensearch.reportsscheduler.model.GetReportInstanceResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class GetReportInstanceAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<GetReportInstanceRequest, GetReportInstanceResponse>(NAME,
26+
) : PluginBaseAction<GetReportInstanceRequest, GetReportInstanceResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::GetReportInstanceRequest) {
31+
::GetReportInstanceRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/instance/get"
3335
internal val ACTION_TYPE = ActionType(NAME, ::GetReportInstanceResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/InContextReportCreateAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.InContextReportCreateRequest
10-
import org.opensearch.reportsscheduler.model.InContextReportCreateResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.InContextReportCreateRequest
15+
import org.opensearch.reportsscheduler.model.InContextReportCreateResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class InContextReportCreateAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<InContextReportCreateRequest, InContextReportCreateResponse>(NAME,
26+
) : PluginBaseAction<InContextReportCreateRequest, InContextReportCreateResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::InContextReportCreateRequest) {
31+
::InContextReportCreateRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/menu/download"
3335
internal val ACTION_TYPE = ActionType(NAME, ::InContextReportCreateResponse)

‎reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/action/OnDemandReportCreateAction.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.opensearch.reportsscheduler.action
77

8-
import org.opensearch.commons.authuser.User
9-
import org.opensearch.reportsscheduler.model.OnDemandReportCreateRequest
10-
import org.opensearch.reportsscheduler.model.OnDemandReportCreateResponse
118
import org.opensearch.action.ActionType
129
import org.opensearch.action.support.ActionFilters
1310
import org.opensearch.client.Client
1411
import org.opensearch.common.inject.Inject
1512
import org.opensearch.common.xcontent.NamedXContentRegistry
13+
import org.opensearch.commons.authuser.User
14+
import org.opensearch.reportsscheduler.model.OnDemandReportCreateRequest
15+
import org.opensearch.reportsscheduler.model.OnDemandReportCreateResponse
1616
import org.opensearch.transport.TransportService
1717

1818
/**
@@ -23,11 +23,13 @@ internal class OnDemandReportCreateAction @Inject constructor(
2323
client: Client,
2424
actionFilters: ActionFilters,
2525
val xContentRegistry: NamedXContentRegistry
26-
) : PluginBaseAction<OnDemandReportCreateRequest, OnDemandReportCreateResponse>(NAME,
26+
) : PluginBaseAction<OnDemandReportCreateRequest, OnDemandReportCreateResponse>(
27+
NAME,
2728
transportService,
2829
client,
2930
actionFilters,
30-
::OnDemandReportCreateRequest) {
31+
::OnDemandReportCreateRequest
32+
) {
3133
companion object {
3234
private const val NAME = "cluster:admin/opendistro/reports/definition/on_demand"
3335
internal val ACTION_TYPE = ActionType(NAME, ::OnDemandReportCreateResponse)

0 commit comments

Comments
 (0)