POLICY-139 API endpoint to move the policy

atlanhq · Sep 11, 2024 · c51121a · c51121a
1 parent c8cdb9d
commit c51121a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
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
@@ -2943,10 +2943,7 @@ private void handleEntityMutation(List<AtlasVertex> vertices) throws AtlasBaseEx
         this.atlasAlternateChangeNotifier.onEntitiesMutation(vertices);
         RequestContext.get().endMetricRecord(metricRecorder);
     }
-<<<<<<< HEAD
-=======
 
->>>>>>> 0724d62c5 (POLICY-139 API endpoint to move the policy)
     @Override
     @GraphTransaction
     public void moveBusinessPolicy(Set<String> policyIds, String assetId, String type) throws AtlasBaseException {
@@ -2972,10 +2969,3 @@ public void moveBusinessPolicy(Set<String> policyIds, String assetId, String typ
         }
     }
 }
-
-<<<<<<< HEAD
-
-
-
-=======
->>>>>>> 0724d62c5 (POLICY-139 API endpoint to move the policy)
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -5083,12 +5083,6 @@ public AtlasVertex moveBusinessPolicy(Set<String> policyIds, String assetId, Str
         return assetVertex;
     }
 
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 90294f49a (Adding new API for shifting)
     private void cacheDifferentialEntity(AtlasVertex ev, Set<String> existingValues) {
         AtlasEntity diffEntity = new AtlasEntity(ev.getProperty(TYPE_NAME_PROPERTY_KEY, String.class));
         setEntityCommonAttributes(ev, diffEntity);