RANGER-5345: [GDS] Shared resource creation api is failing for oracle db

Author: Sanket-Shelar

agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java

@@ -276,13 +276,14 @@ public static List<RangerTag> jsonToRangerTagList(String jsonStr) {
     }
 
     public static List<RangerGdsMaskInfo> jsonToListGdsMaskInfo(String jsonStr) {
-        try {
-            return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
-        } catch (Exception e) {
-            LOG.error("Cannot get Map<String, RangerPolicyItemDataMaskInfo> from {}", jsonStr, e);
-
-            return null;
+        if (StringUtils.isNotEmpty(jsonStr)) {
+            try {
+                return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
+            } catch (Exception e) {
+                LOG.error("Cannot get List<RangerGdsMaskInfo> from {}", jsonStr, e);
+            }
         }
+        return null;
     }
 
     public static Map<String, RangerPolicyResource> jsonToMapPolicyResource(String jsonStr) {

security-admin/src/main/resources/META-INF/jpa_named_queries.xml

@@ -2263,12 +2263,14 @@
 	</named-query>
 
 	<named-query name="XXGdsProject.findProjectsWithDataShareInStatus">
-		<query>SELECT DISTINCT obj FROM XXGdsProject obj, XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid
-			WHERE dshid.dataShareId = :dataShareId
-			  AND dshid.status      = :status
-			  AND dip.datasetId     = dshid.datasetId
-			  AND dip.projectId     = obj.id
-			  AND dip.status        = :status</query>
+		<query>SELECT obj FROM XXGdsProject obj
+			WHERE EXISTS (
+				SELECT 1 FROM XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid
+				  WHERE dshid.dataShareId = :dataShareId
+				    AND dshid.status      = :status
+				    AND dip.datasetId     = dshid.datasetId
+				    AND dip.projectId     = obj.id
+				    AND dip.status        = :status)</query>
 	</named-query>
 
 	<named-query name="XXGdsProject.findServiceIds">