OPENDJ-770 Simplify the "rebuild-index --clearDegradedState" command output...

Violette Roche-Montane

04.25.2013 db4562c1de42de3e2e9d2fcc45816ad302a77189

OPENDJ-770 Simplify the "rebuild-index --clearDegradedState" command output
- If in cleardegradedState mode, output just displays the following msg "Degraded state of index(es) [indexe(s) name] has been removed".

 opends/src/messages/messages/jeb.properties

@@ -451,4 +451,5 @@
 disabled for database backend %s
NOTICE_JEB_REBUILD_DEGRADED_START_231=Rebuild of all degraded indexes started \
 with %d total entries to process

NOTICE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS_232=Degraded state of \
index(es) : %s has been removed

 opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java

@@ -3194,7 +3194,7 @@
      }
      totalEntries = suffix.getID2Entry().getRecordCount();

      Message message;
      Message message = null;
      switch (rebuildConfig.getRebuildMode())
      {
      case ALL:
@@ -3204,11 +3204,16 @@
        message = NOTE_JEB_REBUILD_DEGRADED_START.get(totalEntries);
        break;
      default:
        if (!rebuildConfig.isClearDegradedState())
        {
        message = NOTE_JEB_REBUILD_START.get(sb.toString(), totalEntries);
        }
        break;
      }
      if ( message != null ) {
      logError(message);
    }
    }

    /**
     * Print stop message.
@@ -3225,11 +3230,15 @@
      {
        rate = 1000f * entriesProcessed.get() / totalTime;
      }

      if (!rebuildConfig.isClearDegradedState())
      {
      Message message =
          NOTE_JEB_REBUILD_FINAL_STATUS.get(entriesProcessed.get(),
              totalTime / 1000, rate);
      logError(message);
    }
    }

    /**
     * {@inheritDoc}
@@ -3306,6 +3315,13 @@
        }
        phaseTwo();
      }
      else
      {
        Message message =
            NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS.get(
                rebuildConfig.getRebuildList().toString());
        logError(message);
      }

      setRebuildListIndexesTrusted(true);
    }