avoid duplicate loop over datasetVersions

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java

@@ -491,34 +491,12 @@ private String reindexFilesInBatches(List<DataFile> filesToReindexPermissionsFor
                     permStringByDatasetVersion.put(datasetVersionFileIsAttachedTo.getId(), searchPermissionsService.findDatasetVersionPerms(datasetVersionFileIsAttachedTo));
                 }
             }
-            
-            //ToDo - are we creating these docs twice - both this loop and constructDatafileSolrDocs go through all versions?
-            for (DatasetVersion datasetVersionFileIsAttachedTo : datasetVersions) {
-                boolean cardShouldExist = desiredCards.get(datasetVersionFileIsAttachedTo.getVersionState());
-                
-                if (cardShouldExist) {
-                    for (DataFile file : filesToReindexPermissionsFor) {
-                        List<String> cachedPermission = permStringByDatasetVersion.get(datasetVersionFileIsAttachedTo.getId());
-                        if (cachedPermission == null) {
-                            logger.warning("no cached permission! Looking it up...");
-                            List<DvObjectSolrDoc> fileSolrDocs = constructDatafileSolrDocs(file, permStringByDatasetVersion, desiredCards, datasetVersions);
-                            for (DvObjectSolrDoc fileSolrDoc : fileSolrDocs) {
-                                Long datasetVersionId = fileSolrDoc.getDatasetVersionId();
-                                if (datasetVersionId != null) {
-                                    permStringByDatasetVersion.put(datasetVersionId, fileSolrDoc.getPermissions());
-                                    SolrInputDocument solrDoc = SearchUtil.createSolrDoc(fileSolrDoc);
-                                    docs.add(solrDoc);
-                                }
-                            }
-                        } else {
-                            logger.finest("cached permission is " + cachedPermission);
-                            List<DvObjectSolrDoc> fileSolrDocsBasedOnCachedPermissions = constructDatafileSolrDocs(file, permStringByDatasetVersion, desiredCards, datasetVersions);
-                            for (DvObjectSolrDoc fileSolrDoc : fileSolrDocsBasedOnCachedPermissions) {
-                                SolrInputDocument solrDoc = SearchUtil.createSolrDoc(fileSolrDoc);
-                                docs.add(solrDoc);
-                            }
-                        }
-                    }
+
+            for (DataFile file : filesToReindexPermissionsFor) {
+                List<DvObjectSolrDoc> fileSolrDocsBasedOnCachedPermissions = constructDatafileSolrDocs(file, permStringByDatasetVersion, desiredCards, datasetVersions);
+                for (DvObjectSolrDoc fileSolrDoc : fileSolrDocsBasedOnCachedPermissions) {
+                    SolrInputDocument solrDoc = SearchUtil.createSolrDoc(fileSolrDoc);
+                    docs.add(solrDoc);
                 }
             }