From 83f86f11c27378d650c3bfc7e55397687062edbc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 22 Apr 2016 14:23:28 +0000
Subject: [PATCH] Improvements suggested by UCDetector: remove dead code, add final keywords, change visibilities

---
 opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
index f9dad7c..7fb0743 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
@@ -25,19 +25,18 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
 import org.forgerock.opendj.config.server.ConfigurationChangeListener;
 import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
 import org.opends.server.api.DirectoryThread;
 import org.opends.server.api.ServerShutdownListener;
 import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.FilePermission;
 import org.opends.server.util.TimeThread;
@@ -60,17 +59,15 @@
 
   private static final String UTF8_ENCODING= "UTF-8";
 
-  private CopyOnWriteArrayList<RotationPolicy> rotationPolicies = new CopyOnWriteArrayList<>();
-  private CopyOnWriteArrayList<RetentionPolicy> retentionPolicies = new CopyOnWriteArrayList<>();
+  private final CopyOnWriteArrayList<RotationPolicy<?>> rotationPolicies = new CopyOnWriteArrayList<>();
+  private final CopyOnWriteArrayList<RetentionPolicy<?>> retentionPolicies = new CopyOnWriteArrayList<>();
 
   private FileNamingPolicy namingPolicy;
   private FilePermission filePermissions;
-  private LogPublisherErrorHandler errorHandler;
-  /** TODO: Implement actions. */
-  private ArrayList<ActionType> actions;
+  private final LogPublisherErrorHandler errorHandler;
 
-  private String name;
-  private String encoding;
+  private final String name;
+  private final String encoding;
   private int bufferSize;
   private boolean autoFlush;
   private boolean append;
@@ -78,7 +75,7 @@
   private boolean stopRequested;
   private long sizeLimit;
 
-  private Thread rotaterThread;
+  private final Thread rotaterThread;
 
   private Calendar lastRotationTime = TimeThread.getCalendar();
   private Calendar lastCleanTime = TimeThread.getCalendar();
@@ -202,7 +199,7 @@
    *
    * @param policy The rotation policy to add.
    */
-  public void addRotationPolicy(RotationPolicy policy)
+  public void addRotationPolicy(RotationPolicy<?> policy)
   {
     this.rotationPolicies.add(policy);
 
@@ -224,7 +221,7 @@
    *
    * @param policy The retention policy to add.
    */
-  public void addRetentionPolicy(RetentionPolicy policy)
+  public void addRetentionPolicy(RetentionPolicy<?> policy)
   {
     this.retentionPolicies.add(policy);
   }
@@ -232,7 +229,7 @@
   /** Removes all the rotation policies currently enforced by this writer. */
   public void removeAllRotationPolicies()
   {
-    for(RotationPolicy policy : rotationPolicies)
+    for (RotationPolicy<?> policy : rotationPolicies)
     {
       if(policy instanceof SizeBasedRotationPolicy)
       {
@@ -345,7 +342,7 @@
     long newSizeLimit = Integer.MAX_VALUE;
 
     // Go through all current size rotation policies and get the lowest size setting.
-    for(RotationPolicy policy : rotationPolicies)
+    for (RotationPolicy<?> policy : rotationPolicies)
     {
       if(policy instanceof SizeBasedRotationPolicy)
       {
@@ -371,7 +368,7 @@
   private class RotaterThread extends DirectoryThread
   {
     MultifileTextWriter writer;
-    /** Create a new rotater thread. */
+
     public RotaterThread(MultifileTextWriter writer)
     {
       super(name);
@@ -400,7 +397,7 @@
           logger.traceException(e);
         }
 
-        for(RotationPolicy rotationPolicy : rotationPolicies)
+        for (RotationPolicy<?> rotationPolicy : rotationPolicies)
         {
           if(rotationPolicy.rotateFile(writer))
           {
@@ -408,7 +405,7 @@
           }
         }
 
-        for(RetentionPolicy retentionPolicy : retentionPolicies)
+        for (RetentionPolicy<?> retentionPolicy : retentionPolicies)
         {
           try
           {
@@ -611,26 +608,11 @@
       errorHandler.handleOpenError(currentFile, e);
     }
 
-    //RotationActionThread rotThread =
-    //  new RotationActionThread(newFile, actions, configEntry);
-    //rotThread.start();
-
-    logger.trace("Log file %s rotated and renamed to %s",
-                       currentFile, newFile);
+    logger.trace("Log file %s rotated and renamed to %s", currentFile, newFile);
     totalFilesRotated++;
     lastRotationTime = TimeThread.getCalendar();
   }
 
-  /**
-   * This method sets the actions that need to be executed after rotation.
-   *
-   * @param actions An array of actions that need to be executed on rotation.
-   */
-  public void setPostRotationActions(ArrayList<ActionType> actions)
-  {
-    this.actions = actions;
-  }
-
   @Override
   public long getBytesWritten()
   {

--
Gitblit v1.10.0