Convert to java-based spring configuration