Added type parameters to Java to Scala conversion #SCL-2325 Fixed