In the ObjectManagerFactory class, renamed the method from getInstance to getDataManager.

Author: taojing2002

src/main/java/org/dataone/cn/indexer/IndexWorker.java

@@ -243,7 +243,7 @@ public IndexWorker(Boolean initialize)
             initExecutorService();//initialize the executor first
             initIndexQueue();
             initIndexParsers();
-            ObjectManagerFactory.getInstance();
+            ObjectManagerFactory.getObjectManager();
             OntologyModelService.getInstance();
         }
     }

src/main/java/org/dataone/cn/indexer/SolrIndex.java

@@ -152,7 +152,7 @@ private Map<String, SolrDoc> process(String id, boolean isSysmetaChangeOnly)
         Map<String, SolrDoc> docs = new HashMap<>();
         // Load the System Metadata document
         try (InputStream systemMetadataStream =
-                 ObjectManagerFactory.getInstance().getSystemMetadataStream(id)){
+                 ObjectManagerFactory.getObjectManager().getSystemMetadataStream(id)){
             docs = systemMetadataProcessor.processDocument(id, docs, systemMetadataStream);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -190,7 +190,7 @@ private Map<String, SolrDoc> process(String id, boolean isSysmetaChangeOnly)
                         // if so, then extract the additional information from the
                         // document.
                         try (InputStream dataStream =
-                                 ObjectManagerFactory.getInstance().getObject(id)) {
+                                 ObjectManagerFactory.getObjectManager().getObject(id)) {
                             // docObject = the resource map document or science
                             // metadata document.
                             // note that resource map processing touches all objects

src/main/java/org/dataone/cn/indexer/object/ObjectManagerFactory.java

@@ -28,7 +28,7 @@ public class ObjectManagerFactory {
      * @throws InstantiationException
      * @throws IllegalAccessException
      */
-    public static ObjectManager getInstance()
+    public static ObjectManager getObjectManager()
         throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
         InstantiationException, IllegalAccessException {
         String classNameFromEnv = System.getenv(OBJECT_MANAGER_CLASSNAME_ENV);

src/main/java/org/dataone/cn/indexer/resourcemap/ForesiteResourceMap.java

@@ -240,7 +240,7 @@ private SolrDoc _mergeMappedReference(ResourceEntry resourceEntry, SolrDoc merge
         Identifier identifier = new Identifier();
         identifier.setValue(mergeDocument.getIdentifier());
         try {
-            SystemMetadata sysMeta = (SystemMetadata) ObjectManagerFactory.getInstance()
+            SystemMetadata sysMeta = (SystemMetadata) ObjectManagerFactory.getObjectManager()
                                                         .getSystemMetadata(identifier.getValue());
             if (sysMeta.getSeriesId() != null && sysMeta.getSeriesId().getValue() != null
                                        && !sysMeta.getSeriesId().getValue().trim().equals("")) {

src/main/java/org/dataone/cn/indexer/resourcemap/IndexVisibilityDelegateImpl.java

@@ -28,7 +28,7 @@ public IndexVisibilityDelegateImpl() {
     public boolean isDocumentVisible(Identifier pid) {
         boolean visible = false;
         try {
-            SystemMetadata systemMetadata = ObjectManagerFactory.getInstance()
+            SystemMetadata systemMetadata = ObjectManagerFactory.getObjectManager()
                                                             .getSystemMetadata(pid.getValue());
             // TODO: Is pid Identifier a SID?
             if (systemMetadata == null) {
@@ -76,7 +76,7 @@ public boolean documentExists(Identifier pid) {
         boolean exists = false;
         try {
             SystemMetadata systemMetadata =
-                ObjectManagerFactory.getInstance().getSystemMetadata(pid.getValue());
+                ObjectManagerFactory.getObjectManager().getSystemMetadata(pid.getValue());
             if (systemMetadata != null) {
                 exists = true;
             } else {

src/test/java/org/dataone/cn/indexer/object/ObjectManagerTest.java

@@ -62,7 +62,7 @@ public void setUp() throws Exception {
      */
     @Test
     public void testGetObjectAndSystemMetadata() throws Exception {
-        try (InputStream input = ObjectManagerFactory.getInstance().getObject(identifier)) {
+        try (InputStream input = ObjectManagerFactory.getObjectManager().getObject(identifier)) {
             assertNotNull(input);
             try (OutputStream os = new ByteArrayOutputStream()) {
                 MessageDigest md5 = MessageDigest.getInstance("MD5");
@@ -77,7 +77,7 @@ public void testGetObjectAndSystemMetadata() throws Exception {
                 assertEquals("1755a557c13be7af44d676bb09274b0e", md5Digest);
             }
         }
-        org.dataone.service.types.v1.SystemMetadata sysmeta = ObjectManagerFactory.getInstance()
+        org.dataone.service.types.v1.SystemMetadata sysmeta = ObjectManagerFactory.getObjectManager()
                 .getSystemMetadata(identifier);
         assertEquals(identifier, sysmeta.getIdentifier().getValue());
         assertEquals("1755a557c13be7af44d676bb09274b0e", sysmeta.getChecksum().getValue());