diff --git a/build-tools-internal/src/main/resources/checkstyle_ide_fragment.xml b/build-tools-internal/src/main/resources/checkstyle_ide_fragment.xml
index 9441fa9cd77c3..6aeae3712aaf9 100644
--- a/build-tools-internal/src/main/resources/checkstyle_ide_fragment.xml
+++ b/build-tools-internal/src/main/resources/checkstyle_ide_fragment.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ActionListenerUtils.java b/test/framework/src/main/java/org/elasticsearch/test/ActionListenerUtils.java
new file mode 100644
index 0000000000000..292e1fbef4a03
--- /dev/null
+++ b/test/framework/src/main/java/org/elasticsearch/test/ActionListenerUtils.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.test;
+
+import org.elasticsearch.action.ActionListener;
+
+import static org.mockito.Matchers.any;
+
+public abstract class ActionListenerUtils {
+
+ @SuppressWarnings("unchecked")
+ public static ActionListener anyActionListener() {
+ return any(ActionListener.class);
+ }
+}
diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
index 65f8a0a5d053e..eb832f8f7c237 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -136,10 +136,6 @@ dependencies {
testImplementation('org.apache.directory.mavibot:mavibot:1.0.0-M8')
}
-tasks.withType(JavaCompile).configureEach {
- options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
-}
-
tasks.named("processInternalClusterTestResources").configure {
from(project(xpackModule('core')).file('src/main/config'))
from(project(xpackModule('core')).file('src/test/resources'))
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlAuthenticateAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlAuthenticateAction.java
index 6f4543cc5ce81..a223b259689b3 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlAuthenticateAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlAuthenticateAction.java
@@ -64,6 +64,7 @@ protected void doExecute(Task task, SamlAuthenticateRequest request, ActionListe
return;
}
assert authentication != null : "authentication should never be null at this point";
+ @SuppressWarnings("unchecked")
final Map tokenMeta = (Map) result.getMetadata().get(SamlRealm.CONTEXT_TOKEN_DATA);
tokenService.createOAuth2Tokens(authentication, originatingAuthentication,
tokenMeta, true, ActionListener.wrap(tokenResult -> {
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java
index 123ab949127b6..c4402bb85b453 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java
@@ -118,6 +118,7 @@ private void invalidateTokenPair(Tuple tokenPair, ActionListe
private Predicate> containsMetadata(Map requiredMetadata) {
return source -> {
+ @SuppressWarnings("unchecked")
Map actualMetadata = (Map) source.get("metadata");
return requiredMetadata.entrySet().stream().allMatch(e -> Objects.equals(actualMetadata.get(e.getKey()), e.getValue()));
};
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java
index 28b3bf25907f8..0b9ebb88eaefb 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java
@@ -34,18 +34,14 @@
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.cache.RemovalListener;
-import org.elasticsearch.common.cache.RemovalNotification.RemovalReason;
-import org.elasticsearch.core.CharArrays;
-import org.elasticsearch.core.Nullable;
-import org.elasticsearch.common.xcontent.ParseField;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.cache.Cache;
import org.elasticsearch.common.cache.CacheBuilder;
-import org.elasticsearch.core.Tuple;
+import org.elasticsearch.common.cache.RemovalListener;
+import org.elasticsearch.common.cache.RemovalNotification.RemovalReason;
import org.elasticsearch.common.hash.MessageDigests;
import org.elasticsearch.common.logging.DeprecationCategory;
import org.elasticsearch.common.logging.DeprecationLogger;
@@ -53,7 +49,6 @@
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.core.TimeValue;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.util.concurrent.FutureUtils;
import org.elasticsearch.common.util.concurrent.ListenableFuture;
@@ -63,12 +58,17 @@
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ObjectParserHelper;
+import org.elasticsearch.common.xcontent.ParseField;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentLocation;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.CharArrays;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.Tuple;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.license.LicenseUtils;
@@ -91,13 +91,12 @@
import org.elasticsearch.xpack.core.security.authc.support.Hasher;
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
import org.elasticsearch.xpack.core.security.user.User;
-import org.elasticsearch.xpack.security.support.LockingAtomicCounter;
import org.elasticsearch.xpack.security.support.CacheInvalidatorRegistry;
import org.elasticsearch.xpack.security.support.FeatureNotEnabledException;
import org.elasticsearch.xpack.security.support.FeatureNotEnabledException.Feature;
+import org.elasticsearch.xpack.security.support.LockingAtomicCounter;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
-import javax.crypto.SecretKeyFactory;
import java.io.Closeable;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -125,6 +124,7 @@
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import javax.crypto.SecretKeyFactory;
import static org.elasticsearch.action.bulk.TransportSingleItemBulkWriteAction.toSingleItemBulkRequest;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
@@ -513,7 +513,9 @@ public void getRoleForApiKey(Authentication authentication, ActionListener metadata = authentication.getMetadata();
final String apiKeyId = (String) metadata.get(API_KEY_ID_KEY);
+ @SuppressWarnings("unchecked")
final Map roleDescriptors = (Map) metadata.get(API_KEY_ROLE_DESCRIPTORS_KEY);
+ @SuppressWarnings("unchecked")
final Map authnRoleDescriptors = (Map) metadata.get(API_KEY_LIMITED_ROLE_DESCRIPTORS_KEY);
if (roleDescriptors == null && authnRoleDescriptors == null) {
@@ -573,6 +575,7 @@ private List parseRoleDescriptors(final String apiKeyId, final M
return roleDescriptors.entrySet().stream()
.map(entry -> {
final String name = entry.getKey();
+ @SuppressWarnings("unchecked")
final Map rdMap = (Map) entry.getValue();
try (XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent())) {
builder.map(rdMap);
@@ -722,6 +725,7 @@ void validateApiKeyExpiration(ApiKeyDoc apiKeyDoc, ApiKeyCredentials credentials
final String principal = Objects.requireNonNull((String) apiKeyDoc.creator.get("principal"));
final String fullName = (String) apiKeyDoc.creator.get("full_name");
final String email = (String) apiKeyDoc.creator.get("email");
+ @SuppressWarnings("unchecked")
Map metadata = (Map) apiKeyDoc.creator.get("metadata");
final User apiKeyUser = new User(principal, Strings.EMPTY_ARRAY, fullName, email, metadata, true);
final Map authResultMetadata = new HashMap<>();
@@ -944,8 +948,11 @@ private void findApiKeys(final BoolQueryBuilder boolQuery, boolean filterOutInva
Long creation = (Long) source.get("creation_time");
Long expiration = (Long) source.get("expiration_time");
Boolean invalidated = (Boolean) source.get("api_key_invalidated");
+ @SuppressWarnings("unchecked")
String username = (String) ((Map) source.get("creator")).get("principal");
+ @SuppressWarnings("unchecked")
String realm = (String) ((Map) source.get("creator")).get("realm");
+ @SuppressWarnings("unchecked")
Map metadata = (Map) source.get("metadata_flattened");
return new ApiKey(name, id, Instant.ofEpochMilli(creation),
(expiration != null) ? Instant.ofEpochMilli(expiration) : null,
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
index d1f33ecc41c1b..81a0baf77926d 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
@@ -253,6 +253,7 @@ protected List initRealms() throws Exception {
return Collections.unmodifiableList(realms);
}
+ @SuppressWarnings("unchecked")
public void usageStats(ActionListener> listener) {
final XPackLicenseState licenseStateSnapshot = licenseState.copyCurrentLicenseState();
Map realmMap = new HashMap<>();
@@ -276,6 +277,7 @@ public void usageStats(ActionListener> listener) {
}
assert value instanceof Map;
+ @SuppressWarnings("unchecked")
Map realmTypeUsage = (Map) value;
realmTypeUsage.put("enabled", true);
realmTypeUsage.put("available", true);
@@ -330,6 +332,7 @@ private void addNativeRealms(List realms) throws Exception {
}
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private static void combineMaps(Map mapA, Map mapB) {
for (Entry entry : mapB.entrySet()) {
mapA.compute(entry.getKey(), (key, value) -> {
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
index 6d12e6b026522..eb7f3e0b651ba 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
@@ -45,14 +45,12 @@
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.ack.AckedRequest;
import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.core.Nullable;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.cache.Cache;
import org.elasticsearch.common.cache.CacheBuilder;
-import org.elasticsearch.core.Tuple;
import org.elasticsearch.common.hash.MessageDigests;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.InputStreamStreamInput;
@@ -63,13 +61,15 @@
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.core.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.util.iterable.Iterables;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.Tuple;
import org.elasticsearch.core.internal.io.Streams;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.engine.VersionConflictEngineException;
@@ -97,15 +97,6 @@
import org.elasticsearch.xpack.security.support.FeatureNotEnabledException.Feature;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -144,6 +135,15 @@
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
@@ -449,6 +449,7 @@ private void getUserTokenFromId(String userTokenId, Version tokenVersion, Action
() -> executeAsyncWithOrigin(client.threadPool().getThreadContext(), SECURITY_ORIGIN, getRequest,
ActionListener.wrap(response -> {
if (response.isExists()) {
+ @SuppressWarnings("unchecked")
Map accessTokenSource =
(Map) response.getSource().get("access_token");
if (accessTokenSource == null) {
@@ -458,6 +459,7 @@ private void getUserTokenFromId(String userTokenId, Version tokenVersion, Action
onFailure.accept(new IllegalStateException(
"token document is missing the user_token field"));
} else {
+ @SuppressWarnings("unchecked")
Map userTokenSource =
(Map) accessTokenSource.get("user_token");
listener.onResponse(UserToken.fromSourceMap(userTokenSource));
@@ -691,7 +693,7 @@ public void invalidateActiveTokensForRealmAndUser(@Nullable String realmName, @N
}
}, listener::onFailure));
} else {
- Predicate filter = null;
+ Predicate> filter = null;
if (Strings.hasText(username)) {
filter = isOfUser(username);
}
@@ -1295,6 +1297,7 @@ private static Optional checkClientCanRefresh(Re
}
private static Map getRefreshTokenSourceMap(Map source) {
+ @SuppressWarnings("unchecked")
final Map refreshTokenSource = (Map) source.get("refresh_token");
if (refreshTokenSource == null || refreshTokenSource.isEmpty()) {
throw new IllegalStateException("token document is missing the refresh_token object");
@@ -1303,10 +1306,12 @@ private static Map getRefreshTokenSourceMap(Map
}
private static Map getUserTokenSourceMap(Map source) {
+ @SuppressWarnings("unchecked")
final Map accessTokenSource = (Map) source.get("access_token");
if (accessTokenSource == null || accessTokenSource.isEmpty()) {
throw new IllegalStateException("token document is missing the access_token object");
}
+ @SuppressWarnings("unchecked")
final Map userTokenSource = (Map) accessTokenSource.get("user_token");
if (userTokenSource == null || userTokenSource.isEmpty()) {
throw new IllegalStateException("token document is missing the user token info");
@@ -1556,7 +1561,9 @@ private Tuple filterAndParseHit(SearchHit hit, @Nullable Pred
*/
private Tuple parseTokensFromDocument(Map source, @Nullable Predicate> filter)
throws IllegalStateException, DateTimeException {
+ @SuppressWarnings("unchecked")
final String hashedRefreshToken = (String) ((Map) source.get("refresh_token")).get("token");
+ @SuppressWarnings("unchecked")
final Map userTokenSource = (Map)
((Map) source.get("access_token")).get("user_token");
if (null != filter && filter.test(userTokenSource) == false) {
@@ -1634,6 +1641,7 @@ private void checkIfTokenIsValid(UserToken userToken, ActionListener
ActionListener.wrap(response -> {
if (response.isExists()) {
Map source = response.getSource();
+ @SuppressWarnings("unchecked")
Map accessTokenSource = (Map) source.get("access_token");
if (accessTokenSource == null) {
onFailure.accept(new IllegalStateException("token document is missing access_token field"));
@@ -2002,6 +2010,7 @@ public void onFailure(Exception e) {
* Creates a new key unless present that is newer than the current active key and returns the corresponding metadata. Note:
* this method doesn't modify the metadata used in this token service. See {@link #refreshMetadata(TokenMetadata)}
*/
+ @SuppressWarnings("unchecked")
synchronized TokenMetadata generateSpareKey() {
KeyAndCache maxKey = keyCache.cache.values().stream().max(Comparator.comparingLong(v -> v.keyAndTimestamp.getTimestamp())).get();
KeyAndCache currentKey = keyCache.activeKeyCache;
@@ -2406,6 +2415,7 @@ static RefreshTokenStatus fromSourceMap(Map refreshTokenSource)
if (invalidated == null) {
throw new IllegalStateException("token document is missing the \"invalidated\" field");
}
+ @SuppressWarnings("unchecked")
final Map clientInfo = (Map) refreshTokenSource.get("client");
if (clientInfo == null) {
throw new IllegalStateException("token document is missing the \"client\" field");
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java
index 0c503b41bb9f5..fa0ea816b7c3d 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java
@@ -155,6 +155,7 @@ static UserToken fromSourceMap(Map source) throws IllegalStateEx
if (versionId == null) {
throw new IllegalStateException("user token source document does not have the \"version\" field");
}
+ @SuppressWarnings("unchecked")
final Map metadata = (Map) source.get("metadata");
final String authString = (String) source.get("authentication");
if (authString == null) {
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java
index 0f2ec31cea659..9ec4629f7af4f 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java
@@ -614,6 +614,7 @@ private UserAndPassword transformUser(final String id, final Map
final String username = id.substring(USER_DOC_TYPE.length() + 1);
try {
String password = (String) sourceMap.get(Fields.PASSWORD.getPreferredName());
+ @SuppressWarnings("unchecked")
String[] roles = ((List) sourceMap.get(Fields.ROLES.getPreferredName())).toArray(Strings.EMPTY_ARRAY);
String fullName = (String) sourceMap.get(Fields.FULL_NAME.getPreferredName());
String email = (String) sourceMap.get(Fields.EMAIL.getPreferredName());
@@ -622,6 +623,7 @@ private UserAndPassword transformUser(final String id, final Map
// fallback mechanism as a user from 2.x may not have the enabled field
enabled = Boolean.TRUE;
}
+ @SuppressWarnings("unchecked")
Map metadata = (Map) sourceMap.get(Fields.METADATA.getPreferredName());
return new UserAndPassword(new User(username, roles, fullName, email, metadata, enabled), password.toCharArray());
} catch (Exception e) {
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java
index 1bf24861c0f10..6cabaeb81c926 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java
@@ -6,6 +6,8 @@
*/
package org.elasticsearch.xpack.security.authc.oidc;
+import net.minidev.json.JSONArray;
+
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.jwk.JWK;
@@ -40,7 +42,7 @@
import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
import com.nimbusds.openid.connect.sdk.validators.AccessTokenValidator;
import com.nimbusds.openid.connect.sdk.validators.IDTokenValidator;
-import net.minidev.json.JSONArray;
+
import org.apache.commons.codec.Charsets;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
@@ -75,11 +77,11 @@
import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.SpecialPermission;
import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.util.concurrent.ListenableFuture;
import org.elasticsearch.core.CheckedRunnable;
import org.elasticsearch.core.Nullable;
-import org.elasticsearch.common.Strings;
import org.elasticsearch.core.Tuple;
-import org.elasticsearch.common.util.concurrent.ListenableFuture;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.watcher.FileChangesListener;
import org.elasticsearch.watcher.FileWatcher;
@@ -90,8 +92,6 @@
import org.elasticsearch.xpack.core.ssl.SSLConfiguration;
import org.elasticsearch.xpack.core.ssl.SSLService;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URI;
@@ -110,6 +110,8 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
import static org.elasticsearch.xpack.core.security.authc.oidc.OpenIdConnectRealmSettings.ALLOWED_CLOCK_SKEW;
import static org.elasticsearch.xpack.core.security.authc.oidc.OpenIdConnectRealmSettings.HTTP_CONNECTION_READ_TIMEOUT;
@@ -224,6 +226,7 @@ public void authenticate(OpenIdConnectToken token, final ActionListener claimsListener) {
try {
@@ -636,8 +639,8 @@ IDTokenValidator createIdTokenValidator(boolean addFileWatcherIfRequired) {
if (jwkSetPath.startsWith("http://")) {
throw new IllegalArgumentException("The [http] protocol is not supported as it is insecure. Use [https] instead");
} else if (jwkSetPath.startsWith("https://")) {
- final JWSVerificationKeySelector keySelector = new JWSVerificationKeySelector(requestedAlgorithm,
- new ReloadableJWKSource(new URL(jwkSetPath)));
+ final JWSVerificationKeySelector keySelector = new JWSVerificationKeySelector<>(requestedAlgorithm,
+ new ReloadableJWKSource<>(new URL(jwkSetPath)));
idTokenValidator = new IDTokenValidator(opConfig.getIssuer(), rpConfig.getClientId(), keySelector, null);
} else {
if (addFileWatcherIfRequired) {
@@ -676,6 +679,7 @@ private void setMetadataFileWatcher(String jwkSetPath) throws IOException {
* @return the merged Map
*/
// pkg protected for testing
+ @SuppressWarnings("unchecked")
static Map mergeObjects(Map idToken, Map userInfo) {
for (Map.Entry entry : idToken.entrySet()) {
Object value1 = entry.getValue();
@@ -707,6 +711,7 @@ static Map mergeObjects(Map idToken, Map mergeObjects(Map jsonObject1, Object jsonObject2) {
if (jsonObject2 == null) {
return jsonObject1;
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java
index a785246e2e18e..5d2d994731ca9 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java
@@ -394,7 +394,7 @@ public void close() {
*/
private static boolean isAllowedTypeForClaim(Object o) {
return (o instanceof String || o instanceof Boolean || o instanceof Number
- || (o instanceof Collection && ((Collection) o).stream()
+ || (o instanceof Collection && ((Collection) o).stream()
.allMatch(c -> c instanceof String || c instanceof Boolean || c instanceof Number)));
}
@@ -425,6 +425,7 @@ public String toString() {
return name;
}
+ @SuppressWarnings("unchecked")
private static Collection parseClaimValues(JWTClaimsSet claimsSet, String claimName, String settingKey) {
Collection values;
final Object claimValueObject = claimsSet.getClaim(claimName);
@@ -433,7 +434,7 @@ private static Collection parseClaimValues(JWTClaimsSet claimsSet, Strin
} else if (claimValueObject instanceof String) {
values = Collections.singletonList((String) claimValueObject);
} else if (claimValueObject instanceof Collection &&
- ((Collection) claimValueObject).stream().allMatch(c -> c instanceof String)) {
+ ((Collection) claimValueObject).stream().allMatch(c -> c instanceof String)) {
values = (Collection) claimValueObject;
} else {
throw new SettingsException("Setting [ " + settingKey + " expects a claim with String or a String Array value");
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java
index 78528c5cc7660..294c8c6289338 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java
@@ -136,7 +136,7 @@ public CompositeRolesStore(Settings settings, FileRolesStore fileRolesStore, Nat
builder.setMaximumWeight(cacheSize);
}
this.roleCache = builder.build();
- this.roleCacheHelper = new CacheIteratorHelper(roleCache);
+ this.roleCacheHelper = new CacheIteratorHelper<>(roleCache);
this.threadContext = threadContext;
CacheBuilder nlcBuilder = CacheBuilder.builder();
final int nlcCacheSize = NEGATIVE_LOOKUP_CACHE_SIZE_SETTING.get(settings);
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java
index 718dbee5937d6..db49e6ff12dd7 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java
@@ -34,6 +34,7 @@
* Rest action to invalidate one or more API keys
*/
public final class RestInvalidateApiKeyAction extends SecurityBaseRestHandler {
+ @SuppressWarnings("unchecked")
static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("invalidate_api_key",
a -> {
return new InvalidateApiKeyRequest((String) a[0], (String) a[1], (String) a[2], (String) a[3],
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
index 3e287796fcf02..ef19b2d1f08d3 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
@@ -292,6 +292,7 @@ private static IndexMetadata resolveConcreteIndex(final String indexOrAliasName,
private static Version readMappingVersion(String indexName, MappingMetadata mappingMetadata, Logger logger) {
try {
+ @SuppressWarnings("unchecked")
Map meta =
(Map) mappingMetadata.sourceAsMap().get("_meta");
if (meta == null) {
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java
index 5723c40fc39bc..91fef098424d3 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java
@@ -20,14 +20,13 @@
import org.elasticsearch.xpack.security.LocalStateSecurity;
import org.hamcrest.Matcher;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.is;
@@ -35,7 +34,7 @@
public class SettingsFilterTests extends ESTestCase {
private Settings.Builder configuredSettingsBuilder = Settings.builder();
- private Map settingsMatcherMap = new HashMap<>();
+ private Map> settingsMatcherMap = new HashMap<>();
private MockSecureSettings mockSecureSettings = new MockSecureSettings();
public void testFiltering() throws Exception {
@@ -130,7 +129,7 @@ public void testFiltering() throws Exception {
SettingsFilter settingsFilter = injector.getInstance(SettingsFilter.class);
Settings filteredSettings = settingsFilter.filter(settings);
- for (Map.Entry entry : settingsMatcherMap.entrySet()) {
+ for (Map.Entry> entry : settingsMatcherMap.entrySet()) {
assertThat(filteredSettings.get(entry.getKey()), entry.getValue());
}
@@ -154,7 +153,7 @@ private void configureSecureSetting(String settingName, String value) {
settingsMatcherMap.put(settingName, is(nullValue()));
}
- private void configureSetting(String settingName, String value, Matcher expectedMatcher) {
+ private void configureSetting(String settingName, String value, Matcher expectedMatcher) {
configuredSettingsBuilder.put(settingName, value);
settingsMatcherMap.put(settingName, expectedMatcher);
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java
index ffc5ac682447a..8ee98f3744755 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java
@@ -38,12 +38,12 @@
import java.util.HashMap;
import java.util.Map;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.emptyIterable;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -84,6 +84,7 @@ public void testEnabled() {
assertThat(featureSet.enabled(), is(false));
}
+ @SuppressWarnings("rawtypes")
public void testUsage() throws Exception {
final boolean explicitlyDisabled = randomBoolean();
final boolean operatorPrivilegesAvailable = randomBoolean();
@@ -324,14 +325,16 @@ private XContentSource getXContentSource(XPackFeatureSet.Usage usage) throws IOE
private void configureRealmsUsage(Map realmsUsageStats) {
doAnswer(invocationOnMock -> {
- ActionListener> listener = (ActionListener) invocationOnMock.getArguments()[0];
+ @SuppressWarnings("unchecked")
+ ActionListener> listener = (ActionListener>) invocationOnMock.getArguments()[0];
listener.onResponse(realmsUsageStats);
return Void.TYPE;
- }).when(realms).usageStats(any(ActionListener.class));
+ }).when(realms).usageStats(anyActionListener());
}
private void configureRoleStoreUsage(boolean rolesStoreEnabled) {
doAnswer(invocationOnMock -> {
+ @SuppressWarnings("unchecked")
ActionListener> listener = (ActionListener>) invocationOnMock.getArguments()[0];
if (rolesStoreEnabled) {
listener.onResponse(Collections.singletonMap("count", 1));
@@ -339,12 +342,13 @@ private void configureRoleStoreUsage(boolean rolesStoreEnabled) {
listener.onResponse(Collections.emptyMap());
}
return Void.TYPE;
- }).when(rolesStore).usageStats(any(ActionListener.class));
+ }).when(rolesStore).usageStats(anyActionListener());
}
private void configureRoleMappingStoreUsage(boolean roleMappingStoreEnabled) {
doAnswer(invocationOnMock -> {
- ActionListener> listener = (ActionListener) invocationOnMock.getArguments()[0];
+ @SuppressWarnings("unchecked")
+ ActionListener> listener = (ActionListener>) invocationOnMock.getArguments()[0];
if (roleMappingStoreEnabled) {
final Map map = new HashMap<>();
map.put("size", 12L);
@@ -354,6 +358,6 @@ private void configureRoleMappingStoreUsage(boolean roleMappingStoreEnabled) {
listener.onResponse(Collections.emptyMap());
}
return Void.TYPE;
- }).when(roleMappingStore).usageStats(any(ActionListener.class));
+ }).when(roleMappingStore).usageStats(anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/TransportGrantApiKeyActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/TransportGrantApiKeyActionTests.java
index 72c3727291043..70f229cbff9c5 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/TransportGrantApiKeyActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/TransportGrantApiKeyActionTests.java
@@ -34,6 +34,7 @@
import java.util.Collections;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.test.TestMatchers.throwableWithMessage;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.equalTo;
@@ -95,12 +96,13 @@ public void testGrantApiKeyWithUsernamePassword() throws Exception {
assertThat(token.principal(), equalTo(username));
assertThat(token.credentials(), equalTo(password));
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[args.length - 1];
listener.onResponse(authentication);
return null;
}).when(authenticationService)
- .authenticate(eq(GrantApiKeyAction.NAME), same(request), any(UsernamePasswordToken.class), any(ActionListener.class));
+ .authenticate(eq(GrantApiKeyAction.NAME), same(request), any(UsernamePasswordToken.class), anyActionListener());
setupApiKeyGenerator(authentication, request, response);
@@ -133,12 +135,13 @@ public void testGrantApiKeyWithInvalidUsernamePassword() throws Exception {
assertThat(token.principal(), equalTo(username));
assertThat(token.credentials(), equalTo(password));
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[args.length - 1];
listener.onFailure(new ElasticsearchSecurityException("authentication failed for testing"));
return null;
}).when(authenticationService)
- .authenticate(eq(GrantApiKeyAction.NAME), same(request), any(UsernamePasswordToken.class), any(ActionListener.class));
+ .authenticate(eq(GrantApiKeyAction.NAME), same(request), any(UsernamePasswordToken.class), anyActionListener());
setupApiKeyGenerator(authentication, request, response);
@@ -221,11 +224,12 @@ private void setupApiKeyGenerator(Authentication authentication, GrantApiKeyRequ
assertThat(args[0], equalTo(authentication));
assertThat(args[1], sameInstance(request.getApiKeyRequest()));
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[args.length - 1];
listener.onResponse(response);
return null;
- }).when(apiKeyGenerator).generateApiKey(any(Authentication.class), any(CreateApiKeyRequest.class), any(ActionListener.class));
+ }).when(apiKeyGenerator).generateApiKey(any(Authentication.class), any(CreateApiKeyRequest.class), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java
index 7d4ea9544d267..1936e701f8ed0 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java
@@ -47,6 +47,7 @@
import java.util.Collections;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.xpack.core.security.authz.AuthorizationServiceField.INDICES_PERMISSIONS_KEY;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.is;
@@ -62,6 +63,7 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
+@SuppressWarnings({"unchecked", "rawtypes"})
public class SecurityActionFilterTests extends ESTestCase {
private AuthenticationService authcService;
private AuthorizationService authzService;
@@ -115,7 +117,7 @@ public void testApply() throws Exception {
ActionResponse actionResponse = mock(ActionResponse.class);
mockChain(task, "_action", request, actionResponse);
filter.apply(task, "_action", request, listener, chain);
- verify(authzService).authorize(eq(authentication), eq("_action"), eq(request), any(ActionListener.class));
+ verify(authzService).authorize(eq(authentication), eq("_action"), eq(request), anyActionListener());
verify(auditTrail).coordinatingActionResponse(eq(requestId), eq(authentication), eq("_action"), eq(request), eq(actionResponse));
}
@@ -137,7 +139,7 @@ public void testApplyRestoresThreadContext() throws Exception {
assertNull(threadContext.getTransient(AuthenticationField.AUTHENTICATION_KEY));
assertNull(threadContext.getTransient(INDICES_PERMISSIONS_KEY));
- verify(authzService).authorize(eq(authentication), eq("_action"), eq(request), any(ActionListener.class));
+ verify(authzService).authorize(eq(authentication), eq("_action"), eq(request), anyActionListener());
verify(auditTrail).coordinatingActionResponse(eq(requestId), eq(authentication), eq("_action"), eq(request), eq(actionResponse));
}
@@ -178,7 +180,7 @@ public void testApplyAsSystemUser() throws Exception {
requestIdFromAuthn.set(AuditUtil.generateRequestId(threadContext));
callback.onResponse(threadContext.getTransient(AuthenticationField.AUTHENTICATION_KEY));
return Void.TYPE;
- }).when(authcService).authenticate(eq(action), eq(request), eq(SystemUser.INSTANCE), any(ActionListener.class));
+ }).when(authcService).authenticate(eq(action), eq(request), eq(SystemUser.INSTANCE), anyActionListener());
IndicesAccessControl authzAccessControl = mock(IndicesAccessControl.class);
mockAuthorize(authzAccessControl);
@@ -220,20 +222,20 @@ public void testApplyDestructiveOperations() throws Exception {
threadContext.putHeader(AuthenticationField.AUTHENTICATION_KEY, authentication.encode());
callback.onResponse(authentication);
return Void.TYPE;
- }).when(authcService).authenticate(eq(action), eq(request), eq(SystemUser.INSTANCE), any(ActionListener.class));
+ }).when(authcService).authenticate(eq(action), eq(request), eq(SystemUser.INSTANCE), anyActionListener());
doAnswer((i) -> {
ActionListener callback = (ActionListener) i.getArguments()[3];
callback.onResponse(null);
return Void.TYPE;
}).when(authzService)
- .authorize(any(Authentication.class), any(String.class), any(TransportRequest.class), any(ActionListener.class));
+ .authorize(any(Authentication.class), any(String.class), any(TransportRequest.class), anyActionListener());
filter.apply(task, action, request, listener, chain);
if (failDestructiveOperations) {
verify(listener).onFailure(isA(IllegalArgumentException.class));
verifyNoMoreInteractions(authzService, chain, auditTrailService, auditTrail);
} else {
- verify(authzService).authorize(eq(authentication), eq(action), eq(request), any(ActionListener.class));
- verify(chain).proceed(eq(task), eq(action), eq(request), any(ActionListener.class));
+ verify(authzService).authorize(eq(authentication), eq(action), eq(request), anyActionListener());
+ verify(chain).proceed(eq(task), eq(action), eq(request), anyActionListener());
verify(auditTrail).coordinatingActionResponse(eq(requestIdFromAuthn.get()), eq(authentication), eq(action), eq(request),
eq(actionResponse));
}
@@ -255,16 +257,16 @@ public void testActionProcessException() throws Exception {
AuditUtil.generateRequestId(threadContext);
callback.onResponse(authentication);
return Void.TYPE;
- }).when(authcService).authenticate(eq("_action"), eq(request), eq(SystemUser.INSTANCE), any(ActionListener.class));
+ }).when(authcService).authenticate(eq("_action"), eq(request), eq(SystemUser.INSTANCE), anyActionListener());
if (randomBoolean()) {
- doThrow(exception).when(authzService).authorize(eq(authentication), eq("_action"), eq(request), any(ActionListener.class));
+ doThrow(exception).when(authzService).authorize(eq(authentication), eq("_action"), eq(request), anyActionListener());
} else {
doAnswer((i) -> {
ActionListener callback = (ActionListener) i.getArguments()[3];
callback.onFailure(exception);
return Void.TYPE;
}).when(authzService)
- .authorize(eq(authentication), eq("_action"), eq(request), any(ActionListener.class));
+ .authorize(eq(authentication), eq("_action"), eq(request), anyActionListener());
}
filter.apply(task, "_action", request, listener, chain);
verify(listener).onFailure(exception);
@@ -294,7 +296,7 @@ private void mockAuthentication(ActionRequest request, Authentication authentica
threadContext.putHeader("_xpack_audit_request_id", requestId);
callback.onResponse(authentication);
return Void.TYPE;
- }).when(authcService).authenticate(eq("_action"), eq(request), eq(SystemUser.INSTANCE), any(ActionListener.class));
+ }).when(authcService).authenticate(eq("_action"), eq(request), eq(SystemUser.INSTANCE), anyActionListener());
}
private void mockAuthorize() {
@@ -311,7 +313,7 @@ private void mockAuthorize(IndicesAccessControl indicesAccessControl) {
callback.onResponse(null);
return Void.TYPE;
}).when(authzService)
- .authorize(any(Authentication.class), any(String.class), any(TransportRequest.class), any(ActionListener.class));
+ .authorize(any(Authentication.class), any(String.class), any(TransportRequest.class), anyActionListener());
}
private void mockChain(Task task, String action, ActionRequest request, ActionResponse actionResponse) {
@@ -321,6 +323,6 @@ private void mockChain(Task task, String action, ActionRequest request, ActionRe
ActionListener callback = (ActionListener) args[args.length - 1];
callback.onResponse(actionResponse);
return Void.TYPE;
- }).when(chain).proceed(eq(task), eq(action), eq(request), any(ActionListener.class));
+ }).when(chain).proceed(eq(task), eq(action), eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutActionTests.java
index e7ed9772f75e3..bc342389676f9 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutActionTests.java
@@ -66,6 +66,7 @@
import java.util.Map;
import java.util.function.Consumer;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.xpack.security.authc.TokenServiceTests.mockGetTokenFromId;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
@@ -138,40 +139,43 @@ public void setup() throws Exception {
}).when(client).prepareBulk();
doAnswer(invocationOnMock -> {
IndexRequest indexRequest = (IndexRequest) invocationOnMock.getArguments()[0];
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1];
indexRequests.add(indexRequest);
final IndexResponse response = new IndexResponse(
indexRequest.shardId(), indexRequest.type(), indexRequest.id(), 1, 1, 1, true);
listener.onResponse(response);
return Void.TYPE;
- }).when(client).index(any(IndexRequest.class), any(ActionListener.class));
+ }).when(client).index(any(IndexRequest.class), anyActionListener());
doAnswer(invocationOnMock -> {
IndexRequest indexRequest = (IndexRequest) invocationOnMock.getArguments()[1];
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) invocationOnMock.getArguments()[2];
indexRequests.add(indexRequest);
final IndexResponse response = new IndexResponse(
new ShardId("test", "test", 0), indexRequest.type(), indexRequest.id(), 1, 1, 1, true);
listener.onResponse(response);
return Void.TYPE;
- }).when(client).execute(eq(IndexAction.INSTANCE), any(IndexRequest.class), any(ActionListener.class));
+ }).when(client).execute(eq(IndexAction.INSTANCE), any(IndexRequest.class), anyActionListener());
doAnswer(invocationOnMock -> {
BulkRequest bulkRequest = (BulkRequest) invocationOnMock.getArguments()[0];
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1];
bulkRequests.add(bulkRequest);
final BulkResponse response = new BulkResponse(new BulkItemResponse[0], 1);
listener.onResponse(response);
return Void.TYPE;
- }).when(client).bulk(any(BulkRequest.class), any(ActionListener.class));
+ }).when(client).bulk(any(BulkRequest.class), anyActionListener());
final SecurityIndexManager securityIndex = mock(SecurityIndexManager.class);
doAnswer(inv -> {
((Runnable) inv.getArguments()[1]).run();
return null;
- }).when(securityIndex).prepareIndexIfNeededThenExecute(any(Consumer.class), any(Runnable.class));
+ }).when(securityIndex).prepareIndexIfNeededThenExecute(anyConsumer(), any(Runnable.class));
doAnswer(inv -> {
((Runnable) inv.getArguments()[1]).run();
return null;
- }).when(securityIndex).checkIndexVersionThenExecute(any(Consumer.class), any(Runnable.class));
+ }).when(securityIndex).checkIndexVersionThenExecute(anyConsumer(), any(Runnable.class));
when(securityIndex.isAvailable()).thenReturn(true);
when(securityIndex.freeze()).thenReturn(securityIndex);
@@ -243,4 +247,9 @@ public void testLogoutInvalidatesTokens() throws Exception {
public void cleanup() {
oidcRealm.close();
}
+
+ @SuppressWarnings("unchecked")
+ private static Consumer anyConsumer() {
+ return any(Consumer.class);
+ }
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java
index 2d0f833da02d5..1dfa1425ce4b2 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java
@@ -18,20 +18,18 @@
import org.elasticsearch.xpack.core.security.action.role.DeleteRoleResponse;
import org.elasticsearch.xpack.core.security.authz.store.ReservedRolesStore;
import org.elasticsearch.xpack.security.authz.store.NativeRolesStore;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -84,16 +82,14 @@ public void testValidRole() {
request.name(roleName);
final boolean found = randomBoolean();
- doAnswer(new Answer() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onResponse(found);
- return null;
- }
- }).when(rolesStore).deleteRole(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onResponse(found);
+ return null;
+ }).when(rolesStore).deleteRole(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -112,7 +108,7 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().found(), is(found));
assertThat(throwableRef.get(), is(nullValue()));
- verify(rolesStore, times(1)).deleteRole(eq(request), any(ActionListener.class));
+ verify(rolesStore, times(1)).deleteRole(eq(request), anyActionListener());
}
public void testException() {
@@ -126,16 +122,14 @@ public void testException() {
DeleteRoleRequest request = new DeleteRoleRequest();
request.name(roleName);
- doAnswer(new Answer() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onFailure(e);
- return null;
- }
- }).when(rolesStore).deleteRole(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onFailure(e);
+ return null;
+ }).when(rolesStore).deleteRole(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -154,6 +148,6 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(nullValue()));
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), is(sameInstance(e)));
- verify(rolesStore, times(1)).deleteRole(eq(request), any(ActionListener.class));
+ verify(rolesStore, times(1)).deleteRole(eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java
index 2241bb9b27b39..8c3e34ad50566 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java
@@ -31,11 +31,11 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -60,10 +60,11 @@ public void testReservedRoles() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[1];
listener.onResponse(RoleRetrievalResult.success(Collections.emptySet()));
return null;
- }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>()), any(ActionListener.class));
+ }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>()), anyActionListener());
GetRolesRequest request = new GetRolesRequest();
request.names(names.toArray(Strings.EMPTY_ARRAY));
@@ -104,10 +105,11 @@ public void testStoreRoles() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[1];
listener.onResponse(RoleRetrievalResult.success(new HashSet<>(storeRoleDescriptors)));
return null;
- }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(Arrays.asList(request.names()))), any(ActionListener.class));
+ }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(Arrays.asList(request.names()))), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -164,7 +166,9 @@ public void testGetAllOrMix() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
Set requestedNames1 = (Set) args[0];
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[1];
if (requestedNames1.size() == 0) {
listener.onResponse(RoleRetrievalResult.success(new HashSet<>(storeRoleDescriptors)));
@@ -174,7 +178,7 @@ public void testGetAllOrMix() {
.collect(Collectors.toSet())));
}
return null;
- }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(specificStoreNames)), any(ActionListener.class));
+ }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(specificStoreNames)), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -197,10 +201,10 @@ public void onFailure(Exception e) {
assertThat(retrievedRoleNames, containsInAnyOrder(expectedNames.toArray(Strings.EMPTY_ARRAY)));
if (all) {
- verify(rolesStore, times(1)).getRoleDescriptors(eq(new HashSet<>()), any(ActionListener.class));
+ verify(rolesStore, times(1)).getRoleDescriptors(eq(new HashSet<>()), anyActionListener());
} else {
verify(rolesStore, times(1))
- .getRoleDescriptors(eq(new HashSet<>(specificStoreNames)), any(ActionListener.class));
+ .getRoleDescriptors(eq(new HashSet<>(specificStoreNames)), anyActionListener());
}
}
@@ -219,10 +223,11 @@ public void testException() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[1];
listener.onFailure(e);
return null;
- }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(Arrays.asList(request.names()))), any(ActionListener.class));
+ }).when(rolesStore).getRoleDescriptors(eq(new HashSet<>(Arrays.asList(request.names()))), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java
index 42469b5998222..0fe4435e0669e 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java
@@ -10,12 +10,12 @@
import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.common.xcontent.ParseField;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.common.xcontent.ParseField;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.TermQueryBuilder;
@@ -30,14 +30,13 @@
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
import org.elasticsearch.xpack.core.security.authz.store.ReservedRolesStore;
import org.elasticsearch.xpack.security.authz.store.NativeRolesStore;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
@@ -110,16 +109,14 @@ public void testValidRole() {
PutRoleRequest request = new PutRoleRequest();
request.name(roleName);
- doAnswer(new Answer() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- assert args.length == 3;
- ActionListener listener = (ActionListener) args[2];
- listener.onResponse(created);
- return null;
- }
- }).when(rolesStore).putRole(eq(request), any(RoleDescriptor.class), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 3;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[2];
+ listener.onResponse(created);
+ return null;
+ }).when(rolesStore).putRole(eq(request), any(RoleDescriptor.class), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -138,7 +135,7 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().isCreated(), is(created));
assertThat(throwableRef.get(), is(nullValue()));
- verify(rolesStore, times(1)).putRole(eq(request), any(RoleDescriptor.class), any(ActionListener.class));
+ verify(rolesStore, times(1)).putRole(eq(request), any(RoleDescriptor.class), anyActionListener());
}
public void testException() {
@@ -153,16 +150,14 @@ public void testException() {
PutRoleRequest request = new PutRoleRequest();
request.name(roleName);
- doAnswer(new Answer() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- assert args.length == 3;
- ActionListener listener = (ActionListener) args[2];
- listener.onFailure(e);
- return null;
- }
- }).when(rolesStore).putRole(eq(request), any(RoleDescriptor.class), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 3;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[2];
+ listener.onFailure(e);
+ return null;
+ }).when(rolesStore).putRole(eq(request), any(RoleDescriptor.class), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -181,7 +176,7 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(nullValue()));
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), is(sameInstance(e)));
- verify(rolesStore, times(1)).putRole(eq(request), any(RoleDescriptor.class), any(ActionListener.class));
+ verify(rolesStore, times(1)).putRole(eq(request), any(RoleDescriptor.class), anyActionListener());
}
public void testCreationOfRoleWithMalformedQueryJsonFails() {
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportGetRoleMappingsActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportGetRoleMappingsActionTests.java
index 3f0485adbf7c1..4a455d7349fff 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportGetRoleMappingsActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportGetRoleMappingsActionTests.java
@@ -43,6 +43,7 @@ public class TransportGetRoleMappingsActionTests extends ESTestCase {
private AtomicReference> namesRef;
private List result;
+ @SuppressWarnings("unchecked")
@Before
public void setupMocks() {
store = mock(NativeRoleMappingStore.class);
@@ -57,7 +58,7 @@ public void setupMocks() {
Object[] args = invocation.getArguments();
assert args.length == 2;
namesRef.set((Set) args[0]);
- ActionListener> listener = (ActionListener) args[1];
+ ActionListener> listener = (ActionListener>) args[1];
listener.onResponse(result);
return null;
}).when(store).getRoleMappings(any(Set.class), any(ActionListener.class));
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingActionTests.java
index 2cdcd9fef564d..0a4e3b17876d9 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingActionTests.java
@@ -40,6 +40,7 @@ public class TransportPutRoleMappingActionTests extends ESTestCase {
private TransportPutRoleMappingAction action;
private AtomicReference requestRef;
+ @SuppressWarnings("unchecked")
@Before
public void setupMocks() {
store = mock(NativeRoleMappingStore.class);
@@ -53,7 +54,7 @@ public void setupMocks() {
Object[] args = invocation.getArguments();
assert args.length == 2;
requestRef.set((PutRoleMappingRequest) args[0]);
- ActionListener listener = (ActionListener) args[1];
+ ActionListener listener = (ActionListener) args[1];
listener.onResponse(true);
return null;
}).when(store).putRoleMapping(any(PutRoleMappingRequest.class), any(ActionListener.class)
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionActionTests.java
index b6fd5c62d629b..fd242dae98d3e 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionActionTests.java
@@ -145,6 +145,7 @@ public void setup() throws Exception {
bulkRequests = new ArrayList<>();
final Client client = new NoOpClient(threadPool) {
@Override
+ @SuppressWarnings("unchecked")
protected
void doExecute(ActionType action, Request request, ActionListener listener) {
if (IndexAction.NAME.equals(action.name())) {
@@ -192,11 +193,11 @@ void doExecute(ActionType action, Request request, ActionListener {
((Runnable) inv.getArguments()[1]).run();
return null;
- }).when(securityIndex).prepareIndexIfNeededThenExecute(any(Consumer.class), any(Runnable.class));
+ }).when(securityIndex).prepareIndexIfNeededThenExecute(anyConsumer(), any(Runnable.class));
doAnswer(inv -> {
((Runnable) inv.getArguments()[1]).run();
return null;
- }).when(securityIndex).checkIndexVersionThenExecute(any(Consumer.class), any(Runnable.class));
+ }).when(securityIndex).checkIndexVersionThenExecute(anyConsumer(), any(Runnable.class));
when(securityIndex.isAvailable()).thenReturn(true);
when(securityIndex.indexExists()).thenReturn(true);
when(securityIndex.isIndexUpToDate()).thenReturn(true);
@@ -242,7 +243,9 @@ private SearchHit tokenHit(int idx, BytesReference source) {
try {
final Map sourceMap = XContentType.JSON.xContent()
.createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, source.streamInput()).map();
+ @SuppressWarnings("unchecked")
final Map accessToken = (Map) sourceMap.get("access_token");
+ @SuppressWarnings("unchecked")
final Map userToken = (Map) accessToken.get("user_token");
final SearchHit hit = new SearchHit(idx, "token_" + userToken.get("id"), null, null, null);
hit.sourceRef(source);
@@ -364,6 +367,7 @@ private Function findTokenByRefreshToken(SearchHit[]
final TermQueryBuilder termQuery = (TermQueryBuilder) filters.get(1);
assertThat(termQuery.fieldName(), equalTo("refresh_token.token"));
for (SearchHit hit : searchHits) {
+ @SuppressWarnings("unchecked")
final Map refreshToken = (Map) hit.getSourceAsMap().get("refresh_token");
if (termQuery.value().equals(refreshToken.get("token"))) {
return new SearchHit[]{hit};
@@ -388,4 +392,8 @@ private TokenService.CreateTokenResult storeToken(SamlNameId nameId, String sess
return storeToken(userTokenId, refreshToken, nameId, session);
}
+ @SuppressWarnings("unchecked")
+ private static Consumer anyConsumer() {
+ return any(Consumer.class);
+ }
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutActionTests.java
index d5b698470c486..ac94bc5a1b22a 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutActionTests.java
@@ -103,6 +103,7 @@ public class TransportSamlLogoutActionTests extends SamlTestCase {
private TransportSamlLogoutAction action;
private Client client;
+ @SuppressWarnings("unchecked")
@Before
public void setup() throws Exception {
final Path metadata = PathUtils.get(SamlRealm.class.getResource("idp1.xml").toURI());
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportDeleteServiceAccountTokenActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportDeleteServiceAccountTokenActionTests.java
index 641a50c42ceb3..3c191514be1a5 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportDeleteServiceAccountTokenActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportDeleteServiceAccountTokenActionTests.java
@@ -13,12 +13,14 @@
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.transport.TransportService;
import org.elasticsearch.xpack.core.security.action.service.DeleteServiceAccountTokenRequest;
+import org.elasticsearch.xpack.core.security.action.service.DeleteServiceAccountTokenResponse;
import org.elasticsearch.xpack.security.authc.service.IndexServiceAccountTokenStore;
import org.elasticsearch.xpack.security.authc.support.HttpTlsRuntimeCheck;
import org.junit.Before;
import java.util.Collections;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -45,13 +47,12 @@ public void init() {
}).when(httpTlsRuntimeCheck).checkTlsThenExecute(any(), any(), any());
}
- @SuppressWarnings("rawtypes")
public void testDoExecuteWillDelegate() {
final DeleteServiceAccountTokenRequest request = new DeleteServiceAccountTokenRequest(
randomAlphaOfLengthBetween(3, 8), randomAlphaOfLengthBetween(3, 8), randomAlphaOfLengthBetween(3, 8));
- final ActionListener listener = mock(ActionListener.class);
+ @SuppressWarnings("unchecked") final ActionListener listener = mock(ActionListener.class);
transportDeleteServiceAccountTokenAction.doExecute(mock(Task.class), request, listener);
- verify(indexServiceAccountTokenStore).deleteToken(eq(request), any(ActionListener.class));
+ verify(indexServiceAccountTokenStore).deleteToken(eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportGetServiceAccountCredentialsActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportGetServiceAccountCredentialsActionTests.java
index 8bdd72676075a..4122ff6072200 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportGetServiceAccountCredentialsActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/service/TransportGetServiceAccountCredentialsActionTests.java
@@ -12,10 +12,10 @@
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.PlainActionFuture;
-import org.elasticsearch.core.SuppressForbidden;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.core.SuppressForbidden;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.transport.Transport;
@@ -74,9 +74,8 @@ public void init() throws UnknownHostException {
public void testDoExecuteWillDelegate() {
final GetServiceAccountCredentialsRequest request =
new GetServiceAccountCredentialsRequest(randomAlphaOfLengthBetween(3, 8), randomAlphaOfLengthBetween(3, 8));
- @SuppressWarnings("rawtypes")
- final ActionListener listener = mock(ActionListener.class);
- //noinspection unchecked
+ @SuppressWarnings("unchecked")
+ final ActionListener listener = mock(ActionListener.class);
transportGetServiceAccountCredentialsAction.doExecute(mock(Task.class), request, listener);
verify(serviceAccountService).findTokensFor(
eq(new ServiceAccount.ServiceAccountId(request.getNamespace(), request.getServiceName())),
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenActionTests.java
index 862e7d8046dd3..b37574bfcf485 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenActionTests.java
@@ -68,6 +68,7 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
@@ -108,6 +109,7 @@ public void setupClient() {
}).when(client).prepareGet(anyString(), anyString(), anyString());
when(client.prepareMultiGet()).thenReturn(new MultiGetRequestBuilder(client, MultiGetAction.INSTANCE));
doAnswer(invocationOnMock -> {
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1];
MultiGetResponse response = mock(MultiGetResponse.class);
MultiGetItemResponse[] responses = new MultiGetItemResponse[2];
@@ -122,18 +124,19 @@ public void setupClient() {
when(getResponse.isExists()).thenReturn(false);
listener.onResponse(response);
return Void.TYPE;
- }).when(client).multiGet(any(MultiGetRequest.class), any(ActionListener.class));
+ }).when(client).multiGet(any(MultiGetRequest.class), anyActionListener());
when(client.prepareIndex(any(String.class), any(String.class), any(String.class)))
.thenReturn(new IndexRequestBuilder(client, IndexAction.INSTANCE));
when(client.prepareUpdate(any(String.class), any(String.class), any(String.class)))
.thenReturn(new UpdateRequestBuilder(client, UpdateAction.INSTANCE));
doAnswer(invocationOnMock -> {
idxReqReference.set((IndexRequest) invocationOnMock.getArguments()[1]);
+ @SuppressWarnings("unchecked")
ActionListener responseActionListener = (ActionListener) invocationOnMock.getArguments()[2];
responseActionListener.onResponse(new IndexResponse(new ShardId(".security", UUIDs.randomBase64UUID(), randomInt()), "_doc",
randomAlphaOfLength(4), randomNonNegativeLong(), randomNonNegativeLong(), randomNonNegativeLong(), true));
return null;
- }).when(client).execute(eq(IndexAction.INSTANCE), any(IndexRequest.class), any(ActionListener.class));
+ }).when(client).execute(eq(IndexAction.INSTANCE), any(IndexRequest.class), anyActionListener());
securityContext = new SecurityContext(Settings.EMPTY, threadPool.getThreadContext());
@@ -143,10 +146,11 @@ public void setupClient() {
Runnable runnable = (Runnable) invocationOnMock.getArguments()[1];
runnable.run();
return null;
- }).when(securityIndex).prepareIndexIfNeededThenExecute(any(Consumer.class), any(Runnable.class));
+ }).when(securityIndex).prepareIndexIfNeededThenExecute(anyConsumer(), any(Runnable.class));
doAnswer(invocationOnMock -> {
AuthenticationToken authToken = (AuthenticationToken) invocationOnMock.getArguments()[2];
+ @SuppressWarnings("unchecked")
ActionListener authListener = (ActionListener) invocationOnMock.getArguments()[3];
User user = null;
if (authToken instanceof UsernamePasswordToken) {
@@ -170,7 +174,7 @@ && new String((byte[]) token.credentials(), StandardCharsets.UTF_8).equals("fail
authListener.onResponse(authentication);
return Void.TYPE;
}).when(authenticationService).authenticate(eq(CreateTokenAction.NAME), any(CreateTokenRequest.class),
- any(AuthenticationToken.class), any(ActionListener.class));
+ any(AuthenticationToken.class), anyActionListener());
this.clusterService = ClusterServiceUtils.createClusterService(threadPool);
@@ -328,4 +332,9 @@ private static ActionListener assertListenerIsOnlyCalledOnce(ActionListen
}
});
}
+
+ @SuppressWarnings("unchecked")
+ private static Consumer anyConsumer() {
+ return any(Consumer.class);
+ }
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java
index d461c3b025af5..ea6a7395dcfc7 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java
@@ -28,13 +28,12 @@
import org.elasticsearch.xpack.core.security.user.XPackSecurityUser;
import org.elasticsearch.xpack.core.security.user.XPackUser;
import org.elasticsearch.xpack.security.authc.esnative.NativeUsersStore;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.Collections;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.test.SecurityIntegTestCase.getFastStoredHashAlgoForTests;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
@@ -42,7 +41,6 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -132,10 +130,11 @@ public void testValidUser() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener listener = (ActionListener) args[1];
listener.onResponse(null);
return null;
- }).when(usersStore).changePassword(eq(request), any(ActionListener.class));
+ }).when(usersStore).changePassword(eq(request), anyActionListener());
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
Settings passwordHashingSettings = Settings.builder().
@@ -159,7 +158,7 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(notNullValue()));
assertSame(responseRef.get(), ActionResponse.Empty.INSTANCE);
assertThat(throwableRef.get(), is(nullValue()));
- verify(usersStore, times(1)).changePassword(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).changePassword(eq(request), anyActionListener());
}
public void testIncorrectPasswordHashingAlgorithm() {
@@ -205,15 +204,14 @@ public void testException() {
request.username(user.principal());
request.passwordHash(hasher.hash(SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING));
final Exception e = randomFrom(new ElasticsearchSecurityException(""), new IllegalStateException(), new RuntimeException());
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onFailure(e);
- return null;
- }
- }).when(usersStore).changePassword(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onFailure(e);
+ return null;
+ }).when(usersStore).changePassword(eq(request), anyActionListener());
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
Settings passwordHashingSettings = Settings.builder().
@@ -237,6 +235,6 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(nullValue()));
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), sameInstance(e));
- verify(usersStore, times(1)).changePassword(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).changePassword(eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java
index d865dc558c025..daa2ab5b7241f 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java
@@ -25,19 +25,17 @@
import org.elasticsearch.xpack.core.security.user.XPackSecurityUser;
import org.elasticsearch.xpack.core.security.user.XPackUser;
import org.elasticsearch.xpack.security.authc.esnative.NativeUsersStore;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -146,15 +144,14 @@ public void testValidUser() {
final boolean found = randomBoolean();
final DeleteUserRequest request = new DeleteUserRequest(user.principal());
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onResponse(found);
- return null;
- }
- }).when(usersStore).deleteUser(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onResponse(found);
+ return null;
+ }).when(usersStore).deleteUser(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -173,7 +170,7 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().found(), is(found));
assertThat(throwableRef.get(), is(nullValue()));
- verify(usersStore, times(1)).deleteUser(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).deleteUser(eq(request), anyActionListener());
}
public void testException() {
@@ -186,15 +183,14 @@ public void testException() {
usersStore, transportService);
final DeleteUserRequest request = new DeleteUserRequest(user.principal());
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onFailure(e);
- return null;
- }
- }).when(usersStore).deleteUser(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onFailure(e);
+ return null;
+ }).when(usersStore).deleteUser(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -213,6 +209,6 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(nullValue()));
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), sameInstance(e));
- verify(usersStore, times(1)).deleteUser(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).deleteUser(eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java
index 72b43790ab28a..3873684db0e3a 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java
@@ -34,8 +34,6 @@
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
import org.junit.After;
import org.junit.Before;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -45,6 +43,7 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.emptyArray;
@@ -54,8 +53,8 @@
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.AdditionalMatchers.aryEq;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -219,15 +218,14 @@ public void testGetAllUsers() {
usersStore, transportService, reservedRealm);
GetUsersRequest request = new GetUsersRequest();
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener> listener = (ActionListener>) args[1];
- listener.onResponse(storeUsers);
- return null;
- }
- }).when(usersStore).getUsers(eq(Strings.EMPTY_ARRAY), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener> listener = (ActionListener>) args[1];
+ listener.onResponse(storeUsers);
+ return null;
+ }).when(usersStore).getUsers(eq(Strings.EMPTY_ARRAY), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -252,7 +250,7 @@ public void onFailure(Exception e) {
assertThat(throwableRef.get(), is(nullValue()));
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().users(), arrayContaining(expectedList.toArray(new User[expectedList.size()])));
- verify(usersStore, times(1)).getUsers(aryEq(Strings.EMPTY_ARRAY), any(ActionListener.class));
+ verify(usersStore, times(1)).getUsers(aryEq(Strings.EMPTY_ARRAY), anyActionListener());
}
public void testGetStoreOnlyUsers() {
@@ -270,10 +268,11 @@ public void testGetStoreOnlyUsers() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener> listener = (ActionListener>) args[1];
listener.onResponse(storeUsers);
return null;
- }).when(usersStore).getUsers(aryEq(storeUsernames), any(ActionListener.class));
+ }).when(usersStore).getUsers(aryEq(storeUsernames), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -296,9 +295,9 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().users(), arrayContaining(expectedList.toArray(new User[expectedList.size()])));
if (storeUsers.size() > 1) {
- verify(usersStore, times(1)).getUsers(aryEq(storeUsernames), any(ActionListener.class));
+ verify(usersStore, times(1)).getUsers(aryEq(storeUsernames), anyActionListener());
} else {
- verify(usersStore, times(1)).getUsers(aryEq(new String[] {storeUsernames[0]}), any(ActionListener.class));
+ verify(usersStore, times(1)).getUsers(aryEq(new String[] {storeUsernames[0]}), anyActionListener());
}
}
@@ -318,10 +317,11 @@ public void testException() {
doAnswer(invocation -> {
Object[] args = invocation.getArguments();
assert args.length == 2;
+ @SuppressWarnings("unchecked")
ActionListener> listener = (ActionListener>) args[1];
listener.onFailure(e);
return null;
- }).when(usersStore).getUsers(aryEq(storeUsernames), any(ActionListener.class));
+ }).when(usersStore).getUsers(aryEq(storeUsernames), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -340,7 +340,7 @@ public void onFailure(Exception e) {
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), is(sameInstance(e)));
assertThat(responseRef.get(), is(nullValue()));
- verify(usersStore, times(1)).getUsers(aryEq(storeUsernames), any(ActionListener.class));
+ verify(usersStore, times(1)).getUsers(aryEq(storeUsernames), anyActionListener());
}
private List randomUsers() {
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java
index 51884da6590ea..e489d36c7c544 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java
@@ -34,13 +34,12 @@
import org.elasticsearch.xpack.security.authc.esnative.ReservedRealm;
import org.elasticsearch.xpack.security.authc.esnative.ReservedRealmTests;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.test.SecurityIntegTestCase.getFastStoredHashAlgoForTests;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
@@ -49,7 +48,6 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -177,15 +175,14 @@ public void testValidUser() {
request.passwordHash(hasher.hash(SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING));
}
final boolean created = isCreate ? randomBoolean() : false; // updates should always return false for create
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onResponse(created);
- return null;
- }
- }).when(usersStore).putUser(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onResponse(created);
+ return null;
+ }).when(usersStore).putUser(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -204,7 +201,7 @@ public void onFailure(Exception e) {
assertThat(throwableRef.get(), is(nullValue()));
assertThat(responseRef.get(), is(notNullValue()));
assertThat(responseRef.get().created(), is(created));
- verify(usersStore, times(1)).putUser(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).putUser(eq(request), anyActionListener());
}
public void testInvalidUser() {
@@ -238,15 +235,14 @@ public void testException() {
final PutUserRequest request = new PutUserRequest();
request.username(user.principal());
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 2;
- ActionListener listener = (ActionListener) args[1];
- listener.onFailure(e);
- return null;
- }
- }).when(usersStore).putUser(eq(request), any(ActionListener.class));
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 2;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[1];
+ listener.onFailure(e);
+ return null;
+ }).when(usersStore).putUser(eq(request), anyActionListener());
final AtomicReference throwableRef = new AtomicReference<>();
final AtomicReference responseRef = new AtomicReference<>();
@@ -265,6 +261,6 @@ public void onFailure(Exception e) {
assertThat(responseRef.get(), is(nullValue()));
assertThat(throwableRef.get(), is(notNullValue()));
assertThat(throwableRef.get(), sameInstance(e));
- verify(usersStore, times(1)).putUser(eq(request), any(ActionListener.class));
+ verify(usersStore, times(1)).putUser(eq(request), anyActionListener());
}
}
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java
index a4d763f2ef803..8caa60272f1f6 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java
@@ -31,19 +31,17 @@
import org.elasticsearch.xpack.core.security.user.XPackSecurityUser;
import org.elasticsearch.xpack.core.security.user.XPackUser;
import org.elasticsearch.xpack.security.authc.esnative.NativeUsersStore;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicReference;
+import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -159,16 +157,15 @@ public void testValidUser() throws Exception {
request.enabled(randomBoolean());
request.setRefreshPolicy(randomFrom(RefreshPolicy.values()));
// mock the setEnabled call on the native users store so that it will invoke the action listener with a response
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 4;
- ActionListener listener = (ActionListener) args[3];
- listener.onResponse(null);
- return null;
- }
+ doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ assert args.length == 4;
+ @SuppressWarnings("unchecked")
+ ActionListener listener = (ActionListener) args[3];
+ listener.onResponse(null);
+ return null;
}).when(usersStore)
- .setEnabled(eq(user.principal()), eq(request.enabled()), eq(request.getRefreshPolicy()), any(ActionListener.class));
+ .setEnabled(eq(user.principal()), eq(request.enabled()), eq(request.getRefreshPolicy()), anyActionListener());
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
final SecurityContext securityContext = new SecurityContext(Settings.EMPTY, threadContext);
@@ -193,7 +190,7 @@ public void onFailure(Exception e) {
assertSame(responseRef.get(), ActionResponse.Empty.INSTANCE);
assertThat(throwableRef.get(), is(nullValue()));
verify(usersStore, times(1))
- .setEnabled(eq(user.principal()), eq(request.enabled()), eq(request.getRefreshPolicy()), any(ActionListener.class));
+ .setEnabled(eq(user.principal()), eq(request.enabled()), eq(request.getRefreshPolicy()), anyActionListener());
}
public void testException() throws Exception {
@@ -214,16 +211,15 @@ public void testException() throws Exception {
request.setRefreshPolicy(randomFrom(RefreshPolicy.values()));
final Exception e = randomFrom(new ElasticsearchSecurityException(""), new IllegalStateException(), new RuntimeException());
// we're mocking the setEnabled call on the native users store so that it will invoke the action listener with an exception
- doAnswer(new Answer() {
- public Void answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- assert args.length == 4;
- ActionListener