PLFM-1815 Refactor DoiObjectType and ObjectType.
PLFM-1815 Refactor DoiObjectType and ObjectType.
Merge pull request #667 from eric-wu/quickfix

PLFM-1815 Refactor DoiObjectType and ObjectType.