ANNOTATIONJAVA-464: JSON annotation storage support
Updated for 'ONE' store logic