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

@@ -279,7 +279,7 @@ 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);
+            LOG.error("Cannot get List<RangerGdsMaskInfo> from {}", jsonStr, e);
 
             return null;
         }

security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java

@@ -676,6 +676,10 @@ public List<RangerSharedResource> addSharedResources(List<RangerSharedResource>
                 resource.setGuid(guidUtil.genGUID());
             }
 
+            if (resource.getSubResourceMasks() == null) {
+                resource.setSubResourceMasks(new ArrayList<>());
+            }
+
             RangerSharedResource sharedResource = sharedResourceService.create(resource);
 
             ret.add(sharedResource);

security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java

@@ -2047,6 +2047,7 @@ private Long getOrCreateDataShare(Long datasetId, Long serviceId, Long zoneId, S
             dataShare.setTermsOfUse(rangerDataset.getTermsOfUse());
             dataShare.setService(serviceName);
             dataShare.setDefaultAccessTypes(new HashSet<>());
+            dataShare.setDefaultTagMasks(new ArrayList<>());
 
             rangerDataShare = gdsStore.createDataShare(dataShare);
 

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">