[PLAT-3565] - Market data manipulations via ViewDefinition

Fix possible NullPointer bug, add in extra logging.
[PLAT-3565] - Market data manipulations via ViewDefinition

Switch to Java 7 generics