From c412076734d96126179203d692ad42e245349564 Mon Sep 17 00:00:00 2001 From: Rory Hunter Date: Tue, 20 Jul 2021 12:41:51 +0100 Subject: [PATCH] Enable javac warnings in x-pack identity-provider (#75450) Part of #40366 --- x-pack/plugin/identity-provider/build.gradle | 4 ---- .../xpack/idp/saml/sp/WildcardServiceProvider.java | 1 + ...TransportSamlInitiateSingleSignOnActionTests.java | 1 + .../idp/privileges/UserPrivilegeResolverTests.java | 5 ++++- .../saml/sp/SamlServiceProviderResolverTests.java | 1 + .../xpack/idp/saml/test/IdpSamlTestCase.java | 12 +++++++----- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle index c7f21f8c3a922..cf4ebea8df891 100644 --- a/x-pack/plugin/identity-provider/build.gradle +++ b/x-pack/plugin/identity-provider/build.gradle @@ -51,10 +51,6 @@ dependencies { testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}" } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << "-Xlint:-unchecked" -} - tasks.named("dependencyLicenses").configure { mapping from: /java-support|opensaml-.*/, to: 'shibboleth' mapping from: /http.*/, to: 'httpclient' diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java index 83e669c16312c..b51adb999883a 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java @@ -41,6 +41,7 @@ */ class WildcardServiceProvider { + @SuppressWarnings("unchecked") private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( "wildcard_service", args -> { diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java index dea90e2bd2320..a335ce32917b6 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java @@ -118,6 +118,7 @@ public void testGetResponseWithoutSecondaryAuthenticationInSpInitiatedFlow() thr assertThat(response.getSamlResponse(), containsString("InResponseTo=\"" + requestId + "\"")); } + @SuppressWarnings("unchecked") private TransportSamlInitiateSingleSignOnAction setupTransportAction(boolean withSecondaryAuth) throws Exception { final Settings settings = Settings.builder() .put("path.home", createTempDir()) diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java index fac21860378ca..8c8e99b3c694d 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java @@ -50,6 +50,7 @@ public class UserPrivilegeResolverTests extends ESTestCase { private UserPrivilegeResolver resolver; @Before + @SuppressWarnings("unchecked") public void setupTest() { client = mock(Client.class); securityContext = new SecurityContext(Settings.EMPTY, new ThreadContext(Settings.EMPTY)); @@ -167,7 +168,9 @@ private ServiceProviderPrivileges service(String appName, String resource, Funct return new ServiceProviderPrivileges(appName, resource, roleMapping); } - private HasPrivilegesResponse setupHasPrivileges(String username, String appName, + @SafeVarargs + @SuppressWarnings("unchecked") + private final HasPrivilegesResponse setupHasPrivileges(String username, String appName, Tuple>... resourceActionAccess) { final boolean isCompleteMatch = randomBoolean(); final Map> resourcePrivilegeMap = new HashMap<>(resourceActionAccess.length); diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java index 1b39076145a1b..aaf1fba15b170 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java @@ -159,6 +159,7 @@ private ServiceProviderDefaults configureIdentityProviderDefaults() { return defaults; } + @SuppressWarnings("unchecked") private void mockDocument(String entityId, DocumentVersion docVersion, SamlServiceProviderDocument document) { doAnswer(inv -> { final Object[] args = inv.getArguments(); diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java index 8a688b2e56f4e..908051e84cedf 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java @@ -34,11 +34,6 @@ import org.opensaml.security.x509.X509Credential; import org.w3c.dom.Element; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; @@ -55,6 +50,11 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; import static org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport.getUnmarshallerFactory; @@ -87,6 +87,7 @@ public static void restoreLocale() { } } + @SuppressWarnings("unchecked") protected static void mockRegisteredServiceProvider(SamlIdentityProvider idp, String entityId, SamlServiceProvider sp) { Mockito.doAnswer(inv -> { final Object[] args = inv.getArguments(); @@ -101,6 +102,7 @@ protected static void mockRegisteredServiceProvider(SamlIdentityProvider idp, St Mockito.any(ActionListener.class)); } + @SuppressWarnings("unchecked") protected static void mockRegisteredServiceProvider(SamlServiceProviderResolver resolverMock, String entityId, SamlServiceProvider sp) { Mockito.doAnswer(inv -> {