SLING-2986 - Merged Resource Provider

#12 - Get rid of adapter factory