Hide more DirectoryServer.getCryptoManager()

Jean-Noël Rouvignac

25.17.2016 689f5fecf900cf69a0d6889f96014aef48abc603

 opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java

@@ -233,11 +233,11 @@
      {
        if (searchEntry.hasObjectClass(ocCipherKey))
        {
          DirectoryServer.getCryptoManager().importCipherKeyEntry(searchEntry);
          getCryptoManager().importCipherKeyEntry(searchEntry);
        }
        else if (searchEntry.hasObjectClass(ocMacKey))
        {
          DirectoryServer.getCryptoManager().importMacKeyEntry(searchEntry);
          getCryptoManager().importMacKeyEntry(searchEntry);
        }
      }
      catch (CryptoManagerException e)
@@ -248,6 +248,11 @@
    }
  }

  private CryptoManagerImpl getCryptoManager()
  {
    return DirectoryServer.getCryptoManager();
  }


  private void handleInstanceKeySearchEntry(SearchResultEntry searchEntry)
       throws DirectoryException
@@ -414,11 +419,11 @@
      {
        if (entry.hasObjectClass(ocCipherKey))
        {
          DirectoryServer.getCryptoManager().importCipherKeyEntry(entry);
          getCryptoManager().importCipherKeyEntry(entry);
        }
        else if (entry.hasObjectClass(ocMacKey))
        {
          DirectoryServer.getCryptoManager().importMacKeyEntry(entry);
          getCryptoManager().importMacKeyEntry(entry);
        }
      }
      catch (CryptoManagerException e)
@@ -487,11 +492,11 @@
      {
        if (newEntry.hasObjectClass(ocCipherKey))
        {
          DirectoryServer.getCryptoManager().importCipherKeyEntry(newEntry);
          getCryptoManager().importCipherKeyEntry(newEntry);
        }
        else if (newEntry.hasObjectClass(ocMacKey))
        {
          DirectoryServer.getCryptoManager().importMacKeyEntry(newEntry);
          getCryptoManager().importMacKeyEntry(newEntry);
        }
      }
      catch (CryptoManagerException e)