Merge pull request #1837, spring spi support inject by type.