Spring Replace else-if with if when the method has the return value

Using if to replace eles-if can make the whole logic clearer.

Comment From: pivotal-cla

@Encyclopedias Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

Comment From: pivotal-cla

@Encyclopedias Thank you for signing the Contributor License Agreement!