ANNOTATIONJAVA-283: Update Annotation samples according to changes in front-end