fix checkstyle errors

Author: mneethiraj

pdp/conf.dist/README-k8s.md

@@ -39,7 +39,7 @@ PDP exposes Prometheus-style text metrics at:
 
 - `GET /metrics`
 
-Current metrics include request counts, auth failures, average latency and policy-cache age.
+Current metrics include request counts, auth failures, average latency and loaded services count.
 
 ## Runtime Tuning
 

pdp/src/main/java/org/apache/ranger/pdp/RangerPdpServer.java

@@ -264,9 +264,9 @@ private void addJerseyServlet(Context ctx) {
     }
 
     private void addStatusEndpoints(Context ctx) {
-        HttpServlet liveServlet    = new RangerPdpStatusServlet(runtimeStats, config, RangerPdpStatusServlet.Mode.LIVE);
-        HttpServlet readyServlet   = new RangerPdpStatusServlet(runtimeStats, config, RangerPdpStatusServlet.Mode.READY);
-        HttpServlet metricsServlet = new RangerPdpStatusServlet(runtimeStats, config, RangerPdpStatusServlet.Mode.METRICS);
+        HttpServlet liveServlet    = new RangerPdpStatusServlet(runtimeStats, RangerPdpStatusServlet.Mode.LIVE);
+        HttpServlet readyServlet   = new RangerPdpStatusServlet(runtimeStats, RangerPdpStatusServlet.Mode.READY);
+        HttpServlet metricsServlet = new RangerPdpStatusServlet(runtimeStats, RangerPdpStatusServlet.Mode.METRICS);
 
         Tomcat.addServlet(ctx, "pdpLiveServlet", liveServlet).setLoadOnStartup(1);
         Tomcat.addServlet(ctx, "pdpReadyServlet", readyServlet).setLoadOnStartup(1);

pdp/src/main/java/org/apache/ranger/pdp/RangerPdpStatusServlet.java

@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.ranger.authz.embedded.RangerEmbeddedAuthorizer;
-import org.apache.ranger.pdp.config.RangerPdpConfig;
 import org.apache.ranger.pdp.config.RangerPdpConstants;
 
 import javax.servlet.ServletContext;
@@ -39,14 +38,12 @@ public class RangerPdpStatusServlet extends HttpServlet {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final RangerPdpStats  runtimeState;
-    private final RangerPdpConfig config;
     private final Mode            mode;
 
     public enum Mode { LIVE, READY, METRICS }
 
-    public RangerPdpStatusServlet(RangerPdpStats runtimeState, RangerPdpConfig config, Mode mode) {
+    public RangerPdpStatusServlet(RangerPdpStats runtimeState, Mode mode) {
         this.runtimeState = runtimeState;
-        this.config       = config;
         this.mode         = mode;
     }
 
@@ -113,7 +110,7 @@ private void writeMetrics(HttpServletRequest req, HttpServletResponse resp) thro
         sb.append("ranger_pdp_auth_failures_total ").append(runtimeState.getTotalAuthFailures()).append('\n');
         sb.append("# TYPE ranger_pdp_request_latency_avg_ms gauge\n");
         sb.append("ranger_pdp_request_latency_avg_ms ").append(runtimeState.getAverageLatencyMs()).append('\n');
-        sb.append("# TYPE ranger_pdp_loaded_services_count counter\n");
+        sb.append("# TYPE ranger_pdp_loaded_services_count gauge\n");
         sb.append("ranger_pdp_loaded_services_count ").append(getLoadedServicesCount(req)).append('\n');
 
         resp.setStatus(HttpServletResponse.SC_OK);

pdp/src/test/java/org/apache/ranger/pdp/RangerPdpStatusServletTest.java

@@ -18,22 +18,18 @@
 
 package org.apache.ranger.pdp;
 
-import org.apache.ranger.pdp.config.RangerPdpConfig;
 import org.apache.ranger.pdp.config.RangerPdpConstants;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,7 +50,7 @@ public void testMetricsEndpointRendersCounters() throws Exception {
         stats.recordRequestError(5_000_000L);
         stats.recordAuthFailure(5_000_000L);
 
-        RangerPdpStatusServlet servlet = new RangerPdpStatusServlet(stats, new RangerPdpConfig(), RangerPdpStatusServlet.Mode.METRICS);
+        RangerPdpStatusServlet servlet = new RangerPdpStatusServlet(stats, RangerPdpStatusServlet.Mode.METRICS);
         HttpServletRequest     req     = proxy(HttpServletRequest.class, (proxy, method, args) -> null);
         ResponseCapture        capture = new ResponseCapture();
         HttpServletResponse    resp    = capture.responseProxy();
@@ -68,15 +64,15 @@ public void testMetricsEndpointRendersCounters() throws Exception {
 
     @Test
     public void testLoadedServicesCount() throws Exception {
-        RangerPdpStatusServlet servlet = new RangerPdpStatusServlet(new RangerPdpStats(), new RangerPdpConfig(), RangerPdpStatusServlet.Mode.READY);
+        RangerPdpStatusServlet servlet = new RangerPdpStatusServlet(new RangerPdpStats(), RangerPdpStatusServlet.Mode.READY);
         HttpServletRequest     req     = proxy(HttpServletRequest.class, (proxy, method, args) -> null);
         Method                 method  = RangerPdpStatusServlet.class.getDeclaredMethod("getLoadedServicesCount", HttpServletRequest.class);
 
         method.setAccessible(true);
 
-        Integer ageMs = (Integer) method.invoke(servlet, req);
+        Integer servicesCount = (Integer) method.invoke(servlet, req);
 
-        assertTrue(ageMs >= 0L);
+        assertTrue(servicesCount >= 0L);
     }
 
     @SuppressWarnings("unchecked")