Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead

Jean-Noël Rouvignac

08.55.2016 8368f9ae15d65cda433652abcddd2ddbf61024a0

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java

@@ -17,13 +17,15 @@

package org.opends.guitools.controlpanel.util;

import static org.forgerock.opendj.ldap.SearchScope.*;

import java.util.HashSet;
import java.util.Set;

import javax.naming.NamingEnumeration;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;

import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldif.ConnectionEntryReader;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
@@ -59,22 +61,14 @@
  public CustomSearchResult processBackgroundTask() throws Throwable
  {
    isOver = false;
    NamingEnumeration<SearchResult> en = null;
    try
    final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
    SearchRequest request = Requests.newSearchRequest(dn, BASE_OBJECT, filter, "*", "+");
    try (ConnectionEntryReader entryReader = conn.getConnection().search(request))
    {
      SearchControls controls = new SearchControls();

      String[] attrs = {"*", "+"};
      controls.setReturningAttributes(attrs);
      controls.setSearchScope(SearchControls.OBJECT_SCOPE);
      final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";

      en = conn.getLdapContext().search(Utilities.getJNDIName(dn), filter, controls);

      SearchResult sr = null;
      while (en.hasMore())
      SearchResultEntry sr = null;
      while (entryReader.hasNext())
      {
        sr = en.next();
        sr = entryReader.readEntry();
      }

      return new CustomSearchResult(sr, dn);
@@ -85,10 +79,6 @@
      {
        isOver = true;
      }
      if (en != null)
      {
        en.close();
      }
    }
  }