This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-flume-legacy.git
commit 71b0637277c0c8be4f915b187afc2b87145834f4 Author: Mike Percy <[email protected]> AuthorDate: Sun Jun 26 02:57:37 2016 -0700 FLUME-2937. Integrate checkstyle for non-test classes Based on the Google checkstyle file with modifications. The changes here do not change the generated Java bytecode (after stripping line numbers). They are syntax / whitespace ONLY. Code review: https://reviews.apache.org/r/49403/ Reviewed by Hari. --- .../log4jappender/LoadBalancingLog4jAppender.java | 18 +++++++-------- .../flume/clients/log4jappender/Log4jAppender.java | 26 ++++++++++------------ .../clients/log4jappender/Log4jAvroHeaders.java | 13 +++++------ 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/LoadBalancingLog4jAppender.java b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/LoadBalancingLog4jAppender.java index 713234f..ae31916 100644 --- a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/LoadBalancingLog4jAppender.java +++ b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/LoadBalancingLog4jAppender.java @@ -99,11 +99,11 @@ public class LoadBalancingLog4jAppender extends Log4jAppender { @Override public synchronized void append(LoggingEvent event) { - if(!configured) { + if (!configured) { String errorMsg = "Flume Log4jAppender not configured correctly! Cannot" + - " send events to Flume."; + " send events to Flume."; LogLog.error(errorMsg); - if(getUnsafeMode()) { + if (getUnsafeMode()) { return; } throw new FlumeException(errorMsg); @@ -121,10 +121,9 @@ public class LoadBalancingLog4jAppender extends Log4jAppender { @Override public void activateOptions() throws FlumeException { try { - final Properties properties = getProperties(hosts, selector, - maxBackoff, getTimeout()); + final Properties properties = getProperties(hosts, selector, maxBackoff, getTimeout()); rpcClient = RpcClientFactory.getInstance(properties); - if(layout != null) { + if (layout != null) { layout.activateOptions(); } configured = true; @@ -169,14 +168,13 @@ public class LoadBalancingLog4jAppender extends Log4jAppender { throw new FlumeException( "Misconfigured max backoff, value must be greater than 0"); } - props.put(RpcClientConfigurationConstants.CONFIG_BACKOFF, - String.valueOf(true)); + props.put(RpcClientConfigurationConstants.CONFIG_BACKOFF, String.valueOf(true)); props.put(RpcClientConfigurationConstants.CONFIG_MAX_BACKOFF, maxBackoff); } props.setProperty(RpcClientConfigurationConstants.CONFIG_CONNECT_TIMEOUT, - String.valueOf(timeout)); + String.valueOf(timeout)); props.setProperty(RpcClientConfigurationConstants.CONFIG_REQUEST_TIMEOUT, - String.valueOf(timeout)); + String.valueOf(timeout)); return props; } } diff --git a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java index 7c483db..f9803e4 100644 --- a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java +++ b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java @@ -75,8 +75,7 @@ public class Log4jAppender extends AppenderSkeleton { private String hostname; private int port; private boolean unsafeMode = false; - private long timeout = RpcClientConfigurationConstants - .DEFAULT_REQUEST_TIMEOUT_MILLIS; + private long timeout = RpcClientConfigurationConstants.DEFAULT_REQUEST_TIMEOUT_MILLIS; private boolean avroReflectionEnabled; private String avroSchemaUrl; @@ -99,7 +98,7 @@ public class Log4jAppender extends AppenderSkeleton { * @param port The port to connect on the host. * */ - public Log4jAppender(String hostname, int port){ + public Log4jAppender(String hostname, int port) { this.hostname = hostname; this.port = port; } @@ -112,14 +111,14 @@ public class Log4jAppender extends AppenderSkeleton { * was a connection error. */ @Override - public synchronized void append(LoggingEvent event) throws FlumeException{ + public synchronized void append(LoggingEvent event) throws FlumeException { //If rpcClient is null, it means either this appender object was never //setup by setting hostname and port and then calling activateOptions //or this appender object was closed by calling close(), so we throw an //exception to show the appender is no longer accessible. if (rpcClient == null) { String errorMsg = "Cannot Append to Appender! Appender either closed or" + - " not setup correctly!"; + " not setup correctly!"; LogLog.error(errorMsg); if (unsafeMode) { return; @@ -127,7 +126,7 @@ public class Log4jAppender extends AppenderSkeleton { throw new FlumeException(errorMsg); } - if(!rpcClient.isActive()){ + if (!rpcClient.isActive()) { reconnect(); } @@ -231,7 +230,7 @@ public class Log4jAppender extends AppenderSkeleton { } else { String errorMsg = "Flume log4jappender already closed!"; LogLog.error(errorMsg); - if(unsafeMode) { + if (unsafeMode) { return; } throw new FlumeException(errorMsg); @@ -251,7 +250,7 @@ public class Log4jAppender extends AppenderSkeleton { * Set the first flume hop hostname. * @param hostname The first hop where the client should connect to. */ - public void setHostname(String hostname){ + public void setHostname(String hostname) { this.hostname = hostname; } @@ -259,7 +258,7 @@ public class Log4jAppender extends AppenderSkeleton { * Set the port on the hostname to connect to. * @param port The port to connect on the host. */ - public void setPort(int port){ + public void setPort(int port) { this.port = port; } @@ -299,19 +298,18 @@ public class Log4jAppender extends AppenderSkeleton { Properties props = new Properties(); props.setProperty(RpcClientConfigurationConstants.CONFIG_HOSTS, "h1"); props.setProperty(RpcClientConfigurationConstants.CONFIG_HOSTS_PREFIX + "h1", - hostname + ":" + port); + hostname + ":" + port); props.setProperty(RpcClientConfigurationConstants.CONFIG_CONNECT_TIMEOUT, - String.valueOf(timeout)); + String.valueOf(timeout)); props.setProperty(RpcClientConfigurationConstants.CONFIG_REQUEST_TIMEOUT, - String.valueOf(timeout)); + String.valueOf(timeout)); try { rpcClient = RpcClientFactory.getInstance(props); if (layout != null) { layout.activateOptions(); } } catch (FlumeException e) { - String errormsg = "RPC client creation failed! " + - e.getMessage(); + String errormsg = "RPC client creation failed! " + e.getMessage(); LogLog.error(errormsg); if (unsafeMode) { return; diff --git a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAvroHeaders.java b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAvroHeaders.java index b68e749..22983d3 100644 --- a/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAvroHeaders.java +++ b/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAvroHeaders.java @@ -30,24 +30,23 @@ public enum Log4jAvroHeaders { AVRO_SCHEMA_URL("flume.avro.schema.url"); private String headerName; - private Log4jAvroHeaders(String headerName){ + private Log4jAvroHeaders(String headerName) { this.headerName = headerName; } - public String getName(){ + public String getName() { return headerName; } - public String toString(){ + public String toString() { return getName(); } - public static Log4jAvroHeaders getByName(String headerName){ + public static Log4jAvroHeaders getByName(String headerName) { Log4jAvroHeaders hdrs = null; - try{ + try { hdrs = Log4jAvroHeaders.valueOf(headerName.toLowerCase(Locale.ENGLISH).trim()); - } - catch(IllegalArgumentException e){ + } catch (IllegalArgumentException e) { hdrs = Log4jAvroHeaders.OTHER; } return hdrs;
