Skip to content

Commit cfcb373

Browse files
RANGER-5061: checkstyle compliance updates - security-admin org.apache.ranger.rest
1 parent 23cb503 commit cfcb373

17 files changed

+10792
-12284
lines changed

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

Lines changed: 618 additions & 719 deletions
Large diffs are not rendered by default.

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

Lines changed: 380 additions & 419 deletions
Large diffs are not rendered by default.

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

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919

2020
package org.apache.ranger.rest;
2121

22-
import java.lang.management.ManagementFactory;
23-
import java.lang.management.RuntimeMXBean;
24-
import java.util.LinkedHashMap;
25-
import java.util.Map;
26-
27-
import javax.ws.rs.GET;
28-
import javax.ws.rs.Path;
29-
import javax.ws.rs.Produces;
30-
import javax.ws.rs.core.MediaType;
31-
3222
import org.apache.ranger.metrics.RangerAdminMetricsWrapper;
3323
import org.apache.ranger.plugin.model.RangerMetrics;
3424
import org.apache.ranger.util.RangerMetricsUtil;
@@ -40,17 +30,28 @@
4030
import org.springframework.transaction.annotation.Propagation;
4131
import org.springframework.transaction.annotation.Transactional;
4232

33+
import javax.ws.rs.GET;
34+
import javax.ws.rs.Path;
35+
import javax.ws.rs.Produces;
36+
import javax.ws.rs.core.MediaType;
37+
38+
import java.lang.management.ManagementFactory;
39+
import java.lang.management.RuntimeMXBean;
40+
import java.util.LinkedHashMap;
41+
import java.util.Map;
42+
4343
@Path("metrics")
4444
@Component
4545
@Scope("request")
4646
@Transactional(propagation = Propagation.REQUIRES_NEW)
4747
public class MetricsREST {
4848
private static final Logger LOG = LoggerFactory.getLogger(MetricsREST.class);
49-
private static final RuntimeMXBean RUNTIME = ManagementFactory.getRuntimeMXBean();
50-
private static final String JVM_MACHINE_ACTUAL_NAME = RUNTIME.getVmName();
51-
private static final String VERSION = RUNTIME.getVmVersion();
52-
private static final String JVM_MACHINE_REPRESENTATION_NAME = RUNTIME.getName();
53-
private static final String JVM_VENDOR_NAME = RUNTIME.getVmVendor();
49+
50+
private static final RuntimeMXBean RUNTIME = ManagementFactory.getRuntimeMXBean();
51+
private static final String JVM_MACHINE_ACTUAL_NAME = RUNTIME.getVmName();
52+
private static final String VERSION = RUNTIME.getVmVersion();
53+
private static final String JVM_MACHINE_REPRESENTATION_NAME = RUNTIME.getName();
54+
private static final String JVM_VENDOR_NAME = RUNTIME.getVmVendor();
5455

5556
@Autowired
5657
RangerMetricsUtil jvmMetricUtil;
@@ -60,25 +61,21 @@ public class MetricsREST {
6061

6162
@GET
6263
@Path("/status")
63-
@Produces({ "application/json" })
64+
@Produces("application/json")
6465
public RangerMetrics getStatus() {
65-
if (LOG.isDebugEnabled()) {
66-
LOG.debug("==> MetricsREST.getStatus()");
67-
}
66+
LOG.debug("==> MetricsREST.getStatus()");
6867

69-
Map<String, Object> jvm = new LinkedHashMap<>();
68+
Map<String, Object> jvm = new LinkedHashMap<>();
7069
Map<String, Object> vmDetails = new LinkedHashMap<>();
7170
vmDetails.put("JVM Machine Actual Name", JVM_MACHINE_ACTUAL_NAME);
7271
vmDetails.put("version", VERSION);
7372
vmDetails.put("JVM Machine Representation Name", JVM_MACHINE_REPRESENTATION_NAME);
7473
vmDetails.put("Up time of JVM", RUNTIME.getUptime());
7574
vmDetails.put("JVM Vendor Name", JVM_VENDOR_NAME);
7675
vmDetails.putAll(jvmMetricUtil.getValues());
77-
jvm.put("jvm",vmDetails);
76+
jvm.put("jvm", vmDetails);
7877

79-
if (LOG.isDebugEnabled()) {
80-
LOG.debug("<== MetricsREST.getStatus(): jvm=" + jvm);
81-
}
78+
LOG.debug("<== MetricsREST.getStatus(): jvm={}", jvm);
8279

8380
return new RangerMetrics(jvm);
8481
}
@@ -87,29 +84,23 @@ public RangerMetrics getStatus() {
8784
@Path("/prometheus")
8885
@Produces(MediaType.TEXT_PLAIN)
8986
public String getMetricsPrometheus() {
90-
if (LOG.isDebugEnabled()) {
91-
LOG.debug("==> MetricsREST.getMetricsPrometheus()");
92-
}
87+
LOG.debug("==> MetricsREST.getMetricsPrometheus()");
9388
String ret = "";
9489
try {
9590
ret = rangerAdminMetricsWrapper.getRangerMetricsInPrometheusFormat();
9691
} catch (Exception e) {
9792
LOG.error("MetricsREST.getMetricsPrometheus(): Exception occurred while getting metric.", e);
9893
}
9994

100-
if (LOG.isDebugEnabled()) {
101-
LOG.debug("<== MetricsREST.getMetricsPrometheus(): ret=" + ret);
102-
}
95+
LOG.debug("<== MetricsREST.getMetricsPrometheus(): ret={}", ret);
10396
return ret;
10497
}
10598

10699
@GET
107100
@Path("/json")
108101
@Produces(MediaType.APPLICATION_JSON)
109102
public Map<String, Map<String, Object>> getMetricsJson() {
110-
if (LOG.isDebugEnabled()) {
111-
LOG.debug("==> MetricsREST.getMetricsJson()");
112-
}
103+
LOG.debug("==> MetricsREST.getMetricsJson()");
113104

114105
Map<String, Map<String, Object>> ret = null;
115106
try {
@@ -118,9 +109,7 @@ public Map<String, Map<String, Object>> getMetricsJson() {
118109
LOG.error("MetricsREST.getMetricsJson(): Exception occurred while getting metric.", e);
119110
}
120111

121-
if (LOG.isDebugEnabled()) {
122-
LOG.debug("<== MetricsREST.getMetricsJson(): ret=" + ret);
123-
}
112+
LOG.debug("<== MetricsREST.getMetricsJson(): ret={}", ret);
124113
return ret;
125114
}
126115
}

0 commit comments

Comments
 (0)