From 8b83cf067c1314b6408892c81c7e00f5a86432e2 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Wed, 12 Oct 2016 08:14:06 +0200 Subject: [PATCH 1/6] Watcher: Ensure awesome painless exceptions are propagated to the user (elastic/elasticsearch#3707) When adding a watch which has a painless component, the scriptexception was wrapped into a deprecated exception which means, that the awesome painless descriptions were lost. This wrapping has been removed. Closes elastic/elasticsearch#3161 Original commit: elastic/x-pack-elasticsearch@1703fe4eb6151d8cdfa6588d7f06f1ade6f67ad7 --- .../script/ExecutableScriptCondition.java | 10 ++---- .../script/ScriptConditionTests.java | 6 ++-- .../HttpSecretsIntegrationTests.java | 20 +++-------- .../10_basic.yaml | 0 .../20_minimal_body.yaml | 0 .../30_inline_watch.yaml | 0 .../test/watcher_painless/40_exception.yaml | 36 +++++++++++++++++++ 7 files changed, 47 insertions(+), 25 deletions(-) rename qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/{watcher_groovy => watcher_painless}/10_basic.yaml (100%) rename qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/{watcher_groovy => watcher_painless}/20_minimal_body.yaml (100%) rename qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/{watcher_groovy => watcher_painless}/30_inline_watch.yaml (100%) create mode 100644 qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/40_exception.yaml diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java index bec88e6a726..e948e80ad66 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java @@ -31,13 +31,9 @@ public class ExecutableScriptCondition extends ExecutableCondition conditionParser.createExecutable(scriptCondition)); } @@ -182,9 +182,9 @@ public class ScriptConditionTests extends ESTestCase { XContentParser parser = XContentFactory.xContent(builder.bytes()).createParser(builder.bytes()); parser.nextToken(); ScriptCondition scriptCondition = conditionParser.parseCondition("_watch", parser, false); - GeneralScriptException exception = expectThrows(GeneralScriptException.class, + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> conditionParser.createExecutable(scriptCondition)); - assertThat(exception.getMessage(), containsString("script_lang not supported [not_a_valid_lang]]")); + assertThat(exception.getMessage(), containsString("script_lang not supported [not_a_valid_lang]")); } public void testScriptConditionThrowException() throws Exception { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java index 46dd8456719..107463ed85a 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java @@ -8,16 +8,15 @@ package org.elasticsearch.xpack.watcher.test.integration; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; import com.squareup.okhttp.mockwebserver.RecordedRequest; -import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.xpack.security.crypto.CryptoService; -import org.elasticsearch.xpack.watcher.client.WatcherClient; -import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; import org.elasticsearch.xpack.common.http.HttpRequestTemplate; import org.elasticsearch.xpack.common.http.auth.basic.ApplicableBasicAuth; import org.elasticsearch.xpack.common.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.security.crypto.CryptoService; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; @@ -29,7 +28,6 @@ import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; -import java.net.BindException; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -62,16 +60,8 @@ public class HttpSecretsIntegrationTests extends AbstractWatcherIntegrationTestC @Before public void init() throws Exception { - for (int webPort = 9200; webPort < 9300; webPort++) { - try { - webServer = new MockWebServer(); - webServer.start(webPort); - return; - } catch (BindException be) { - logger.warn("port [{}] was already in use trying next port", webPort); - } - } - throw new ElasticsearchException("unable to find open port between 9200 and 9300"); + webServer = new MockWebServer(); + webServer.start(); } @After diff --git a/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/10_basic.yaml similarity index 100% rename from qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/10_basic.yaml diff --git a/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/20_minimal_body.yaml similarity index 100% rename from qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/20_minimal_body.yaml diff --git a/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/30_inline_watch.yaml similarity index 100% rename from qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/30_inline_watch.yaml diff --git a/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/40_exception.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/40_exception.yaml new file mode 100644 index 00000000000..1928ee5ba1a --- /dev/null +++ b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/40_exception.yaml @@ -0,0 +1,36 @@ +--- +"Test awesome painless exceptions are returned including the script_stack field": + - do: + cluster.health: + wait_for_status: green + + - do: + catch: request + xpack.watcher.put_watch: + id: "my_exe_watch" + body: > + { + "trigger" : { + "schedule" : { "cron" : "0 0 0 1 * ? 2099" } + }, + "input" : { + "simple" : {} + }, + "condition" : { + "script" : { + "inline" : "FOO == 1", + "lang" : "painless" + } + }, + "actions" : { + "email_admin" : { + "email" : { + "to" : "someone@domain.host.com", + "subject" : "404 recently encountered" + } + } + } + } + + - is_true: error.script_stack + - match: { status: 500 } From 4e00ab2f2b4b3f69daf7832a93b22def9ef58b12 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Wed, 12 Oct 2016 09:08:02 +0200 Subject: [PATCH 2/6] Remove test for transport handler that was removed in core (elastic/elasticsearch#3717) Relates to elastic/elasticsearchelastic/elasticsearch#20836 Original commit: elastic/x-pack-elasticsearch@38f2d2e24294a86c3dec2a30adf0c1310189c378 --- .../src/test/resources/org/elasticsearch/transport/handlers | 1 - 1 file changed, 1 deletion(-) diff --git a/elasticsearch/src/test/resources/org/elasticsearch/transport/handlers b/elasticsearch/src/test/resources/org/elasticsearch/transport/handlers index bb3374ee88c..d1ed1c3d5a8 100644 --- a/elasticsearch/src/test/resources/org/elasticsearch/transport/handlers +++ b/elasticsearch/src/test/resources/org/elasticsearch/transport/handlers @@ -78,7 +78,6 @@ internal:cluster/nodes/indices/shard/store internal:cluster/nodes/indices/shard/store[n] internal:cluster/shard/failure internal:cluster/shard/started -internal:cluster/snapshot/update_restore internal:cluster/snapshot/update_snapshot internal:discovery/zen/fd/master_ping internal:discovery/zen/fd/ping From 9a1d33d863fbdc08f74f6eaf02876f6276900c61 Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Wed, 12 Oct 2016 06:52:24 -0400 Subject: [PATCH 3/6] security: include anonymous roles when building the global permission The anonymous role was being applied to other users for index access control but was not being applied in terms of action level access control. This change makes the minimum required change to apply the anonymous role for all users when anonymous is enabled. Additionally, some minor changes were made to the native roles store to not lookup roles before the service is started. Closes elastic/elasticsearch#3711 Original commit: elastic/x-pack-elasticsearch@a9398e178de72ec5539029406e438eabdde222f4 --- .../security/authz/AuthorizationService.java | 16 ++++---- .../authz/store/NativeRolesStore.java | 7 ++++ .../authc/esnative/NativeRealmIntegTests.java | 40 ++++++++++++------- .../authz/AuthorizationServiceTests.java | 27 +++++++++++++ 4 files changed, 68 insertions(+), 22 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 1e56b1717cd..85fac3c9543 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -53,6 +53,7 @@ import org.elasticsearch.xpack.security.user.XPackUser; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -308,19 +309,20 @@ public class AuthorizationService extends AbstractComponent { } private GlobalPermission permission(String[] roleNames) { + final String[] anonymousRoles = isAnonymousEnabled ? anonymousUser.roles() : Strings.EMPTY_ARRAY; if (roleNames.length == 0) { - return DefaultRole.INSTANCE; - } - - if (roleNames.length == 1) { - Role role = rolesStore.role(roleNames[0]); - return role == null ? DefaultRole.INSTANCE : GlobalPermission.Compound.builder().add(DefaultRole.INSTANCE).add(role).build(); + if (anonymousRoles.length == 0) { + assert isAnonymousEnabled == false : "anonymous is only enabled when the anonymous user has roles"; + return DefaultRole.INSTANCE; + } } // we'll take all the roles and combine their associated permissions + final Set uniqueNames = new HashSet<>(Arrays.asList(roleNames)); + uniqueNames.addAll(Arrays.asList(anonymousRoles)); GlobalPermission.Compound.Builder roles = GlobalPermission.Compound.builder().add(DefaultRole.INSTANCE); - for (String roleName : roleNames) { + for (String roleName : uniqueNames) { Role role = rolesStore.role(roleName); if (role != null) { roles.add(role); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java index 75e4c3df5d0..1d25ffaf8c0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java @@ -354,6 +354,9 @@ public class NativeRolesStore extends AbstractComponent implements RolesStore, C @Override public Role role(String roleName) { + if (state() != State.STARTED) { + return null; + } RoleAndVersion roleAndVersion = getRoleAndVersion(roleName); return roleAndVersion == null ? null : roleAndVersion.getRole(); } @@ -443,6 +446,10 @@ public class NativeRolesStore extends AbstractComponent implements RolesStore, C } private RoleAndVersion getRoleAndVersion(final String roleId) { + if (securityIndexExists == false) { + return null; + } + RoleAndVersion roleAndVersion = null; final AtomicReference getRef = new AtomicReference<>(null); final CountDownLatch latch = new CountDownLatch(1); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java index 45540150e92..06ae853661f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java @@ -49,6 +49,7 @@ import java.util.List; import java.util.Map; import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; import static org.elasticsearch.xpack.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.containsString; @@ -316,10 +317,12 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { .addIndices(new String[]{"*"}, new String[]{"read"}, new FieldPermissions(new String[]{"body", "title"}, null), new BytesArray("{\"match_all\": {}}")) .get(); - try { - client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get(); - fail("user should not be able to execute any cluster actions!"); - } catch (ElasticsearchSecurityException e) { + if (anonymousEnabled) { + assertNoTimeout(client() + .filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); + } else { + ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, () -> client() + .filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); assertThat(e.status(), is(RestStatus.FORBIDDEN)); } } else { @@ -358,10 +361,12 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { .prepareHealth().get(); assertFalse(response.isTimedOut()); c.prepareDeleteRole("test_role").get(); - try { - client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get(); - fail("user should not be able to execute any actions!"); - } catch (ElasticsearchSecurityException e) { + if (anonymousEnabled) { + assertNoTimeout( + client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); + } else { + ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, () -> + client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); assertThat(e.status(), is(RestStatus.FORBIDDEN)); } } @@ -406,11 +411,14 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { assertThat(joe.roles(), arrayContaining("read_role")); assertThat(joe.fullName(), is("Joe Smith")); - // test that role change took effect - try { - client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get(); - fail("test_role does not have permission to get health"); - } catch (ElasticsearchSecurityException e) { + // test that role change took effect if anonymous is disabled as anonymous grants monitoring permissions... + if (anonymousEnabled) { + assertNoTimeout( + client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); + } else { + ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, () -> + client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()); + assertThat(e.status(), is(RestStatus.FORBIDDEN)); assertThat(e.getMessage(), containsString("authorized")); } @@ -434,7 +442,8 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { // test with new password and role response = client() .filterWithHeader( - Collections.singletonMap("Authorization",basicAuthHeaderValue("joe", new SecuredString("changeme2".toCharArray())))) + Collections.singletonMap("Authorization", + basicAuthHeaderValue("joe", new SecuredString("changeme2".toCharArray())))) .admin().cluster().prepareHealth().get(); assertFalse(response.isTimedOut()); } @@ -558,7 +567,8 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { response = client() .filterWithHeader( - Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", new SecuredString("changeme".toCharArray())))) + Collections.singletonMap("Authorization", + basicAuthHeaderValue("joe", new SecuredString("changeme".toCharArray())))) .admin().cluster().prepareHealth().get(); assertThat(response.isTimedOut(), is(false)); } diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java index 5a8888240f9..356cd4192b5 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java @@ -15,6 +15,7 @@ import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.admin.indices.create.CreateIndexAction; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; +import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsAction; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; import org.elasticsearch.action.admin.indices.recovery.RecoveryAction; import org.elasticsearch.action.admin.indices.recovery.RecoveryRequest; @@ -614,6 +615,32 @@ public class AuthorizationServiceTests extends ESTestCase { } } + public void testAnonymousRolesAreAppliedToOtherUsers() { + TransportRequest request = new ClusterHealthRequest(); + ClusterState state = mock(ClusterState.class); + Settings settings = Settings.builder().put(AnonymousUser.ROLES_SETTING.getKey(), "anonymous_user_role").build(); + final AnonymousUser anonymousUser = new AnonymousUser(settings); + authorizationService = new AuthorizationService(settings, rolesStore, clusterService, auditTrail, + new DefaultAuthenticationFailureHandler(), threadPool, anonymousUser); + + when(rolesStore.role("anonymous_user_role")) + .thenReturn(Role.builder("anonymous_user_role") + .cluster(ClusterPrivilege.ALL) + .add(IndexPrivilege.ALL, "a") + .build()); + when(clusterService.state()).thenReturn(state); + when(state.metaData()).thenReturn(MetaData.EMPTY_META_DATA); + + // sanity check the anonymous user + authorizationService.authorize(createAuthentication(anonymousUser), ClusterHealthAction.NAME, request); + authorizationService.authorize(createAuthentication(anonymousUser), IndicesExistsAction.NAME, new IndicesExistsRequest("a")); + + // test the no role user + final User userWithNoRoles = new User("no role user"); + authorizationService.authorize(createAuthentication(userWithNoRoles), ClusterHealthAction.NAME, request); + authorizationService.authorize(createAuthentication(userWithNoRoles), IndicesExistsAction.NAME, new IndicesExistsRequest("a")); + } + private Authentication createAuthentication(User user) { RealmRef lookedUpBy = user.runAs() == null ? null : new RealmRef("looked", "up", "by"); return new Authentication(user, new RealmRef("test", "test", "foo"), lookedUpBy); From 7ba55a4c99cd2ca6e5ccfdc2658988e10d75af31 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Wed, 12 Oct 2016 13:22:18 +0200 Subject: [PATCH 4/6] Remove empty comments (elastic/elasticsearch#3731) Original commit: elastic/x-pack-elasticsearch@a3e814bf34f06aa869dcc1090d057fda27e3c0ba --- .../main/java/org/elasticsearch/license/LicensingClient.java | 3 --- .../main/java/org/elasticsearch/license/XPackInfoResponse.java | 2 -- .../src/main/java/org/elasticsearch/xpack/XPackClient.java | 3 --- .../src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java | 3 --- .../elasticsearch/xpack/action/TransportXPackInfoAction.java | 2 -- .../elasticsearch/xpack/action/TransportXPackUsageAction.java | 2 -- .../java/org/elasticsearch/xpack/action/XPackInfoAction.java | 3 --- .../java/org/elasticsearch/xpack/action/XPackInfoRequest.java | 3 --- .../elasticsearch/xpack/action/XPackInfoRequestBuilder.java | 2 -- .../java/org/elasticsearch/xpack/action/XPackUsageAction.java | 3 --- .../java/org/elasticsearch/xpack/action/XPackUsageRequest.java | 3 --- .../org/elasticsearch/xpack/action/XPackUsageResponse.java | 2 -- .../org/elasticsearch/xpack/common/http/HttpContentType.java | 2 -- .../java/org/elasticsearch/xpack/common/http/HttpMethod.java | 2 -- .../org/elasticsearch/xpack/common/http/auth/HttpAuth.java | 3 --- .../elasticsearch/xpack/common/http/auth/HttpAuthFactory.java | 3 --- .../elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java | 3 --- .../xpack/common/http/auth/basic/ApplicableBasicAuth.java | 2 -- .../elasticsearch/xpack/common/http/auth/basic/BasicAuth.java | 3 --- .../xpack/common/http/auth/basic/BasicAuthFactory.java | 3 --- .../java/org/elasticsearch/xpack/common/secret/Secret.java | 3 --- .../org/elasticsearch/xpack/common/xcontent/XContentUtils.java | 3 --- .../java/org/elasticsearch/xpack/graph/GraphFeatureSet.java | 3 --- .../elasticsearch/xpack/monitoring/MonitoringFeatureSet.java | 3 --- .../org/elasticsearch/xpack/monitoring/exporter/Exporters.java | 3 --- .../xpack/monitoring/exporter/local/LocalExporter.java | 3 --- .../org/elasticsearch/xpack/notification/email/Account.java | 3 --- .../org/elasticsearch/xpack/notification/email/Accounts.java | 3 --- .../org/elasticsearch/xpack/notification/email/Attachment.java | 3 --- .../elasticsearch/xpack/notification/email/Authentication.java | 3 --- .../elasticsearch/xpack/notification/email/DataAttachment.java | 3 --- .../java/org/elasticsearch/xpack/notification/email/Email.java | 3 --- .../elasticsearch/xpack/notification/email/HtmlSanitizer.java | 3 --- .../xpack/notification/email/support/BodyPartSource.java | 3 --- .../xpack/notification/hipchat/HipChatAccount.java | 3 --- .../xpack/notification/hipchat/HipChatAccounts.java | 3 --- .../xpack/notification/hipchat/HipChatMessage.java | 3 --- .../xpack/notification/hipchat/HipChatServer.java | 3 --- .../xpack/notification/hipchat/IntegrationAccount.java | 3 --- .../elasticsearch/xpack/notification/hipchat/SentMessages.java | 3 --- .../elasticsearch/xpack/notification/hipchat/UserAccount.java | 3 --- .../elasticsearch/xpack/notification/hipchat/V1Account.java | 3 --- .../xpack/notification/pagerduty/PagerDutyAccount.java | 3 --- .../xpack/notification/pagerduty/PagerDutyAccounts.java | 3 --- .../elasticsearch/xpack/notification/pagerduty/SentEvent.java | 3 --- .../elasticsearch/xpack/notification/slack/SentMessages.java | 3 --- .../elasticsearch/xpack/notification/slack/SlackAccount.java | 3 --- .../elasticsearch/xpack/notification/slack/SlackAccounts.java | 3 --- .../xpack/notification/slack/message/DynamicAttachments.java | 3 --- .../xpack/notification/slack/message/MessageElement.java | 3 --- .../xpack/notification/slack/message/SlackMessageDefaults.java | 3 --- .../org/elasticsearch/xpack/scheduler/SchedulerEngine.java | 3 --- .../xpack/security/action/realm/ClearRealmCacheAction.java | 3 --- .../xpack/security/action/realm/ClearRealmCacheRequest.java | 3 --- .../security/action/realm/ClearRealmCacheRequestBuilder.java | 3 --- .../xpack/security/action/realm/ClearRealmCacheResponse.java | 3 --- .../security/action/realm/TransportClearRealmCacheAction.java | 3 --- .../security/action/role/TransportClearRolesCacheAction.java | 3 --- .../xpack/security/action/user/AuthenticateAction.java | 3 --- .../xpack/security/action/user/AuthenticateRequest.java | 3 --- .../xpack/security/action/user/AuthenticateRequestBuilder.java | 2 -- .../xpack/security/action/user/AuthenticateResponse.java | 2 -- .../xpack/security/action/user/ChangePasswordAction.java | 2 -- .../xpack/security/action/user/ChangePasswordResponse.java | 2 -- .../security/action/user/TransportAuthenticateAction.java | 2 -- .../security/action/user/TransportChangePasswordAction.java | 2 -- .../org/elasticsearch/xpack/security/audit/AuditTrail.java | 3 --- .../elasticsearch/xpack/security/audit/AuditTrailService.java | 3 --- .../java/org/elasticsearch/xpack/security/audit/AuditUtil.java | 3 --- .../xpack/security/audit/logfile/LoggingAuditTrail.java | 3 --- .../org/elasticsearch/xpack/security/authc/RealmConfig.java | 3 --- .../authc/activedirectory/ActiveDirectoryGroupsResolver.java | 3 --- .../security/authc/activedirectory/ActiveDirectoryRealm.java | 3 --- .../org/elasticsearch/xpack/security/authc/file/FileRealm.java | 3 --- .../xpack/security/authc/ldap/support/LdapSearchScope.java | 3 --- .../org/elasticsearch/xpack/security/authc/support/Hasher.java | 3 --- .../xpack/security/authc/support/RefreshListener.java | 3 --- .../xpack/security/authc/support/UsernamePasswordRealm.java | 3 --- .../xpack/security/authc/support/UsernamePasswordToken.java | 3 --- .../xpack/security/authz/AuthorizationService.java | 3 --- .../elasticsearch/xpack/security/authz/AuthorizationUtils.java | 3 --- .../indicesresolver/DefaultIndicesAndAliasesResolver.java | 3 --- .../authz/indicesresolver/IndicesAndAliasesResolver.java | 3 --- .../xpack/security/authz/permission/KibanaRole.java | 3 --- .../elasticsearch/xpack/security/authz/permission/Role.java | 3 --- .../xpack/security/authz/permission/SuperuserRole.java | 3 --- .../security/authz/privilege/AbstractAutomatonPrivilege.java | 3 --- .../xpack/security/authz/privilege/ClusterPrivilege.java | 3 --- .../xpack/security/authz/privilege/GeneralPrivilege.java | 3 --- .../security/authz/privilege/HealthAndStatsPrivilege.java | 3 --- .../xpack/security/authz/privilege/IndexPrivilege.java | 3 --- .../xpack/security/authz/privilege/Privilege.java | 3 --- .../xpack/security/authz/privilege/SystemPrivilege.java | 3 --- .../xpack/security/authz/store/ReservedRolesStore.java | 3 --- .../elasticsearch/xpack/security/rest/RemoteHostHeader.java | 3 --- .../elasticsearch/xpack/security/rest/SecurityRestFilter.java | 3 --- .../elasticsearch/xpack/security/rest/SecurityRestModule.java | 3 --- .../security/rest/action/role/RestClearRolesCacheAction.java | 3 --- .../security/rest/action/user/RestChangePasswordAction.java | 2 -- .../xpack/security/support/AbstractSecurityModule.java | 3 --- .../xpack/security/support/AutomatonPredicate.java | 3 --- .../org/elasticsearch/xpack/security/support/Automatons.java | 3 --- .../org/elasticsearch/xpack/security/support/Exceptions.java | 3 --- .../org/elasticsearch/xpack/security/support/Validation.java | 3 --- .../transport/netty3/IPFilterNetty3UpstreamHandler.java | 3 --- .../main/java/org/elasticsearch/xpack/support/clock/Clock.java | 3 --- .../org/elasticsearch/xpack/support/clock/HaltedClock.java | 3 --- .../org/elasticsearch/xpack/support/clock/SystemClock.java | 3 --- .../java/org/elasticsearch/xpack/watcher/WatcherBuild.java | 2 -- .../org/elasticsearch/xpack/watcher/WatcherFeatureSet.java | 3 --- .../elasticsearch/xpack/watcher/WatcherLifeCycleService.java | 2 -- .../java/org/elasticsearch/xpack/watcher/actions/Action.java | 3 --- .../elasticsearch/xpack/watcher/actions/ActionRegistry.java | 2 -- .../org/elasticsearch/xpack/watcher/actions/ActionStatus.java | 3 --- .../org/elasticsearch/xpack/watcher/actions/ActionWrapper.java | 3 --- .../elasticsearch/xpack/watcher/actions/ExecutableAction.java | 2 -- .../elasticsearch/xpack/watcher/actions/ExecutableActions.java | 3 --- .../elasticsearch/xpack/watcher/actions/email/EmailAction.java | 3 --- .../xpack/watcher/actions/email/EmailActionFactory.java | 3 --- .../xpack/watcher/actions/email/ExecutableEmailAction.java | 2 -- .../xpack/watcher/actions/hipchat/ExecutableHipChatAction.java | 3 --- .../xpack/watcher/actions/hipchat/HipChatActionFactory.java | 3 --- .../elasticsearch/xpack/watcher/actions/index/IndexAction.java | 3 --- .../xpack/watcher/actions/index/IndexActionFactory.java | 3 --- .../xpack/watcher/actions/logging/ExecutableLoggingAction.java | 3 --- .../xpack/watcher/actions/logging/LoggingActionFactory.java | 3 --- .../xpack/watcher/actions/logging/LoggingLevel.java | 3 --- .../watcher/actions/pagerduty/PagerDutyActionFactory.java | 3 --- .../xpack/watcher/actions/slack/ExecutableSlackAction.java | 3 --- .../xpack/watcher/actions/slack/SlackActionFactory.java | 3 --- .../xpack/watcher/actions/throttler/AckThrottler.java | 3 --- .../xpack/watcher/actions/throttler/ActionThrottler.java | 3 --- .../xpack/watcher/actions/throttler/Throttler.java | 3 --- .../xpack/watcher/actions/webhook/ExecutableWebhookAction.java | 2 -- .../xpack/watcher/actions/webhook/WebhookAction.java | 3 --- .../xpack/watcher/actions/webhook/WebhookActionFactory.java | 3 --- .../elasticsearch/xpack/watcher/client/WatchSourceBuilder.java | 3 --- .../xpack/watcher/client/WatchSourceBuilders.java | 3 --- .../org/elasticsearch/xpack/watcher/client/WatcherClient.java | 2 -- .../xpack/watcher/client/WatcherClientModule.java | 3 --- .../org/elasticsearch/xpack/watcher/condition/Condition.java | 3 --- .../elasticsearch/xpack/watcher/condition/ConditionModule.java | 3 --- .../xpack/watcher/condition/ConditionRegistry.java | 3 --- .../xpack/watcher/condition/ExecutableCondition.java | 3 --- .../xpack/watcher/condition/always/AlwaysCondition.java | 3 --- .../xpack/watcher/condition/always/AlwaysConditionFactory.java | 3 --- .../watcher/condition/always/ExecutableAlwaysCondition.java | 2 -- .../xpack/watcher/condition/compare/CompareCondition.java | 3 --- .../watcher/condition/compare/CompareConditionFactory.java | 3 --- .../watcher/condition/compare/ExecutableCompareCondition.java | 3 --- .../watcher/condition/never/ExecutableNeverCondition.java | 2 -- .../xpack/watcher/condition/never/NeverCondition.java | 3 --- .../xpack/watcher/condition/never/NeverConditionFactory.java | 3 --- .../xpack/watcher/execution/ActionExecutionMode.java | 3 --- .../xpack/watcher/execution/AsyncTriggerListener.java | 2 -- .../elasticsearch/xpack/watcher/execution/ExecutionModule.java | 2 -- .../elasticsearch/xpack/watcher/execution/ExecutionPhase.java | 2 -- .../xpack/watcher/execution/ManualExecutionContext.java | 2 -- .../xpack/watcher/execution/SyncTriggerListener.java | 2 -- .../xpack/watcher/execution/TriggeredExecutionContext.java | 2 -- .../xpack/watcher/execution/WatchExecutionContext.java | 3 --- .../xpack/watcher/execution/WatchExecutionResult.java | 3 --- .../xpack/watcher/execution/WatchExecutionSnapshot.java | 2 -- .../elasticsearch/xpack/watcher/execution/WatchExecutor.java | 3 --- .../java/org/elasticsearch/xpack/watcher/execution/Wid.java | 3 --- .../org/elasticsearch/xpack/watcher/history/HistoryModule.java | 2 -- .../org/elasticsearch/xpack/watcher/history/HistoryStore.java | 2 -- .../org/elasticsearch/xpack/watcher/input/ExecutableInput.java | 3 --- .../main/java/org/elasticsearch/xpack/watcher/input/Input.java | 3 --- .../org/elasticsearch/xpack/watcher/input/InputModule.java | 3 --- .../xpack/watcher/input/http/ExecutableHttpInput.java | 2 -- .../org/elasticsearch/xpack/watcher/input/http/HttpInput.java | 3 --- .../xpack/watcher/input/http/HttpInputFactory.java | 3 --- .../xpack/watcher/input/none/ExecutableNoneInput.java | 3 --- .../org/elasticsearch/xpack/watcher/input/none/NoneInput.java | 3 --- .../xpack/watcher/input/none/NoneInputFactory.java | 3 --- .../elasticsearch/xpack/watcher/input/simple/SimpleInput.java | 3 --- .../xpack/watcher/input/simple/SimpleInputFactory.java | 3 --- .../xpack/watcher/rest/action/RestExecuteWatchAction.java | 2 -- .../xpack/watcher/support/ArrayObjectIterator.java | 3 --- .../org/elasticsearch/xpack/watcher/support/Variables.java | 3 --- .../xpack/watcher/support/WatcherDateTimeUtils.java | 3 --- .../xpack/watcher/support/WatcherIndexTemplateRegistry.java | 2 -- .../xpack/watcher/support/validation/Validation.java | 3 --- .../xpack/watcher/support/xcontent/ObjectPath.java | 3 --- .../xpack/watcher/support/xcontent/WatcherParams.java | 3 --- .../xpack/watcher/transform/ExecutableTransform.java | 3 --- .../org/elasticsearch/xpack/watcher/transform/Transform.java | 3 --- .../xpack/watcher/transform/TransformFactory.java | 3 --- .../elasticsearch/xpack/watcher/transform/TransformModule.java | 3 --- .../xpack/watcher/transform/TransformRegistry.java | 3 --- .../xpack/watcher/transform/chain/ChainTransform.java | 3 --- .../watcher/transform/chain/ExecutableChainTransform.java | 3 --- .../watcher/transport/actions/WatcherTransportAction.java | 3 --- .../watcher/transport/actions/delete/DeleteWatchResponse.java | 2 -- .../watcher/transport/actions/put/TransportPutWatchAction.java | 2 -- .../actions/service/TransportWatcherServiceAction.java | 2 -- .../transport/actions/service/WatcherServiceAction.java | 2 -- .../transport/actions/service/WatcherServiceRequest.java | 2 -- .../actions/service/WatcherServiceRequestBuilder.java | 2 -- .../xpack/watcher/trigger/AbstractTriggerEngine.java | 3 --- .../java/org/elasticsearch/xpack/watcher/trigger/Trigger.java | 3 --- .../elasticsearch/xpack/watcher/trigger/TriggerBuilders.java | 3 --- .../org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java | 3 --- .../org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java | 3 --- .../org/elasticsearch/xpack/watcher/trigger/TriggerModule.java | 3 --- .../elasticsearch/xpack/watcher/trigger/TriggerService.java | 3 --- .../xpack/watcher/trigger/manual/ManualTrigger.java | 2 -- .../xpack/watcher/trigger/manual/ManualTriggerEngine.java | 2 -- .../xpack/watcher/trigger/manual/ManualTriggerEvent.java | 2 -- .../xpack/watcher/trigger/schedule/CronSchedule.java | 3 --- .../xpack/watcher/trigger/schedule/CronnableSchedule.java | 3 --- .../xpack/watcher/trigger/schedule/DailySchedule.java | 3 --- .../xpack/watcher/trigger/schedule/HourlySchedule.java | 3 --- .../xpack/watcher/trigger/schedule/IntervalSchedule.java | 3 --- .../xpack/watcher/trigger/schedule/MonthlySchedule.java | 3 --- .../elasticsearch/xpack/watcher/trigger/schedule/Schedule.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleModule.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleRegistry.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleTrigger.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java | 3 --- .../xpack/watcher/trigger/schedule/WeeklySchedule.java | 3 --- .../xpack/watcher/trigger/schedule/YearlySchedule.java | 3 --- .../schedule/engine/SchedulerScheduleTriggerEngine.java | 3 --- .../trigger/schedule/engine/TickerScheduleTriggerEngine.java | 3 --- .../xpack/watcher/trigger/schedule/support/DayOfWeek.java | 3 --- .../xpack/watcher/trigger/schedule/support/DayTimes.java | 3 --- .../xpack/watcher/trigger/schedule/support/Month.java | 3 --- .../xpack/watcher/trigger/schedule/support/MonthTimes.java | 3 --- .../xpack/watcher/trigger/schedule/support/Times.java | 3 --- .../xpack/watcher/trigger/schedule/support/WeekTimes.java | 3 --- .../xpack/watcher/trigger/schedule/support/YearTimes.java | 3 --- .../elasticsearch/xpack/watcher/watch/WatchLockService.java | 3 --- .../org/elasticsearch/xpack/watcher/watch/WatchModule.java | 3 --- .../org/elasticsearch/xpack/watcher/watch/WatchStatus.java | 3 --- .../integration/DocumentAndFieldLevelSecurityTests.java | 2 -- .../integration/DocumentLevelSecurityRandomTests.java | 2 -- .../elasticsearch/integration/DocumentLevelSecurityTests.java | 2 -- .../IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java | 2 -- .../elasticsearch/integration/KibanaUserRoleIntegTests.java | 3 --- .../test/java/org/elasticsearch/test/SecurityTestsUtils.java | 3 --- .../org/elasticsearch/xpack/common/http/HttpClientTests.java | 2 -- .../xpack/common/http/HttpConnectionTimeoutTests.java | 2 -- .../elasticsearch/xpack/common/http/HttpReadTimeoutTests.java | 2 -- .../org/elasticsearch/xpack/common/http/HttpResponseTests.java | 3 --- .../org/elasticsearch/xpack/graph/GraphFeatureSetTests.java | 3 --- .../xpack/monitoring/MonitoringFeatureSetTests.java | 3 --- .../xpack/monitoring/exporter/ExportersTests.java | 3 --- .../xpack/monitoring/test/MonitoringIntegTestCase.java | 3 --- .../elasticsearch/xpack/notification/email/AccountTests.java | 3 --- .../elasticsearch/xpack/notification/email/AccountsTests.java | 3 --- .../xpack/notification/email/EmailSecretsIntegrationTests.java | 3 --- .../org/elasticsearch/xpack/notification/email/EmailTests.java | 2 -- .../xpack/notification/email/HtmlSanitizerTests.java | 3 --- .../xpack/notification/hipchat/HipChatAccountsTests.java | 3 --- .../xpack/notification/hipchat/HipChatServiceTests.java | 3 --- .../xpack/notification/hipchat/IntegrationAccountTests.java | 3 --- .../xpack/notification/hipchat/V1AccountTests.java | 3 --- .../notification/pagerduty/IncidentEventDefaultsTests.java | 3 --- .../xpack/notification/pagerduty/PagerDutyAccountsTests.java | 3 --- .../xpack/notification/slack/SlackAccountsTests.java | 3 --- .../notification/slack/message/SlackMessageDefaultsTests.java | 3 --- .../security/action/filter/SecurityActionFilterTests.java | 3 --- .../xpack/security/audit/AuditTrailServiceTests.java | 3 --- .../elasticsearch/xpack/security/authc/RunAsIntegTests.java | 3 --- .../xpack/security/authc/file/FileRealmTests.java | 3 --- .../xpack/security/authc/support/DnRoleMapperTests.java | 3 --- .../xpack/security/authc/support/HasherTests.java | 3 --- .../security/authc/support/UsernamePasswordTokenTests.java | 3 --- .../xpack/security/authz/permission/PermissionTests.java | 3 --- .../xpack/security/authz/privilege/PrivilegeTests.java | 3 --- .../xpack/security/rest/SecurityRestFilterTests.java | 3 --- .../elasticsearch/xpack/security/support/AutomatonsTests.java | 3 --- .../elasticsearch/xpack/security/support/ValidationTests.java | 3 --- .../xpack/security/transport/ServerTransportFilterTests.java | 3 --- .../xpack/security/transport/filter/IPFilterTests.java | 3 --- .../org/elasticsearch/xpack/security/user/SystemUserTests.java | 3 --- .../java/org/elasticsearch/xpack/support/clock/ClockTests.java | 2 -- .../elasticsearch/xpack/watcher/WatcherFeatureSetTests.java | 3 --- .../xpack/watcher/WatcherLifeCycleServiceTests.java | 2 -- .../elasticsearch/xpack/watcher/WatcherPluginDisableTests.java | 3 --- .../org/elasticsearch/xpack/watcher/WatcherServiceTests.java | 3 --- .../xpack/watcher/actions/ActionErrorIntegrationTests.java | 3 --- .../watcher/actions/pagerduty/PagerDutyActionFactoryTests.java | 3 --- .../xpack/watcher/actions/slack/SlackActionFactoryTests.java | 3 --- .../xpack/watcher/actions/throttler/AckThrottlerTests.java | 3 --- .../xpack/watcher/actions/throttler/PeriodThrottlerTests.java | 3 --- .../xpack/watcher/actions/throttler/WatchThrottlerTests.java | 3 --- .../xpack/watcher/condition/always/AlwaysConditionTests.java | 2 -- .../watcher/condition/compare/CompareConditionSearchTests.java | 2 -- .../xpack/watcher/condition/compare/CompareConditionTests.java | 2 -- .../xpack/watcher/condition/never/NeverConditionTests.java | 2 -- .../xpack/watcher/execution/ExecutionServiceTests.java | 2 -- .../watcher/execution/TriggeredWatchStoreLifeCycleTests.java | 2 -- .../xpack/watcher/execution/TriggeredWatchTests.java | 2 -- .../xpack/watcher/history/HistoryStoreSettingsTests.java | 2 -- .../elasticsearch/xpack/watcher/history/HistoryStoreTests.java | 2 -- .../elasticsearch/xpack/watcher/input/InputRegistryTests.java | 3 --- .../xpack/watcher/input/simple/SimpleInputTests.java | 2 -- .../xpack/watcher/support/FilterXContentTests.java | 2 -- .../elasticsearch/xpack/watcher/support/VariablesTests.java | 3 --- .../xpack/watcher/support/WatcherDateTimeUtilsTests.java | 3 --- .../watcher/support/WatcherIndexTemplateRegistryTests.java | 2 -- .../xpack/watcher/support/xcontent/MapPathTests.java | 3 --- .../xpack/watcher/support/xcontent/XContentSourceTests.java | 3 --- .../elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java | 3 --- .../xpack/watcher/test/WatchExecutionContextMockBuilder.java | 3 --- .../org/elasticsearch/xpack/watcher/test/WatcherMatchers.java | 3 --- .../watcher/test/bench/ScheduleEngineTriggerBenchmark.java | 3 --- .../watcher/test/bench/WatcherScheduleEngineBenchmark.java | 2 -- .../watcher/test/integration/HttpSecretsIntegrationTests.java | 3 --- .../xpack/watcher/transform/chain/ChainTransformTests.java | 3 --- .../watcher/transport/action/activate/ActivateWatchTests.java | 2 -- .../watcher/transport/action/delete/DeleteWatchTests.java | 3 --- .../watcher/transport/action/delete/ForceDeleteWatchTests.java | 2 -- .../watcher/transport/action/execute/ExecuteWatchTests.java | 3 --- .../action/execute/ExecuteWatchWithDateMathTests.java | 3 --- .../xpack/watcher/transport/action/get/GetWatchTests.java | 3 --- .../xpack/watcher/transport/action/put/PutWatchTests.java | 3 --- .../xpack/watcher/trigger/schedule/CronScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/DailyScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/HourlyScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/IntervalScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/MonthlyScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleRegistryTests.java | 3 --- .../xpack/watcher/trigger/schedule/ScheduleTestCase.java | 3 --- .../watcher/trigger/schedule/ScheduleTriggerEventTests.java | 2 -- .../xpack/watcher/trigger/schedule/WeeklyScheduleTests.java | 3 --- .../xpack/watcher/trigger/schedule/YearlyScheduleTests.java | 3 --- .../trigger/schedule/engine/TickerScheduleEngineTests.java | 2 -- .../xpack/watcher/watch/WatchLockServiceTests.java | 2 -- 332 files changed, 923 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java index 882e5bcc85b..59f9262c940 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java +++ b/elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java @@ -8,9 +8,6 @@ package org.elasticsearch.license; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.ElasticsearchClient; -/** - * - */ public class LicensingClient { private final ElasticsearchClient client; diff --git a/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java index c729c6f6fbc..2ab7feec18d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -/** - */ public class XPackInfoResponse extends ActionResponse { @Nullable private BuildInfo buildInfo; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java index 50e4c3cdf3c..1e5878a3b47 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java @@ -23,9 +23,6 @@ import java.util.Map; import static org.elasticsearch.xpack.security.authc.support.UsernamePasswordToken.BASIC_AUTH_HEADER; import static org.elasticsearch.xpack.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue; -/** - * - */ public class XPackClient { private final Client client; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java index caa9d38cc79..6e9b17b3782 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java @@ -13,9 +13,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; -/** - * - */ public interface XPackFeatureSet { String name(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java index 521661adf21..fe764a74b94 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java @@ -24,8 +24,6 @@ import org.elasticsearch.license.XPackInfoResponse.LicenseInfo; import java.util.Set; import java.util.stream.Collectors; -/** - */ public class TransportXPackInfoAction extends HandledTransportAction { private final LicenseService licenseService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java index 9438c85e2e6..30c3a6db434 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -/** - */ public class TransportXPackUsageAction extends TransportMasterNodeAction { private final Set featureSets; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java index d1045f52b43..634a29214b5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java @@ -9,9 +9,6 @@ import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.license.XPackInfoResponse; -/** - * - */ public class XPackInfoAction extends Action { public static final String NAME = "cluster:monitor/xpack/info"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java index 64f0b512cb6..408eb460535 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java @@ -14,9 +14,6 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Locale; -/** - * - */ public class XPackInfoRequest extends ActionRequest { public enum Category { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java index 6e4e534e1fc..16452e5c39e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java @@ -11,8 +11,6 @@ import org.elasticsearch.license.XPackInfoResponse; import java.util.EnumSet; -/** - */ public class XPackInfoRequestBuilder extends ActionRequestBuilder { public XPackInfoRequestBuilder(ElasticsearchClient client) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java index 6d148f4d5a8..059fc84524b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.action; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; -/** - * - */ public class XPackUsageAction extends Action { public static final String NAME = "cluster:monitor/xpack/usage"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java index 506bc5d30fd..29984692a09 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.action; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; -/** - * - */ public class XPackUsageRequest extends MasterNodeRequest { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java index 5afbb725351..1a8ec1e75ca 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java @@ -14,8 +14,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -/** - */ public class XPackUsageResponse extends ActionResponse { private List usages; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java index 5ab4c09c02c..1beb5ab58c0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java @@ -14,8 +14,6 @@ import java.util.Locale; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - */ public enum HttpContentType implements ToXContent { JSON() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java index 984d3203cd4..fb67b711538 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java @@ -11,8 +11,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Locale; -/** - */ public enum HttpMethod implements ToXContent { HEAD("HEAD"), diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java index 2ecd3fd9080..2049424bc77 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java @@ -7,9 +7,6 @@ package org.elasticsearch.xpack.common.http.auth; import org.elasticsearch.common.xcontent.ToXContent; -/** - * - */ public interface HttpAuth extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java index 71886e5bcea..3a142356fe6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; -/** - * - */ public abstract class HttpAuthFactory> { public abstract String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java index bf301ae0580..d547cc3953c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java @@ -14,9 +14,6 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public class HttpAuthRegistry { private final Map factories; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java index 28e2d311927..0d7108671a0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java @@ -12,8 +12,6 @@ import java.util.Base64; import org.elasticsearch.xpack.common.http.auth.ApplicableHttpAuth; import org.elasticsearch.xpack.security.crypto.CryptoService; -/** - */ public class ApplicableBasicAuth extends ApplicableHttpAuth { private final String basicAuth; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java index aa8ccb9ef7a..d414a5bb316 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; import java.io.IOException; -/** - * - */ public class BasicAuth implements HttpAuth { public static final String TYPE = "basic"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java index 9ef970f1da7..bbe91546fed 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.security.crypto.CryptoService; import java.io.IOException; -/** - * - */ public class BasicAuthFactory extends HttpAuthFactory { private final CryptoService cryptoService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java index 50904d1020a..b6e0adf57bc 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java @@ -12,9 +12,6 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.security.crypto.CryptoService; -/** - * - */ public class Secret implements ToXContent { protected final char[] text; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java index 0ad83294e18..c2fdea4a1d0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java @@ -16,9 +16,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -/** - * - */ public class XContentUtils { private XContentUtils() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java index 809141b7b17..072440730ad 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.XPackFeatureSet; import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackSettings; -/** - * - */ public class GraphFeatureSet implements XPackFeatureSet { private final boolean enabled; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java index 45b36240539..a3eaeddcdf2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java @@ -21,9 +21,6 @@ import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.monitoring.exporter.Exporter; import org.elasticsearch.xpack.monitoring.exporter.Exporters; -/** - * - */ public class MonitoringFeatureSet implements XPackFeatureSet { private final boolean enabled; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java index f504b72686e..5624b776bf4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java @@ -28,9 +28,6 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Collections.emptyMap; -/** - * - */ public class Exporters extends AbstractLifecycleComponent implements Iterable { private final Map factories; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java index cfd7ac4e690..4c113ea4c99 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java @@ -56,9 +56,6 @@ import java.util.stream.StreamSupport; import static org.elasticsearch.common.Strings.collectionToCommaDelimitedString; -/** - * - */ public class LocalExporter extends Exporter implements ClusterStateListener, CleanerService.Listener { private static final Logger logger = Loggers.getLogger(LocalExporter.class); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java index ef42446a1e4..5005b1b87a8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java @@ -24,9 +24,6 @@ import java.security.PrivilegedAction; import java.util.Map; import java.util.Properties; -/** - * - */ public class Account { static final String SMTP_PROTOCOL = "smtp"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java index 810e5ad079d..7bdc2baf549 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.security.crypto.CryptoService; import java.util.HashMap; import java.util.Map; -/** - * - */ public class Accounts { private final String defaultAccountName; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java index d5dfa7f4469..292ac50bcb4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java @@ -28,9 +28,6 @@ import java.nio.file.Path; import static javax.mail.Part.ATTACHMENT; import static javax.mail.Part.INLINE; -/** -* -*/ public abstract class Attachment extends BodyPartSource { private final boolean inline; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java index cc710a77959..9cfb96098e8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java @@ -9,9 +9,6 @@ import org.elasticsearch.xpack.common.secret.Secret; import java.util.Objects; -/** -* -*/ public class Authentication { private final String user; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java index a3c1d1a6619..174f6c8126b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java @@ -20,9 +20,6 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public enum DataAttachment implements ToXContent { YAML() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java index c44f0f979dd..86061119c4e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java @@ -32,9 +32,6 @@ import java.util.Map; import static java.util.Collections.unmodifiableMap; -/** - * - */ public class Email implements ToXContent { final String id; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java index b47f564dcd2..41caed6af38 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java @@ -19,9 +19,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Locale; -/** - * - */ public class HtmlSanitizer { static final String[] FORMATTING_TAGS = new String[] { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java index f7376888feb..667c2bfa605 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java @@ -15,9 +15,6 @@ import javax.mail.internet.MimeBodyPart; import java.security.AccessController; import java.security.PrivilegedAction; -/** - * - */ public abstract class BodyPartSource implements ToXContent { protected static FileTypeMap fileTypeMap; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java index af687efdf9a..baeb65b594f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java @@ -20,9 +20,6 @@ import java.io.IOException; import java.util.Locale; import java.util.Map; -/** - * - */ public abstract class HipChatAccount { public static final String AUTH_TOKEN_SETTING = "auth_token"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java index 883bc52b206..b7ccad4f817 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.notification.hipchat.HipChatAccount.Profile; import java.util.HashMap; import java.util.Map; -/** - * - */ public class HipChatAccounts { private final Map accounts; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java index bb7a794913f..b4f787cd08c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java @@ -433,9 +433,6 @@ public class HipChatMessage implements ToXContent { } } - /** - * - */ public enum Format implements ToXContent { TEXT, diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java index 30db53ab75f..c75dc953cef 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.notification.hipchat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.common.http.HttpRequest; -/** - * - */ public class HipChatServer { public static final String HOST_SETTING = "host"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java index 60d00f90701..28fc53569e4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java @@ -30,9 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * - */ public class IntegrationAccount extends HipChatAccount { public static final String TYPE = "integration"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java index 44aff7169a2..d94fba86aa8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java @@ -17,9 +17,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -/** - * - */ public class SentMessages implements ToXContent, Iterable { private String accountName; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java index e39e64848bc..26739a19554 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java @@ -30,9 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * - */ public class UserAccount extends HipChatAccount { public static final String TYPE = "user"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java index 847269a1668..aca64f20525 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java @@ -25,9 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * - */ public class V1Account extends HipChatAccount { public static final String TYPE = "v1"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java index 5a98b0105a4..c5eb83e43d3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java @@ -15,9 +15,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - * - */ public class PagerDutyAccount { public static final String SERVICE_KEY_SETTING = "service_api_key"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java index 57ff792a240..49bde3a146e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.common.http.HttpClient; import java.util.HashMap; import java.util.Map; -/** - * - */ public class PagerDutyAccounts { private final Map accounts; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java index f6269e3f9de..6decccb708b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java @@ -22,9 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -/** - * - */ public class SentEvent implements ToXContent { final IncidentEvent event; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java index ad6c027f57f..387d2de087c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java @@ -17,9 +17,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -/** - * - */ public class SentMessages implements ToXContent, Iterable { private String accountName; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java index 407e6adec80..950796e2106 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java @@ -27,9 +27,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -/** - * - */ public class SlackAccount { public static final String URL_SETTING = "url"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java index 8d325ff7f5f..77f7ea487f6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.common.http.HttpClient; import java.util.HashMap; import java.util.Map; -/** - * - */ public class SlackAccounts { private final Map accounts; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java index 93e040f1b85..1c39fbc6e91 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java @@ -18,9 +18,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * - */ public class DynamicAttachments implements MessageElement { private String listPath; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java index bf58e9b0e36..149c4d7374a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.notification.slack.message; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; -/** - * - */ public interface MessageElement extends ToXContent { interface XField { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java index 6a78019d623..61d59d35768 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.settings.Settings; import java.util.Arrays; -/** - * - */ public class SlackMessageDefaults { public static final String FROM_SETTING = SlackMessage.XField.FROM.getPreferredName(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java index d6de32ad489..d0ab37cb90a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java @@ -22,9 +22,6 @@ import java.util.stream.Collectors; import static java.util.Collections.unmodifiableMap; -/** - * - */ public class SchedulerEngine { public static class Job { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java index b5ea8617f13..28ef355eab6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.security.action.realm; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; -/** - * - */ public class ClearRealmCacheAction extends Action { public static final ClearRealmCacheAction INSTANCE = new ClearRealmCacheAction(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java index ed549692b83..73595a03412 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java @@ -12,9 +12,6 @@ import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -/** - * - */ public class ClearRealmCacheRequest extends BaseNodesRequest { String[] realms; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java index 083cf785530..28021076f22 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.security.action.realm; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; -/** - * - */ public class ClearRealmCacheRequestBuilder extends NodesOperationRequestBuilder { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java index 53b6fe425bd..0506ebaffd8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java @@ -19,9 +19,6 @@ import org.elasticsearch.common.xcontent.XContentFactory; import java.io.IOException; import java.util.List; -/** - * - */ public class ClearRealmCacheResponse extends BaseNodesResponse implements ToXContent { public ClearRealmCacheResponse() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java index a1d443fb293..1246b5f24c1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java @@ -21,9 +21,6 @@ import org.elasticsearch.transport.TransportService; import java.util.List; -/** - * - */ public class TransportClearRealmCacheAction extends TransportNodesAction { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java index 954e416aedc..7ad84400dea 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java @@ -18,9 +18,6 @@ import org.elasticsearch.transport.TransportService; import java.util.List; -/** - * - */ public class TransportClearRolesCacheAction extends TransportNodesAction { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java index 964b7d17ce9..e579628bab8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.security.action.user; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; -/** - * - */ public class AuthenticateAction extends Action { public static final String NAME = "cluster:admin/xpack/security/user/authenticate"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java index 648f8cba9cf..1589c843298 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java @@ -15,9 +15,6 @@ import java.io.IOException; import static org.elasticsearch.action.ValidateActions.addValidationError; -/** - * - */ public class AuthenticateRequest extends ActionRequest implements UserRequest { private String username; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java index 78ea046e3e8..98b0a52d78d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.security.action.user; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; -/** - */ public class AuthenticateRequestBuilder extends ActionRequestBuilder { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java index 3c4d66cd3e7..5c18193f7bd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java @@ -12,8 +12,6 @@ import org.elasticsearch.xpack.security.user.User; import java.io.IOException; -/** - */ public class AuthenticateResponse extends ActionResponse { private User user; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java index 4e6b758f961..f1c04b97095 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.security.action.user; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; -/** - */ public class ChangePasswordAction extends Action { public static final ChangePasswordAction INSTANCE = new ChangePasswordAction(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java index a0d4465e93c..8e4b820da7a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.security.action.user; import org.elasticsearch.action.ActionResponse; -/** - */ public class ChangePasswordResponse extends ActionResponse { public ChangePasswordResponse() {} diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java index 5f368564be9..57c06f9404a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java @@ -19,8 +19,6 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.security.user.XPackUser; -/** - */ public class TransportAuthenticateAction extends HandledTransportAction { private final SecurityContext securityContext; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java index b91206d24b3..d75e780818e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java @@ -18,8 +18,6 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.security.user.XPackUser; -/** - */ public class TransportChangePasswordAction extends HandledTransportAction { private final NativeUsersStore nativeUsersStore; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java index 5450d38c3b1..15497dc9d36 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java @@ -13,9 +13,6 @@ import org.elasticsearch.transport.TransportMessage; import java.net.InetAddress; -/** - * - */ public interface AuditTrail { String name(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java index a4561e5440a..bb7bf41506a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java @@ -22,9 +22,6 @@ import org.elasticsearch.xpack.security.authc.AuthenticationToken; import org.elasticsearch.xpack.security.transport.filter.SecurityIpFilterRule; import org.elasticsearch.xpack.security.user.User; -/** - * - */ public class AuditTrailService extends AbstractComponent implements AuditTrail { public static final Map DISABLED_USAGE_STATS = Collections.singletonMap("enabled", false); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java index e7aa41a0b9d..a6131cf59b8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java @@ -17,9 +17,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -/** - * - */ public class AuditUtil { public static String restRequestContent(RestRequest request) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java index d21a9230bc4..2a89f000b1d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java @@ -57,9 +57,6 @@ import static org.elasticsearch.xpack.security.audit.AuditLevel.parse; import static org.elasticsearch.xpack.security.audit.AuditUtil.indices; import static org.elasticsearch.xpack.security.audit.AuditUtil.restRequestContent; -/** - * - */ public class LoggingAuditTrail extends AbstractComponent implements AuditTrail { public static final String NAME = "logfile"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java index da8afcc3edc..cd9d277b04f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java @@ -10,9 +10,6 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -/** - * - */ public class RealmConfig { final String name; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java index f606469e53d..f139dd6ee65 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java @@ -30,9 +30,6 @@ import static org.elasticsearch.xpack.security.authc.ldap.support.LdapUtils.OBJE import static org.elasticsearch.xpack.security.authc.ldap.support.LdapUtils.search; import static org.elasticsearch.xpack.security.authc.ldap.support.LdapUtils.searchForEntry; -/** - * - */ public class ActiveDirectoryGroupsResolver implements GroupsResolver { private final String baseDn; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java index 97cfad7c6af..60ceec614ba 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java @@ -12,9 +12,6 @@ import org.elasticsearch.xpack.security.authc.ldap.support.SessionFactory; import org.elasticsearch.xpack.security.authc.support.DnRoleMapper; import org.elasticsearch.xpack.ssl.SSLService; -/** - * - */ public class ActiveDirectoryRealm extends AbstractLdapRealm { public static final String TYPE = "active_directory"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java index 43f0ed0d563..820d4a84cb1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.security.authc.support.RefreshListener; import org.elasticsearch.xpack.security.authc.support.UsernamePasswordToken; import org.elasticsearch.xpack.security.user.User; -/** - * - */ public class FileRealm extends CachingUsernamePasswordRealm { public static final String TYPE = "file"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java index 0959f147e2c..40ea34f78dd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java @@ -9,9 +9,6 @@ import com.unboundid.ldap.sdk.SearchScope; import java.util.Locale; -/** - * - */ public enum LdapSearchScope { BASE(SearchScope.BASE), diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java index c6e910ab65a..3f74064f24f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java @@ -14,9 +14,6 @@ import java.util.Base64; import java.util.Locale; import java.util.Random; -/** - * - */ public enum Hasher { BCRYPT() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java index 9127d916af3..3b638e79b6b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java @@ -5,9 +5,6 @@ */ package org.elasticsearch.xpack.security.authc.support; -/** - * - */ public interface RefreshListener { RefreshListener NOOP = () -> {}; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java index 080d5aca001..954eea07f40 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java @@ -10,9 +10,6 @@ import org.elasticsearch.xpack.security.authc.AuthenticationToken; import org.elasticsearch.xpack.security.authc.Realm; import org.elasticsearch.xpack.security.authc.RealmConfig; -/** - * - */ public abstract class UsernamePasswordRealm extends Realm { public UsernamePasswordRealm(String type, RealmConfig config) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java index cad951baf64..411fe185164 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java @@ -15,9 +15,6 @@ import java.util.Objects; import static org.elasticsearch.xpack.security.support.Exceptions.authenticationError; -/** - * - */ public class UsernamePasswordToken implements AuthenticationToken { public static final String BASIC_AUTH_HEADER = "Authorization"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 85fac3c9543..5d6116b1595 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -62,9 +62,6 @@ import java.util.function.Predicate; import static org.elasticsearch.xpack.security.Security.setting; import static org.elasticsearch.xpack.security.support.Exceptions.authorizationError; -/** - * - */ public class AuthorizationService extends AbstractComponent { public static final Setting ANONYMOUS_AUTHORIZATION_EXCEPTION_SETTING = diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java index b3c7344e68e..30e763a88f8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.security.support.Automatons; import java.util.function.Predicate; -/** - * - */ public final class AuthorizationUtils { private static final Predicate INTERNAL_PREDICATE = new AutomatonPredicate(Automatons.patterns("internal:*")); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java index 6e79ba5fb27..69ea98923b0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java @@ -30,9 +30,6 @@ import java.util.List; import java.util.Set; import java.util.SortedMap; -/** - * - */ public class DefaultIndicesAndAliasesResolver implements IndicesAndAliasesResolver { private final AuthorizationService authzService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java index f58282fbfbb..19f67af90ee 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java @@ -11,9 +11,6 @@ import org.elasticsearch.transport.TransportRequest; import java.util.Set; -/** - * - */ public interface IndicesAndAliasesResolver { Class requestType(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java index b8e106b378c..e2fcbba2810 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.security.authz.privilege.ClusterPrivilege; import org.elasticsearch.xpack.security.authz.privilege.Privilege.Name; import org.elasticsearch.xpack.security.support.MetadataUtils; -/** - * - */ public class KibanaRole extends Role { private static final String[] CLUSTER_PRIVILEGES = new String[] { "monitor", MonitoringBulkAction.NAME}; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java index b79e615fb5f..6ad66f79547 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java @@ -15,9 +15,6 @@ import org.elasticsearch.xpack.security.authz.privilege.Privilege; import java.util.ArrayList; import java.util.List; -/** - * - */ public class Role extends GlobalPermission { private final String name; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java index 273142b5612..181902bf02a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.security.authz.privilege.GeneralPrivilege; import org.elasticsearch.xpack.security.authz.privilege.Privilege.Name; import org.elasticsearch.xpack.security.support.MetadataUtils; -/** - * - */ public class SuperuserRole extends Role { public static final String NAME = "superuser"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java index 0eab8bc14f0..5c76e72a95a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java @@ -14,9 +14,6 @@ import java.util.function.Predicate; import static org.elasticsearch.xpack.security.support.Automatons.patterns; -/** - * - */ @SuppressWarnings("unchecked") abstract class AbstractAutomatonPrivilege

> extends Privilege

{ diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java index d733b0cd8a0..fdfb56ee0b9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java @@ -18,9 +18,6 @@ import java.util.function.Predicate; import static org.elasticsearch.xpack.security.support.Automatons.minusAndDeterminize; import static org.elasticsearch.xpack.security.support.Automatons.patterns; -/** - * - */ public class ClusterPrivilege extends AbstractAutomatonPrivilege { // shared automatons diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java index 4454292097d..22d719f583b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.security.authz.privilege; import dk.brics.automaton.Automaton; import dk.brics.automaton.BasicAutomata; -/** - * - */ public class GeneralPrivilege extends AbstractAutomatonPrivilege { public static final GeneralPrivilege NONE = new GeneralPrivilege(Name.NONE, BasicAutomata.makeEmpty()); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java index ec5e26461a4..654925c2503 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java @@ -5,9 +5,6 @@ */ package org.elasticsearch.xpack.security.authz.privilege; -/** - * - */ public class HealthAndStatsPrivilege extends GeneralPrivilege { public static final HealthAndStatsPrivilege INSTANCE = new HealthAndStatsPrivilege(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java index c40e635efa9..cf3d131672a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java @@ -31,9 +31,6 @@ import java.util.function.Predicate; import static org.elasticsearch.xpack.security.support.Automatons.patterns; import static org.elasticsearch.xpack.security.support.Automatons.unionAndDeterminize; -/** - * - */ public class IndexPrivilege extends AbstractAutomatonPrivilege { private static final Automaton ALL_AUTOMATON = patterns("indices:*"); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java index c0fb92ceb4b..14a2f4283a2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java @@ -16,9 +16,6 @@ import static java.util.Collections.singleton; import static java.util.Collections.unmodifiableSet; import static org.elasticsearch.common.util.set.Sets.newHashSet; -/** - * - */ public abstract class Privilege

> { protected final Name name; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java index 0d9f3b9fc43..d3c32ec15a2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java @@ -11,9 +11,6 @@ import java.util.function.Predicate; import static org.elasticsearch.xpack.security.support.Automatons.patterns; -/** - * - */ public class SystemPrivilege extends Privilege { public static SystemPrivilege INSTANCE = new SystemPrivilege(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java index 5f0987d5b6f..4eaf675a492 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java @@ -27,9 +27,6 @@ import org.elasticsearch.xpack.security.user.KibanaUser; import org.elasticsearch.xpack.security.user.SystemUser; import org.elasticsearch.xpack.security.user.User; -/** - * - */ public class ReservedRolesStore implements RolesStore { private static final User DEFAULT_ENABLED_KIBANA_USER = new KibanaUser(true); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java index 868846360dc..dcee6535cf3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java @@ -11,9 +11,6 @@ import org.elasticsearch.rest.RestRequest; import java.net.InetSocketAddress; import java.net.SocketAddress; -/** - * - */ public class RemoteHostHeader { static final String KEY = "_rest_remote_address"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java index 6435745d607..9277f1eb58f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java @@ -34,9 +34,6 @@ import java.security.cert.X509Certificate; import static org.elasticsearch.xpack.XPackSettings.HTTP_SSL_ENABLED; -/** - * - */ public class SecurityRestFilter extends RestFilter { private final AuthenticationService service; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java index d11c9a87b7b..b2560d4d865 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.security.rest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.security.support.AbstractSecurityModule; -/** - * - */ public class SecurityRestModule extends AbstractSecurityModule.Node { public SecurityRestModule(Settings settings) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java index fda01cbcc7a..e7a69734393 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java @@ -19,9 +19,6 @@ import java.io.IOException; import static org.elasticsearch.rest.RestRequest.Method.POST; -/** - * - */ public class RestClearRolesCacheAction extends BaseRestHandler { @Inject diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java index 93f23ad409d..a2c7eee7a8b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java @@ -26,8 +26,6 @@ import java.io.IOException; import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.PUT; -/** - */ public class RestChangePasswordAction extends BaseRestHandler { private final SecurityContext securityContext; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java index 87e952efdf0..0024aab38cb 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java @@ -11,9 +11,6 @@ import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.XPackSettings; -/** - * - */ public abstract class AbstractSecurityModule extends AbstractModule { protected final Settings settings; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java index 6f5da52f981..3233c1698ef 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java @@ -10,9 +10,6 @@ import dk.brics.automaton.RunAutomaton; import java.util.function.Predicate; -/** -* -*/ public class AutomatonPredicate implements Predicate { private final RunAutomaton automaton; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java index 93dc06e5d57..42bc79ba460 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java @@ -19,9 +19,6 @@ import static dk.brics.automaton.BasicOperations.minus; import static dk.brics.automaton.BasicOperations.union; import static dk.brics.automaton.MinimizationOperations.minimize; -/** - * - */ public final class Automatons { public static final Automaton EMPTY = BasicAutomata.makeEmpty(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java index 5e2f280923f..08845541069 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java @@ -9,9 +9,6 @@ import org.elasticsearch.ElasticsearchSecurityException; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.xpack.XPackPlugin; -/** - * - */ public class Exceptions { private Exceptions() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Validation.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Validation.java index 54ebbf9a119..aa6cf382790 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Validation.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/support/Validation.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.security.authz.store.ReservedRolesStore; import java.util.regex.Pattern; -/** - * - */ public final class Validation { private static final Pattern COMMON_NAME_PATTERN = Pattern.compile("[a-zA-Z_][a-zA-Z0-9_@\\-\\$\\.]{0,29}"); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java index bf10ad80cd7..1d0622e3cac 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java @@ -13,9 +13,6 @@ import org.jboss.netty.handler.ipfilter.IpFilteringHandlerImpl; import java.net.InetSocketAddress; -/** - * - */ @ChannelHandler.Sharable public class IPFilterNetty3UpstreamHandler extends IpFilteringHandlerImpl { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java index 3d317a89b7c..29095a383d6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -/** - * - */ public interface Clock { long millis(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java index d69b27cd162..00e078c12a3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -/** - * - */ public class HaltedClock implements Clock { private final DateTime now; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java index 27fb71e8622..4536f80b5f9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -/** - * - */ public final class SystemClock implements Clock { public static final SystemClock INSTANCE = new SystemClock(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java index 82a09468788..cd7638700c7 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java @@ -14,8 +14,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -/** - */ public class WatcherBuild { public static final WatcherBuild CURRENT; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java index e3c7b6ee4a5..cb476a82f68 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java @@ -20,9 +20,6 @@ import org.elasticsearch.xpack.XPackFeatureSet; import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackSettings; -/** - * - */ public class WatcherFeatureSet implements XPackFeatureSet { private final boolean enabled; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java index b96fed9f746..2e75cc578e5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java @@ -27,8 +27,6 @@ import org.elasticsearch.xpack.watcher.watch.WatchStore; import java.util.concurrent.CountDownLatch; -/** - */ public class WatcherLifeCycleService extends AbstractComponent implements ClusterStateListener { private final ThreadPool threadPool; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java index debf8bf9ab6..7dd90765c48 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java @@ -13,9 +13,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Locale; -/** - * - */ public interface Action extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java index 9a93cf7c561..7edde1b9fc6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - */ public class ActionRegistry { private final Map parsers; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java index 2ac481a518e..4d2cf2732f5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java @@ -24,9 +24,6 @@ import java.util.Objects; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.dateTimeFormatter; -/** - * - */ public class ActionStatus implements ToXContent { private AckStatus ackStatus; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java index e8fc9024cb8..15d0eabb99b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java @@ -35,9 +35,6 @@ import java.io.IOException; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -/** - * - */ public class ActionWrapper implements ToXContent { private String id; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java index b7d1a0276d4..0cb0ad5ca43 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java @@ -13,8 +13,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - */ public abstract class ExecutableAction implements ToXContent { protected final A action; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java index c73550313e3..0425804abcf 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java @@ -13,9 +13,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -/** - * - */ public class ExecutableActions implements Iterable, ToXContent { private final List actions; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java index 50daa3db895..52476186834 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java @@ -27,9 +27,6 @@ import java.io.IOException; import java.util.Locale; import java.util.Objects; -/** - * - */ public class EmailAction implements Action { public static final String TYPE = "email"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java index 074823f9926..b725816f741 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java @@ -17,9 +17,6 @@ import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsPar import java.io.IOException; -/** - * - */ public class EmailActionFactory extends ActionFactory { private final EmailService emailService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java index 0e08a50cc13..4217a27e9f9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java @@ -23,8 +23,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.HashMap; import java.util.Map; -/** - */ public class ExecutableEmailAction extends ExecutableAction { final EmailService emailService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java index 0e81cb2091f..d108fbff027 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java @@ -19,9 +19,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; -/** - * - */ public class ExecutableHipChatAction extends ExecutableAction { private final TextTemplateEngine templateEngine; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java index 13ca3f1ea9c..462d83e0652 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java @@ -17,9 +17,6 @@ import org.elasticsearch.xpack.notification.hipchat.HipChatService; import java.io.IOException; -/** - * - */ public class HipChatActionFactory extends ActionFactory { private final TextTemplateEngine templateEngine; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java index e529a75ef12..fb26cd3cf5b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java @@ -21,9 +21,6 @@ import java.io.IOException; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -/** - * - */ public class IndexAction implements Action { public static final String TYPE = "index"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java index 21682d9bb75..ce75c32c29e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import java.io.IOException; -/** - * - */ public class IndexActionFactory extends ActionFactory { private final WatcherClientProxy client; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java index 5bab8eae3a0..d9cac7cf3d1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java @@ -17,9 +17,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; -/** - * - */ public class ExecutableLoggingAction extends ExecutableAction { private final Logger textLogger; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java index f2742174fa2..892b9a26a52 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.watcher.actions.ActionFactory; import java.io.IOException; -/** - * - */ public class LoggingActionFactory extends ActionFactory { private final Settings settings; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java index 83044444f59..282d4c52629 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java @@ -13,9 +13,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Locale; -/** - * - */ public enum LoggingLevel implements ToXContent { ERROR() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java index 77573ec5840..dc23a6ebde2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java @@ -18,9 +18,6 @@ import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; import java.io.IOException; -/** - * - */ public class PagerDutyActionFactory extends ActionFactory { private final TextTemplateEngine templateEngine; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java index 0c8de9180c0..007875c1a3b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java @@ -19,9 +19,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; -/** - * - */ public class ExecutableSlackAction extends ExecutableAction { private final TextTemplateEngine templateEngine; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java index 3311eb73ee5..87666e59fa3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java @@ -18,9 +18,6 @@ import org.elasticsearch.xpack.notification.slack.SlackService; import java.io.IOException; -/** - * - */ public class SlackActionFactory extends ActionFactory { private final TextTemplateEngine templateEngine; private final SlackService slackService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java index bb78e8ec111..8545f573ad4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.formatDate; -/** - * - */ public class AckThrottler implements Throttler { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java index ca070914a14..a25241e9f87 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java @@ -11,9 +11,6 @@ import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import org.elasticsearch.xpack.support.clock.Clock; -/** - * - */ public class ActionThrottler implements Throttler { private static final AckThrottler ACK_THROTTLER = new AckThrottler(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java index 07ba18bd9ae..ae803db110b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; -/** - * - */ public interface Throttler { Result throttle(String actionId, WatchExecutionContext ctx); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java index 6ac91d9ce93..97487931601 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java @@ -18,8 +18,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; -/** - */ public class ExecutableWebhookAction extends ExecutableAction { private final HttpClient httpClient; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java index df0a0b89c3a..37066a4f61f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.common.http.HttpResponse; import java.io.IOException; -/** - * - */ public class WebhookAction implements Action { public static final String TYPE = "webhook"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java index c0a9d996416..fed40e489d4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.common.http.HttpRequestTemplate; import java.io.IOException; -/** - * - */ public class WebhookActionFactory extends ActionFactory { private final HttpClient httpClient; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java index 9b635a0952f..090804a22b2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java @@ -31,9 +31,6 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -/** - * - */ public class WatchSourceBuilder implements ToXContent { private Trigger trigger; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java index 7b3434bddb9..fa9b7b591c2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java @@ -5,9 +5,6 @@ */ package org.elasticsearch.xpack.watcher.client; -/** - * - */ public final class WatchSourceBuilders { private WatchSourceBuilders() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java index 080f1d85cde..e8c16abb05f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java @@ -44,8 +44,6 @@ import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRespo import java.util.Map; -/** - */ public class WatcherClient { private final Client client; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java index f917db59d3c..36cadc6bdc6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java @@ -7,9 +7,6 @@ package org.elasticsearch.xpack.watcher.client; import org.elasticsearch.common.inject.AbstractModule; -/** - * - */ public class WatcherClientModule extends AbstractModule { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java index d930d911b01..4b3e67cc6e5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java @@ -12,9 +12,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Locale; -/** - * - */ public interface Condition extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java index b3056edabff..2bc422aefea 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java @@ -21,9 +21,6 @@ import org.elasticsearch.xpack.watcher.condition.script.ScriptConditionFactory; import java.util.HashMap; import java.util.Map; -/** - * - */ public class ConditionModule extends AbstractModule { private final Map> factories = new HashMap<>(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java index 3f02b1f50be..cecce51af50 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java @@ -15,9 +15,6 @@ import java.io.IOException; import java.util.Map; import java.util.Set; -/** - * - */ public class ConditionRegistry { private final Map factories; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java index 7c3eff1c0a7..1aaf52d3384 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java @@ -12,9 +12,6 @@ import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; -/** - * - */ public abstract class ExecutableCondition implements ToXContent { protected final C condition; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java index 492a08fc045..dba05654bfc 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java @@ -12,9 +12,6 @@ import org.elasticsearch.xpack.watcher.condition.Condition; import java.io.IOException; -/** - * - */ public class AlwaysCondition implements Condition { public static final String TYPE = "always"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java index c2da3cb1e1e..fa35b77903d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.condition.ConditionFactory; import java.io.IOException; -/** - * - */ public class AlwaysConditionFactory extends ConditionFactory { private final ExecutableAlwaysCondition condition; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java index 0284753ddf3..d0bc0a1bd7d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java @@ -12,8 +12,6 @@ import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; -/** - */ public class ExecutableAlwaysCondition extends ExecutableCondition { public ExecutableAlwaysCondition(Logger logger) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java index 1f969a3cd69..7b8033760df 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java @@ -17,9 +17,6 @@ import java.io.IOException; import java.util.Locale; import java.util.Map; -/** - * - */ public class CompareCondition implements Condition { public static final String TYPE = "compare"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java index 6c186ea3838..dc9bfa478c0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.support.clock.Clock; import java.io.IOException; -/** - * - */ public class CompareConditionFactory extends ConditionFactory { private final Clock clock; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java index fcc7268bce9..9abd7ac54a5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java @@ -12,9 +12,6 @@ import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; import java.util.Map; -/** - * - */ public class ExecutableCompareCondition extends AbstractExecutableCompareCondition { public ExecutableCompareCondition(CompareCondition condition, Logger logger, Clock clock) { super(condition, logger, clock); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java index 4fdb70cc6e4..d04ba10ca14 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java @@ -12,8 +12,6 @@ import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; -/** - */ public class ExecutableNeverCondition extends ExecutableCondition { public ExecutableNeverCondition(Logger logger) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java index b313076f57d..19540cf863c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java @@ -12,9 +12,6 @@ import org.elasticsearch.xpack.watcher.condition.Condition; import java.io.IOException; -/** - * - */ public class NeverCondition implements Condition { public static final String TYPE = "never"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java index 5aebce5d5fb..a41a1967540 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.condition.ConditionFactory; import java.io.IOException; -/** - * - */ public class NeverConditionFactory extends ConditionFactory { private final ExecutableNeverCondition condition; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java index 156d07a182f..7961532cd97 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java @@ -9,9 +9,6 @@ import java.util.Locale; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public enum ActionExecutionMode { /** diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java index f03a8dd4630..ba5ea5e5445 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java @@ -17,8 +17,6 @@ import org.elasticsearch.xpack.watcher.trigger.TriggerService; import static java.util.stream.StreamSupport.stream; -/** - */ public class AsyncTriggerListener implements TriggerEngine.Listener { private final Logger logger; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java index 7a9c70113e4..a016cc7e262 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; -/** - */ public class ExecutionModule extends AbstractModule { private final Class executorClass; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java index 75f423c8f9e..42631973f3a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.watcher.execution; import java.util.Locale; -/** - */ public enum ExecutionPhase { AWAITS_EXECUTION(false), diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java index d424c4e105f..954624c088a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java @@ -20,8 +20,6 @@ import java.util.Map; import static java.util.Collections.unmodifiableMap; -/** - */ public class ManualExecutionContext extends WatchExecutionContext { private final Map actionModes; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java index f0a3c667971..328a8070a24 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java @@ -17,8 +17,6 @@ import org.elasticsearch.xpack.watcher.trigger.TriggerService; import static java.util.stream.StreamSupport.stream; -/** - */ public class SyncTriggerListener implements TriggerEngine.Listener { private final ExecutionService executionService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java index b3d7ee82030..c1c4f0e8ea7 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java @@ -10,8 +10,6 @@ import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; -/** - */ public class TriggeredExecutionContext extends WatchExecutionContext { public TriggeredExecutionContext(Watch watch, DateTime executionTime, TriggerEvent triggerEvent, TimeValue defaultThrottlePeriod) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java index f9bb9a71786..ef9a2627f54 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java @@ -22,9 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentMap; -/** - * - */ public abstract class WatchExecutionContext { private final Wid id; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java index d05d3e67e57..e6733f19e76 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java @@ -18,9 +18,6 @@ import org.joda.time.DateTime; import java.io.IOException; -/** -* -*/ public class WatchExecutionResult implements ToXContent { private final DateTime executionTime; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java index 31a0ed9388e..fbf29f3e48a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java @@ -17,8 +17,6 @@ import org.joda.time.DateTimeZone; import java.io.IOException; -/** - */ public class WatchExecutionSnapshot implements Streamable, ToXContent { private String watchId; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java index a3fb5cf00a9..46dad83640a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.watcher.execution; import java.util.concurrent.BlockingQueue; import java.util.stream.Stream; -/** - * - */ public interface WatchExecutor { BlockingQueue queue(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java index 9ccedf58014..36f614c782c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java @@ -11,9 +11,6 @@ import org.joda.time.format.ISODateTimeFormat; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public class Wid { private static final DateTimeFormatter formatter = ISODateTimeFormat.dateTime(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java index 3c325c0f0e0..10928810a96 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java @@ -9,8 +9,6 @@ import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.watcher.execution.InternalWatchExecutor; -/** - */ public class HistoryModule extends AbstractModule { public HistoryModule() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java index 44c8ef07792..996b288e8f6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java @@ -28,8 +28,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; -/** - */ public class HistoryStore extends AbstractComponent { public static final String INDEX_PREFIX = ".watcher-history-"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java index 6d13cefe091..e1d702c9170 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - * - */ public abstract class ExecutableInput implements ToXContent { protected final I input; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java index c9bca989d49..7c96adc08f8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; -/** - * - */ public interface Input extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java index e8ef61763c9..98e1f4fc760 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java @@ -21,9 +21,6 @@ import org.elasticsearch.xpack.watcher.input.simple.SimpleInputFactory; import java.util.HashMap; import java.util.Map; -/** - * - */ public class InputModule extends AbstractModule { private final Map> parsers = new HashMap<>(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java index 02bbd623b9e..712d8e9927b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java @@ -27,8 +27,6 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.input.http.HttpInput.TYPE; -/** - */ public class ExecutableHttpInput extends ExecutableInput { private final HttpClient client; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java index 5434b98d7f5..15d733bcb45 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java @@ -25,9 +25,6 @@ import java.util.Set; import static java.util.Collections.unmodifiableSet; -/** - * - */ public class HttpInput implements Input { public static final String TYPE = "http"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java index 03ae56ba298..4c96597326e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java @@ -16,9 +16,6 @@ import org.elasticsearch.xpack.common.http.HttpRequestTemplate; import java.io.IOException; -/** - * - */ public final class HttpInputFactory extends InputFactory { private final HttpClient httpClient; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java index cf18af72462..69815b0ea3e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import org.elasticsearch.xpack.watcher.input.ExecutableInput; import org.elasticsearch.xpack.watcher.watch.Payload; -/** - * - */ public class ExecutableNoneInput extends ExecutableInput { public ExecutableNoneInput(Logger logger) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java index 8ff31624efb..4aa8e012d5a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - * - */ public class NoneInput implements Input { public static final String TYPE = "none"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java index a9a32821547..df0ce231e77 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.input.InputFactory; import java.io.IOException; -/** - * - */ public class NoneInputFactory extends InputFactory { @Inject diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java index bc2b26e60cb..918679e76ec 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - * - */ public class SimpleInput implements Input { public static final String TYPE = "simple"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java index ac25f22545f..075e288d542 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.input.InputFactory; import java.io.IOException; -/** - * - */ public class SimpleInputFactory extends InputFactory { @Inject diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java index f0473794b06..4bcec3c7477 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java @@ -35,8 +35,6 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT; import static org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction.Field.IGNORE_CONDITION; import static org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction.Field.RECORD_EXECUTION; -/** - */ public class RestExecuteWatchAction extends WatcherRestHandler { final TriggerService triggerService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java index 9b1b09f727d..6401d49ca1a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.watcher.support; import java.lang.reflect.Array; import java.util.Iterator; -/** - * - */ public class ArrayObjectIterator implements Iterator { private final Object array; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java index 20436778f70..8c3439b0265 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.HashMap; import java.util.Map; -/** - * - */ public final class Variables { public static final String CTX = "ctx"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java index 7e1851fa0d2..9d5a20405ef 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java @@ -23,9 +23,6 @@ import java.io.IOException; import java.util.Locale; import java.util.Objects; import java.util.concurrent.TimeUnit; -/** - * - */ public class WatcherDateTimeUtils { public static final FormatDateTimeFormatter dateTimeFormatter = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java index 28c8a91c932..11a6151119b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java @@ -34,8 +34,6 @@ import java.util.regex.Pattern; import static java.util.Collections.unmodifiableMap; -/** - */ public class WatcherIndexTemplateRegistry extends AbstractComponent implements ClusterStateListener { private static final String FORBIDDEN_INDEX_SETTING = "index.mapper.dynamic"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java index 5625b622094..928702b3055 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java @@ -9,9 +9,6 @@ import org.elasticsearch.common.logging.LoggerMessageFormat; import java.util.regex.Pattern; -/** - * - */ public class Validation { private static final Pattern NO_WS_PATTERN = Pattern.compile("\\S+"); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java index bf1583d0531..da8816d2006 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java @@ -11,9 +11,6 @@ import java.lang.reflect.Array; import java.util.List; import java.util.Map; -/** - * - */ public class ObjectPath { private ObjectPath() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java index 130982de75c..f7d5f791d48 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java @@ -13,9 +13,6 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.unmodifiableMap; -/** - * - */ public class WatcherParams extends ToXContent.DelegatingMapParams { public static final WatcherParams HIDE_SECRETS = WatcherParams.builder().hideSecrets(true).build(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java index cf4f4421161..df28b41ecf7 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java @@ -13,9 +13,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -/** - * - */ public abstract class ExecutableTransform implements ToXContent { protected final T transform; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java index 4cd1442fc8d..5efbc778fb6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java @@ -15,9 +15,6 @@ import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; -/** - * - */ public interface Transform extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java index b8b2a41f8d3..d4166944585 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java @@ -10,9 +10,6 @@ import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; -/** - * - */ public abstract class TransformFactory> { protected final Logger transformLogger; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java index 429860e9639..37f548546a5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java @@ -17,9 +17,6 @@ import org.elasticsearch.xpack.watcher.transform.search.SearchTransformFactory; import java.util.HashMap; import java.util.Map; -/** - * - */ public class TransformModule extends AbstractModule { private Map> factories = new HashMap<>(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java index 17280f0f92e..6267cac5d69 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java @@ -17,9 +17,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -/** - * - */ public class TransformRegistry { private final Map factories; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java index 965c9436b8b..75a2ab54eaf 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java @@ -19,9 +19,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -/** - * - */ public class ChainTransform implements Transform { public static final String TYPE = "chain"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java index 1664dd60b9b..02084410404 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java @@ -22,9 +22,6 @@ import java.util.List; import static org.elasticsearch.common.logging.LoggerMessageFormat.format; import static org.elasticsearch.xpack.watcher.transform.chain.ChainTransform.TYPE; -/** - * - */ public class ExecutableChainTransform extends ExecutableTransform { private final List transforms; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java index be1754fe225..1ea4f3b9175 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java @@ -22,9 +22,6 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.XPackPlugin; -/** - * - */ public abstract class WatcherTransportAction, Response extends ActionResponse> extends TransportMasterNodeAction { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java index 1a14dd25b2b..05e3dad739f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java @@ -11,8 +11,6 @@ import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -/** - */ public class DeleteWatchResponse extends ActionResponse { private String id; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java index d79a0ca7b1b..3f11c1dd721 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java @@ -26,8 +26,6 @@ import org.elasticsearch.xpack.watcher.WatcherService; import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; import org.elasticsearch.xpack.watcher.watch.WatchStore; -/** - */ public class TransportPutWatchAction extends WatcherTransportAction { private final WatcherService watcherService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java index c9512ca2374..4df6832a84d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java @@ -21,8 +21,6 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.watcher.WatcherLifeCycleService; import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; -/** - */ public class TransportWatcherServiceAction extends WatcherTransportAction { private final WatcherLifeCycleService lifeCycleService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java index a43119d9158..e5f5a211911 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; -/** - */ public class WatcherServiceAction extends Action { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java index 1bd9cfb03a5..bf6961de5dd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java @@ -14,8 +14,6 @@ import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.Locale; -/** - */ public class WatcherServiceRequest extends MasterNodeRequest { enum Command { START, STOP, RESTART } diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java index 799a4960ba5..bd49d24d561 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; -/** - */ public class WatcherServiceRequestBuilder extends MasterNodeOperationRequestBuilder { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java index 27eafe415e2..876009c16a1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java @@ -11,9 +11,6 @@ import org.elasticsearch.common.settings.Settings; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -/** - * - */ public abstract class AbstractTriggerEngine extends AbstractComponent implements TriggerEngine { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java index eb3124cddc8..cbe98b87bde 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java @@ -10,9 +10,6 @@ import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; -/** - * - */ public interface Trigger extends ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java index b8fd5dfb17c..947d1043570 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; -/** - * - */ public final class TriggerBuilders { private TriggerBuilders() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java index 24d192f90d6..b8d6bf042b2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java @@ -12,9 +12,6 @@ import java.io.IOException; import java.util.Collection; import java.util.Map; -/** - * - */ public interface TriggerEngine { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java index 85c5ce6473f..c00b4dfa561 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java @@ -15,9 +15,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -/** - * - */ public abstract class TriggerEvent implements ToXContent { private final String jobName; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java index 236ba0a1b37..1b7e876a3c9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java @@ -14,9 +14,6 @@ import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleModule; import java.util.HashSet; import java.util.Set; -/** - * - */ public class TriggerModule extends AbstractModule { private final Settings settings; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java index 92ca3dce3f2..f3fa81fef2d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java @@ -22,9 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import static java.util.Collections.unmodifiableMap; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public class TriggerService extends AbstractComponent { private final Listeners listeners; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java index 68efc970975..76af1918f18 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java @@ -12,8 +12,6 @@ import org.elasticsearch.xpack.watcher.trigger.Trigger; import java.io.IOException; -/** - */ public class ManualTrigger implements Trigger { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java index 5773f3a3ea7..1029a37867c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java @@ -17,8 +17,6 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - */ public class ManualTriggerEngine implements TriggerEngine { static final String TYPE = "manual"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java index b0f2184cff7..cd046ced5fd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java @@ -12,8 +12,6 @@ import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.io.IOException; -/** - */ public class ManualTriggerEvent extends TriggerEvent { private final TriggerEvent triggerEvent; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java index 739ea54ccfa..2e8a2f0e360 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java @@ -13,9 +13,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -/** - * - */ public class CronSchedule extends CronnableSchedule { public static final String TYPE = "cron"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java index 6db0812ad01..a0c9833e634 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java @@ -9,9 +9,6 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Objects; -/** - * - */ public abstract class CronnableSchedule implements Schedule { private static final Comparator CRON_COMPARATOR = new Comparator() { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java index ef53be93bfe..3c5ee6c8371 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java @@ -18,9 +18,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * - */ public class DailySchedule extends CronnableSchedule { public static final String TYPE = "daily"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java index 2e6b322724a..88d6f13e1ee 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java @@ -21,9 +21,6 @@ import java.util.Set; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public class HourlySchedule extends CronnableSchedule { public static final String TYPE = "hourly"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java index fd481f8530f..7249f97a178 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java @@ -16,9 +16,6 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public class IntervalSchedule implements Schedule { public static final String TYPE = "interval"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java index b57a7a12044..63c1d497f17 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java @@ -16,9 +16,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * - */ public class MonthlySchedule extends CronnableSchedule { public static final String TYPE = "monthly"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java index 5125b93f59a..d8f4928a6d4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java @@ -11,9 +11,6 @@ import org.elasticsearch.xpack.scheduler.SchedulerEngine; import java.io.IOException; -/** - * - */ public interface Schedule extends SchedulerEngine.Schedule, ToXContent { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java index 407362814cf..eb553682bc5 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java @@ -17,9 +17,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -/** - * - */ public class ScheduleModule extends AbstractModule { private final Map> parsers = new HashMap<>(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java index 236ec6049cf..776dd9f1f79 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java @@ -13,9 +13,6 @@ import java.io.IOException; import java.util.Map; import java.util.Set; -/** - * - */ public class ScheduleRegistry { private final Map parsers; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java index 55e519f634e..069f7a9a351 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java @@ -10,9 +10,6 @@ import org.elasticsearch.xpack.watcher.trigger.Trigger; import java.io.IOException; -/** - * - */ public class ScheduleTrigger implements Trigger { public static final String TYPE = "schedule"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java index cfc3644925d..999b09be5ca 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java @@ -19,9 +19,6 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -/** - * - */ public abstract class ScheduleTriggerEngine extends AbstractTriggerEngine { public static final String TYPE = ScheduleTrigger.TYPE; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java index 5781f147083..947cb9c14c4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java @@ -18,9 +18,6 @@ import org.joda.time.DateTimeZone; import java.io.IOException; -/** - * - */ public class ScheduleTriggerEvent extends TriggerEvent { private final DateTime scheduledTime; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java index f49f087daa7..923c642566e 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java @@ -16,9 +16,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * - */ public class WeeklySchedule extends CronnableSchedule { public static final String TYPE = "weekly"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java index 015de3d7feb..739f22e2dfe 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java @@ -16,9 +16,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * - */ public class YearlySchedule extends CronnableSchedule { public static final String TYPE = "yearly"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java index 055c8732948..3281b402ded 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java @@ -22,9 +22,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -/** - * - */ public class SchedulerScheduleTriggerEngine extends ScheduleTriggerEngine { private final SchedulerEngine schedulerEngine; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java index aa2850d6e2d..70698b028f3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java @@ -25,9 +25,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; -/** - * - */ public class TickerScheduleTriggerEngine extends ScheduleTriggerEngine { private final TimeValue tickInterval; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java index 1a366f233f3..2095cfa6ea6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java @@ -13,9 +13,6 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Locale; -/** - * - */ public enum DayOfWeek implements ToXContent { SUNDAY("SUN"), diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java index ad3af2213e6..da416896429 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java @@ -19,9 +19,6 @@ import java.util.List; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.elasticsearch.xpack.watcher.support.Strings.join; -/** - * - */ public class DayTimes implements Times { public static final DayTimes NOON = new DayTimes("noon", new int[] { 12 }, new int[] { 0 }); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java index 53e53ad6d79..d23170b2392 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java @@ -13,9 +13,6 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Locale; -/** - * - */ public enum Month implements ToXContent { JANUARY("JAN"), diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java index 0add079ef35..2bf28ac3f83 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java @@ -22,9 +22,6 @@ import static org.elasticsearch.common.util.set.Sets.newHashSet; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.elasticsearch.xpack.watcher.support.Strings.join; -/** - * - */ public class MonthTimes implements Times { public static final String LAST = "last_day"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java index e281dc3eed6..e4e4957dde1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; -/** - * - */ public interface Times extends ToXContent { ParseField MONTH_FIELD = new ParseField("in", "month"); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java index 994926f2056..3c9224036e8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java @@ -20,9 +20,6 @@ import java.util.Set; import static org.elasticsearch.common.util.set.Sets.newHashSet; import static org.elasticsearch.xpack.watcher.support.Strings.join; -/** - * - */ public class WeekTimes implements Times { public static final EnumSet DEFAULT_DAYS = EnumSet.of(DayOfWeek.MONDAY); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java index 781099e08ed..1a82764c1ba 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java @@ -24,9 +24,6 @@ import static org.elasticsearch.common.util.set.Sets.newHashSet; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.elasticsearch.xpack.watcher.support.Strings.join; -/** - * - */ public class YearTimes implements Times { public static final EnumSet DEFAULT_MONTHS = EnumSet.of(Month.JANUARY); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java index 1aaeb3c9855..99586670f80 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java @@ -18,9 +18,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; -/** - * - */ public class WatchLockService extends AbstractComponent { private final KeyedLock watchLocks = new KeyedLock<>(true); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java index 69e6b06b873..c9f1ddb02ba 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java @@ -8,9 +8,6 @@ package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.xpack.watcher.WatcherService; -/** - * - */ public class WatchModule extends AbstractModule { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java index 7ce0fe53430..a04286a1179 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java @@ -35,9 +35,6 @@ import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.readO import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.writeDate; import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.writeOptionalDate; -/** - * - */ public class WatchStatus implements ToXContent, Streamable { public static final String INCLUDE_VERSION_KEY = "include_version"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java index 7e1cde66867..72d84b4ff0f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java @@ -25,8 +25,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.equalTo; -/** - */ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { protected static final SecuredString USERS_PASSWD = new SecuredString("change_me".toCharArray()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java index cb449f624bb..c8b7014d485 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java @@ -24,8 +24,6 @@ import static org.elasticsearch.xpack.security.authc.support.UsernamePasswordTok import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -/** - */ public class DocumentLevelSecurityRandomTests extends SecurityIntegTestCase { protected static final SecuredString USERS_PASSWD = new SecuredString("change_me".toCharArray()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java index eccb8609a9b..e7155086264 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java @@ -46,8 +46,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -/** - */ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { protected static final SecuredString USERS_PASSWD = new SecuredString("change_me".toCharArray()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java index e9c6dfe43fa..edd72021444 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java @@ -21,8 +21,6 @@ import static org.elasticsearch.xpack.security.authc.support.UsernamePasswordTok import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -/** - */ public class IndicesPermissionsWithAliasesWildcardsAndRegexsTests extends SecurityIntegTestCase { protected static final SecuredString USERS_PASSWD = new SecuredString("change_me".toCharArray()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java index 8342a77f9c8..d65de8485e1 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java @@ -39,9 +39,6 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class KibanaUserRoleIntegTests extends SecurityIntegTestCase { protected static final SecuredString USERS_PASSWD = new SecuredString("change_me".toCharArray()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java b/elasticsearch/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java index d8e85ba8d33..0b7b8d16714 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java +++ b/elasticsearch/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java @@ -14,9 +14,6 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -/** - * - */ public class SecurityTestsUtils { private SecurityTestsUtils() { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java index 2d730df42f1..8307212f847 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java @@ -41,8 +41,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; -/** - */ public class HttpClientTests extends ESTestCase { private MockWebServer webServer; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java index 71dca67a294..3f7de0265c8 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java @@ -18,8 +18,6 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; import static org.mockito.Mockito.mock; -/** - */ public class HttpConnectionTimeoutTests extends ESTestCase { // setting an unroutable IP to simulate a connection timeout private static final String UNROUTABLE_IP = "192.168.255.255"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java index a4fa90ec717..7280a3511bd 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java @@ -26,8 +26,6 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; import static org.mockito.Mockito.mock; -/** - */ public class HttpReadTimeoutTests extends ESTestCase { private MockWebServer webServer; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java index 63f1d7107ed..e2c5b454a51 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java @@ -31,9 +31,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class HttpResponseTests extends ESTestCase { public void testParseSelfGenerated() throws Exception { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java index 4e826cb2daf..4a4fda5d63e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java @@ -16,9 +16,6 @@ import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class GraphFeatureSetTests extends ESTestCase { private XPackLicenseState licenseState; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java index 3adb276dd74..98754ed2d0d 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java @@ -27,9 +27,6 @@ import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class MonitoringFeatureSetTests extends ESTestCase { private XPackLicenseState licenseState; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java index c1b234abb2f..81a1174d68f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java @@ -51,9 +51,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class ExportersTests extends ESTestCase { private Exporters exporters; private Map factories; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java index d39b0718207..2ac25f09b97 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java @@ -70,9 +70,6 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; -/** - * - */ public abstract class MonitoringIntegTestCase extends ESIntegTestCase { public static final String MONITORING_INDICES_PREFIX = MonitoringIndexNameResolver.PREFIX + MonitoringIndexNameResolver.DELIMITER; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java index 61adce9ac04..aad2c643b0c 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java @@ -29,9 +29,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class AccountTests extends ESTestCase { static final String USERNAME = "_user"; static final String PASSWORD = "_passwd"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java index 548aad3a356..22c3df0c1a4 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java @@ -14,9 +14,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class AccountsTests extends ESTestCase { public void testSingleAccount() throws Exception { Settings.Builder builder = Settings.builder() diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java index c17a2896820..6a80a44352e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java @@ -39,9 +39,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class EmailSecretsIntegrationTests extends AbstractWatcherIntegrationTestCase { static final String USERNAME = "_user"; static final String PASSWORD = "_passwd"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java index 563bbe523da..f5d16de9643 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java @@ -20,8 +20,6 @@ import java.util.Map; import static org.hamcrest.Matchers.equalTo; -/** - */ public class EmailTests extends ESTestCase { public void testEmailParserSelfGenerated() throws Exception { String id = "test-id"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java index e17825a85a1..a170eddfcbc 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java @@ -11,9 +11,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.equalTo; -/** - * - */ public class HtmlSanitizerTests extends ESTestCase { public void testDefaultWithTemplatePlaceholders() { String blockTag = randomFrom(HtmlSanitizer.BLOCK_TAGS); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java index 612e2dab224..6d8e26e4c5f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java @@ -27,9 +27,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * - */ public class HipChatAccountsTests extends ESTestCase { private HttpClient httpClient; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java index 04452d58bb3..c0683088288 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java @@ -23,9 +23,6 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; -/** - * - */ public class HipChatServiceTests extends ESTestCase { private HttpClient httpClient; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java index b6c0b75ba2c..f526601ecf8 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java @@ -27,9 +27,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * - */ public class IntegrationAccountTests extends ESTestCase { public void testSettings() throws Exception { String accountName = "_name"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java index 409261c85fe..c092b715f79 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java @@ -24,9 +24,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * - */ public class V1AccountTests extends ESTestCase { public void testSettings() throws Exception { String accountName = "_name"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java index c8e5b425285..a77eb652592 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java @@ -11,9 +11,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.is; -/** - * - */ public class IncidentEventDefaultsTests extends ESTestCase { public void testConstructor() throws Exception { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java index be0ec93b693..704fe2c9a72 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java @@ -26,9 +26,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class PagerDutyAccountsTests extends ESTestCase { private HttpClient httpClient; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java index 02f282970f7..2c8589a457e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java @@ -20,9 +20,6 @@ import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; -/** - * - */ public class SlackAccountsTests extends ESTestCase { private HttpClient httpClient; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java index 2bc18ef484d..de47a6061b4 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java @@ -10,9 +10,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.is; -/** - * - */ public class SlackMessageDefaultsTests extends ESTestCase { public void testConstructor() throws Exception { Settings settings = randomSettings(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java index 3dd73ab897a..1d314764236 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java @@ -42,9 +42,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class SecurityActionFilterTests extends ESTestCase { private AuthenticationService authcService; private AuthorizationService authzService; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java index 204b88fa2c3..b7ec41b1209 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java @@ -26,9 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class AuditTrailServiceTests extends ESTestCase { private List auditTrails; private AuditTrailService service; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java index 6ac4a3fe74d..af5e79c3daf 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java @@ -32,9 +32,6 @@ import java.util.Map; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -/** - * - */ public class RunAsIntegTests extends SecurityIntegTestCase { static final String RUN_AS_USER = "run_as_user"; static final String TRANSPORT_CLIENT_USER = "transport_user"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java index f581d9d49ff..c77c09418dc 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java @@ -32,9 +32,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * - */ public class FileRealmTests extends ESTestCase { private FileUserPasswdStore userPasswdStore; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java index b0472bf0214..7af4dcc8a6e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java @@ -47,9 +47,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class DnRoleMapperTests extends ESTestCase { private static final String[] STARK_GROUP_DNS = new String[] { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java index 54c3e4d811e..9d1b2e2d6df 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java @@ -9,9 +9,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.sameInstance; -/** - * - */ public class HasherTests extends ESTestCase { public void testBcryptFamilySelfGenerated() throws Exception { testHasherSelfGenerated(Hasher.BCRYPT); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java index ad3a5a664ed..34dcdeb24fb 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java @@ -21,9 +21,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class UsernamePasswordTokenTests extends ESTestCase { @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java index 4a53b30854c..f940af3fc48 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java @@ -23,9 +23,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class PermissionTests extends ESTestCase { private Role permission; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java index 176e522eb7f..ca7de7c931d 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java @@ -22,9 +22,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class PrivilegeTests extends ESTestCase { @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java index e732ea4156e..d3e9097e497 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java @@ -27,9 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class SecurityRestFilterTests extends ESTestCase { private AuthenticationService authcService; private RestChannel channel; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java index d34c8c002c5..0cebff5d603 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java @@ -14,9 +14,6 @@ import static org.elasticsearch.xpack.security.support.Automatons.patterns; import static org.elasticsearch.xpack.security.support.Automatons.wildcard; import static org.hamcrest.Matchers.is; -/** - * - */ public class AutomatonsTests extends ESTestCase { public void testPatternsUnionOfMultiplePatterns() throws Exception { assertMatch(patterns("/fo.*/", "ba*"), "foo"); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java index 05a1128b7c6..2fc80ce0f17 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java @@ -19,9 +19,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class ValidationTests extends ESTestCase { private static final char[] alphabet = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java index 22328097e38..f3759ad9ea5 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java @@ -27,9 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class ServerTransportFilterTests extends ESTestCase { private AuthenticationService authcService; private AuthorizationService authzService; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java index 6e33674a068..2d4454932bc 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java @@ -41,9 +41,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class IPFilterTests extends ESTestCase { private IPFilter ipFilter; private XPackLicenseState licenseState; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java index bdd5660789f..8d665bd2b65 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java @@ -9,9 +9,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.is; -/** - * - */ public class SystemUserTests extends ESTestCase { public void testIsAuthorized() throws Exception { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java index 28ae29c2646..1d4c5033502 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java @@ -10,8 +10,6 @@ import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.equalTo; import static org.joda.time.DateTimeZone.UTC; -/** - */ public class ClockTests extends ESTestCase { public void testNowUTC() { Clock clockMock = new ClockMock(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java index b10ed6d45b3..a62f4e39fe6 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java @@ -26,9 +26,6 @@ import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class WatcherFeatureSetTests extends ESTestCase { private XPackLicenseState licenseState; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java index feff0267558..0185b44a5f4 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java @@ -34,8 +34,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - */ public class WatcherLifeCycleServiceTests extends ESTestCase { private ClusterService clusterService; private WatcherService watcherService; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java index a29fd18e722..1958f2c522b 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java @@ -30,9 +30,6 @@ import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -/** - * - */ @ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, maxNumDataNodes = 3) public class WatcherPluginDisableTests extends ESIntegTestCase { @Override diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java index 6dfcab4b93e..423addac316 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java @@ -44,9 +44,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -/** - * - */ public class WatcherServiceTests extends ESTestCase { private TriggerService triggerService; private WatchStore watchStore; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java index cfa11843db1..38331c40b0e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java @@ -32,9 +32,6 @@ import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; -/** - * - */ public class ActionErrorIntegrationTests extends AbstractWatcherIntegrationTestCase { @Override protected boolean timeWarped() { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java index 63e08e47728..843a9860b49 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java @@ -22,9 +22,6 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class PagerDutyActionFactoryTests extends ESTestCase { private PagerDutyActionFactory factory; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java index eeb196fc6f0..58aa3c661a8 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java @@ -23,9 +23,6 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class SlackActionFactoryTests extends ESTestCase { private SlackActionFactory factory; private SlackService service; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java index 462c906e0db..efdc452f17e 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java @@ -21,9 +21,6 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class AckThrottlerTests extends ESTestCase { public void testWhenAcked() throws Exception { DateTime timestamp = SystemClock.INSTANCE.nowUTC(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java index deced020e54..b35f592a125 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java @@ -22,9 +22,6 @@ import static org.hamcrest.Matchers.startsWith; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class PeriodThrottlerTests extends ESTestCase { public void testBelowPeriodSuccessful() throws Exception { PeriodType periodType = randomFrom(PeriodType.millis(), PeriodType.seconds(), PeriodType.minutes()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java index 527aa73003b..359e8939542 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java @@ -15,9 +15,6 @@ import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class WatchThrottlerTests extends ESTestCase { public void testThrottleDueToAck() throws Exception { PeriodThrottler periodThrottler = mock(PeriodThrottler.class); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java index 566379fbb57..61d3ab73889 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java @@ -17,8 +17,6 @@ import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; -/** - */ public class AlwaysConditionTests extends ESTestCase { public void testExecute() throws Exception { ExecutableCondition alwaysTrue = new ExecutableAlwaysCondition(logger); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java index dd0fadad6db..12d8acb9d10 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java @@ -29,8 +29,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.when; -/** - */ public class CompareConditionSearchTests extends AbstractWatcherIntegrationTestCase { @Override diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java index 78fab989439..d81e307ff51 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java @@ -28,8 +28,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - */ public class CompareConditionTests extends ESTestCase { public void testOpEvalEQ() throws Exception { assertThat(Op.EQ.eval(null, null), is(true)); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java index e536aeda66b..3f525a5442a 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java @@ -18,8 +18,6 @@ import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; -/** - */ public class NeverConditionTests extends ESTestCase { public void testExecute() throws Exception { ExecutableCondition executable = new ExecutableNeverCondition(logger); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java index 4c1c080018d..22c2b130c33 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java @@ -67,8 +67,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - */ public class ExecutionServiceTests extends ESTestCase { private Payload payload; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java index c5f992f9d58..7db487e1dc9 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java @@ -23,8 +23,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - */ public class TriggeredWatchStoreLifeCycleTests extends AbstractWatcherIntegrationTestCase { public void testPutLoadUpdate() throws Exception { ExecutableCondition condition = new ExecutableAlwaysCondition(logger); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java index a280c376c05..2f293ea0d63 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java @@ -18,8 +18,6 @@ import org.joda.time.DateTimeZone; import static org.hamcrest.Matchers.equalTo; -/** - */ public class TriggeredWatchTests extends AbstractWatcherIntegrationTestCase { public void testParser() throws Exception { Watch watch = WatcherTestUtils.createTestWatch("fired_test", watcherHttpClient(), noopEmailService(), diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java index fef45b528d6..0a3ddb83a4f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java @@ -18,8 +18,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; -/** - */ @TestLogging("org.elasticsearch.cluster:DEBUG,org.elasticsearch.action.admin.cluster.settings:DEBUG,org.elasticsearch.watcher:DEBUG") @ESIntegTestCase.ClusterScope(scope = TEST, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, supportsDedicatedMasters = false, numDataNodes = 1) diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java index 59b4213d6a5..9e37b191ebf 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - */ public class HistoryStoreTests extends ESTestCase { private HistoryStore historyStore; private WatcherClientProxy clientProxy; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java index bd22e2b334b..e49b7f9fbf8 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java @@ -15,9 +15,6 @@ import static java.util.Collections.emptyMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; -/** - * - */ public class InputRegistryTests extends ESTestCase { public void testParseEmptyInput() throws Exception { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java index d9ab8dec906..2eabaf2314f 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java @@ -24,8 +24,6 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; -/** - */ public class SimpleInputTests extends ESTestCase { public void testExecute() throws Exception { Map data = new HashMap<>(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java index a8f1d2b4825..919890da860 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java @@ -26,8 +26,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -/** - */ public class FilterXContentTests extends ESTestCase { public void testPayloadFiltering() throws Exception { Map data = new HashMap<>(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java index 70614be781c..fb0eb0268f0 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java @@ -23,9 +23,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.joda.time.DateTimeZone.UTC; -/** - * - */ public class VariablesTests extends ESTestCase { public void testCreateCtxModel() throws Exception { DateTime scheduledTime = DateTime.now(UTC); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java index fdd1295f95c..6952f9289f6 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java @@ -30,9 +30,6 @@ import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class WatcherDateTimeUtilsTests extends ESTestCase { public void testParseTimeValueNumeric() throws Exception { TimeValue value = new TimeValue(randomInt(100), randomFrom(TimeUnit.values())); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java index dab9d363f4c..b85bcc58033 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java @@ -24,8 +24,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; -/** - */ @ESIntegTestCase.ClusterScope(scope = TEST, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, supportsDedicatedMasters = false, numDataNodes = 1) public class WatcherIndexTemplateRegistryTests extends AbstractWatcherIntegrationTestCase { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java index 24093f2a6f4..7550e398b69 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java @@ -17,9 +17,6 @@ import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; -/** - * - */ public class MapPathTests extends ESTestCase { public void testEval() throws Exception { Map map = singletonMap("key", "value"); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java index e9bf9b71236..965d9a49e25 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java @@ -16,9 +16,6 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.smileBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.yamlBuilder; -/** - * - */ public class XContentSourceTests extends ESTestCase { public void testToXContent() throws Exception { XContentBuilder builder = randomBoolean() ? jsonBuilder() : randomBoolean() ? yamlBuilder() : smileBuilder(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java index 6b2c75a5d6d..a2e1eee0f24 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java @@ -23,9 +23,6 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.stream.Stream; -/** - * - */ public class TimeWarpedWatcher extends Watcher { public TimeWarpedWatcher(Settings settings) { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java index 16b9144c1c1..a5e5556e963 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java @@ -21,9 +21,6 @@ import static org.joda.time.DateTimeZone.UTC; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * - */ public class WatchExecutionContextMockBuilder { private final WatchExecutionContext ctx; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java index ae2e6b8f3d3..6fbaaaf8023 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java @@ -10,9 +10,6 @@ import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.mockito.Matchers; -/** - * - */ public final class WatcherMatchers { private WatcherMatchers() { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java index ac7adf19353..6f3a2a60d2c 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java @@ -31,9 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger; import static java.util.Collections.emptyMap; import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; -/** - * - */ @SuppressForbidden(reason = "benchmark") public class ScheduleEngineTriggerBenchmark { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java index ffb70a2578b..3e1d4bcb636 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java @@ -52,8 +52,6 @@ import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.templateRequ import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; -/** - */ @SuppressForbidden(reason = "benchmark") public class WatcherScheduleEngineBenchmark { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java index 107463ed85a..92c5b8758f1 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java @@ -47,9 +47,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.joda.time.DateTimeZone.UTC; -/** - * - */ public class HttpSecretsIntegrationTests extends AbstractWatcherIntegrationTestCase { static final String USERNAME = "_user"; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java index 560a8585bc8..414c9b3c4a9 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java @@ -36,9 +36,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; -/** - * - */ public class ChainTransformTests extends ESTestCase { public void testExecute() throws Exception { ChainTransform transform = new ChainTransform( diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java index c921fc0f368..8c8f7a86292 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java @@ -37,8 +37,6 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - */ public class ActivateWatchTests extends AbstractWatcherIntegrationTestCase { @Override protected boolean timeWarped() { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java index b861424bf30..5cdaa54a839 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java @@ -39,9 +39,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class DeleteWatchTests extends AbstractWatcherIntegrationTestCase { public void testDelete() throws Exception { ensureWatcherStarted(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java index ba5e97b22a9..6cd8250de85 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java @@ -25,8 +25,6 @@ import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interva import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -/** - */ public class ForceDeleteWatchTests extends AbstractWatcherIntegrationTestCase { //Disable time warping for the force delete long running watch test @Override diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java index 73841fc1ca5..ad9667b8c71 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java @@ -42,9 +42,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class ExecuteWatchTests extends AbstractWatcherIntegrationTestCase { public void testExecuteInvalidWatchId() throws Exception { DateTime now = DateTime.now(DateTimeZone.UTC); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java index b47f2d1c0cb..3eeaf78c64c 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java @@ -27,9 +27,6 @@ import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ //test is just too slow, please fix it to not be sleep-based @BadApple(bugUrl = "https://github.com/elastic/x-plugins/issues/1007") public class ExecuteWatchWithDateMathTests extends AbstractWatcherIntegrationTestCase { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java index 6e78c03c24a..ee1132d90c7 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java @@ -27,9 +27,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class GetWatchTests extends AbstractWatcherIntegrationTestCase { public void testGet() throws Exception { PutWatchResponse putResponse = watcherClient().preparePutWatch("_name").setSource(watchBuilder() diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java index 07e72e5f22a..59ee43969df 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java @@ -22,9 +22,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class PutWatchTests extends AbstractWatcherIntegrationTestCase { public void testPut() throws Exception { ensureWatcherStarted(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java index c029f7052b0..4f852622f37 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java @@ -17,9 +17,6 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -/** - * - */ public class CronScheduleTests extends ScheduleTestCase { public void testInvalid() throws Exception { try { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java index b2779a4669e..0293ee6a1de 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java @@ -22,9 +22,6 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class DailyScheduleTests extends ScheduleTestCase { public void testDefault() throws Exception { DailySchedule schedule = new DailySchedule(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java index 6602729b3f5..5f664d1abdd 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java @@ -24,9 +24,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class HourlyScheduleTests extends ScheduleTestCase { public void testDefault() throws Exception { HourlySchedule schedule = new HourlySchedule(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java index dec68cf1101..66316fff709 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java @@ -18,9 +18,6 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class IntervalScheduleTests extends ESTestCase { public void testParseNumber() throws Exception { long value = randomIntBetween(0, Integer.MAX_VALUE); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java index 7290bba4f90..d1214cf7452 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java @@ -21,9 +21,6 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class MonthlyScheduleTests extends ScheduleTestCase { public void testDefault() throws Exception { MonthlySchedule schedule = new MonthlySchedule(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java index 6bdb46868ea..6818ab7698b 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java @@ -21,9 +21,6 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class ScheduleRegistryTests extends ScheduleTestCase { private ScheduleRegistry registry; diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java index d9a8e9bad07..2c85daceb2a 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java @@ -27,9 +27,6 @@ import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interva import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.monthly; import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.weekly; -/** - * - */ public abstract class ScheduleTestCase extends ESTestCase { protected static String[] expressions(CronnableSchedule schedule) { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java index cb0247a3d70..ee28ba69ad9 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java @@ -15,8 +15,6 @@ import org.elasticsearch.xpack.support.clock.SystemClock; import static org.hamcrest.Matchers.is; -/** - */ public class ScheduleTriggerEventTests extends ESTestCase { public void testParserRandomDateMath() throws Exception { String triggeredTime = randomFrom("now", "now+5m", "2015-05-07T22:24:41.254Z", "2015-05-07T22:24:41.254Z||-5m"); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java index 6355bff8f85..31f0def6fb2 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java @@ -26,9 +26,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class WeeklyScheduleTests extends ScheduleTestCase { public void testDefault() throws Exception { WeeklySchedule schedule = new WeeklySchedule(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java index aa03e00ebcf..3eccea7eefa 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java @@ -23,9 +23,6 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -/** - * - */ public class YearlyScheduleTests extends ScheduleTestCase { public void testDefault() throws Exception { YearlySchedule schedule = new YearlySchedule(); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java index 883e41600d6..c29f682de5a 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java @@ -13,8 +13,6 @@ import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; import static org.mockito.Mockito.mock; -/** - */ //test is just too slow, please fix it to not be sleep-based @BadApple(bugUrl = "https://github.com/elastic/x-plugins/issues/1007") public class TickerScheduleEngineTests extends BaseTriggerEngineTestCase { diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java index bd8e0cbabe8..793a9e096e1 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java @@ -22,8 +22,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -/** - */ public class WatchLockServiceTests extends ESTestCase { public void testLockingNotStarted() { WatchLockService lockService = new WatchLockService(new TimeValue(1, TimeUnit.SECONDS)); From 6284db3a4d8503d068e450eceb3688080be7992a Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Wed, 12 Oct 2016 08:04:49 -0400 Subject: [PATCH 5/6] security: use correct time unit for role cache expire after write The role cache was previously using the wrong time unit for its expire after write time; the value passed to the cache was milliseconds instead of nanoseconds. Original commit: elastic/x-pack-elasticsearch@65f7b087636a1d456b1595d3ada9b6e4446edb9c --- .../xpack/security/authz/store/NativeRolesStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java index 1d25ffaf8c0..c4964ce7506 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java @@ -135,7 +135,7 @@ public class NativeRolesStore extends AbstractComponent implements RolesStore, C this.client = client; this.roleCache = CacheBuilder.builder() .setMaximumWeight(CACHE_SIZE_SETTING.get(settings)) - .setExpireAfterWrite(CACHE_TTL_SETTING.get(settings).getMillis()) + .setExpireAfterWrite(CACHE_TTL_SETTING.get(settings).getNanos()) .build(); this.isTribeNode = settings.getGroups("tribe", true).isEmpty() == false; } From 68eb4d981e42bd0f300579f13fb045ec11bb7165 Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Wed, 12 Oct 2016 11:42:02 -0400 Subject: [PATCH 6/6] security: wildcards for superusers includes the security index The superuser role is the only user assignable role that grants access to the .security index, but when resolving wildcards the index was not getting resolved. The resolution of indices and aliases explicitly excludes the .security index for users that are not the internal user without checking if the user has the superuser role. This commit adds a check in for the superuser role. Original commit: elastic/x-pack-elasticsearch@02ee0a87408c646b1495097a0bf478339dc3a39b --- .../security/authz/AuthorizationService.java | 2 +- .../authz/AuthorizationServiceTests.java | 75 +++++++++++++------ 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 5d6116b1595..1dc602e9d52 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -138,7 +138,7 @@ public class AuthorizationService extends AbstractComponent { } } - if (XPackUser.is(user) == false) { + if (XPackUser.is(user) == false && Arrays.binarySearch(user.roles(), SuperuserRole.NAME) < 0) { // we should filter out the .security index from wildcards if (indicesAndAliases.remove(SecurityTemplateService.SECURITY_INDEX_NAME)) { logger.debug("removed [{}] from user [{}] list of authorized indices", diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java index 356cd4192b5..6161ddbc354 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java @@ -56,6 +56,7 @@ import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.action.search.SearchTransportService; +import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportRequest; @@ -77,10 +78,12 @@ import org.elasticsearch.xpack.security.user.XPackUser; import org.junit.Before; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static org.elasticsearch.test.SecurityTestsUtils.assertAuthenticationException; import static org.elasticsearch.test.SecurityTestsUtils.assertAuthorizationException; +import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -543,6 +546,11 @@ public class AuthorizationServiceTests extends ESTestCase { request = new ClusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "foo", "bar"); authorizationService.authorize(createAuthentication(user), ClusterHealthAction.NAME, request); verify(auditTrail).accessGranted(user, ClusterHealthAction.NAME, request); + + SearchRequest searchRequest = new SearchRequest("_all"); + IndexNotFoundException e = expectThrows(IndexNotFoundException.class, + () -> authorizationService.authorize(createAuthentication(user), SearchAction.NAME, searchRequest)); + assertThat(e.getMessage(), containsString("no such index")); } public void testGrantedNonXPackUserCanExecuteMonitoringOperationsAgainstSecurityIndex() { @@ -589,29 +597,29 @@ public class AuthorizationServiceTests extends ESTestCase { .numberOfShards(1).numberOfReplicas(0).build(), true) .build()); - List> requests = new ArrayList<>(); - requests.add(new Tuple<>(DeleteAction.NAME, new DeleteRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(UpdateAction.NAME, new UpdateRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(IndexAction.NAME, new IndexRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(SearchAction.NAME, new SearchRequest(SecurityTemplateService.SECURITY_INDEX_NAME))); - requests.add(new Tuple<>(TermVectorsAction.NAME, - new TermVectorsRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(GetAction.NAME, new GetRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(TermVectorsAction.NAME, - new TermVectorsRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); - requests.add(new Tuple<>(IndicesAliasesAction.NAME, new IndicesAliasesRequest() - .addAliasAction(AliasActions.add().alias("security_alias").index(SecurityTemplateService.SECURITY_INDEX_NAME)))); - requests.add(new Tuple<>(ClusterHealthAction.NAME, new ClusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME))); - requests.add(new Tuple<>(ClusterHealthAction.NAME, - new ClusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "foo", "bar"))); + for (User user : Arrays.asList(XPackUser.INSTANCE, superuser)) { + List> requests = new ArrayList<>(); + requests.add(new Tuple<>(DeleteAction.NAME, new DeleteRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(UpdateAction.NAME, new UpdateRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(IndexAction.NAME, new IndexRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(SearchAction.NAME, new SearchRequest(SecurityTemplateService.SECURITY_INDEX_NAME))); + requests.add(new Tuple<>(TermVectorsAction.NAME, + new TermVectorsRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(GetAction.NAME, new GetRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(TermVectorsAction.NAME, + new TermVectorsRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "type", "id"))); + requests.add(new Tuple<>(IndicesAliasesAction.NAME, new IndicesAliasesRequest() + .addAliasAction(AliasActions.add().alias("security_alias").index(SecurityTemplateService.SECURITY_INDEX_NAME)))); + requests.add(new Tuple<>(ClusterHealthAction.NAME, new ClusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME))); + requests.add(new Tuple<>(ClusterHealthAction.NAME, + new ClusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME, "foo", "bar"))); - for (Tuple requestTuple : requests) { - String action = requestTuple.v1(); - TransportRequest request = requestTuple.v2(); - authorizationService.authorize(createAuthentication(XPackUser.INSTANCE), action, request); - verify(auditTrail).accessGranted(XPackUser.INSTANCE, action, request); - authorizationService.authorize(createAuthentication(superuser), action, request); - verify(auditTrail).accessGranted(superuser, action, request); + for (Tuple requestTuple : requests) { + String action = requestTuple.v1(); + TransportRequest request = requestTuple.v2(); + authorizationService.authorize(createAuthentication(user), action, request); + verify(auditTrail).accessGranted(user, action, request); + } } } @@ -641,6 +649,29 @@ public class AuthorizationServiceTests extends ESTestCase { authorizationService.authorize(createAuthentication(userWithNoRoles), IndicesExistsAction.NAME, new IndicesExistsRequest("a")); } + public void testXPackUserAndSuperusersCanExecuteOperationAgainstSecurityIndexWithWildcard() { + final User superuser = new User("custom_admin", SuperuserRole.NAME); + when(rolesStore.role(SuperuserRole.NAME)).thenReturn(Role.builder(SuperuserRole.DESCRIPTOR).build()); + ClusterState state = mock(ClusterState.class); + when(clusterService.state()).thenReturn(state); + when(state.metaData()).thenReturn(MetaData.builder() + .put(new IndexMetaData.Builder(SecurityTemplateService.SECURITY_INDEX_NAME) + .settings(Settings.builder().put("index.version.created", Version.CURRENT).build()) + .numberOfShards(1).numberOfReplicas(0).build(), true) + .build()); + + String action = SearchAction.NAME; + SearchRequest request = new SearchRequest("_all"); + authorizationService.authorize(createAuthentication(XPackUser.INSTANCE), action, request); + verify(auditTrail).accessGranted(XPackUser.INSTANCE, action, request); + assertThat(request.indices(), arrayContaining(".security")); + + request = new SearchRequest("_all"); + authorizationService.authorize(createAuthentication(superuser), action, request); + verify(auditTrail).accessGranted(superuser, action, request); + assertThat(request.indices(), arrayContaining(".security")); + } + private Authentication createAuthentication(User user) { RealmRef lookedUpBy = user.runAs() == null ? null : new RealmRef("looked", "up", "by"); return new Authentication(user, new RealmRef("test", "test", "foo"), lookedUpBy);