One more fix of code style in some classes

server/appenders/file-appender/src/main/java/org/kaaproject/kaa/server/appenders/file/appender/FileSystemLogAppender.java

@@ -51,7 +51,8 @@ public FileSystemLogAppender() {
   }
 
   @Override
-  public void doAppend(LogEventPack logEventPack, RecordHeader header, LogDeliveryCallback listener) {
+  public void doAppend(LogEventPack logEventPack, RecordHeader header,
+                       LogDeliveryCallback listener) {
     if (!closed) {
       try {
         String path = logsRootPath + "/" + tenantDirName + "/" + applicationDirName;
@@ -63,8 +64,8 @@ public void doAppend(LogEventPack logEventPack, RecordHeader header, LogDelivery
         }
         LOG.debug("[{}] appended {} logs to directory", path, logEventPack.getEvents().size());
         listener.onSuccess();
-      } catch (Exception e) {
-        LOG.error(MessageFormat.format("[{0}] Attempted to append logs failed", getName()), e);
+      } catch (Exception ex) {
+        LOG.error(MessageFormat.format("[{0}] Attempted to append logs failed", getName()), ex);
         listener.onInternalError();
       }
     } else {
@@ -76,8 +77,11 @@ public void doAppend(LogEventPack logEventPack, RecordHeader header, LogDelivery
   private List<String> eventsToStrings(List<LogEventDto> dtos) {
     List<String> events = new ArrayList<>();
     for (LogEventDto logEventDto : dtos) {
-      String event = new StringBuilder("{\"Log Header\": \"").append(logEventDto.getHeader()).append("\", \"Event\": ")
-          .append(logEventDto.getEvent()).append("}").toString();
+      String event = new StringBuilder("{\"Log Header\": \"")
+          .append(logEventDto.getHeader())
+          .append("\", \"Event\": ")
+          .append(logEventDto.getEvent())
+          .append("}").toString();
       events.add(event);
     }
     return events;
@@ -95,11 +99,12 @@ protected void initFromConfiguration(LogAppenderDto appenderDto, FileConfig conf
         logger = new LogbackFileSystemLogger();
       }
       initLogDirectories(appenderDto);
-      logger.init(appenderDto, configuration, Paths.get(logsRootPath, tenantDirName, applicationDirName, "application.log"));
+      logger.init(appenderDto, configuration,
+          Paths.get(logsRootPath, tenantDirName, applicationDirName, "application.log"));
       fileSystemLogEventService.createUserAndGroup(appenderDto, configuration,
           Paths.get(logsRootPath, tenantDirName, applicationDirName).toAbsolutePath().toString());
-    } catch (Exception e) {
-      LOG.error("Failed to init file system log appender: ", e);
+    } catch (Exception ex) {
+      LOG.error("Failed to init file system log appender: ", ex);
     }
   }
 
@@ -110,7 +115,8 @@ private void createTenantLogDirectory(String tenantId) {
 
   private void createApplicationLogDirectory(String applicationToken) {
     applicationDirName = "application_" + applicationToken;
-    fileSystemLogEventService.createDirectory(logsRootPath + "/" + tenantDirName + "/" + applicationDirName);
+    fileSystemLogEventService
+        .createDirectory(logsRootPath + "/" + tenantDirName + "/" + applicationDirName);
   }
 
   private void initLogDirectories(LogAppenderDto appender) {
@@ -126,8 +132,8 @@ public void close() {
       if (logger != null) {
         try {
           logger.close();
-        } catch (IOException e) {
-          LOG.warn("IO Exception catched: ", e);
+        } catch (IOException ex) {
+          LOG.warn("IO Exception catched: ", ex);
         }
       }
       fileSystemLogEventService = null;

server/appenders/file-appender/src/main/java/org/kaaproject/kaa/server/appenders/file/appender/FileSystemLogEventService.java

@@ -25,15 +25,15 @@
 public interface FileSystemLogEventService {
 
   /**
-   * Create Directory with specific path
+   * Create Directory with specific path.
    *
    * @param path the path to directory
    */
   void createDirectory(String path);
 
   /**
    * Create log user and log group and give them permissions to access
-   * logs of application with specific id
+   * logs of application with specific id.
    *
    * @param applicationId the application id
    * @param config        the File log appender config

server/appenders/file-appender/src/main/java/org/kaaproject/kaa/server/appenders/file/appender/FileSystemLogEventServiceImpl.java

@@ -67,7 +67,8 @@ public void createDirectory(String path) {
 
   @Override
   public void createUserAndGroup(LogAppenderDto appender, FileConfig config, String path) {
-    LOG.debug("Starting create user and group for application with id: {}", appender.getApplicationId());
+    LOG.debug("Starting create user and group for application with id: {}",
+        appender.getApplicationId());
     String userName = "kaa_log_user_" + appender.getApplicationToken();
     String groupName = "kaa_log_group_" + appender.getApplicationToken();
     String publicKey = config.getPublicKey();
@@ -85,8 +86,8 @@ public void createUserAndGroup(LogAppenderDto appender, FileConfig config, Strin
       executeCommand(null, "sudo", createUserScript.getAbsolutePath(),
           userName, groupName, path, tmpKeyFile.getAbsolutePath());
 
-    } catch (IOException e) {
-      LOG.error("Unexpected exception occurred while creating user", e);
+    } catch (IOException ex) {
+      LOG.error("Unexpected exception occurred while creating user", ex);
     } finally {
       if (tmpKeyFile != null) {
         tmpKeyFile.delete();
@@ -105,8 +106,8 @@ public void createRootLogDirCommand(String logsRootPath) {
       createRootLogDirScript = prepareScriptFile(CREATE_ROOT_LOG_DIR);
       executeCommand(null, "sudo", createRootLogDirScript.getAbsolutePath(),
           logsRootPath, DEFAULT_SYSTEM_USER);
-    } catch (IOException e) {
-      LOG.error("Can't create root log dir: " + logsRootPath, e);
+    } catch (IOException ex) {
+      LOG.error("Can't create root log dir: " + logsRootPath, ex);
     } finally {
       if (createRootLogDirScript != null) {
         createRootLogDirScript.delete();
@@ -121,8 +122,8 @@ public void removeAll(String path) {
     try {
       FileUtils.deleteDirectory(directory);
       LOG.debug("Directory was successfully deleted");
-    } catch (IOException e) {
-      LOG.error("Unable to delete directory with path: {}, exception catched: {}", path, e);
+    } catch (IOException ex) {
+      LOG.error("Unable to delete directory with path: {}, exception catched: {}", path, ex);
     }
   }
 

server/appenders/flume-appender/src/main/java/org/kaaproject/kaa/server/appenders/flume/appender/FlumeAvroEventBuilder.java

@@ -60,12 +60,15 @@ public void init(FlumeConfig configuration) {
 
   @Override
   public List<Event> generateEvents(String appToken, LogSchema schema, List<LogEvent> logEvents,
-                                    ProfileInfo clientProfile, ProfileInfo serverProfile, RecordHeader header) {
-    LOG.debug("Build flume events with appToken [{}], schema version [{}], events: [{}] and header [{}].", appToken, schema.getVersion(), logEvents, header);
+                                    ProfileInfo clientProfile, ProfileInfo serverProfile,
+                                    RecordHeader header) {
+    LOG.debug("Build flume events with appToken [{}], schema version [{}], events: [{}]"
+        + " and header [{}].", appToken, schema.getVersion(), logEvents, header);
     List<Event> events = null;
     switch (flumeEventFormat) {
       case RECORDS_CONTAINER:
-        Event event = generateRecordsContainerEvent(appToken, schema, logEvents, clientProfile, serverProfile, header);
+        Event event = generateRecordsContainerEvent(appToken, schema, logEvents, clientProfile,
+            serverProfile, header);
         if (event != null) {
           events = Collections.singletonList(event);
         }
@@ -79,8 +82,9 @@ public List<Event> generateEvents(String appToken, LogSchema schema, List<LogEve
     return events;
   }
 
-  private Event generateRecordsContainerEvent(String appToken, LogSchema schema, List<LogEvent> logEvents,
-                                              ProfileInfo clientProfile, ProfileInfo serverProfile, RecordHeader header) {
+  private Event generateRecordsContainerEvent(String appToken, LogSchema schema,
+                                              List<LogEvent> logEvents, ProfileInfo clientProfile,
+                                              ProfileInfo serverProfile, RecordHeader header) {
     if (clientProfile == null && includeClientProfile) {
       LOG.error("Can't  generate records container event. " + CLIENT_PROFILE_NOT_SET);
       throw new RuntimeException(CLIENT_PROFILE_NOT_SET);
@@ -130,8 +134,8 @@ private Event generateRecordsContainerEvent(String appToken, LogSchema schema, L
       writer.write(logData, encoder);
       encoder.flush();
       event = EventBuilder.withBody(baos.toByteArray());
-    } catch (IOException e) {
-      LOG.warn("Can't convert avro object {} to binary. Exception catched: {}", logData, e);
+    } catch (IOException ex) {
+      LOG.warn("Can't convert avro object {} to binary. Exception catched: {}", logData, ex);
     }
     LOG.trace("Build flume event with array body [{}]", baos);
     return event;

server/appenders/flume-appender/src/main/java/org/kaaproject/kaa/server/appenders/flume/appender/FlumeLogAppender.java

@@ -68,15 +68,17 @@ public FlumeLogAppender() {
       public void run() {
         long second = System.currentTimeMillis() / 1000;
         LOG.info(
-            "[{}] Received {} log record count, {} success flume callbacks, {}  failure flume callbacks / second.",
+            "[{}] Received {} log record count, {} success flume callbacks, "
+                + "{}  failure flume callbacks / second.",
             second, inputLogCount.getAndSet(0), flumeSuccessLogCount.getAndSet(0),
             flumeFailureLogCount.getAndSet(0));
       }
     }, 0L, 1L, TimeUnit.SECONDS);
   }
 
   @Override
-  public void doAppend(final LogEventPack logEventPack, final RecordHeader header, final LogDeliveryCallback listener) {
+  public void doAppend(final LogEventPack logEventPack, final RecordHeader header,
+                       final LogDeliveryCallback listener) {
     if (!closed) {
       if (executor == null || callbackExecutor == null || flumeClientManager == null) {
         reinit();
@@ -110,12 +112,12 @@ public void run() {
                 LOG.warn("Unable to generate Flume events from log event pack!");
                 listener.onInternalError();
               }
-            } catch (EventDeliveryException e) {
-              LOG.warn("Can't send flume event. ", e);
+            } catch (EventDeliveryException ex) {
+              LOG.warn("Can't send flume event. ", ex);
               listener.onConnectionError();
             }
-          } catch (Exception e) {
-            LOG.warn("Got exception. Can't process log events", e);
+          } catch (Exception ex) {
+            LOG.warn("Got exception. Can't process log events", ex);
             listener.onInternalError();
           }
         }
@@ -133,31 +135,40 @@ protected void initFromConfiguration(LogAppenderDto appender, FlumeConfig config
       this.configuration = configuration;
       flumeEventBuilder = new FlumeAvroEventBuilder();
       flumeEventBuilder.init(configuration);
-      int executorPoolSize = Math.min(configuration.getExecutorThreadPoolSize(), MAX_CALLBACK_THREAD_POOL_SIZE);
-      int callbackPoolSize = Math.min(configuration.getCallbackThreadPoolSize(), MAX_CALLBACK_THREAD_POOL_SIZE);
+      int executorPoolSize = Math.min(configuration.getExecutorThreadPoolSize(),
+          MAX_CALLBACK_THREAD_POOL_SIZE);
+
+      int callbackPoolSize = Math.min(configuration.getCallbackThreadPoolSize(),
+          MAX_CALLBACK_THREAD_POOL_SIZE);
+
       executor = Executors.newFixedThreadPool(executorPoolSize);
       callbackExecutor = Executors.newFixedThreadPool(callbackPoolSize);
       flumeClientManager = FlumeClientManager.getInstance(configuration);
-    } catch (Exception e) {
-      LOG.error("Failed to init Flume log appender: ", e);
+    } catch (Exception ex) {
+      LOG.error("Failed to init Flume log appender: ", ex);
     }
   }
 
   public void reinit() {
     if (configuration == null) {
-      LOG.warn("Flume configuration wasn't initialized. Invoke method init with configuration before.");
+      LOG.warn("Flume configuration wasn't initialized. "
+          + "Invoke method init with configuration before.");
       return;
     }
     if (flumeEventBuilder == null) {
       flumeEventBuilder = new FlumeAvroEventBuilder();
       flumeEventBuilder.init(configuration);
     }
     if (executor == null) {
-      int executorPoolSize = Math.min(configuration.getExecutorThreadPoolSize(), MAX_CALLBACK_THREAD_POOL_SIZE);
+      int executorPoolSize = Math.min(configuration.getExecutorThreadPoolSize(),
+          MAX_CALLBACK_THREAD_POOL_SIZE);
+
       executor = Executors.newFixedThreadPool(executorPoolSize);
     }
     if (callbackExecutor == null) {
-      int callbackPoolSize = Math.min(configuration.getCallbackThreadPoolSize(), MAX_CALLBACK_THREAD_POOL_SIZE);
+      int callbackPoolSize = Math.min(configuration.getCallbackThreadPoolSize(),
+          MAX_CALLBACK_THREAD_POOL_SIZE);
+
       callbackExecutor = Executors.newFixedThreadPool(callbackPoolSize);
     }
     if (flumeClientManager == null) {
@@ -208,12 +219,12 @@ public void onSuccess(AppendBatchAsyncResultPojo result) {
     }
 
     @Override
-    public void onFailure(Throwable t) {
+    public void onFailure(Throwable throwable) {
       flumeFailureLogCount.getAndAdd(size);
-      LOG.warn("Failed to store record", t);
-      if (t instanceof IOException) {
+      LOG.warn("Failed to store record", throwable);
+      if (throwable instanceof IOException) {
         callback.onConnectionError();
-      } else if (t instanceof EventDeliveryException) {
+      } else if (throwable instanceof EventDeliveryException) {
         callback.onRemoteError();
       } else {
         callback.onInternalError();