Merge pull request #6715 from ORCID/qa-fix-null-in-anoymize-script

Fixed null for anonymizing top contributors

Author: amontenegro

orcid-core/src/main/java/org/orcid/core/cli/AnonymizeWorksFromCSV.java

@@ -94,6 +94,8 @@ private void init() {
         ApplicationContext context = new ClassPathXmlApplicationContext("orcid-core-context.xml");
         workDao = (WorkDao) context.getBean("workDao");
         jpaJaxbWorkAdapter = (JpaJaxbWorkAdapter) context.getBean("jpaJaxbWorkAdapterV3");
+        contributorUtils = (ContributorUtils) context.getBean("contributorUtilsV3");
+        contributorsRolesAndSequencesConverter=context.getBean(ContributorsRolesAndSequencesConverter.class);
         bootstrapTogglz(context.getBean(OrcidTogglzConfiguration.class));
     }
 
@@ -131,7 +133,6 @@ private static void bootstrapTogglz(OrcidTogglzConfiguration togglzConfig) {
     private void anonymizeWorks() throws Exception {
         ArrayList<WorkPojoFromCsv> worksFromCsv = getAllWorks();
         Work work;
-
         // delete all existent works for orcid provided
         workDao.removeWorks(orcid);
 
@@ -151,6 +152,9 @@ private void anonymizeWorks() throws Exception {
             }
             workEntity.setVisibility(work.getVisibility().name());
             if (work.getWorkContributors() != null && work.getWorkContributors().getContributor() != null && work.getWorkContributors().getContributor().size() > 0) {
+                if(maxContributorsForUI == 0) {
+                    maxContributorsForUI = 50;
+                }
                 List<ContributorsRolesAndSequences> topContributors = contributorUtils.getContributorsGroupedByOrcid(work.getWorkContributors().getContributor(), maxContributorsForUI);
                 if (topContributors.size() > 0) {
                     workEntity.setTopContributorsJson(contributorsRolesAndSequencesConverter.convertTo(topContributors, null));

orcid-core/src/main/java/org/orcid/core/cli/AnonymizeWorksFromGetMyData.java

@@ -106,6 +106,8 @@ private void init() {
         ApplicationContext context = new ClassPathXmlApplicationContext("orcid-core-context.xml");
         workDao = (WorkDao) context.getBean("workDao");
         jpaJaxbWorkAdapter = (JpaJaxbWorkAdapter) context.getBean("jpaJaxbWorkAdapterV3");
+        contributorUtils = (ContributorUtils) context.getBean("contributorUtilsV3");
+        contributorsRolesAndSequencesConverter=context.getBean(ContributorsRolesAndSequencesConverter.class);
         bootstrapTogglz(context.getBean(OrcidTogglzConfiguration.class));
     }
 
@@ -284,6 +286,9 @@ private void anonymizeWorks() throws Exception {
                 workEntity.setSourceId(orcid);
             }
             if (anonymizedWork.getWorkContributors() != null && anonymizedWork.getWorkContributors().getContributor() != null && anonymizedWork.getWorkContributors().getContributor().size() > 0) {
+                if(maxContributorsForUI == 0) {
+                    maxContributorsForUI = 50;
+                }
                 List<ContributorsRolesAndSequences> topContributors = contributorUtils.getContributorsGroupedByOrcid(anonymizedWork.getWorkContributors().getContributor(), maxContributorsForUI);
                 if (topContributors.size() > 0) {
                     workEntity.setTopContributorsJson(contributorsRolesAndSequencesConverter.convertTo(topContributors, null));