Replace switch statements with resource ids with if-then-else

Merged Sebastian requested to merge 1883-resource-ids-will-be-non-final into master

Merge request reports