This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch fix/build-project in repository https://gitbox.apache.org/repos/asf/logging-flume-rpc.git
commit 196fcb23727f4d274ec1aa57b3e0cadd5d4703b2 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Sep 2 20:07:48 2026 +0200 Expand wildcard imports The `logging-parent` enforcer rules ban wildcard imports. The two Thrift generated classes are edited in place; regenerating them with the `compileThrift` profile will reintroduce the wildcard import. Assisted-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_01F9NiqMnCccUGDtqt64uKe6 --- .../embedded/TestEmbeddedAgentEmbeddedSource.java | 6 +++- .../rpc/avro/source/SpoolDirectorySource.java | 40 +++++++++++++++++++++- .../serialization/TestSpoolingFileLineReader.java | 5 ++- .../apache/flume/rpc/thrift/ThriftFlumeEvent.java | 1 - .../flume/rpc/thrift/ThriftSourceProtocol.java | 2 +- 5 files changed, 49 insertions(+), 5 deletions(-) diff --git a/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java b/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java index 65b905e..26a6792 100644 --- a/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java +++ b/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java @@ -16,7 +16,11 @@ */ package org.apache.flume.agent.embedded; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java b/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java index 9815e97..819d071 100644 --- a/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java +++ b/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java @@ -16,7 +16,44 @@ */ package org.apache.flume.rpc.avro.source; -import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.*; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BASENAME_HEADER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BASENAME_HEADER_KEY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BATCH_SIZE; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BUFFER_MAX_LINE_LENGTH; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.CONSUME_ORDER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DECODE_ERROR_POLICY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BASENAME_HEADER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BASENAME_HEADER_KEY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BATCH_SIZE; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_CONSUME_ORDER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DECODE_ERROR_POLICY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DELETE_POLICY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DESERIALIZER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_FILENAME_HEADER_KEY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_FILE_HEADER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_IGNORE_PAT; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_INCLUDE_PAT; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_INPUT_CHARSET; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_MAX_BACKOFF; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_POLL_DELAY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_RECURSIVE_DIRECTORY_SEARCH; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_SPOOLED_FILE_SUFFIX; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_TRACKER_DIR; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_TRACKING_POLICY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DELETE_POLICY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DESERIALIZER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.FILENAME_HEADER; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.FILENAME_HEADER_KEY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.IGNORE_PAT; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.INCLUDE_PAT; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.INPUT_CHARSET; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.MAX_BACKOFF; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.POLL_DELAY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.RECURSIVE_DIRECTORY_SEARCH; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.SPOOLED_FILE_SUFFIX; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.SPOOL_DIRECTORY; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.TRACKER_DIR; +import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.TRACKING_POLICY; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -41,6 +78,7 @@ import org.apache.flume.rpc.avro.serialization.ReliableSpoolingFileEventReader; import org.apache.flume.serialization.DecodeErrorPolicy; import org.apache.flume.serialization.LineDeserializer; import org.apache.flume.source.AbstractSource; +import org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.ConsumeOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java index dd3e892..e66546a 100644 --- a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java +++ b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java @@ -16,7 +16,10 @@ */ package org.apache.flume.rpc.avro.serialization; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import com.google.common.base.Charsets; import com.google.common.base.Throwables; diff --git a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java index 320cb1b..4948d68 100644 --- a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java +++ b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java @@ -31,7 +31,6 @@ import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.server.AbstractNonblockingServer.*; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-09-01") diff --git a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java index 1c44708..ec6b0a5 100644 --- a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java +++ b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java @@ -32,7 +32,7 @@ import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.server.AbstractNonblockingServer.*; +import org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
