#6898 code cleanup

IQSS · Jun 10, 2020 · 8fa1b45 · 8fa1b45
1 parent 105038c
commit 8fa1b45
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -1418,33 +1418,24 @@ private void updatePathForExistingSolrDocs(DvObject object) throws SolrServerExc
         solrQuery.setQuery(SearchUtil.constructQuery(SearchFields.ENTITY_ID, object.getId().toString()));
 
         QueryResponse res = solrClientService.getSolrClient().query(solrQuery);
-        Dataset ds = null;
-        Dataverse dv  = null;
+
         if (!res.getResults().isEmpty()) {            
             SolrDocument doc = res.getResults().get(0);
             SolrInputDocument sid = new SolrInputDocument();
 
             for (String fieldName : doc.getFieldNames()) {
                 sid.addField(fieldName, doc.getFieldValue(fieldName));
             }
-            List<String> paths = new ArrayList();
-
-            if(object.isInstanceofDataset()){
-               ds  = datasetService.find(object.getId());
-               paths =   retrieveDVOPaths(ds);
-            }
-
-            if(object.isInstanceofDataverse()){
-               dv  = dataverseService.find(object.getId());
-               paths =   retrieveDVOPaths(dv);
-            } 
 
+            List<String> paths =  object.isInstanceofDataset() ? retrieveDVOPaths(datasetService.find(object.getId())) 
+                    : retrieveDVOPaths(dataverseService.find(object.getId()));
+
             sid.removeField(SearchFields.SUBTREE);
             sid.addField(SearchFields.SUBTREE, paths);
             UpdateResponse addResponse = solrClientService.getSolrClient().add(sid);
             UpdateResponse commitResponse = solrClientService.getSolrClient().commit();
-            if (ds != null) {
-                for (DataFile df : ds.getFiles()) {
+            if (object.isInstanceofDataset()) {
+                for (DataFile df : datasetService.find(object.getId()).getFiles()) {
                     solrQuery.setQuery(SearchUtil.constructQuery(SearchFields.ENTITY_ID, df.getId().toString()));
                     res = solrClientService.getSolrClient().query(solrQuery);
                     if (!res.getResults().isEmpty()) {