From f114ca84d5ee2931d00dcd756bcac1cdddfafcea Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 May 2014 12:57:35 +0000
Subject: [PATCH] Code cleanup.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java | 116 +++++----------------------------------------------------
1 files changed, 11 insertions(+), 105 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
index 19069db..73ed6ec 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -26,13 +26,10 @@
*/
package org.opends.server.replication.plugin;
-import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
@@ -47,9 +44,9 @@
*/
public class DomainFakeCfg implements ReplicationDomainCfg
{
- private DN baseDN;
- private int serverId;
- private SortedSet<String> replicationServers;
+ private final DN baseDN;
+ private final int serverId;
+ private final SortedSet<String> replicationServers;
private long heartbeatInterval = 1000;
/**
@@ -67,12 +64,12 @@
/** Timeout (in milliseconds) when waiting for acknowledgments */
private long assuredTimeout = 1000;
/** Group id */
- private int groupId = 1;
+ private final int groupId;
/** Referrals urls to be published to other servers of the topology */
private SortedSet<String> refUrls = new TreeSet<String>();
- private SortedSet<String> fractionalExcludes = new TreeSet<String>();
- private SortedSet<String> fractionalIncludes = new TreeSet<String>();
+ private final SortedSet<String> fractionalExcludes = new TreeSet<String>();
+ private final SortedSet<String> fractionalIncludes = new TreeSet<String>();
private ExternalChangelogDomainCfg eclCfg =
new ExternalChangelogDomainFakeCfg(true, null, null);
@@ -84,33 +81,7 @@
*/
public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers)
{
- this.baseDN = baseDN;
- this.serverId = serverId;
- this.replicationServers = replServers;
- }
-
- /**
- * Creates a new Domain with the provided information
- * (with some fractional configuration provided)
- */
- public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers,
- List<String> fractionalExcludes, List<String> fractionalIncludes)
- {
- this(baseDN, serverId, replServers);
- if (fractionalExcludes != null)
- {
- for (String str : fractionalExcludes)
- {
- this.fractionalExcludes.add(str);
- }
- }
- if (fractionalIncludes != null)
- {
- for (String str : fractionalIncludes)
- {
- this.fractionalIncludes.add(str);
- }
- }
+ this(baseDN, serverId, replServers, -1);
}
/**
@@ -120,7 +91,9 @@
public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers,
int groupId)
{
- this(baseDN, serverId, replServers);
+ this.baseDN = baseDN;
+ this.serverId = serverId;
+ this.replicationServers = replServers;
this.groupId = groupId;
}
@@ -132,7 +105,7 @@
AssuredType assuredType, int assuredSdLevel, int groupId,
long assuredTimeout, SortedSet<String> refUrls)
{
- this(baseDN, serverId, replServers);
+ this(baseDN, serverId, replServers, groupId);
switch(assuredType)
{
case NOT_ASSURED:
@@ -143,31 +116,12 @@
break;
}
this.assuredSdLevel = assuredSdLevel;
- this.groupId = groupId;
this.assuredTimeout = assuredTimeout;
if (refUrls != null)
this.refUrls = refUrls;
}
/**
- * Create a new Domain from the provided arguments.
- *
- * @param baseDN The baseDN in string form.
- * @param serverId The serverID.
- * @param replServer The replication Server that will be used.
- *
- * @throws DirectoryException When the provided string is not a valid DN.
- */
- public DomainFakeCfg(String baseDN, int serverId, String replServer)
- throws DirectoryException
- {
- this.replicationServers = new TreeSet<String>();
- this.replicationServers.add(replServer);
- this.baseDN = DN.decode(baseDN);
- this.serverId = serverId;
- }
-
- /**
* {@inheritDoc}
*/
@Override
@@ -379,54 +333,6 @@
throws ConfigException
{ this.eclCfg=eclCfg;}
-
-
- /**
- * Registers to be notified when the ECL Domain is added.
- *
- * @param listener
- * The ECL Domain configuration add listener.
- * @throws ConfigException
- * If the add listener could not be registered.
- */
- public void addECLDomainAddListener(
- ConfigurationAddListener<ExternalChangelogDomainCfg> listener)
- throws ConfigException
- {}
-
- /**
- * Deregisters an existing ECL Domain configuration add listener.
- *
- * @param listener
- * The ECL Domain configuration add listener.
- */
- public void removeECLDomainAddListener(
- ConfigurationAddListener<ExternalChangelogDomainCfg> listener)
- {}
-
- /**
- * Registers to be notified the ECL Domain is deleted.
- *
- * @param listener
- * The ECL Domain configuration delete listener.
- * @throws ConfigException
- * If the delete listener could not be registered.
- */
- public void addECLDomainDeleteListener(
- ConfigurationDeleteListener<ExternalChangelogDomainCfg> listener)
- throws ConfigException
- {}
-
- /**
- * Deregisters an existing ECL Domain configuration delete listener.
- *
- * @param listener
- * The ECL Domain configuration delete listener.
- */
- public void removeECLDomainDeleteListener(
- ConfigurationDeleteListener<ExternalChangelogDomainCfg> listener)
- {}
-
@Override
public boolean isLogChangenumber()
{
--
Gitblit v1.10.0