Skip to content

Commit

Permalink
fix: cope with null arguments to custom exception constructors
Browse files Browse the repository at this point in the history
  • Loading branch information
apetro committed Mar 1, 2018
1 parent af71ddf commit 8b45401
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ public class ExpiredMessageException
private final LocalDateTime asOfWhen;

public ExpiredMessageException(Message messageWithRequestedId, LocalDateTime asOfWhen) {
super("Message with id [" + messageWithRequestedId.getId() + "] is expired as of " + asOfWhen
.toString());
super("Message " +
((messageWithRequestedId == null) ?
"" :
(" with id [" + messageWithRequestedId.getId() + "] "))
+ "is expired as of " + asOfWhen);
this.expiredMessage = messageWithRequestedId;
this.asOfWhen = asOfWhen;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ public class PrematureMessageException
private LocalDateTime asOfWhen;

public PrematureMessageException(Message prematureMessage, LocalDateTime asOfWhen) {
super("Message with id " + prematureMessage.getId() + " is premature as of "
+ asOfWhen.toString());
super("Message with id " +
((null == prematureMessage) ?
"" :
prematureMessage.getId() + " ")
+ "is premature as of " + asOfWhen);
this.prematureMessage = prematureMessage;
this.asOfWhen = asOfWhen;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package edu.wisc.my.messages.exception;

import org.junit.Test;

public class ExpiredMessageExceptionTest {

@Test
public void copesWithNullConstructorArguments() {
new ExpiredMessageException(null, null);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package edu.wisc.my.messages.exception;

import org.junit.Test;

public class PrematureMessageExceptionTest {

@Test
public void copesWithNullConstructorArguments() {
new PrematureMessageException(null, null);
}

}

0 comments on commit 8b45401

Please sign in to comment.