Remove redundant code from abstract class.

[jcourtney1]

AbstractApnsService had a lot of redundant code in it. I consolidated the core functions in a couple of methods and then had the other API methods with variant parameterizations call these rather than duplicating the implementations. The results seem much cleaner and easier to follow. I also expanded the API slightly to make specifying the expiry as a Date available as a variant of the methods with byte[] parameters and specifying the expiry as a Unix time available as a variant of the methods with String parameters.

[matzew]

great effort, @jcourtney1 ! I will review it asap.

BTW. do you mind adding some unit tests for the new methods you put on the ApnsService?

[jcourtney1]

@matzew
I'd be happy to add unit tests for the new methods except I admit I'm not sure how. Currently it appears that only one send method on ApnsService of the 8 which existed prior to my change is being called in the unit tests. This method is ApnsService.send(String, String). These calls will also test AbstractApnsService.send(String, String, int) since this is called by AbstractApnsService.send(String, String). Unfortunately no pattern currently exists in the tests for testing the other methods that I can see and I'm not familiar with the Mokito way of things so my imagination on how to extend coverage to these is limited. If you've got some thoughts I'm happy to chip in and help make it happen but I'll need a bit of a jump start on the approach:)