DATACMNS-1259 - Polishing.

Removed unnecessary imports. Tiny refactoring to pull exception creation into static helper method. Made methods static in test cases where possible.

Original pull request: #273.
This commit is contained in:
Oliver Gierke
2018-02-15 14:24:53 +01:00
parent 9d3540cc54
commit 6675e33233
3 changed files with 16 additions and 23 deletions

View File

@@ -193,22 +193,21 @@ public class MappingAuditableBeanWrapperFactoryUnitTests {
});
}
private AbstractLongAssert<?> compareTemporalAccessors(TemporalAccessor expected, TemporalAccessor actual) {
private static AbstractLongAssert<?> compareTemporalAccessors(TemporalAccessor expected, TemporalAccessor actual) {
long actualSeconds = getInstantSeconds(actual);
long expectedSeconds = getInstantSeconds(expected);
return assertThat(actualSeconds).describedAs("Difference is %s", actualSeconds - expectedSeconds)
return assertThat(actualSeconds) //
.describedAs("Difference is %s", actualSeconds - expectedSeconds) //
.isEqualTo(expectedSeconds);
}
private long getInstantSeconds(TemporalAccessor actual) {
private static long getInstantSeconds(TemporalAccessor actual) {
if (actual instanceof LocalDateTime) {
return getInstantSeconds(((LocalDateTime) actual).atZone(ZoneOffset.systemDefault()));
}
return actual.getLong(ChronoField.INSTANT_SECONDS);
return actual instanceof LocalDateTime //
? getInstantSeconds(((LocalDateTime) actual).atZone(ZoneOffset.systemDefault())) //
: actual.getLong(ChronoField.INSTANT_SECONDS);
}
static class Sample {