This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new fb37476 ATLAS-3912: moved classes from intg to repository or common
module
fb37476 is described below
commit fb374763988d869fa8ce1b18bf4d438a64f4bb06
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Thu Jul 23 22:25:44 2020 -0700
ATLAS-3912: moved classes from intg to repository or common module
---
.../src/main/java/org/apache/atlas/pc/StatusReporter.java | 0
.../src/main/java/org/apache/atlas/pc/WorkItemBuilder.java | 0
.../src/main/java/org/apache/atlas/pc/WorkItemConsumer.java | 0
.../src/main/java/org/apache/atlas/pc/WorkItemManager.java | 0
intg/src/main/java/org/apache/atlas/{store => }/DeleteType.java | 2 +-
.../src/main/java/org/apache/atlas/entitytransform/Action.java | 0
.../java/org/apache/atlas/entitytransform/AtlasEntityTransformer.java | 0
.../main/java/org/apache/atlas/entitytransform/BaseEntityHandler.java | 0
.../src/main/java/org/apache/atlas/entitytransform/Condition.java | 0
.../main/java/org/apache/atlas/entitytransform/EntityAttribute.java | 0
.../java/org/apache/atlas/entitytransform/HdfsPathEntityHandler.java | 0
.../org/apache/atlas/entitytransform/HiveColumnEntityHandler.java | 0
.../org/apache/atlas/entitytransform/HiveDatabaseEntityHandler.java | 0
.../atlas/entitytransform/HiveStorageDescriptorEntityHandler.java | 0
.../java/org/apache/atlas/entitytransform/HiveTableEntityHandler.java | 0
.../org/apache/atlas/entitytransform/TransformationConstants.java | 0
.../java/org/apache/atlas/entitytransform/TransformerContext.java | 0
.../src/main/java/org/apache/atlas/listener/ChangedTypeDefs.java | 0
.../main/java/org/apache/atlas/listener/EntityChangeListenerV2.java | 0
.../main/java/org/apache/atlas/listener/TypeDefChangeListener.java | 0
.../apache/atlas/repository/store/graph/v1/DeleteHandlerDelegate.java | 2 +-
.../org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java | 2 +-
.../apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java | 2 +-
.../src/main/java/org/apache/atlas/store/AtlasTypeDefStore.java | 0
.../org/apache/atlas/entitytransform/TransformationHandlerTest.java | 0
.../src/test/java/org/apache/atlas/pc/StatusReporterTest.java | 0
.../src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java | 0
.../java/org/apache/atlas/pc/WorkItemConsumerWithResultsTest.java | 0
.../src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java | 0
.../test/java/org/apache/atlas/pc/WorkItemManagerWithResultsTest.java | 0
.../org/apache/atlas/repository/store/graph/v1/SoftReferenceTest.java | 2 +-
.../store/graph/v2/AtlasRelationshipStoreHardDeleteV2Test.java | 4 +---
.../store/graph/v2/AtlasRelationshipStoreSoftDeleteV2Test.java | 2 +-
.../atlas/repository/store/graph/v2/AtlasRelationshipStoreV2Test.java | 2 +-
.../store/graph/v2/InverseReferenceUpdateHardDeleteV2Test.java | 2 +-
.../store/graph/v2/InverseReferenceUpdateSoftDeleteV2Test.java | 2 +-
.../atlas/repository/store/graph/v2/InverseReferenceUpdateV2Test.java | 2 +-
{intg => repository}/src/test/resources/json/entity1.json | 0
{intg => repository}/src/test/resources/json/transform1.json | 0
server-api/src/main/java/org/apache/atlas/RequestContext.java | 1 -
webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java | 2 +-
.../test/java/org/apache/atlas/web/adapters/TestEntityRESTDelete.java | 2 +-
42 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/intg/src/main/java/org/apache/atlas/pc/StatusReporter.java
b/common/src/main/java/org/apache/atlas/pc/StatusReporter.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/pc/StatusReporter.java
rename to common/src/main/java/org/apache/atlas/pc/StatusReporter.java
diff --git a/intg/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
b/common/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
rename to common/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
diff --git a/intg/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
b/common/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
rename to common/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
diff --git a/intg/src/main/java/org/apache/atlas/pc/WorkItemManager.java
b/common/src/main/java/org/apache/atlas/pc/WorkItemManager.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/pc/WorkItemManager.java
rename to common/src/main/java/org/apache/atlas/pc/WorkItemManager.java
diff --git a/intg/src/main/java/org/apache/atlas/store/DeleteType.java
b/intg/src/main/java/org/apache/atlas/DeleteType.java
similarity index 97%
rename from intg/src/main/java/org/apache/atlas/store/DeleteType.java
rename to intg/src/main/java/org/apache/atlas/DeleteType.java
index de5e5e4..57294bf 100644
--- a/intg/src/main/java/org/apache/atlas/store/DeleteType.java
+++ b/intg/src/main/java/org/apache/atlas/DeleteType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.atlas.store;
+package org.apache.atlas;
import org.apache.commons.lang.StringUtils;
diff --git a/intg/src/main/java/org/apache/atlas/entitytransform/Action.java
b/repository/src/main/java/org/apache/atlas/entitytransform/Action.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/entitytransform/Action.java
rename to repository/src/main/java/org/apache/atlas/entitytransform/Action.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/AtlasEntityTransformer.java
b/repository/src/main/java/org/apache/atlas/entitytransform/AtlasEntityTransformer.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/AtlasEntityTransformer.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/AtlasEntityTransformer.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/BaseEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/BaseEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/BaseEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/BaseEntityHandler.java
diff --git a/intg/src/main/java/org/apache/atlas/entitytransform/Condition.java
b/repository/src/main/java/org/apache/atlas/entitytransform/Condition.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/entitytransform/Condition.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/Condition.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/EntityAttribute.java
b/repository/src/main/java/org/apache/atlas/entitytransform/EntityAttribute.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/EntityAttribute.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/EntityAttribute.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/HdfsPathEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/HdfsPathEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/HdfsPathEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/HdfsPathEntityHandler.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/HiveColumnEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/HiveColumnEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/HiveColumnEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/HiveColumnEntityHandler.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/HiveDatabaseEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/HiveDatabaseEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/HiveDatabaseEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/HiveDatabaseEntityHandler.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/HiveStorageDescriptorEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/HiveStorageDescriptorEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/HiveStorageDescriptorEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/HiveStorageDescriptorEntityHandler.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/HiveTableEntityHandler.java
b/repository/src/main/java/org/apache/atlas/entitytransform/HiveTableEntityHandler.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/HiveTableEntityHandler.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/HiveTableEntityHandler.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/TransformationConstants.java
b/repository/src/main/java/org/apache/atlas/entitytransform/TransformationConstants.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/TransformationConstants.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/TransformationConstants.java
diff --git
a/intg/src/main/java/org/apache/atlas/entitytransform/TransformerContext.java
b/repository/src/main/java/org/apache/atlas/entitytransform/TransformerContext.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/entitytransform/TransformerContext.java
rename to
repository/src/main/java/org/apache/atlas/entitytransform/TransformerContext.java
diff --git a/intg/src/main/java/org/apache/atlas/listener/ChangedTypeDefs.java
b/repository/src/main/java/org/apache/atlas/listener/ChangedTypeDefs.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/listener/ChangedTypeDefs.java
rename to
repository/src/main/java/org/apache/atlas/listener/ChangedTypeDefs.java
diff --git
a/intg/src/main/java/org/apache/atlas/listener/EntityChangeListenerV2.java
b/repository/src/main/java/org/apache/atlas/listener/EntityChangeListenerV2.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/listener/EntityChangeListenerV2.java
rename to
repository/src/main/java/org/apache/atlas/listener/EntityChangeListenerV2.java
diff --git
a/intg/src/main/java/org/apache/atlas/listener/TypeDefChangeListener.java
b/repository/src/main/java/org/apache/atlas/listener/TypeDefChangeListener.java
similarity index 100%
rename from
intg/src/main/java/org/apache/atlas/listener/TypeDefChangeListener.java
rename to
repository/src/main/java/org/apache/atlas/listener/TypeDefChangeListener.java
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerDelegate.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerDelegate.java
index e414a8c..1aaea64 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerDelegate.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerDelegate.java
@@ -20,7 +20,7 @@ package org.apache.atlas.repository.store.graph.v1;
import org.apache.atlas.RequestContext;
import org.apache.atlas.repository.graphdb.AtlasGraph;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasTypeRegistry;
import org.apache.atlas.util.AtlasRepositoryConfiguration;
import org.slf4j.Logger;
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
index 06341a6..9360dd3 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
@@ -36,7 +36,7 @@ import org.apache.atlas.repository.graphdb.AtlasGraph;
import org.apache.atlas.repository.graphdb.AtlasVertex;
import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.*;
import org.apache.atlas.type.AtlasStructType.AtlasAttribute;
import
org.apache.atlas.type.AtlasStructType.AtlasAttribute.AtlasRelationshipEdgeDirection;
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
index 9f8c4c1..7cf77ea 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
@@ -48,7 +48,7 @@ import
org.apache.atlas.repository.store.graph.AtlasEntityStore;
import org.apache.atlas.repository.store.graph.EntityGraphDiscovery;
import org.apache.atlas.repository.store.graph.EntityGraphDiscoveryContext;
import org.apache.atlas.repository.store.graph.v1.DeleteHandlerDelegate;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasArrayType;
import org.apache.atlas.type.AtlasBusinessMetadataType.AtlasBusinessAttribute;
import org.apache.atlas.type.AtlasClassificationType;
diff --git a/intg/src/main/java/org/apache/atlas/store/AtlasTypeDefStore.java
b/repository/src/main/java/org/apache/atlas/store/AtlasTypeDefStore.java
similarity index 100%
rename from intg/src/main/java/org/apache/atlas/store/AtlasTypeDefStore.java
rename to repository/src/main/java/org/apache/atlas/store/AtlasTypeDefStore.java
diff --git
a/intg/src/test/java/org/apache/atlas/entitytransform/TransformationHandlerTest.java
b/repository/src/test/java/org/apache/atlas/entitytransform/TransformationHandlerTest.java
similarity index 100%
rename from
intg/src/test/java/org/apache/atlas/entitytransform/TransformationHandlerTest.java
rename to
repository/src/test/java/org/apache/atlas/entitytransform/TransformationHandlerTest.java
diff --git a/intg/src/test/java/org/apache/atlas/pc/StatusReporterTest.java
b/repository/src/test/java/org/apache/atlas/pc/StatusReporterTest.java
similarity index 100%
rename from intg/src/test/java/org/apache/atlas/pc/StatusReporterTest.java
rename to repository/src/test/java/org/apache/atlas/pc/StatusReporterTest.java
diff --git a/intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
b/repository/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
similarity index 100%
rename from intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
rename to repository/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
diff --git
a/intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerWithResultsTest.java
b/repository/src/test/java/org/apache/atlas/pc/WorkItemConsumerWithResultsTest.java
similarity index 100%
rename from
intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerWithResultsTest.java
rename to
repository/src/test/java/org/apache/atlas/pc/WorkItemConsumerWithResultsTest.java
diff --git a/intg/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
b/repository/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
similarity index 100%
rename from intg/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
rename to repository/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
diff --git
a/intg/src/test/java/org/apache/atlas/pc/WorkItemManagerWithResultsTest.java
b/repository/src/test/java/org/apache/atlas/pc/WorkItemManagerWithResultsTest.java
similarity index 100%
rename from
intg/src/test/java/org/apache/atlas/pc/WorkItemManagerWithResultsTest.java
rename to
repository/src/test/java/org/apache/atlas/pc/WorkItemManagerWithResultsTest.java
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftReferenceTest.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftReferenceTest.java
index 2ffc972..98153f9 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftReferenceTest.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftReferenceTest.java
@@ -34,7 +34,7 @@ import
org.apache.atlas.repository.store.graph.AtlasEntityStore;
import org.apache.atlas.repository.store.graph.v2.AtlasEntityStream;
import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
import org.apache.atlas.store.AtlasTypeDefStore;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasEntityType;
import org.apache.atlas.type.AtlasType;
import org.apache.atlas.type.AtlasTypeRegistry;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreHardDeleteV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreHardDeleteV2Test.java
index 623235f..d4760ae 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreHardDeleteV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreHardDeleteV2Test.java
@@ -18,11 +18,9 @@
package org.apache.atlas.repository.store.graph.v2;
import com.google.common.collect.ImmutableList;
-import org.apache.atlas.RequestContext;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.store.DeleteType;
-import org.testng.annotations.BeforeTest;
+import org.apache.atlas.DeleteType;
import java.util.List;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreSoftDeleteV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreSoftDeleteV2Test.java
index b169988..1bf6b4e 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreSoftDeleteV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreSoftDeleteV2Test.java
@@ -20,7 +20,7 @@ package org.apache.atlas.repository.store.graph.v2;
import com.google.common.collect.ImmutableList;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import java.util.List;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreV2Test.java
index 24683a5..4cdd677 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipStoreV2Test.java
@@ -39,7 +39,7 @@ import
org.apache.atlas.repository.store.graph.AtlasRelationshipStore;
import org.apache.atlas.repository.store.graph.v1.DeleteHandlerDelegate;
import org.apache.atlas.runner.LocalSolrRunner;
import org.apache.atlas.store.AtlasTypeDefStore;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasEntityType;
import org.apache.atlas.type.AtlasTypeRegistry;
import org.apache.commons.collections.CollectionUtils;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateHardDeleteV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateHardDeleteV2Test.java
index ed72d5f..32d6c36 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateHardDeleteV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateHardDeleteV2Test.java
@@ -20,7 +20,7 @@ package org.apache.atlas.repository.store.graph.v2;
import com.google.common.collect.ImmutableList;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasTypeUtil;
import java.util.Map;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateSoftDeleteV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateSoftDeleteV2Test.java
index 92d1ddc..afa1c59 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateSoftDeleteV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateSoftDeleteV2Test.java
@@ -20,7 +20,7 @@ package org.apache.atlas.repository.store.graph.v2;
import com.google.common.collect.ImmutableList;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasTypeUtil;
import java.util.Map;
diff --git
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateV2Test.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateV2Test.java
index 6364fd4..36aedae 100644
---
a/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateV2Test.java
+++
b/repository/src/test/java/org/apache/atlas/repository/store/graph/v2/InverseReferenceUpdateV2Test.java
@@ -34,7 +34,7 @@ import
org.apache.atlas.repository.store.bootstrap.AtlasTypeDefStoreInitializer;
import org.apache.atlas.repository.store.graph.AtlasEntityStore;
import org.apache.atlas.runner.LocalSolrRunner;
import org.apache.atlas.store.AtlasTypeDefStore;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.type.AtlasEntityType;
import org.apache.atlas.type.AtlasTypeRegistry;
import org.apache.atlas.type.AtlasTypeUtil;
diff --git a/intg/src/test/resources/json/entity1.json
b/repository/src/test/resources/json/entity1.json
similarity index 100%
rename from intg/src/test/resources/json/entity1.json
rename to repository/src/test/resources/json/entity1.json
diff --git a/intg/src/test/resources/json/transform1.json
b/repository/src/test/resources/json/transform1.json
similarity index 100%
rename from intg/src/test/resources/json/transform1.json
rename to repository/src/test/resources/json/transform1.json
diff --git a/server-api/src/main/java/org/apache/atlas/RequestContext.java
b/server-api/src/main/java/org/apache/atlas/RequestContext.java
index c5cbf05..befd726 100644
--- a/server-api/src/main/java/org/apache/atlas/RequestContext.java
+++ b/server-api/src/main/java/org/apache/atlas/RequestContext.java
@@ -23,7 +23,6 @@ import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasEntity.AtlasEntityWithExtInfo;
import org.apache.atlas.model.instance.AtlasEntityHeader;
import org.apache.atlas.model.instance.AtlasObjectId;
-import org.apache.atlas.store.DeleteType;
import org.apache.atlas.utils.AtlasPerfMetrics;
import org.apache.atlas.utils.AtlasPerfMetrics.MetricRecorder;
import org.apache.commons.lang.StringUtils;
diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java
b/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java
index 7e66981..329d209 100755
--- a/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java
+++ b/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java
@@ -22,7 +22,7 @@ import org.apache.atlas.AtlasClient;
import org.apache.atlas.AtlasException;
import org.apache.atlas.RequestContext;
import org.apache.atlas.authorize.AtlasAuthorizationUtils;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.util.AtlasRepositoryConfiguration;
import org.apache.atlas.web.util.DateTimeHelper;
import org.apache.atlas.web.util.Servlets;
diff --git
a/webapp/src/test/java/org/apache/atlas/web/adapters/TestEntityRESTDelete.java
b/webapp/src/test/java/org/apache/atlas/web/adapters/TestEntityRESTDelete.java
index 6e604f5..76d4deb 100644
---
a/webapp/src/test/java/org/apache/atlas/web/adapters/TestEntityRESTDelete.java
+++
b/webapp/src/test/java/org/apache/atlas/web/adapters/TestEntityRESTDelete.java
@@ -28,7 +28,7 @@ import org.apache.atlas.model.instance.EntityMutationResponse;
import org.apache.atlas.model.instance.EntityMutations;
import org.apache.atlas.model.typedef.AtlasTypesDef;
import org.apache.atlas.store.AtlasTypeDefStore;
-import org.apache.atlas.store.DeleteType;
+import org.apache.atlas.DeleteType;
import org.apache.atlas.web.rest.EntityREST;
import org.mockito.Mockito;
import org.testng.Assert;
