import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.json.JSONException;
import org.json.JSONObject;
+import org.onap.aai.datarouter.entity.AaiEventEntity;
+import org.onap.aai.datarouter.entity.AggregationEntity;
+import org.onap.aai.datarouter.entity.DocumentStoreDataEntity;
+import org.onap.aai.datarouter.entity.OxmEntityDescriptor;
+import org.onap.aai.datarouter.entity.SuggestionSearchEntity;
+import org.onap.aai.datarouter.entity.TopographicalEntity;
+import org.onap.aai.datarouter.entity.UebEventHeader;
import org.openecomp.cl.api.Logger;
import org.openecomp.cl.eelf.LoggerFactory;
import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.datarouter.entity.AaiEventEntity;
-import org.openecomp.datarouter.entity.AggregationEntity;
-import org.openecomp.datarouter.entity.DocumentStoreDataEntity;
-import org.openecomp.datarouter.entity.OxmEntityDescriptor;
-import org.openecomp.datarouter.entity.SuggestionSearchEntity;
-import org.openecomp.datarouter.entity.TopographicalEntity;
-import org.openecomp.datarouter.entity.UebEventHeader;
import org.openecomp.datarouter.logging.EntityEventPolicyMsgs;
import org.openecomp.datarouter.util.CrossEntityReference;
import org.openecomp.datarouter.util.EntityOxmReferenceHelper;