From 49016cd8da23b491bd37aae1bd42783a9b7c6556 Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Wed, 26 Oct 2022 07:05:46 -0500 Subject: [PATCH] Fix checkstyle issue Signed-off-by: Peter Nied --- build.gradle | 7 ++++++- src/test/java/org/opensearch/security/ssl/OpenSSLTest.java | 1 - .../opensearch/security/test/helper/file/FileHelper.java | 4 ++++ src/test/resources/log4j2-test.properties | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ffbd38fd5f..bd8bc30eae 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,7 @@ test { } retry { failOnPassedAfterRetry = false - maxRetries = 5 + // maxRetries = 5 } jacoco { excludes = [ @@ -376,6 +376,11 @@ dependencies { runtimeOnly 'org.apache.santuario:xmlsec:2.2.3' runtimeOnly 'com.github.luben:zstd-jni:1.5.0-2' runtimeOnly 'org.checkerframework:checker-qual:3.5.0' + // testRuntimeOnly 'io.netty:netty-tcnative:2.0.54.Final:windows-x86_64' + // runtimeOnly 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final' + // testRuntimeOnly "io.netty:netty-all:${versions.netty}" + testRuntimeOnly 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:windows-x86_64' + implementation 'org.apache.commons:commons-lang3:3.4' diff --git a/src/test/java/org/opensearch/security/ssl/OpenSSLTest.java b/src/test/java/org/opensearch/security/ssl/OpenSSLTest.java index 65d21589f8..c353b7ebb4 100644 --- a/src/test/java/org/opensearch/security/ssl/OpenSSLTest.java +++ b/src/test/java/org/opensearch/security/ssl/OpenSSLTest.java @@ -22,7 +22,6 @@ import java.util.Set; import io.netty.handler.ssl.OpenSsl; -import io.netty.util.internal.PlatformDependent; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; diff --git a/src/test/java/org/opensearch/security/test/helper/file/FileHelper.java b/src/test/java/org/opensearch/security/test/helper/file/FileHelper.java index 93cc31ffee..e806b188d7 100644 --- a/src/test/java/org/opensearch/security/test/helper/file/FileHelper.java +++ b/src/test/java/org/opensearch/security/test/helper/file/FileHelper.java @@ -97,6 +97,7 @@ public static Path getAbsoluteFilePathFromClassPath(final String fileNameFromCla public static final String loadFile(final String file) throws IOException { final StringWriter sw = new StringWriter(); IOUtils.copy(FileHelper.class.getResourceAsStream("/" + file), sw, StandardCharsets.UTF_8); + // System.err.println("Loaded file + " + file + "\r\n\r\n" + sw.toString()); return sw.toString(); } @@ -108,6 +109,8 @@ public static BytesReference readYamlContent(final String file) { parser.nextToken(); final XContentBuilder builder = XContentFactory.jsonBuilder(); builder.copyCurrentStructure(parser); + // Reproduction + System.err.println("Builder: " + file + "\r\n\r\n" + new String(BytesReference.toBytes(BytesReference.bytes(builder)))); return BytesReference.bytes(builder); } catch (Exception e) { throw new RuntimeException(e); @@ -131,6 +134,7 @@ public static BytesReference readYamlContentFromString(final String yaml) { parser.nextToken(); final XContentBuilder builder = XContentFactory.jsonBuilder(); builder.copyCurrentStructure(parser); + System.err.println("Builder " + builder.toString()); return BytesReference.bytes(builder); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties index 3d22ca3765..7eef03367a 100644 --- a/src/test/resources/log4j2-test.properties +++ b/src/test/resources/log4j2-test.properties @@ -13,7 +13,7 @@ appender.file.layout.type=PatternLayout appender.file.layout.pattern=[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n -rootLogger.level = warn +rootLogger.level = info rootLogger.appenderRef.console.ref = console rootLogger.appenderRef.file.ref = LOGFILE @@ -22,6 +22,8 @@ rootLogger.appenderRef.file.ref = LOGFILE #logger.pe.name = org.opensearch.security.configuration.PrivilegesEvaluator #logger.pe.level = trace +logger.br.name = org.opensearch.security.auth.BackendRegistry +logger.br.level = trace logger.cas.name = org.opensearch.cluster.service.ClusterApplierService logger.cas.level = error