AttributeDefinition's protected attributeMarshaller and referenceRecorder fields should be made private. They were deprecated long ago with javadoc saying to use the getter.