Spotless apply

Signed-off-by: Finn Carroll <carrofin@amazon.com>

Author: finnegancarroll

src/integrationTest/java/org/opensearch/security/api/CertificatesRestApiIntegrationTest.java

@@ -30,13 +30,13 @@
 import org.opensearch.test.framework.cluster.LocalOpenSearchCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 
-import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;
 import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.CERTS_INFO_ACTION;
 import static org.opensearch.security.support.ConfigConstants.SECURITY_RESTAPI_ADMIN_ENABLED;
+import static junit.framework.TestCase.fail;
 
 public class CertificatesRestApiIntegrationTest extends AbstractApiIntegrationTest {
     final static String REST_API_ADMIN_SSL_INFO = "rest-api-admin-ssl-info";
@@ -88,7 +88,11 @@ public void forbiddenForAdminUser() throws Exception {
 
     @Test
     public void availableForTlsAdmin() throws Exception {
-        withUser(ADMIN_USER_NAME, localCluster.getAdminCertificate(), verifySSLCertsInfo(List.of(CertType.HTTP, CertType.TRANSPORT, CertType.TRANSPORT_CLIENT)));
+        withUser(
+            ADMIN_USER_NAME,
+            localCluster.getAdminCertificate(),
+            verifySSLCertsInfo(List.of(CertType.HTTP, CertType.TRANSPORT, CertType.TRANSPORT_CLIENT))
+        );
     }
 
     @Test
@@ -112,14 +116,16 @@ private CheckedConsumer<TestRestClient, Exception> verifySSLCertsInfo(List<CertT
                 assertSSLCertsInfo(localCluster.nodes(), expectCerts, ok(() -> testRestClient.get(sslCertsPath())));
                 if (localCluster.nodes().size() > 1) {
                     final var randomNodes = randomNodes();
-                    final var nodeIds = randomNodes.stream().map(n -> n.esNode().getNodeEnvironment().nodeId()).collect(Collectors.joining(","));
+                    final var nodeIds = randomNodes.stream()
+                        .map(n -> n.esNode().getNodeEnvironment().nodeId())
+                        .collect(Collectors.joining(","));
                     assertSSLCertsInfo(randomNodes, expectCerts, ok(() -> testRestClient.get(sslCertsPath(nodeIds))));
                 }
                 final var randomCertType = randomFrom(expectCerts);
                 assertSSLCertsInfo(
-                        localCluster.nodes(),
-                        List.of(randomCertType),
-                        ok(() -> testRestClient.get(String.format("%s?cert_type=%s", sslCertsPath(), randomCertType)))
+                    localCluster.nodes(),
+                    List.of(randomCertType),
+                    ok(() -> testRestClient.get(String.format("%s?cert_type=%s", sslCertsPath(), randomCertType)))
                 );
             } catch (Exception e) {
                 fail("Verify SSLCerts info failed with exception: " + e.getMessage());
@@ -161,22 +167,18 @@ private void assertSSLCertsInfo(
 
     private void verifyCertsJson(final int nodeNumber, final JsonNode jsonNode) {
         if (jsonNode.get("subject_dn").asText().contains(ROOT_CA)) { // handle root cert
-            assertThat(
-                    jsonNode.toPrettyString(),
-                    jsonNode.get("subject_dn").asText(),
-                    is(TestCertificates.CA_SUBJECT)
-            );
+            assertThat(jsonNode.toPrettyString(), jsonNode.get("subject_dn").asText(), is(TestCertificates.CA_SUBJECT));
             assertThat(jsonNode.toPrettyString(), jsonNode.get("san").asText().isEmpty());
         } else { // handle non-root
             assertThat(
-                    jsonNode.toPrettyString(),
-                    jsonNode.get("subject_dn").asText(),
-                    is(String.format(TestCertificates.NODE_SUBJECT_PATTERN, nodeNumber))
+                jsonNode.toPrettyString(),
+                jsonNode.get("subject_dn").asText(),
+                is(String.format(TestCertificates.NODE_SUBJECT_PATTERN, nodeNumber))
             );
             assertThat(
-                    jsonNode.toPrettyString(),
-                    jsonNode.get("san").asText(),
-                    containsString(String.format("node-%s.example.com", nodeNumber))
+                jsonNode.toPrettyString(),
+                jsonNode.get("san").asText(),
+                containsString(String.format("node-%s.example.com", nodeNumber))
             );
         }
         assertThat(jsonNode.toPrettyString(), jsonNode.get("issuer_dn").asText(), is(TestCertificates.CA_SUBJECT));

src/main/java/org/opensearch/security/ssl/config/CertType.java

@@ -144,9 +144,9 @@ public Iterator<CertType> iterator() {
     public static CertType TRANSPORT_CLIENT = new CertType(SSL_TRANSPORT_CLIENT_PREFIX, "transport_client");
     public static CertType TRANSPORT_SERVER = new CertType(SSL_TRANSPORT_SERVER_PREFIX, "transport_server");
     public static final NodeCertTypeRegistry CERT_TYPE_REGISTRY = new NodeCertTypeRegistry(
-            HTTP,
-            TRANSPORT,
-            TRANSPORT_CLIENT,
-            TRANSPORT_SERVER
+        HTTP,
+        TRANSPORT,
+        TRANSPORT_CLIENT,
+        TRANSPORT_SERVER
     );
 }

src/test/java/org/opensearch/security/ssl/SslSettingsManagerTest.java

@@ -66,8 +66,8 @@
 import static org.opensearch.security.ssl.util.SSLConfigConstants.getBoolAffixKeyForCertType;
 import static org.opensearch.security.ssl.util.SSLConfigConstants.getStringAffixKeyForCertType;
 import static org.opensearch.security.support.ConfigConstants.SECURITY_SSL_ONLY;
-import static org.junit.Assert.assertThrows;
 import static org.opensearch.transport.AuxTransport.AUX_TRANSPORT_TYPES_SETTING;
+import static org.junit.Assert.assertThrows;
 
 public class SslSettingsManagerTest extends RandomizedTest {