This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch feat/logging-parent-migration2 in repository https://gitbox.apache.org/repos/asf/logging-flume.git
commit 3873ce44ada53c9f348ccf00a3e13e3db9ba2f6f Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Jul 24 14:11:58 2026 +0200 Expand star imports The formatting rules inherited from `logging-parent` forbid wildcard imports. Assisted-By: Claude Fable 5 <[email protected]> --- .../channel/file/TestCheckpointRebuilder.java | 5 ++++- .../flume/channel/file/TestFileChannelRestart.java | 2 +- .../apache/flume/conf/TestAgentConfiguration.java | 6 +++++- .../apache/flume/conf/TestFlumeConfiguration.java | 7 ++++++- .../apache/flume/interceptor/HostInterceptor.java | 7 ++++++- .../flume/interceptor/TimestampInterceptor.java | 5 ++++- .../test/java/org/apache/flume/TestContext.java | 3 ++- .../flume/source/TestAbstractPollableSource.java | 2 +- .../flume/source/TestBasicSourceSemantics.java | 3 ++- .../org/apache/flume/tools/TestVersionInfo.java | 3 ++- .../org/apache/flume/node/TestApplication.java | 6 +++++- .../syslog/TestMultiportSyslogTCPSource.java | 3 ++- .../flume/source/syslog/TestSyslogUtils.java | 2 +- .../apache/flume/source/taildir/TaildirSource.java | 24 +++++++++++++++++++++- 14 files changed, 64 insertions(+), 14 deletions(-) diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestCheckpointRebuilder.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestCheckpointRebuilder.java index 008c2e3a..7ebebc7e 100644 --- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestCheckpointRebuilder.java +++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestCheckpointRebuilder.java @@ -16,7 +16,10 @@ */ package org.apache.flume.channel.file; -import static org.apache.flume.channel.file.TestUtils.*; +import static org.apache.flume.channel.file.TestUtils.compareInputAndOut; +import static org.apache.flume.channel.file.TestUtils.consumeChannel; +import static org.apache.flume.channel.file.TestUtils.fillChannel; +import static org.apache.flume.channel.file.TestUtils.getAllLogs; import com.google.common.collect.Maps; import java.io.File; diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannelRestart.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannelRestart.java index 5f43bc87..69bb9a4b 100644 --- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannelRestart.java +++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannelRestart.java @@ -25,7 +25,7 @@ import static org.apache.flume.channel.file.TestUtils.putEvents; import static org.apache.flume.channel.file.TestUtils.putWithoutCommit; import static org.apache.flume.channel.file.TestUtils.takeEvents; import static org.apache.flume.channel.file.TestUtils.takeWithoutCommit; -import static org.fest.reflect.core.Reflection.*; +import static org.fest.reflect.core.Reflection.field; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestAgentConfiguration.java b/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestAgentConfiguration.java index 0683c6d3..dccc399e 100644 --- a/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestAgentConfiguration.java +++ b/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestAgentConfiguration.java @@ -17,7 +17,11 @@ package org.apache.flume.conf; import static org.apache.flume.conf.FlumeConfigurationError.ErrorOrWarning.ERROR; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.HashMap; diff --git a/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestFlumeConfiguration.java b/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestFlumeConfiguration.java index 2d250c79..e2b0048e 100644 --- a/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestFlumeConfiguration.java +++ b/flume-ng-configuration/src/test/java/org/apache/flume/conf/TestFlumeConfiguration.java @@ -17,7 +17,12 @@ package org.apache.flume.conf; import static org.apache.flume.conf.FlumeConfigurationError.ErrorOrWarning.ERROR; -import static org.apache.flume.conf.FlumeConfigurationErrorType.*; +import static org.apache.flume.conf.FlumeConfigurationErrorType.AGENT_CONFIGURATION_INVALID; +import static org.apache.flume.conf.FlumeConfigurationErrorType.AGENT_NAME_MISSING; +import static org.apache.flume.conf.FlumeConfigurationErrorType.CONFIG_ERROR; +import static org.apache.flume.conf.FlumeConfigurationErrorType.INVALID_PROPERTY; +import static org.apache.flume.conf.FlumeConfigurationErrorType.PROPERTY_NAME_NULL; +import static org.apache.flume.conf.FlumeConfigurationErrorType.PROPERTY_VALUE_NULL; import static org.junit.Assert.assertEquals; import java.util.HashMap; diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java index 707109e5..94ea167f 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java +++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/HostInterceptor.java @@ -16,7 +16,12 @@ */ package org.apache.flume.interceptor; -import static org.apache.flume.interceptor.HostInterceptor.Constants.*; +import static org.apache.flume.interceptor.HostInterceptor.Constants.HOST; +import static org.apache.flume.interceptor.HostInterceptor.Constants.HOST_HEADER; +import static org.apache.flume.interceptor.HostInterceptor.Constants.PRESERVE; +import static org.apache.flume.interceptor.HostInterceptor.Constants.PRESERVE_DFLT; +import static org.apache.flume.interceptor.HostInterceptor.Constants.USE_IP; +import static org.apache.flume.interceptor.HostInterceptor.Constants.USE_IP_DFLT; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/TimestampInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/TimestampInterceptor.java index 577e61cc..6b558850 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/TimestampInterceptor.java +++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/TimestampInterceptor.java @@ -16,7 +16,10 @@ */ package org.apache.flume.interceptor; -import static org.apache.flume.interceptor.TimestampInterceptor.Constants.*; +import static org.apache.flume.interceptor.TimestampInterceptor.Constants.CONFIG_HEADER_NAME; +import static org.apache.flume.interceptor.TimestampInterceptor.Constants.CONFIG_PRESERVE; +import static org.apache.flume.interceptor.TimestampInterceptor.Constants.DEFAULT_HEADER_NAME; +import static org.apache.flume.interceptor.TimestampInterceptor.Constants.DEFAULT_PRESERVE; import java.util.List; import java.util.Map; diff --git a/flume-ng-core/src/test/java/org/apache/flume/TestContext.java b/flume-ng-core/src/test/java/org/apache/flume/TestContext.java index b0935180..9f8ffdaf 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/TestContext.java +++ b/flume-ng-core/src/test/java/org/apache/flume/TestContext.java @@ -16,7 +16,8 @@ */ package org.apache.flume; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import com.google.common.collect.ImmutableMap; import org.junit.Before; diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestAbstractPollableSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestAbstractPollableSource.java index 16991a5d..ddea222d 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/TestAbstractPollableSource.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestAbstractPollableSource.java @@ -16,7 +16,7 @@ */ package org.apache.flume.source; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.spy; import java.util.HashMap; import org.apache.flume.Context; diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestBasicSourceSemantics.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestBasicSourceSemantics.java index 9bdeb8a1..6458785b 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/TestBasicSourceSemantics.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestBasicSourceSemantics.java @@ -16,7 +16,8 @@ */ package org.apache.flume.source; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import org.apache.flume.Context; import org.apache.flume.FlumeException; diff --git a/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java b/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java index a71a0801..59457f96 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java +++ b/flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java @@ -16,7 +16,8 @@ */ package org.apache.flume.tools; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/flume-ng-node/src/test/java/org/apache/flume/node/TestApplication.java b/flume-ng-node/src/test/java/org/apache/flume/node/TestApplication.java index 583fe97f..f0bce1f5 100644 --- a/flume-ng-node/src/test/java/org/apache/flume/node/TestApplication.java +++ b/flume-ng-node/src/test/java/org/apache/flume/node/TestApplication.java @@ -16,7 +16,11 @@ */ package org.apache.flume.node; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.google.common.collect.Lists; import com.google.common.eventbus.EventBus; diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java index b29d02ed..4976e135 100644 --- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java +++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java @@ -19,7 +19,8 @@ package org.apache.flume.source.syslog; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.doThrow; import com.google.common.base.Charsets; import com.google.common.collect.Lists; diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUtils.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUtils.java index 9834ca3e..df2ef51d 100644 --- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUtils.java +++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogUtils.java @@ -16,7 +16,7 @@ */ package org.apache.flume.source.syslog; -import static io.netty.buffer.Unpooled.*; +import static io.netty.buffer.Unpooled.buffer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java index 9ae59e68..8d9c0ef9 100644 --- a/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java +++ b/flume-ng-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TaildirSource.java @@ -16,7 +16,29 @@ */ package org.apache.flume.source.taildir; -import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.*; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.BATCH_SIZE; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.BYTE_OFFSET_HEADER; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.CACHE_PATTERN_MATCHING; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_BATCH_SIZE; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_BYTE_OFFSET_HEADER; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_CACHE_PATTERN_MATCHING; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_FILENAME_HEADER_KEY; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_FILE_HEADER; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_IDLE_TIMEOUT; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_MAX_BATCH_COUNT; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_POSITION_FILE; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_SKIP_TO_END; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.DEFAULT_WRITE_POS_INTERVAL; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.FILENAME_HEADER; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.FILENAME_HEADER_KEY; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.FILE_GROUPS; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.FILE_GROUPS_PREFIX; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.HEADERS_PREFIX; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.IDLE_TIMEOUT; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.MAX_BATCH_COUNT; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.POSITION_FILE; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.SKIP_TO_END; +import static org.apache.flume.source.taildir.TaildirSourceConfigurationConstants.WRITE_POS_INTERVAL; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions;
