Skip to content

Commit

Permalink
replace regex with EmailValidator package
Browse files Browse the repository at this point in the history
  • Loading branch information
hams7504 committed Nov 30, 2023
1 parent 72ff51e commit cc017d4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,13 @@
<version>${swagger.ui.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
</dependency>

</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.broadinstitute.consent.http.service;

import com.google.inject.Inject;
import org.apache.commons.validator.EmailValidator;
import jakarta.ws.rs.NotFoundException;
import java.sql.SQLException;
import java.util.ArrayList;
Expand Down Expand Up @@ -376,18 +377,11 @@ protected void notifyCustodiansOfApprovedDatasets(List<Dataset> datasets, User r
}

// Data Depositors
List<String> depositors = d.getDataDepositors();
List<String> depositorEmails = new ArrayList<>();
String emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\."+
"[a-zA-Z0-9_+&*-]+)*@" +
"(?:[a-zA-Z0-9-]+\\.)+[a-z" +
"A-Z]{2,7}$";
depositors.forEach(e -> {
Pattern pat = Pattern.compile(emailRegex);
if (pat.matcher(e).matches()) {
depositorEmails.add(e);
}
});
EmailValidator emailValidator = EmailValidator.getInstance();
List<String> depositorEmails = d.getDataDepositors()
.stream()
.filter(e -> emailValidator.isValid(e))
.toList();
if (!depositorEmails.isEmpty()) {
userDAO.findUsersByEmailList(depositorEmails).forEach(u -> {
custodianMap.putIfAbsent(u, new HashSet<>());
Expand Down

0 comments on commit cc017d4

Please sign in to comment.