Merge remote-tracking branch 'origin/DQ-165' into beta

atlanhq · Aug 5, 2024 · 43cbc54 · 43cbc54
2 parents 0837290 + 0cb18dd
commit 43cbc54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...rg/apache/atlas/repository/store/graph/v2/preprocessor/contract/ContractPreProcessor.java b/...rg/apache/atlas/repository/store/graph/v2/preprocessor/contract/ContractPreProcessor.java
@@ -110,7 +110,9 @@ private void processCreateContract(AtlasEntity entity, EntityMutationContext con
 
         boolean contractSync = syncContractCertificateStatus(entity, contract);
         contractString = DataContract.serialize(contract);
-        entity.setAttribute(ATTR_CONTRACT, contractString);
+        if (!isContractYaml(entity)) {
+            entity.setAttribute(ATTR_CONTRACT, contractString);
+        }
         String contractStringJSON = DataContract.serializeJSON(contract);
         entity.setAttribute(ATTR_CONTRACT_JSON, contractStringJSON);
 
@@ -298,4 +300,8 @@ private static String getContractString(AtlasEntity entity) {
         }
         return contractString;
     }
+
+    private static boolean isContractYaml(AtlasEntity entity) {
+        return !StringUtils.isEmpty((String) entity.getAttribute(ATTR_CONTRACT));
+    }
 }
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/BusinessPolicyREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/BusinessPolicyREST.java
@@ -57,7 +57,7 @@ public void linkBusinessPolicy(@PathParam("policyId") final String policyGuid, f
         // Set request context parameters
         RequestContext.get().setIncludeClassifications(false);
         RequestContext.get().setIncludeMeanings(false);
-        RequestContext.get().getRequestContextHeaders().put("route", "business-policy-rest");
+        RequestContext.get().getRequestContextHeaders().put("x-atlan-route", "business-policy-rest");
 
         AtlasPerfTracer perf = null;
         try {
@@ -95,7 +95,7 @@ public void unlinkBusinessPolicy(@PathParam("policyId") final String policyGuid,
         // Set request context parameters
         RequestContext.get().setIncludeClassifications(false);
         RequestContext.get().setIncludeMeanings(false);
-        RequestContext.get().getRequestContextHeaders().put("route", "business-policy-rest");
+        RequestContext.get().getRequestContextHeaders().put("x-atlan-route", "business-policy-rest");
 
         AtlasPerfTracer perf = null;
         try {