honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop references to deprecated logger (#50474) (#50681) 

This drops all remaining references to `BaseRestHandler.logger` which
has been deprecated for something like a year now. I replaced all of the
references with locally declared loggers which is so much less spooky
action at a distance to me.
This commit is contained in:
Nik Everett 2020-01-06 16:34:07 -05:00 committed by GitHub
parent 06cea5136e
commit 7fd84a03a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/ApiKeyBaseRestHandler.java
View File

@ -6,6 +6,8 @@
package org.elasticsearch.xpack.security.rest.action.apikey;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.LicenseUtils;
import org.elasticsearch.license.XPackLicenseState;
@ -16,6 +18,8 @@ import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler;
* A base rest handler that handles licensing for ApiKey actions
*/
abstract class ApiKeyBaseRestHandler extends SecurityBaseRestHandler {
private static final Logger logger = LogManager.getLogger();
ApiKeyBaseRestHandler(Settings settings, XPackLicenseState licenseState) {
super(settings, licenseState);
}

3
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oidc/OpenIdConnectBaseRestHandler.java
View File

@ -5,6 +5,8 @@
*/
package org.elasticsearch.xpack.security.rest.action.oidc;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.LicenseUtils;
import org.elasticsearch.license.XPackLicenseState;
@ -14,6 +16,7 @@ import org.elasticsearch.xpack.security.authc.Realms;
import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler;
public abstract class OpenIdConnectBaseRestHandler extends SecurityBaseRestHandler {
private static final Logger logger = LogManager.getLogger();
private static final String OIDC_REALM_TYPE = OpenIdConnectRealmSettings.TYPE;

3
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oidc/RestOpenIdConnectAuthenticateAction.java
View File

@ -5,6 +5,8 @@
*/
package org.elasticsearch.xpack.security.rest.action.oidc;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.settings.Settings;
@ -30,6 +32,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
* Rest handler that authenticates the user based on the information provided as parameters of the redirect_uri
*/
public class RestOpenIdConnectAuthenticateAction extends OpenIdConnectBaseRestHandler {
private static final Logger logger = LogManager.getLogger();
static final ObjectParser<OpenIdConnectAuthenticateRequest, Void> PARSER = new ObjectParser<>("oidc_authn",
OpenIdConnectAuthenticateRequest::new);

3
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oidc/RestOpenIdConnectPrepareAuthenticationAction.java
View File

@ -5,6 +5,8 @@
*/
package org.elasticsearch.xpack.security.rest.action.oidc;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.settings.Settings;
@ -30,6 +32,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
* Generates an oAuth 2.0 authentication request as a URL string and returns it to the REST client.
*/
public class RestOpenIdConnectPrepareAuthenticationAction extends OpenIdConnectBaseRestHandler {
private static final Logger logger = LogManager.getLogger();
static final ObjectParser<OpenIdConnectPrepareAuthenticationRequest, Void> PARSER = new ObjectParser<>("oidc_prepare_authentication",
OpenIdConnectPrepareAuthenticationRequest::new);

5
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.xpack.security.rest.action.saml;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.Strings;
@ -36,9 +37,9 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
* A REST handler that attempts to authenticate a user based on the provided SAML response/assertion.
*/
public class RestSamlAuthenticateAction extends SamlBaseRestHandler implements RestHandler {
private static final Logger logger = LogManager.getLogger();
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger);
private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(RestSamlAuthenticateAction.class));
static class Input {
String content;
List<String> ids;

3
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/SamlBaseRestHandler.java
View File

@ -5,6 +5,8 @@
*/
package org.elasticsearch.xpack.security.rest.action.saml;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.LicenseUtils;
import org.elasticsearch.license.XPackLicenseState;
@ -17,6 +19,7 @@ import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler;
* An abstract implementation of {@link SecurityBaseRestHandler} that performs a license check for the SAML realm type
*/
public abstract class SamlBaseRestHandler extends SecurityBaseRestHandler {
private static final Logger logger = LogManager.getLogger();
private static final String SAML_REALM_TYPE = SamlRealmSettings.TYPE;