misc
modified it to handle null return
migrated from log4j1x to log4j2
fixed unit tests