From ab850214325997dad434282c3518235a2e4a5766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 6 Dec 2021 17:21:11 -0800 Subject: [PATCH] fix build warnings for forbidden-apis * replace deprecated forbidden-apis config failOnUnresolvableSignatures with ignoreSignaturesOfMissingClasses which avoids warnings for classes not present in a particular sub-module * fix incorrect signature for Files.createTempDirectory --- codestyle/druid-forbidden-apis.txt | 2 +- .../impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java | 2 ++ pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt index 909039ec4f82..fa078c052ff9 100644 --- a/codestyle/druid-forbidden-apis.txt +++ b/codestyle/druid-forbidden-apis.txt @@ -29,7 +29,7 @@ java.lang.String#replace(java.lang.CharSequence,java.lang.CharSequence) @ Use on java.lang.String#replaceAll(java.lang.String,java.lang.String) @ Use one of the appropriate methods in StringUtils instead, or compile and cache a Pattern explicitly java.lang.String#replaceFirst(java.lang.String,java.lang.String) @ Use String.indexOf() and substring methods, or compile and cache a Pattern explicitly java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[]) @ Use org.apache.druid.java.util.common.FileUtils.createTempDir() -java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.Path,java.nio.file.attribute.FileAttribute[]) @ Use org.apache.druid.java.util.common.FileUtils.createTempDir() +java.nio.file.Files#createTempDirectory(java.nio.file.Path,java.lang.String,java.nio.file.attribute.FileAttribute[]) @ Use org.apache.druid.java.util.common.FileUtils.createTempDir() java.util.HashMap#(int) @ Use com.google.common.collect.Maps#newHashMapWithExpectedSize(int) instead java.util.HashMap#(int, float) @ Use com.google.common.collect.Maps#newHashMapWithExpectedSize(int) instead java.util.LinkedHashMap#(int) @ Use org.apache.druid.utils.CollectionUtils#newLinkedHashMapWithExpectedSize(int) instead diff --git a/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java index 6394e48dac00..c97fc8a22c5e 100644 --- a/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java +++ b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java @@ -22,6 +22,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.io.CountingOutputStream; +import io.netty.util.SuppressForbidden; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; import org.apache.druid.common.config.NullHandling; @@ -152,6 +153,7 @@ private static void assertNumRemainingCacheFiles(File firehoseTmpDir, int expect Assert.assertEquals(expectedNumFiles, files.length); } + @SuppressForbidden(reason = "Files#createTempDirectory") private static File createFirehoseTmpDir(String dirPrefix) throws IOException { return Files.createTempDirectory(tempDir.getRoot().toPath(), dirPrefix).toFile(); diff --git a/pom.xml b/pom.xml index 134f8b6b381a..25957c887b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -1290,7 +1290,7 @@ forbiddenapis 3.1 - false + true