From 2efe1bfb73221f1ff9707e1069f1e9a36d62b4f2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 30 Apr 2014 14:14:10 +0000
Subject: [PATCH] Code cleanup: - Increased MessageHandler encapsulation. - Removed ServerHandler.closeSession() because it is adding unnecessary complexity in understanding calling sites.

---
 opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
index e522952..f98fd81 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -59,7 +59,7 @@
  * LocalizableMessage are buffered into a queue.
  * Consumers are expected to come and consume the UpdateMsg from the queue.
  */
-public class MessageHandler extends MonitorProvider<MonitorProviderCfg>
+class MessageHandler extends MonitorProvider<MonitorProviderCfg>
 {
   /** The logger of this class. */
   protected static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -84,11 +84,11 @@
   /**
    * Number of update sent to the server.
    */
-  protected int outCount = 0;
+  private int outCount = 0;
   /**
    * Number of updates received from the server.
    */
-  protected int inCount = 0;
+  private int inCount = 0;
   /**
    * Specifies the max queue size for this handler.
    */
@@ -96,7 +96,7 @@
   /**
    * Specifies the max queue size in bytes for this handler.
    */
-  protected int maxQueueBytesSize = maxQueueSize * 100;
+  private int maxQueueBytesSize = maxQueueSize * 100;
   /**
    * Specifies whether the consumer is following the producer (is not late).
    */
@@ -126,7 +126,7 @@
    *                  in memory by this ServerHandler.
    * @param replicationServer The hosting replication server.
    */
-  public MessageHandler(int queueSize, ReplicationServer replicationServer)
+  MessageHandler(int queueSize, ReplicationServer replicationServer)
   {
     this.maxQueueSize = queueSize;
     this.maxQueueBytesSize = queueSize * 100;
@@ -140,7 +140,7 @@
    * @param update The update that must be added to the list of updates of
    * this handler.
    */
-  public void add(UpdateMsg update)
+  void add(UpdateMsg update)
   {
     synchronized (msgQueue)
     {
@@ -149,7 +149,9 @@
        * waiting for some changes, wake it up
        */
       if (msgQueue.isEmpty())
+      {
         msgQueue.notify();
+      }
 
       msgQueue.add(update);
 
@@ -179,7 +181,7 @@
    * Set the shut down flag to true and returns the previous value of the flag.
    * @return The previous value of the shut down flag
    */
-  public boolean engageShutdown()
+  boolean engageShutdown()
   {
     return shuttingDown.getAndSet(true);
   }
@@ -188,7 +190,7 @@
    * Returns the shutdown flag.
    * @return The shutdown flag value.
    */
-  public boolean shuttingDown()
+  boolean shuttingDown()
   {
     return shuttingDown.get();
   }
@@ -198,9 +200,8 @@
    *
    * @param waitConnections     Waits for the Connections with other RS to
    *                            be established before returning.
-   * @return The replication server domain.
    */
-  public ReplicationServerDomain getDomain(boolean waitConnections)
+  private void setDomain(boolean waitConnections)
   {
     if (replicationServerDomain == null)
     {
@@ -211,14 +212,13 @@
         replicationServer.waitConnections();
       }
     }
-    return replicationServerDomain;
   }
 
   /**
    * Get the count of updates received from the server.
    * @return the count of update received from the server.
    */
-  public int getInCount()
+  int getInCount()
   {
     return inCount;
   }
@@ -372,10 +372,14 @@
             while (msgQueue.isEmpty() && following)
             {
               if (!synchronous)
+              {
                 return null;
+              }
               msgQueue.wait(500);
               if (!activeConsumer)
+              {
                 return null;
+              }
             }
           } catch (InterruptedException e)
           {
@@ -475,7 +479,7 @@
    * Get the count of updates sent to this server.
    * @return  The count of update sent to this server.
    */
-  public int getOutCount()
+  int getOutCount()
   {
     return outCount;
   }
@@ -542,7 +546,7 @@
   /**
    * Increase the counter of updates received from the server.
    */
-  public void incrementInCount()
+  void incrementInCount()
   {
     inCount++;
   }
@@ -550,14 +554,12 @@
   /**
    * Increase the counter of updates sent to the server.
    */
-  public void incrementOutCount()
+  void incrementOutCount()
   {
     outCount++;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
   throws ConfigException, InitializationException
@@ -616,10 +618,8 @@
     else
     {
       this.baseDN = baseDN;
-      if (!baseDN.toNormalizedString().equals("cn=changelog"))
-      {
-        getDomain(isDataServer);
-      }
+      setDomain(!"cn=changelog".equals(baseDN.toNormalizedString())
+          && isDataServer);
     }
   }
 
@@ -644,7 +644,7 @@
    * @param msg the last update sent.
    * @return boolean indicating if the update was meaningful.
    */
-  public boolean updateServerState(UpdateMsg msg)
+  boolean updateServerState(UpdateMsg msg)
   {
     return serverState.update(msg.getCSN());
   }

--
Gitblit v1.10.0