Update ServiceREST.java

Author: kumaab

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

@@ -168,6 +168,9 @@
 @Scope("request")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class ServiceREST {
+    private static final Logger LOG      = LoggerFactory.getLogger(ServiceREST.class);
+    private static final Logger PERF_LOG = RangerPerfTracer.getPerfLogger("rest.ServiceREST");
+    
     public static final String PARAM_SERVICE_NAME                   = "serviceName";
     public static final String PARAM_SERVICE_TYPE                   = "serviceType";
     public static final String PARAM_POLICY_NAME                    = "policyName";
@@ -189,8 +192,7 @@ public class ServiceREST {
     public static final String PURGE_RECORD_TYPE_LOGIN_LOGS         = "login_records";
     public static final String PURGE_RECORD_TYPE_TRX_LOGS           = "trx_records";
     public static final String PURGE_RECORD_TYPE_POLICY_EXPORT_LOGS = "policy_export_logs";
-    private static final Logger LOG      = LoggerFactory.getLogger(ServiceREST.class);
-    private static final Logger PERF_LOG = RangerPerfTracer.getPerfLogger("rest.ServiceREST");
+    
     private final RangerAdminConfig config                              = RangerAdminConfig.getInstance();
     private final int               maxPolicyNameLength                 = config.getInt("ranger.policyname.maxlength", 255);
     private final boolean           isPolicyNameLengthValidationEnabled = config.getBoolean("ranger.policyname.maxlength.validation.enabled", true);
@@ -634,8 +636,7 @@ public RangerService createService(RangerService service) {
             if (session != null && !session.isSpnegoEnabled()) {
                 bizUtil.hasAdminPermissions("Services");
 
-                // TODO: As of now we are allowing SYS_ADMIN to create all the
-                // services including KMS
+                // TODO: As of now we are allowing SYS_ADMIN to create all the services including KMS
                 bizUtil.hasKMSPermissions("Service", xxServiceDef.getImplclassname());
             }
             if (session != null && session.isSpnegoEnabled()) {
@@ -713,8 +714,7 @@ public RangerService updateService(RangerService service, @Context HttpServletRe
 
             bizUtil.hasAdminPermissions("Services");
 
-            // TODO: As of now we are allowing SYS_ADMIN to create all the
-            // services including KMS
+            // TODO: As of now we are allowing SYS_ADMIN to create all the services including KMS
 
             XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(service.getType());
             bizUtil.hasKMSPermissions("Service", xxServiceDef.getImplclassname());
@@ -745,7 +745,7 @@ public void deleteService(@PathParam("id") Long id) {
 
         String deletedServiceName = deleteServiceById(id);
 
-        LOG.debug("<== ServiceREST.deleteService() - [id={}],[deletedServiceName={}]", deletedServiceName, deletedServiceName);
+        LOG.debug("<== ServiceREST.deleteService() - [id={}],[deletedServiceName={}]", id, deletedServiceName);
     }
 
     @GET
@@ -966,7 +966,7 @@ public List<RangerServiceHeaderInfo> getServiceHeaders(@Context HttpServletReque
     @Produces("application/json")
     @PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.COUNT_SERVICES + "\")")
     public Long countServices(@Context HttpServletRequest request) {
-        LOG.debug("==> ServiceREST.countServices():");
+        LOG.debug("==> ServiceREST.countServices()");
 
         Long             ret  = null;
         RangerPerfTracer perf = null;
@@ -1534,7 +1534,7 @@ public RangerPolicy createPolicy(RangerPolicy policy, @Context HttpServletReques
     @Consumes("application/json")
     @Produces("application/json")
     public RangerPolicy applyPolicy(RangerPolicy policy, @Context HttpServletRequest request) {
-        LOG.debug("==> ServiceREST.applyPolicy({}, {})", policy);
+        LOG.debug("==> ServiceREST.applyPolicy({})", policy);
 
         RangerPolicy ret = null;
 
@@ -2040,12 +2040,14 @@ public void importPoliciesFromFile(@Context HttpServletRequest request, @FormDat
             List<String> serviceNameList = new ArrayList<>();
 
             getServiceNameList(request, serviceNameList);
+
             Map<String, String> servicesMappingMap  = new LinkedHashMap<>();
             List<String>        sourceServices      = new ArrayList<>();
             List<String>        destinationServices = new ArrayList<>();
             Map<String, String> zoneMappingMap      = new LinkedHashMap<>();
             List<String>        sourceZones         = new ArrayList<>();
             List<String>        destinationZones    = new ArrayList<>();
+
             if (zoneMapStream != null) {
                 zoneMappingMap = svcStore.getMapFromInputStream(zoneMapStream);
                 processZoneMapping(zoneMappingMap, sourceZones, destinationZones);
@@ -2061,6 +2063,7 @@ public void importPoliciesFromFile(@Context HttpServletRequest request, @FormDat
             String                    zoneNameInJson         = null;
             Map<String, RangerPolicy> policiesMap            = new LinkedHashMap<>();
             List<String>              dataFileSourceServices = new ArrayList<>();
+
             if (fileName.endsWith("json")) {
                 try {
                     RangerExportPolicyList rangerExportPolicyList = null;
@@ -2131,6 +2134,7 @@ public void importPoliciesFromFile(@Context HttpServletRequest request, @FormDat
                     String destinationZoneName = getDestinationZoneName(destinationZones, zoneNameInJson);
                     if (isOverride && !updateIfExists && StringUtils.isEmpty(polResource)) {
                         LOG.debug("Deleting Policy from provided services in servicesMapJson file...");
+
                         if (CollectionUtils.isNotEmpty(sourceServices) && CollectionUtils.isNotEmpty(destinationServices)) {
                             deletePoliciesProvidedInServiceMap(sourceServices, destinationServices, destinationZoneName); //In order to delete Zone specific policies from service
                         }
@@ -2695,8 +2699,7 @@ public HashMap<String, Object> getCSRFProperties(@Context HttpServletRequest req
     @PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_METRICS_BY_TYPE + "\")")
     public String getMetricByType(@PathParam("type") String type) {
         LOG.debug("==> ServiceREST.getMetricByType(serviceDefName={})", type);
-        // as of now we are allowing only users with Admin role to access this
-        // API
+        // as of now we are allowing only users with Admin role to access this API
         bizUtil.checkSystemAdminAccess();
         bizUtil.blockAuditorRoleUser();
         String ret = null;
@@ -2756,7 +2759,6 @@ public ResponseEntity<List<ServiceDeleteResponse>> deleteClusterServices(@PathPa
                         deleteResponse.setServiceName(serviceName);
                         deleteResponse.setIsDeleted(Boolean.TRUE);
                     } catch (Throwable e) {
-                        //log and proceed
                         LOG.warn("Skipping deletion of service with ID={}", serviceId);
                         e.printStackTrace();
                         deleteResponse.setIsDeleted(Boolean.FALSE);
@@ -3237,8 +3239,7 @@ private boolean validateDestZoneServiceMapping(String destinationZoneName, Range
             LOG.error("destination zone provided does not exist");
             throw restErrorUtil.createRESTException("destination zone provided does not exist");
         }
-        // CHECK IF json policies service is there on destination and asscioated with
-        // destination zone.
+        // CHECK IF json policies service is there on destination and asscioated with destination zone.
 
         String serviceNameToCheck = policyInJson.getService();