The NotificationRouter currently creates the PushMessageInfo object, and performs some logic before it can actually create it:

https://github.com/aerogear/aerogear-unifiedpush-server/blob/master/push/sender/src/main/java/org/jboss/aerogear/unifiedpush/message/NotificationRouter.java#L101-L115

This should be move to some other class, as the Router should just route