OPENDJ-2987 Simplify ways to retrieve an object class from the DirectorySer...

Nicolas Capponi

19.33.2016 327ed7b44629d254f59b785ee2e0b7f8860e5cf8

 opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java

@@ -190,7 +190,7 @@
    // Construct the trust store base entry.
    LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
    objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
    objectClasses.put(DirectoryServer.getObjectClass2("ds-cfg-branch"), "ds-cfg-branch");
    objectClasses.put(DirectoryServer.getObjectClass("ds-cfg-branch"), "ds-cfg-branch");

    LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
    for (AVA ava : getBaseDN().rdn())
@@ -414,7 +414,7 @@
    // Construct the certificate entry to return.
    LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
    ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
    ocMap.put(DirectoryServer.getObjectClass2(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
    ocMap.put(DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);

    LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
    LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -1055,7 +1055,7 @@
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

      if (entry.hasObjectClass(DirectoryServer.getObjectClass2(OC_SELF_SIGNED_CERT_REQUEST)))
      if (entry.hasObjectClass(DirectoryServer.getObjectClass(OC_SELF_SIGNED_CERT_REQUEST)))
      {
        try
        {