Skip to content

Commit

Permalink
Fix(14) - Null exception
Browse files Browse the repository at this point in the history
  • Loading branch information
Eduardo Gulias Davis committed Jun 23, 2019
1 parent 71e40ee commit ceb4e0a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build
*.iws
*.iml
.gradle
out/
6 changes: 5 additions & 1 deletion src/main/java/emailvalidator4j/parser/Email.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import emailvalidator4j.parser.exception.InvalidEmail;
import emailvalidator4j.parser.exception.NoLocalPart;

import javax.swing.text.html.Option;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

public class Email {
private final EmailLexer lexer;
Expand All @@ -22,7 +24,9 @@ public Email(EmailLexer lexer) {
}

public void parse(String email) throws InvalidEmail {
this.lexer.lex(email);
this.lexer.lex(Optional.ofNullable(email).orElseThrow(() ->
new InvalidEmail("Empty email")
));

if (!this.lexer.find(Tokens.AT)) {
throw new NoLocalPart("No local part found");
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/emailvalidator4j/EmailValidatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ public void validEmailHasNoWarnings() {
Assert.assertFalse(validator.hasWarnings());
}

@Test
public void preventNull() {
EmailValidator validator = new EmailValidator();
Assert.assertFalse(validator.isValid(null));
}

@Test
public void validEmailHasWarnings() {
EmailValidator validator = new EmailValidator();
Expand Down

0 comments on commit ceb4e0a

Please sign in to comment.