Updated opendj-server code after changes to the SDK in r11554.

Jean-Noel Rouvignac

13.57.2015 1aaa00cfc3333e99cecb2a2c9f7a0747441e3531

 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CoreSchemaProvider.java

@@ -22,10 +22,12 @@
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Portions Copyright 2014 ForgeRock AS
 *      Portions Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.schema;

import static org.forgerock.opendj.ldap.schema.SchemaOptions.*;

import java.util.List;

import org.forgerock.i18n.LocalizableMessage;
@@ -37,8 +39,6 @@
import org.forgerock.opendj.server.config.server.CoreSchemaCfg;
import org.opends.server.types.InitializationException;

import static org.forgerock.opendj.ldap.schema.SchemaOptions.*;

/**
 * Provides the core schema, which includes core matching rules and syntaxes.
 */
@@ -156,8 +156,9 @@
    final boolean isUpdated = schemaUpdater.updateSchema(currentSchemaBuilder);

    // TODO : fix result code + log an error in case of failure
    final ResultCode code = isUpdated ? ResultCode.SUCCESS : ResultCode.OTHER;
    return new ConfigChangeResult(code, false);
    final ConfigChangeResult result = new ConfigChangeResult();
    result.setResultCode(isUpdated ? ResultCode.SUCCESS : ResultCode.OTHER);
    return result;
  }

}

 opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ConfigurationHandlerTestCase.java

@@ -21,7 +21,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Copyright 2014-2015 ForgeRock AS.
 */
package org.opends.server.core;

@@ -206,7 +206,7 @@
    when(listener.configAddIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationAdd(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.SUCCESS, false));
      thenReturn(new ConfigChangeResult());

    configHandler.addEntry(new LinkedHashMapEntry(dn));

@@ -229,13 +229,15 @@
  @Test(expectedExceptions=DirectoryException.class)
  public void testAddListenerWithAddEntryWhenFailureApplyingConfig() throws Exception
  {
    final ConfigChangeResult ccr = new ConfigChangeResult();
    ccr.setResultCode(ResultCode.OTHER);
    ConfigurationHandler configHandler = getConfigurationHandler();
    ConfigAddListener listener = mock(ConfigAddListener.class);
    configHandler.registerAddListener(DN_SCHEMA_PROVIDERS, listener);
    when(listener.configAddIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationAdd(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.OTHER, false));
      thenReturn(ccr);

    configHandler.addEntry(new LinkedHashMapEntry("cn=New schema provider,cn=Schema Providers,cn=config"));
  }
@@ -284,7 +286,7 @@
    when(listener.configDeleteIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationDelete(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.SUCCESS, false));
      thenReturn(new ConfigChangeResult());

    configHandler.deleteEntry(DN_CORE_SCHEMA);

@@ -310,12 +312,15 @@
  {
    ConfigurationHandler configHandler = getConfigurationHandler();

    final ConfigChangeResult ccr = new ConfigChangeResult();
    ccr.setResultCode(ResultCode.OTHER);

    ConfigDeleteListener listener = mock(ConfigDeleteListener.class);
    configHandler.registerDeleteListener(DN_SCHEMA_PROVIDERS, listener);
    when(listener.configDeleteIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationDelete(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.OTHER, false));
      thenReturn(ccr);

    configHandler.deleteEntry(DN_CORE_SCHEMA);
  }
@@ -344,7 +349,7 @@
    when(listener.configChangeIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationChange(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.SUCCESS, false));
      thenReturn(new ConfigChangeResult());
    Entry oldEntry = configHandler.getEntry(DN_CORE_SCHEMA);

    configHandler.replaceEntry(oldEntry,
@@ -378,12 +383,15 @@
  {
    ConfigurationHandler configHandler = getConfigurationHandler();

    final ConfigChangeResult ccr = new ConfigChangeResult();
    ccr.setResultCode(ResultCode.OTHER);

    ConfigChangeListener listener = mock(ConfigChangeListener.class);
    configHandler.registerChangeListener(DN_CORE_SCHEMA, listener);
    when(listener.configChangeIsAcceptable(any(Entry.class), any(LocalizableMessageBuilder.class))).
      thenReturn(true);
    when(listener.applyConfigurationChange(any(Entry.class))).
      thenReturn(new ConfigChangeResult(ResultCode.OTHER, false));
      thenReturn(ccr);
    Entry oldEntry = configHandler.getEntry(DN_CORE_SCHEMA);

    configHandler.replaceEntry(oldEntry,