Move inner classes to standalone classes#1095

flyrain merged 3 commits intoapache:mainapache/polaris:mainfrom

flyrain:result-entity-refactorflyrain/polaris:result-entity-refactorCopy head branch name to clipboard