update: make LDAP search happen before accounts lookup, not in parallel

• update: make LDAP search happen before accounts lookup, not in parallel

This may be causing some of our stability issues upstream with accounts as the pipe gets overloaded and fails over.

Resolves #122 (closed)

src/main/java/org/eclipsefoundation/profile/services/impl/DefaultProfileService.java

@@ -117,21 +117,23 @@ public class DefaultProfileService implements ProfileService {
     @Override
     public EfUser getProfileByUsername(String username) {
         try {
-            // Search in LDAP and accounts asynchronously
-            CompletableFuture<Optional<LdapResult>> ldapSearch = executor.supplyAsync(() -> ldapService.searchLdapByUsername(username));
-            CompletableFuture<Optional<AccountsProfileData>> accountsSearch = executor
-                    .supplyAsync(() -> profileHelper.getAccountsProfileByUsername(username));
-
-            Optional<LdapResult> ldapResult = ldapSearch.get();
-            Optional<AccountsProfileData> accountsResult = accountsSearch.get();
+            // Search in LDAP first and then accounts
+            Optional<LdapResult> ldapSearch = ldapService.searchLdapByUsername(username);
+            // ldap is really reliable, if it has no results, then its incredibly likely there is no user
+            if (ldapSearch.isEmpty()) {
+                return null;
+            }
+            
+            // retrieve accounts results for the given username
+            Optional<AccountsProfileData> accountsSearch = profileHelper.getAccountsProfileByUsername(username);
             // #114 - If results are asymmetrical, throw an exception
-            if (ldapResult.isPresent() ^ accountsResult.isPresent()) {
+            if (accountsSearch.isEmpty()) {
                 throw new ApplicationException(
                         String.format("Results from services are inconsistent regarding user, cannot return: %s", username));
             }
 
             // if either result is empty, both are empty with above bitwise check
-            return ldapResult.isEmpty() ? null : buildEfUser(ldapResult.get(), accountsResult.get());
+            return buildEfUser(ldapSearch.get(), accountsSearch.get());
         } catch (Exception e) {
             if (e.getClass().equals(InterruptedException.class)) {
              // only interrupt on interrupts