SONARJAVA-774 Support addition and substraction