[prev in list] [next in list] [prev in thread] [next in thread]
List: flume-commits
Subject: [flume] branch trunk updated: Update checkstyle and maven checkstyle plugin
From: rgoers () apache ! org
Date: 2021-11-01 16:42:56
Message-ID: 163578497599.31703.13953508701768399700 () gitbox ! apache ! org
[Download RAW message or body]
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9b9c9bf Update checkstyle and maven checkstyle plugin
9b9c9bf is described below
commit 9b9c9bf7e54435bd5ac48eb9e51174e19e66802f
Author: rgoers <ralph.goers@dslextreme.com>
AuthorDate: Mon Nov 1 09:42:36 2021 -0700
Update checkstyle and maven checkstyle plugin
---
.gitignore | 1 +
.../resources/config/checkstyle/checkstyle.xml | 19 +++++++------
.../apache/flume/auth/FlumeAuthenticationUtil.java | 3 +-
.../org/apache/flume/auth/PrivilegedExecutor.java | 1 -
.../org/apache/flume/auth/SimpleAuthenticator.java | 6 ++--
.../file/EventQueueBackingStoreFactory.java | 3 +-
.../org/apache/flume/channel/file/FlumeEvent.java | 14 ++++-----
.../flume/channel/file/FlumeEventPointer.java | 1 -
.../apache/flume/channel/file/LogFileFactory.java | 3 +-
.../org/apache/flume/channel/file/LogFileV2.java | 3 +-
.../org/apache/flume/channel/file/LogFileV3.java | 3 +-
.../apache/flume/channel/file/Serialization.java | 3 +-
.../flume/channel/file/TransactionEventRecord.java | 3 --
.../flume/channel/file/TransactionIDOracle.java | 3 +-
.../flume/channel/file/WriteOrderOracle.java | 3 +-
.../file/encryption/EncryptionConfiguration.java | 3 +-
.../flume/channel/jdbc/ConfigurationConstants.java | 1 -
.../jdbc/TestTransactionIsolationLevelEnum.java | 1 -
.../apache/flume/channel/kafka/KafkaChannel.java | 1 -
.../src/test/resources/kafka-server.properties | 15 ++++++----
.../flume/clients/log4jappender/Log4jAppender.java | 1 -
.../flume/annotations/InterfaceAudience.java | 9 ++++--
.../org/apache/flume/channel/AbstractChannel.java | 3 +-
.../flume/channel/BasicChannelSemantics.java | 3 +-
.../flume/channel/BasicTransactionSemantics.java | 6 ++--
.../org/apache/flume/channel/ChannelUtils.java | 3 +-
.../serialization/DurablePositionTracker.java | 1 -
.../serialization/ResettableFileInputStream.java | 1 -
.../flume/sink/LoadBalancingSinkProcessor.java | 1 -
.../source/NetcatSourceConfigurationConstants.java | 1 -
.../org/apache/flume/source/http/HTTPSource.java | 8 ++----
.../source/shaded/guava/Uninterruptibles.java | 3 +-
.../agent/embedded/EmbeddedAgentConfiguration.java | 3 +-
.../org/apache/flume/api/NettyAvroRpcClient.java | 2 +-
.../flume/api/RpcClientConfigurationConstants.java | 1 -
.../sink/kite/NonRecoverableEventException.java | 5 ++--
.../org/apache/flume/sink/hdfs/HDFSEventSink.java | 2 --
.../flume/sink/hbase/IncrementHBaseSerializer.java | 9 ++++--
.../sink/hbase2/IncrementHBase2Serializer.java | 9 ++++--
.../org/apache/flume/sink/kafka/KafkaSink.java | 5 ++--
.../src/test/resources/kafka-server.properties | 25 +++++++++-------
.../sink/solr/morphline/BlobDeserializer.java | 9 +++---
.../sink/solr/morphline/MorphlineInterceptor.java | 33 ++++++++++------------
.../sink/solr/morphline/MorphlineSolrSink.java | 7 ++---
.../flume/sink/solr/morphline/UUIDInterceptor.java | 1 -
.../flume/source/jms/JMSMessageConsumer.java | 3 +-
.../source/jms/TestDefaultJMSMessageConverter.java | 2 +-
.../flume/source/jms/TestJMSMessageConsumer.java | 13 +++++----
.../org/apache/flume/source/jms/TestJMSSource.java | 2 +-
.../org/apache/flume/test/util/StagedInstall.java | 1 -
pom.xml | 13 +++++++--
51 files changed, 146 insertions(+), 129 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0f26790..9a0a932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ derby.log
nb-configuration.xml
.DS_Store
/.mvn/wrapper/maven-wrapper.jar
+**/metastore_db
diff --git a/build-support/src/main/resources/config/checkstyle/checkstyle.xml \
b/build-support/src/main/resources/config/checkstyle/checkstyle.xml index \
16f3669..87004e1 100644
--- a/build-support/src/main/resources/config/checkstyle/checkstyle.xml
+++ b/build-support/src/main/resources/config/checkstyle/checkstyle.xml
@@ -51,6 +51,11 @@ under the License.
<property name="optional" value="false"/>
</module>
+ <module name="LineLength">
+ <property name="max" value="100"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a \
href|href|http://|https://|ftp://"/> + </module>
+
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
@@ -63,10 +68,7 @@ under the License.
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
- <module name="LineLength">
- <property name="max" value="100"/>
- <property name="ignorePattern" value="^package.*|^import.*|a \
href|href|http://|https://|ftp://"/>
- </module>
+
<module name="AvoidStarImport">
<property name="allowStaticMemberImports" value="true"/>
</module>
@@ -170,15 +172,14 @@ under the License.
<property name="tagOrder" value="@param, @return, @throws, \
@deprecated"/>
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, \
METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> </module>
+ <module name="MissingJavadocMethod">
+ <property name="excludeScope" value="public"/>
+ </module>
<module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowMissingJavadoc" value="true"/>
+ <property name="accessModifiers" value=""/>
<property name="allowMissingParamTags" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
- <property name="minLineCount" value="0"/>
<property name="allowedAnnotations" value="Override, Test"/>
- <property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
diff --git a/flume-ng-auth/src/main/java/org/apache/flume/auth/FlumeAuthenticationUtil.java \
b/flume-ng-auth/src/main/java/org/apache/flume/auth/FlumeAuthenticationUtil.java \
index 87cef31..88de168 100644
--- a/flume-ng-auth/src/main/java/org/apache/flume/auth/FlumeAuthenticationUtil.java
+++ b/flume-ng-auth/src/main/java/org/apache/flume/auth/FlumeAuthenticationUtil.java
@@ -33,7 +33,8 @@ import java.io.IOException;
*/
public class FlumeAuthenticationUtil {
- private FlumeAuthenticationUtil() {}
+ private FlumeAuthenticationUtil() {
+ }
private static KerberosAuthenticator kerbAuthenticator;
diff --git a/flume-ng-auth/src/main/java/org/apache/flume/auth/PrivilegedExecutor.java \
b/flume-ng-auth/src/main/java/org/apache/flume/auth/PrivilegedExecutor.java index \
0aa321a..866c606 100644
--- a/flume-ng-auth/src/main/java/org/apache/flume/auth/PrivilegedExecutor.java
+++ b/flume-ng-auth/src/main/java/org/apache/flume/auth/PrivilegedExecutor.java
@@ -20,7 +20,6 @@ package org.apache.flume.auth;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
-
/**
* PrivilegedExecutor provides the ability to execute a PrivilegedAction
* or a PrivilegedExceptionAction. Implementors of this class, can chose to execute
diff --git a/flume-ng-auth/src/main/java/org/apache/flume/auth/SimpleAuthenticator.java \
b/flume-ng-auth/src/main/java/org/apache/flume/auth/SimpleAuthenticator.java index \
d2791a1..df41167 100644
--- a/flume-ng-auth/src/main/java/org/apache/flume/auth/SimpleAuthenticator.java
+++ b/flume-ng-auth/src/main/java/org/apache/flume/auth/SimpleAuthenticator.java
@@ -30,7 +30,8 @@ import java.util.Map;
* without any authenticated privileges
*/
class SimpleAuthenticator implements FlumeAuthenticator {
- private SimpleAuthenticator() {}
+ private SimpleAuthenticator() {
+ }
private static class SimpleAuthenticatorHolder {
public static SimpleAuthenticator authenticator = new SimpleAuthenticator();
@@ -40,8 +41,7 @@ class SimpleAuthenticator implements FlumeAuthenticator {
return SimpleAuthenticatorHolder.authenticator;
}
- private Map<String, PrivilegedExecutor> proxyCache =
- new HashMap<String, PrivilegedExecutor>();
+ private Map<String, PrivilegedExecutor> proxyCache = new HashMap<String, \
PrivilegedExecutor>();
@Override
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java
index 7f8b3f6..2e92f4c 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java
@@ -30,7 +30,8 @@ import java.io.RandomAccessFile;
class EventQueueBackingStoreFactory {
private static final Logger LOG = \
LoggerFactory.getLogger(EventQueueBackingStoreFactory.class);
- private EventQueueBackingStoreFactory() {}
+ private EventQueueBackingStoreFactory() {
+ }
static EventQueueBackingStore get(
File checkpointFile, int capacity, String name, FileChannelCounter counter
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEvent.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEvent.java
index cd1b6d8..d0a03e0 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEvent.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEvent.java
@@ -51,13 +51,13 @@ class FlumeEvent implements Event, Writable {
private static ThreadLocal<CharsetDecoder> DECODER_FACTORY =
new ThreadLocal<CharsetDecoder>() {
- @Override
- protected CharsetDecoder initialValue() {
- return Charset.forName("UTF-8").newDecoder()
- .onMalformedInput(CodingErrorAction.REPLACE)
- \
.onUnmappableCharacter(CodingErrorAction.REPLACE);
- }
- };
+ @Override
+ protected CharsetDecoder initialValue() {
+ return Charset.forName("UTF-8").newDecoder()
+ .onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE);
+ }
+ };
private Map<String, String> headers;
private byte[] body;
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventPointer.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventPointer.java
index ebf7843..717eb71 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventPointer.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventPointer.java
@@ -18,7 +18,6 @@
*/
package org.apache.flume.channel.file;
-
/**
* Pointer to an Event on disk. This is represented in memory
* as a long. As such there are methods to convert from this
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileFactory.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileFactory.java
index f2fcad6..897d944 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileFactory.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileFactory.java
@@ -35,7 +35,8 @@ class LogFileFactory {
private static final Logger LOGGER =
LoggerFactory.getLogger(LogFileFactory.class);
- private LogFileFactory() {}
+ private LogFileFactory() {
+ }
static LogFile.MetaDataWriter getMetaDataWriter(File file, int logFileID)
throws IOException {
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV2.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV2.java
index f2469b2..fae8ff5 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV2.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV2.java
@@ -37,7 +37,8 @@ class LogFileV2 extends LogFile {
private static final long OFFSET_CHECKPOINT = 2 * Serialization.SIZE_OF_INT;
- private LogFileV2() {}
+ private LogFileV2() {
+ }
static class MetaDataWriter extends LogFile.MetaDataWriter {
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
index b459947..2e03137 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
@@ -52,7 +52,8 @@ public class LogFileV3 extends LogFile {
protected static final Logger LOGGER =
LoggerFactory.getLogger(LogFileV3.class);
- private LogFileV3() {}
+ private LogFileV3() {
+ }
static class MetaDataWriter extends LogFile.MetaDataWriter {
private ProtosFactory.LogFileMetaData logFileMetaData;
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Serialization.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Serialization.java
index 19303cc..b6deaaa 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Serialization.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Serialization.java
@@ -41,7 +41,8 @@ import java.util.Set;
@InterfaceAudience.Private
@InterfaceStability.Unstable
public class Serialization {
- private Serialization() {}
+ private Serialization() {
+ }
static final long SIZE_OF_INT = 4;
static final int SIZE_OF_LONG = 8;
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java
index 0f7c3c8..145df12 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java
@@ -58,11 +58,9 @@ public abstract class TransactionEventRecord implements Writable \
{
@Override
public void readFields(DataInput in) throws IOException {
-
}
@Override
public void write(DataOutput out) throws IOException {
-
}
abstract void writeProtos(OutputStream out) throws IOException;
@@ -78,7 +76,6 @@ public abstract class TransactionEventRecord implements Writable {
abstract short getRecordType();
-
/**
* Provides a minimum guarantee we are not reading complete junk
*/
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionIDOracle.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionIDOracle.java
index 12e5c7d..7664c82 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionIDOracle.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionIDOracle.java
@@ -22,7 +22,8 @@ import java.util.concurrent.atomic.AtomicLong;
public final class TransactionIDOracle {
- private TransactionIDOracle() {}
+ private TransactionIDOracle() {
+ }
private static final AtomicLong TRANSACTION_ID =
new AtomicLong(System.currentTimeMillis());
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/WriteOrderOracle.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/WriteOrderOracle.java
index b26cbb4..9aaca43 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/WriteOrderOracle.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/WriteOrderOracle.java
@@ -22,7 +22,8 @@ import java.util.concurrent.atomic.AtomicLong;
public final class WriteOrderOracle {
- private WriteOrderOracle() {}
+ private WriteOrderOracle() {
+ }
private static final AtomicLong WRITER_ORDERER =
new AtomicLong(System.currentTimeMillis());
diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/encryption/EncryptionConfiguration.java \
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/encryption/EncryptionConfiguration.java
index aaea0cd..08e3b1e 100644
--- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/encryption/EncryptionConfiguration.java
+++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/encryption/EncryptionConfiguration.java
@@ -19,7 +19,8 @@
package org.apache.flume.channel.file.encryption;
public class EncryptionConfiguration {
- private EncryptionConfiguration() {}
+ private EncryptionConfiguration() {
+ }
// prefix before all encryption options
public static final String ENCRYPTION_PREFIX = "encryption";
diff --git a/flume-ng-channels/flume-jdbc-channel/src/main/java/org/apache/flume/channel/jdbc/ConfigurationConstants.java \
b/flume-ng-channels/flume-jdbc-channel/src/main/java/org/apache/flume/channel/jdbc/ConfigurationConstants.java
index 7138b41..8c33d69 100644
--- a/flume-ng-channels/flume-jdbc-channel/src/main/java/org/apache/flume/channel/jdbc/ConfigurationConstants.java
+++ b/flume-ng-channels/flume-jdbc-channel/src/main/java/org/apache/flume/channel/jdbc/ConfigurationConstants.java
@@ -130,7 +130,6 @@ public final class ConfigurationConstants {
public static final String OLD_CONFIG_MAX_CAPACITY =
PREFIX + CONFIG_MAX_CAPACITY;
-
// Built in constants for JDBC Channel implementation
/**
diff --git a/flume-ng-channels/flume-jdbc-channel/src/test/java/org/apache/flume/channel/jdbc/TestTransactionIsolationLevelEnum.java \
b/flume-ng-channels/flume-jdbc-channel/src/test/java/org/apache/flume/channel/jdbc/TestTransactionIsolationLevelEnum.java
index b9f35c6..f96b6d7 100644
--- a/flume-ng-channels/flume-jdbc-channel/src/test/java/org/apache/flume/channel/jdbc/TestTransactionIsolationLevelEnum.java
+++ b/flume-ng-channels/flume-jdbc-channel/src/test/java/org/apache/flume/channel/jdbc/TestTransactionIsolationLevelEnum.java
@@ -25,7 +25,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
/**
* The purpose of this test is to guard against accidental backward
* compatibility problem since the string representation so of
diff --git a/flume-ng-channels/flume-kafka-channel/src/main/java/org/apache/flume/channel/kafka/KafkaChannel.java \
b/flume-ng-channels/flume-kafka-channel/src/main/java/org/apache/flume/channel/kafka/KafkaChannel.java
index 0ce26ca..9acf340 100644
--- a/flume-ng-channels/flume-kafka-channel/src/main/java/org/apache/flume/channel/kafka/KafkaChannel.java
+++ b/flume-ng-channels/flume-kafka-channel/src/main/java/org/apache/flume/channel/kafka/KafkaChannel.java
@@ -110,7 +110,6 @@ public class KafkaChannel extends BasicChannelSemantics {
// This isn't a Kafka property per se, but we allow it to be configurable
private long pollTimeout = DEFAULT_POLL_TIMEOUT;
-
// Track all consumers to close them eventually.
private final List<ConsumerAndRecords> consumers =
Collections.synchronizedList(new LinkedList<ConsumerAndRecords>());
diff --git a/flume-ng-channels/flume-kafka-channel/src/test/resources/kafka-server.properties \
b/flume-ng-channels/flume-kafka-channel/src/test/resources/kafka-server.properties \
index 55fa20d..67419d4 100644
--- a/flume-ng-channels/flume-kafka-channel/src/test/resources/kafka-server.properties
+++ b/flume-ng-channels/flume-kafka-channel/src/test/resources/kafka-server.properties
@@ -68,8 +68,10 @@ num.partitions=5
# the OS cache lazily. The following configurations control the flush of data to \
disk. # There are a few important trade-offs here:
# 1. Durability: Unflushed data may be lost if you are not using replication.
-# 2. Latency: Very large flush intervals may lead to latency spikes when the \
flush does occur as there will be a lot of data to flush.
-# 3. Throughput: The flush is generally the most expensive operation, and a small \
flush interval may lead to exceessive seeks. +# 2. Latency: Very large flush \
intervals may lead to latency spikes when the flush does occur as +# there will be \
a lot of data to flush. +# 3. Throughput: The flush is generally the most \
expensive operation, and a small flush interval +# may lead to exceessive seeks.
# The settings below allow one to configure the flush policy to flush data after a \
period of time or # every N messages (or both). This can be done globally and \
overridden on a per-topic basis.
@@ -93,15 +95,18 @@ log.retention.hours=168
# segments don't drop below log.retention.bytes.
#log.retention.bytes=1073741824
-# The maximum size of a log segment file. When this size is reached a new log \
segment will be created. +# The maximum size of a log segment file. When this size is \
reached a new log segment will be +# created.
log.segment.bytes=536870912
# The interval at which log segments are checked to see if they can be deleted \
according # to the retention policies
log.retention.check.interval.ms=60000
-# By default the log cleaner is disabled and the log retention policy will default \
to just delete segments after their retention expires.
-# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs \
can then be marked for log compaction. +# By default the log cleaner is disabled and \
the log retention policy will default to just delete +# segments after their \
retention expires. +# If log.cleaner.enable=true is set the cleaner will be enabled \
and individual logs can then be +# marked for log compaction.
log.cleaner.enable=false
############################# Zookeeper #############################
diff --git a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java \
b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
index f5abfbc..6313269 100644
--- a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
+++ b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java
@@ -88,7 +88,6 @@ public class Log4jAppender extends AppenderSkeleton {
RpcClient rpcClient = null;
-
/**
* If this constructor is used programmatically rather than from a log4j conf
* you must set the <tt>port</tt> and <tt>hostname</tt> and then call
diff --git a/flume-ng-core/src/main/java/org/apache/flume/annotations/InterfaceAudience.java \
b/flume-ng-core/src/main/java/org/apache/flume/annotations/InterfaceAudience.java \
index ad36f42..e67443d 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/annotations/InterfaceAudience.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/annotations/InterfaceAudience.java
@@ -47,7 +47,8 @@ public class InterfaceAudience {
/**
* Intended for use by any project or application.
*/
- @Documented public @interface Public {};
+ @Documented public @interface Public {
+ };
/**
* Intended only for the project(s) specified in the annotation.
@@ -60,7 +61,9 @@ public class InterfaceAudience {
/**
* Intended for use only within Flume
*/
- @Documented public @interface Private {};
+ @Documented public @interface Private {
+ };
- private InterfaceAudience() {} // Audience can't exist on its own
+ private InterfaceAudience() {
+ } // Audience can't exist on its own
}
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannel.java \
b/flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannel.java index \
6ea5dac..e298ff8 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannel.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannel.java
@@ -65,7 +65,8 @@ public abstract class AbstractChannel
}
@Override
- public void configure(Context context) {}
+ public void configure(Context context) {
+ }
public String toString() {
return this.getClass().getName() + "{name: " + name + "}";
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/BasicChannelSemantics.java \
b/flume-ng-core/src/main/java/org/apache/flume/channel/BasicChannelSemantics.java \
index 9b2e69c..2b2506d 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/BasicChannelSemantics.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/BasicChannelSemantics.java
@@ -52,7 +52,8 @@ public abstract class BasicChannelSemantics extends AbstractChannel \
{
* transaction begins.
* </p>
*/
- protected void initialize() {}
+ protected void initialize() {
+ }
/**
* <p>
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/BasicTransactionSemantics.java \
b/flume-ng-core/src/main/java/org/apache/flume/channel/BasicTransactionSemantics.java \
index 20231f4..5d99518 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/BasicTransactionSemantics.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/BasicTransactionSemantics.java
@@ -63,12 +63,14 @@ public abstract class BasicTransactionSemantics implements \
Transaction { private State state;
private long initialThreadId;
- protected void doBegin() throws InterruptedException {}
+ protected void doBegin() throws InterruptedException {
+ }
protected abstract void doPut(Event event) throws InterruptedException;
protected abstract Event doTake() throws InterruptedException;
protected abstract void doCommit() throws InterruptedException;
protected abstract void doRollback() throws InterruptedException;
- protected void doClose() {}
+ protected void doClose() {
+ }
protected BasicTransactionSemantics() {
state = State.NEW;
diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java \
b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java index \
aa62408..42137dd 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelUtils.java
@@ -223,5 +223,6 @@ public class ChannelUtils {
}
/** Disallows instantiation */
- private ChannelUtils() {}
+ private ChannelUtils() {
+ }
}
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/DurablePositionTracker.java \
b/flume-ng-core/src/main/java/org/apache/flume/serialization/DurablePositionTracker.java
index 690bca5..451497d 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/DurablePositionTracker.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/DurablePositionTracker.java
@@ -110,7 +110,6 @@ public class DurablePositionTracker implements PositionTracker {
return newTracker;
}
-
/**
* If the file exists, read it and open it for append.
* @param trackerFile
diff --git a/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java \
b/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
index b263f98..65ecabd 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/serialization/ResettableFileInputStream.java
@@ -112,7 +112,6 @@ public class ResettableFileInputStream extends \
ResettableInputStream private long syncPosition;
private int maxCharWidth;
-
/**
* Whether this instance holds a low surrogate character.
*/
diff --git a/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java \
b/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java \
index ac0781e..fa8400e 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/sink/LoadBalancingSinkProcessor.java
@@ -169,7 +169,6 @@ public class LoadBalancingSinkProcessor extends \
AbstractSinkProcessor { return status;
}
-
/**
* <p>
* An interface that allows the LoadBalancingSinkProcessor to use
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSourceConfigurationConstants.java \
b/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSourceConfigurationConstants.java
index f3efddb..07ddecf 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSourceConfigurationConstants.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/NetcatSourceConfigurationConstants.java
@@ -30,7 +30,6 @@ public class NetcatSourceConfigurationConstants {
*/
public static final String CONFIG_PORT = "port";
-
/**
* Ack every event received with an "OK" back to the sender
*/
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/http/HTTPSource.java \
b/flume-ng-core/src/main/java/org/apache/flume/source/http/HTTPSource.java index \
f2c881c..d7d0433 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/http/HTTPSource.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/http/HTTPSource.java
@@ -179,11 +179,9 @@ public class HTTPSource extends SslContextAwareAbstractSource \
implements httpConfiguration.setSecureScheme("https");
return new ServerConnector(srv,
- new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.asString()),
- new HttpConnectionFactory(httpConfiguration));
- }).orElse(
- new ServerConnector(srv, new HttpConnectionFactory(httpConfiguration))
- );
+ new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.asString()),
+ new HttpConnectionFactory(httpConfiguration));
+ }).orElse(new ServerConnector(srv, new \
HttpConnectionFactory(httpConfiguration)));
connector.setPort(port);
connector.setHost(host);
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/shaded/guava/Uninterruptibles.java \
b/flume-ng-core/src/main/java/org/apache/flume/source/shaded/guava/Uninterruptibles.java
index fe5df25..25dc5eb 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/shaded/guava/Uninterruptibles.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/shaded/guava/Uninterruptibles.java
@@ -328,5 +328,6 @@ public final class Uninterruptibles {
// TODO(user): Add support for waitUninterruptibly.
- private Uninterruptibles() {}
+ private Uninterruptibles() {
+ }
}
\ No newline at end of file
diff --git a/flume-ng-embedded-agent/src/main/java/org/apache/flume/agent/embedded/EmbeddedAgentConfiguration.java \
b/flume-ng-embedded-agent/src/main/java/org/apache/flume/agent/embedded/EmbeddedAgentConfiguration.java
index 05d2d04..fe728f9 100644
--- a/flume-ng-embedded-agent/src/main/java/org/apache/flume/agent/embedded/EmbeddedAgentConfiguration.java
+++ b/flume-ng-embedded-agent/src/main/java/org/apache/flume/agent/embedded/EmbeddedAgentConfiguration.java
@@ -318,5 +318,6 @@ public class EmbeddedAgentConfiguration {
return JOINER.join(parts);
}
- private EmbeddedAgentConfiguration() {}
+ private EmbeddedAgentConfiguration() {
+ }
}
\ No newline at end of file
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/NettyAvroRpcClient.java \
b/flume-ng-sdk/src/main/java/org/apache/flume/api/NettyAvroRpcClient.java index \
e657735..cf52f6e 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/NettyAvroRpcClient.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/NettyAvroRpcClient.java
@@ -104,7 +104,7 @@ public class NettyAvroRpcClient extends \
SSLContextAwareAbstractRpcClient {
* This constructor is intended to be called from {@link RpcClientFactory}.
* A call to this constructor should be followed by call to configure().
*/
- protected NettyAvroRpcClient(){
+ protected NettyAvroRpcClient() {
}
/**
diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientConfigurationConstants.java \
b/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientConfigurationConstants.java
index 228ae66..621b10e 100644
--- a/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientConfigurationConstants.java
+++ b/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientConfigurationConstants.java
@@ -134,7 +134,6 @@ public final class RpcClientConfigurationConstants {
public static final String CONFIG_COMPRESSION_LEVEL = "compression-level";
public static final int DEFAULT_COMPRESSION_LEVEL = 6;
-
/**
* Configuration constants for SSL support
*/
diff --git a/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/NonRecoverableEventException.java \
b/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/NonRecoverableEventException.java
index 4373429..991869a 100644
--- a/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/NonRecoverableEventException.java
+++ b/flume-ng-sinks/flume-dataset-sink/src/main/java/org/apache/flume/sink/kite/NonRecoverableEventException.java
@@ -18,12 +18,11 @@
package org.apache.flume.sink.kite;
-
/**
* A non-recoverable error trying to deliver the event.
- *
+ *
* Non-recoverable event delivery failures include:
- *
+ *
* 1. Error parsing the event body thrown from the {@link EntityParser}
* 2. A schema mismatch between the schema of an event and the schema of the
* destination dataset.
diff --git a/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSEventSink.java \
b/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSEventSink.java
index 4393b6d..9e64eb5 100644
--- a/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSEventSink.java
+++ b/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSEventSink.java
@@ -85,7 +85,6 @@ public class HDFSEventSink extends AbstractSink implements \
Configurable, BatchSi
public static final String IN_USE_SUFFIX_PARAM_NAME = "hdfs.inUseSuffix";
-
/**
* Default length of time we wait for blocking BucketWriter calls
* before timing out the operation. Intended to prevent server hangs.
@@ -141,7 +140,6 @@ public class HDFSEventSink extends AbstractSink implements \
Configurable, BatchSi private int tryCount;
private PrivilegedExecutor privExecutor;
-
/*
* Extended Java LinkedHashMap for open file handle LRU queue.
* We want to clear the oldest file handle if there are too many open ones.
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/src/test/java/org/apache/flume/sink/hbase/IncrementHBaseSerializer.java \
b/flume-ng-sinks/flume-ng-hbase-sink/src/test/java/org/apache/flume/sink/hbase/IncrementHBaseSerializer.java
index b4343eb..ae20350 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/src/test/java/org/apache/flume/sink/hbase/IncrementHBaseSerializer.java
+++ b/flume-ng-sinks/flume-ng-hbase-sink/src/test/java/org/apache/flume/sink/hbase/IncrementHBaseSerializer.java
@@ -38,9 +38,12 @@ class IncrementHBaseSerializer implements HbaseEventSerializer, \
BatchAware { private byte[] family;
private int numBatchesStarted = 0;
- @Override public void configure(Context context) { }
- @Override public void configure(ComponentConfiguration conf) { }
- @Override public void close() { }
+ @Override public void configure(Context context) {
+ }
+ @Override public void configure(ComponentConfiguration conf) {
+ }
+ @Override public void close() {
+ }
@Override
public void initialize(Event event, byte[] columnFamily) {
diff --git a/flume-ng-sinks/flume-ng-hbase2-sink/src/test/java/org/apache/flume/sink/hbase2/IncrementHBase2Serializer.java \
b/flume-ng-sinks/flume-ng-hbase2-sink/src/test/java/org/apache/flume/sink/hbase2/IncrementHBase2Serializer.java
index 2b32db4..f5112ae 100644
--- a/flume-ng-sinks/flume-ng-hbase2-sink/src/test/java/org/apache/flume/sink/hbase2/IncrementHBase2Serializer.java
+++ b/flume-ng-sinks/flume-ng-hbase2-sink/src/test/java/org/apache/flume/sink/hbase2/IncrementHBase2Serializer.java
@@ -38,9 +38,12 @@ class IncrementHBase2Serializer implements HBase2EventSerializer, \
BatchAware { private byte[] family;
private int numBatchesStarted = 0;
- @Override public void configure(Context context) { }
- @Override public void configure(ComponentConfiguration conf) { }
- @Override public void close() { }
+ @Override public void configure(Context context) {
+ }
+ @Override public void configure(ComponentConfiguration conf) {
+ }
+ @Override public void close() {
+ }
@Override
public void initialize(Event event, byte[] columnFamily) {
diff --git a/flume-ng-sinks/flume-ng-kafka-sink/src/main/java/org/apache/flume/sink/kafka/KafkaSink.java \
b/flume-ng-sinks/flume-ng-kafka-sink/src/main/java/org/apache/flume/sink/kafka/KafkaSink.java
index d32753f..3b1a866 100644
--- a/flume-ng-sinks/flume-ng-kafka-sink/src/main/java/org/apache/flume/sink/kafka/KafkaSink.java
+++ b/flume-ng-sinks/flume-ng-kafka-sink/src/main/java/org/apache/flume/sink/kafka/KafkaSink.java
@@ -72,7 +72,6 @@ import static \
org.apache.flume.sink.kafka.KafkaSinkConstants.TOPIC_CONFIG; import static \
org.apache.flume.sink.kafka.KafkaSinkConstants.KEY_SERIALIZER_KEY; import static \
org.apache.flume.sink.kafka.KafkaSinkConstants.MESSAGE_SERIALIZER_KEY;
-
/**
* A Flume Sink that can publish messages to Kafka.
* This is a general implementation that can be used with any Flume agent and
@@ -181,9 +180,9 @@ public class KafkaSink extends AbstractSink implements \
Configurable, BatchSizeSu eventTopic = headers.get(topicHeader);
if (eventTopic == null) {
eventTopic = BucketPath.escapeString(topic, event.getHeaders());
- logger.debug("{} was set to true but header {} was null. Producing to \
{}" + + logger.debug("{} was set to true but header {} was null. \
Producing to {}" + " topic instead.",
- new Object[]{KafkaSinkConstants.ALLOW_TOPIC_OVERRIDE_HEADER,
+ new Object[]{KafkaSinkConstants.ALLOW_TOPIC_OVERRIDE_HEADER,
topicHeader, eventTopic});
}
} else {
diff --git a/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/kafka-server.properties \
b/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/kafka-server.properties index \
b6e1207..12c72fd 100644
--- a/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/kafka-server.properties
+++ b/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/kafka-server.properties
@@ -4,9 +4,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@ port=9092
# The number of threads handling network requests
num.network.threads=2
-
+
# The number of threads doing disk I/O
num.io.threads=8
@@ -65,11 +65,13 @@ num.partitions=2
############################# Log Flush Policy #############################
# Messages are immediately written to the filesystem but by default we only fsync() \
to sync
-# the OS cache lazily. The following configurations control the flush of data to \
disk. +# the OS cache lazily. The following configurations control the flush of data \
to disk. # There are a few important trade-offs here:
# 1. Durability: Unflushed data may be lost if you are not using replication.
-# 2. Latency: Very large flush intervals may lead to latency spikes when the \
flush does occur as there will be a lot of data to flush.
-# 3. Throughput: The flush is generally the most expensive operation, and a small \
flush interval may lead to exceessive seeks. +# 2. Latency: Very large flush \
intervals may lead to latency spikes when the flush does occur as +# there will be \
a lot of data to flush. +# 3. Throughput: The flush is generally the most \
expensive operation, and a small flush interval +# may lead to exceessive seeks.
# The settings below allow one to configure the flush policy to flush data after a \
period of time or # every N messages (or both). This can be done globally and \
overridden on a per-topic basis.
@@ -93,15 +95,18 @@ log.retention.hours=168
# segments don't drop below log.retention.bytes.
#log.retention.bytes=1073741824
-# The maximum size of a log segment file. When this size is reached a new log \
segment will be created. +# The maximum size of a log segment file. When this size is \
reached a new log segment will be +# created.
log.segment.bytes=536870912
-# The interval at which log segments are checked to see if they can be deleted \
according +# The interval at which log segments are checked to see if they can be \
deleted according # to the retention policies
log.retention.check.interval.ms=60000
-# By default the log cleaner is disabled and the log retention policy will default \
to just delete segments after their retention expires.
-# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs \
can then be marked for log compaction. +# By default the log cleaner is disabled and \
the log retention policy will default to just delete +# segments after their \
retention expires. +# If log.cleaner.enable=true is set the cleaner will be enabled \
and individual logs can then be +# marked for log compaction.
log.cleaner.enable=false
############################# Zookeeper #############################
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/BlobDeserializer.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/BlobDeserializer.java
index 095f889..9cfe9db 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/BlobDeserializer.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/BlobDeserializer.java
@@ -53,7 +53,7 @@ public class BlobDeserializer implements EventDeserializer {
private static final int DEFAULT_BUFFER_SIZE = 1024 * 8;
private static final Logger LOGGER = \
LoggerFactory.getLogger(BlobDeserializer.class);
-
+
protected BlobDeserializer(Context context, ResettableInputStream in) {
this.in = in;
this.maxBlobLength = context.getInteger(MAX_BLOB_LENGTH_KEY, \
MAX_BLOB_LENGTH_DEFAULT); @@ -89,14 +89,14 @@ public class BlobDeserializer \
implements EventDeserializer { break;
}
}
-
+
if (blob == null) {
return null;
} else {
return EventBuilder.withBody(blob.toByteArray());
}
}
-
+
/**
* Batch BLOB read
* @param numEvents Maximum number of events to return.
@@ -145,7 +145,6 @@ public class BlobDeserializer implements EventDeserializer {
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Nested classes:
///////////////////////////////////////////////////////////////////////////////
@@ -153,7 +152,7 @@ public class BlobDeserializer implements EventDeserializer {
public static class Builder implements EventDeserializer.Builder {
@Override
- public BlobDeserializer build(Context context, ResettableInputStream in) {
+ public BlobDeserializer build(Context context, ResettableInputStream in) {
return new BlobDeserializer(context, in);
}
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
index 3b94133..d8f0f11 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
@@ -40,7 +40,7 @@ import com.google.common.io.ByteStreams;
/**
* Flume Interceptor that executes a morphline on events that are intercepted.
- *
+ *
* Currently, there is a restriction in that the morphline must not generate more \
than one output
* record for each input event.
*/
@@ -48,7 +48,7 @@ public class MorphlineInterceptor implements Interceptor {
private final Context context;
private final Queue<LocalMorphlineInterceptor> pool = new \
ConcurrentLinkedQueue<>();
-
+
protected MorphlineInterceptor(Context context) {
Preconditions.checkNotNull(context);
this.context = context;
@@ -75,7 +75,7 @@ public class MorphlineInterceptor implements Interceptor {
returnToPool(interceptor);
return results;
}
-
+
@Override
public Event intercept(Event event) {
LocalMorphlineInterceptor interceptor = borrowFromPool();
@@ -87,7 +87,7 @@ public class MorphlineInterceptor implements Interceptor {
private void returnToPool(LocalMorphlineInterceptor interceptor) {
pool.add(interceptor);
}
-
+
private LocalMorphlineInterceptor borrowFromPool() {
LocalMorphlineInterceptor interceptor = pool.poll();
if (interceptor == null) {
@@ -96,7 +96,6 @@ public class MorphlineInterceptor implements Interceptor {
return interceptor;
}
-
///////////////////////////////////////////////////////////////////////////////
// Nested classes:
///////////////////////////////////////////////////////////////////////////////
@@ -120,7 +119,6 @@ public class MorphlineInterceptor implements Interceptor {
}
-
///////////////////////////////////////////////////////////////////////////////
// Nested classes:
///////////////////////////////////////////////////////////////////////////////
@@ -128,7 +126,7 @@ public class MorphlineInterceptor implements Interceptor {
private final MorphlineHandlerImpl morphline;
private final Collector collector;
-
+
protected LocalMorphlineInterceptor(Context context) {
this.morphline = new MorphlineHandlerImpl();
this.collector = new Collector();
@@ -166,13 +164,13 @@ public class MorphlineInterceptor implements Interceptor {
return null;
}
if (results.size() > 1) {
- throw new FlumeException(getClass().getName() +
+ throw new FlumeException(getClass().getName() +
" must not generate more than one output record per input event");
}
- Event result = toEvent(results.get(0));
+ Event result = toEvent(results.get(0));
return result;
}
-
+
private Event toEvent(Record record) {
Map<String, String> headers = new HashMap();
Map<String, Collection<Object>> recordMap = record.getFields().asMap();
@@ -192,7 +190,7 @@ public class MorphlineInterceptor implements Interceptor {
body = ByteStreams.toByteArray((InputStream) firstValue);
} catch (IOException e) {
throw new FlumeException(e);
- }
+ }
} else {
throw new FlumeException(getClass().getName()
+ " must non generate attachments that are not a byte[] or \
InputStream"); @@ -204,19 +202,18 @@ public class MorphlineInterceptor implements \
Interceptor { return EventBuilder.withBody(body, headers);
}
}
-
-
+
///////////////////////////////////////////////////////////////////////////////
// Nested classes:
///////////////////////////////////////////////////////////////////////////////
private static final class Collector implements Command {
-
+
private final List<Record> results = new ArrayList();
-
+
public List<Record> getRecords() {
return results;
}
-
+
public void reset() {
results.clear();
}
@@ -225,7 +222,7 @@ public class MorphlineInterceptor implements Interceptor {
public Command getParent() {
return null;
}
-
+
@Override
public void notify(Record notification) {
}
@@ -236,7 +233,7 @@ public class MorphlineInterceptor implements Interceptor {
results.add(record);
return true;
}
-
+
}
}
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
index e403b10..5fa1053 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
@@ -21,7 +21,6 @@ import org.apache.flume.Context;
import org.kitesdk.morphline.api.Command;
import org.kitesdk.morphline.base.FaultTolerance;
-
/**
* Flume sink that extracts search documents from Flume events, processes them using \
a morphline
* {@link Command} chain, and loads them into Apache Solr.
@@ -31,7 +30,7 @@ public class MorphlineSolrSink extends MorphlineSink {
public MorphlineSolrSink() {
super();
}
-
+
/** For testing only */
protected MorphlineSolrSink(MorphlineHandler handler) {
super(handler);
@@ -40,8 +39,8 @@ public class MorphlineSolrSink extends MorphlineSink {
@Override
public void configure(Context context) {
if (context.getString(FaultTolerance.RECOVERABLE_EXCEPTION_CLASSES) == null) {
- context.put(FaultTolerance.RECOVERABLE_EXCEPTION_CLASSES,
- "org.apache.solr.client.solrj.SolrServerException");
+ context.put(FaultTolerance.RECOVERABLE_EXCEPTION_CLASSES,
+ "org.apache.solr.client.solrj.SolrServerException");
}
super.configure(context);
}
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/UUIDInterceptor.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/UUIDInterceptor.java
index 22d5347..f2be53b 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/UUIDInterceptor.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/UUIDInterceptor.java
@@ -88,7 +88,6 @@ public class UUIDInterceptor implements Interceptor {
public void close() {
}
-
///////////////////////////////////////////////////////////////////////////////
// Nested classes:
///////////////////////////////////////////////////////////////////////////////
diff --git a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java \
b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
index 6477f9a..645cbcc 100644
--- a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
+++ b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
@@ -39,8 +39,7 @@ import java.util.ArrayList;
import java.util.List;
class JMSMessageConsumer {
- private static final Logger logger = LoggerFactory
- .getLogger(JMSMessageConsumer.class);
+ private static final Logger logger = \
LoggerFactory.getLogger(JMSMessageConsumer.class);
private final int batchSize;
private final long pollTimeout;
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestDefaultJMSMessageConverter.java \
b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestDefaultJMSMessageConverter.java
index f0e46ca..6f0f1de 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestDefaultJMSMessageConverter.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestDefaultJMSMessageConverter.java
@@ -159,7 +159,7 @@ public class TestDefaultJMSMessageConverter {
public void testBytesMessagePartialReturn() throws Exception {
createBytesMessage();
when(((BytesMessage)message).readBytes(any(byte[].class)))
- .thenReturn(BYTES.length + 1);
+ .thenReturn(BYTES.length + 1);
createHeaders();
converter.convert(message);
}
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java \
b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
index 04f3f48..e7c5f29 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
@@ -41,13 +41,14 @@ public class TestJMSMessageConsumer extends \
JMSMessageConsumerTestBase { @Test(expected = FlumeException.class)
public void testCreateConnectionFails() throws Exception {
when(connectionFactory.createConnection(USERNAME, PASSWORD))
- .thenThrow(new JMSException(""));
+ .thenThrow(new JMSException(""));
create();
}
+
@Test
public void testCreateSessionFails() throws Exception {
when(connection.createSession(true, Session.SESSION_TRANSACTED))
- .thenThrow(new JMSException(""));
+ .thenThrow(new JMSException(""));
try {
create();
fail("Expected exception: org.apache.flume.FlumeException");
@@ -58,7 +59,7 @@ public class TestJMSMessageConsumer extends \
JMSMessageConsumerTestBase { @Test
public void testCreateQueueFails() throws Exception {
when(session.createQueue(destinationName))
- .thenThrow(new JMSException(""));
+ .thenThrow(new JMSException(""));
try {
create();
fail("Expected exception: org.apache.flume.FlumeException");
@@ -71,7 +72,7 @@ public class TestJMSMessageConsumer extends \
JMSMessageConsumerTestBase { public void testCreateTopicFails() throws Exception {
destinationType = JMSDestinationType.TOPIC;
when(session.createTopic(destinationName))
- .thenThrow(new JMSException(""));
+ .thenThrow(new JMSException(""));
try {
create();
fail("Expected exception: org.apache.flume.FlumeException");
@@ -83,7 +84,7 @@ public class TestJMSMessageConsumer extends \
JMSMessageConsumerTestBase { @Test
public void testCreateConsumerFails() throws Exception {
when(session.createConsumer(any(Destination.class), anyString()))
- .thenThrow(new JMSException(""));
+ .thenThrow(new JMSException(""));
try {
create();
fail("Expected exception: org.apache.flume.FlumeException");
@@ -197,7 +198,7 @@ public class TestJMSMessageConsumer extends \
JMSMessageConsumerTestBase { String clientID = "CLIENT_ID";
TopicSubscriber mockTopicSubscriber = mock(TopicSubscriber.class);
when(session.createDurableSubscriber(any(Topic.class), anyString(), anyString(), \
anyBoolean()))
- .thenReturn(mockTopicSubscriber );
+ .thenReturn(mockTopicSubscriber );
when(session.createTopic(destinationName)).thenReturn(topic);
new JMSMessageConsumer(WONT_USE, connectionFactory, destinationName, \
destinationLocator,
JMSDestinationType.TOPIC, messageSelector, batchSize, pollTimeout, \
converter, userName,
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java \
b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
index 2818c5b..ffb0de8 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
@@ -159,7 +159,7 @@ public class TestJMSSource extends JMSMessageConsumerTestBase {
@Test(expected = FlumeException.class)
public void testConfigureWithContextCreateThrowsException() throws Exception {
when(contextFactory.create(any(Properties.class)))
- .thenThrow(new NamingException());
+ .thenThrow(new NamingException());
source.configure(context);
}
diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java \
b/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java index \
a2a3ae1..b75f7a8 100644
--- a/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java
+++ b/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java
@@ -42,7 +42,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.zip.GZIPInputStream;
-
/**
* Attempts to setup a staged install using explicitly specified tar-ball
* distribution or by using relative path into the flume-ng-dist module.
diff --git a/pom.xml b/pom.xml
index 9a9e492..d49e5e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ limitations under the License.
<asynchbase.version>1.7.0</asynchbase.version>
<avro.version>1.7.7</avro.version>
<bundle-plugin.version>2.3.7</bundle-plugin.version>
- <checkstyle.tool.version>8.12</checkstyle.tool.version>
+ <checkstyle.tool.version>8.45.1</checkstyle.tool.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<commons-cli.version>1.4</commons-cli.version>
<commons-codec.version>1.8</commons-codec.version>
@@ -94,7 +94,7 @@ limitations under the License.
<mvn-antrun-plugin.version>1.8</mvn-antrun-plugin.version>
<mvn-assembly-plugin.version>3.1.0</mvn-assembly-plugin.version>
<mvn-build-helper-plugin>3.0.0</mvn-build-helper-plugin>
- <mvn-checkstyle-plugin.version>3.0.0</mvn-checkstyle-plugin.version>
+ <mvn-checkstyle-plugin.version>3.1.2</mvn-checkstyle-plugin.version>
<mvn-checksum-plugin.version>1.7</mvn-checksum-plugin.version>
<mvn-clean-plugin.version>3.1.0</mvn-clean-plugin.version>
<mvn-compiler-plugin.version>3.8.1</mvn-compiler-plugin.version>
@@ -450,7 +450,14 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.tool.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic