From e61d6d0a55d022a0768e730521bfea36ad506f9d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 13 Jul 2016 14:16:36 +0000
Subject: [PATCH] dsreplication: Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 68 +++++++++++++---------------------
1 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index b435df5..d27649d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -5836,7 +5836,6 @@
{
ADSContext adsCtx = new ADSContext(conn);
- boolean somethingDisplayed = false;
TopologyCache cache;
try
{
@@ -5901,6 +5900,8 @@
}
}
+
+ boolean somethingDisplayed = false;
if (!oneReplicated && displayAll)
{
// Maybe there are some replication server configured...
@@ -5932,35 +5933,22 @@
if (oneReplicated && !uData.isScriptFriendly())
{
println();
- print(INFO_REPLICATION_STATUS_REPLICATED_LEGEND.get());
+ println(INFO_REPLICATION_STATUS_REPLICATED_LEGEND.get());
if (!replicasWithNoReplicationServer.isEmpty() ||
!serversWithNoReplica.isEmpty())
{
- println();
- print(
- INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_LEGEND.get());
-
- println();
- print(
- INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_LEGEND.get());
+ println(INFO_REPLICATION_STATUS_NOT_A_REPLICATION_SERVER_LEGEND.get());
+ println(INFO_REPLICATION_STATUS_NOT_A_REPLICATION_DOMAIN_LEGEND.get());
}
- println();
somethingDisplayed = true;
}
}
if (!somethingDisplayed)
{
- if (displayAll)
- {
- print(INFO_REPLICATION_STATUS_NO_REPLICATION_INFORMATION.get());
- println();
- }
- else
- {
- print(INFO_REPLICATION_STATUS_NO_BASEDNS.get());
- println();
- }
+ println(displayAll
+ ? INFO_REPLICATION_STATUS_NO_REPLICATION_INFORMATION.get()
+ : INFO_REPLICATION_STATUS_NO_BASEDNS.get());
}
}
@@ -6029,31 +6017,10 @@
Set<ServerDescriptor> serversWithNoReplica)
{
Set<ReplicaDescriptor> orderedReplicas = new LinkedHashSet<>();
- Set<HostPort> hostPorts = new TreeSet<>(new Comparator<HostPort>()
- {
- @Override
- public int compare(HostPort hp1, HostPort hp2)
- {
- return hp1.toString().compareTo(hp2.toString());
- }
- });
Set<ServerDescriptor> notAddedReplicationServers = new TreeSet<>(new ReplicationServerComparator());
for (Set<ReplicaDescriptor> replicas : orderedReplicaLists)
{
- for (ReplicaDescriptor replica : replicas)
- {
- hostPorts.add(getHostPort2(replica.getServer(), cnx));
- }
- for (HostPort hostPort : hostPorts)
- {
- for (ReplicaDescriptor replica : replicas)
- {
- if (getHostPort2(replica.getServer(), cnx).equals(hostPort))
- {
- orderedReplicas.add(replica);
- }
- }
- }
+ addReplicasSortedByHostPort(orderedReplicas, replicas, cnx);
for (ServerDescriptor server : servers)
{
if (server.isReplicationServer() && isRepServerNotInDomain(replicas, server))
@@ -6211,6 +6178,23 @@
tableBuilder.print(printer);
}
+ private void addReplicasSortedByHostPort(Set<ReplicaDescriptor> orderedReplicas, Set<ReplicaDescriptor> replicas,
+ final Set<PreferredConnection> cnx)
+ {
+ List<ReplicaDescriptor> sortedReplicas = new ArrayList<>(replicas);
+ Collections.sort(sortedReplicas, new Comparator<ReplicaDescriptor>()
+ {
+ @Override
+ public int compare(ReplicaDescriptor replica1, ReplicaDescriptor replica2)
+ {
+ HostPort hp1 = getHostPort2(replica1.getServer(), cnx);
+ HostPort hp2 = getHostPort2(replica2.getServer(), cnx);
+ return hp1.toString().compareTo(hp2.toString());
+ }
+ });
+ orderedReplicas.addAll(sortedReplicas);
+ }
+
private LocalizableMessage fromObject(Object value)
{
return LocalizableMessage.raw("%s", value);
--
Gitblit v1.10.0