You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2019/07/01 15:54:47 UTC
[storm] branch master updated: STORM-3438: webapp: fix all
checkstyle warnings
This is an automated email from the ASF dual-hosted git repository.
srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 4b1d2aa STORM-3438: webapp: fix all checkstyle warnings
new 994a484 Merge pull request #3054 from krichter722/checkstyle-webapp
4b1d2aa is described below
commit 4b1d2aa21db2cf61d82c1e76a9de5c5cc935ab48
Author: Karl-Philipp Richter <kr...@posteo.de>
AuthorDate: Sun Jun 30 11:50:27 2019 +0200
STORM-3438: webapp: fix all checkstyle warnings
---
storm-webapp/pom.xml | 2 +-
.../common/AuthorizationExceptionMapper.java | 4 +-
.../org/apache/storm/daemon/drpc/DRPCServer.java | 1 +
.../storm/daemon/drpc/webapp/DRPCApplication.java | 1 +
.../daemon/drpc/webapp/DRPCExceptionMapper.java | 1 +
.../storm/daemon/drpc/webapp/DRPCResource.java | 1 +
.../handler/LogviewerLogSearchHandler.java | 7 ++-
.../java/org/apache/storm/daemon/ui/UIHelpers.java | 63 +++++++++++-----------
.../java/org/apache/storm/daemon/ui/UIServer.java | 5 +-
.../daemon/ui/filters/AuthorizedUserFilter.java | 12 ++---
10 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml
index b0ada88..8d42589 100644
--- a/storm-webapp/pom.xml
+++ b/storm-webapp/pom.xml
@@ -309,7 +309,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>23</maxAllowedViolations>
+ <maxAllowedViolations>0</maxAllowedViolations>
</configuration>
</plugin>
<plugin>
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/common/AuthorizationExceptionMapper.java b/storm-webapp/src/main/java/org/apache/storm/daemon/common/AuthorizationExceptionMapper.java
index 251ada8..3dc4d2a 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/common/AuthorizationExceptionMapper.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/common/AuthorizationExceptionMapper.java
@@ -18,6 +18,8 @@
package org.apache.storm.daemon.common;
+import static org.apache.storm.daemon.ui.exceptionmappers.ExceptionMapperUtils.getResponse;
+
import java.util.HashMap;
import java.util.Map;
@@ -30,8 +32,6 @@ import javax.ws.rs.ext.Provider;
import org.apache.storm.generated.AuthorizationException;
import org.json.simple.JSONValue;
-import static org.apache.storm.daemon.ui.exceptionmappers.ExceptionMapperUtils.getResponse;
-
@Provider
public class AuthorizationExceptionMapper implements ExceptionMapper<AuthorizationException> {
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
index 9c24f06..7a8b5b3 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
@@ -50,6 +50,7 @@ import org.glassfish.jersey.servlet.ServletContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class DRPCServer implements AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(DRPCServer.class);
private final Meter meterShutdownCalls;
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
index f88bb00..26b2339 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
@@ -29,6 +29,7 @@ import org.apache.storm.daemon.drpc.DRPC;
import org.apache.storm.metric.StormMetricsRegistry;
@ApplicationPath("")
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class DRPCApplication extends Application {
private static DRPC _drpc;
private static StormMetricsRegistry metricsRegistry;
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCExceptionMapper.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCExceptionMapper.java
index 98876a9..85813c0 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCExceptionMapper.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCExceptionMapper.java
@@ -30,6 +30,7 @@ import org.apache.storm.generated.DRPCExecutionException;
import org.json.simple.JSONValue;
@Provider
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class DRPCExceptionMapper implements ExceptionMapper<DRPCExecutionException> {
@Override
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
index dba12cf..5056e09 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
@@ -32,6 +32,7 @@ import org.apache.storm.daemon.drpc.DRPC;
import org.apache.storm.metric.StormMetricsRegistry;
@Path("/drpc/")
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class DRPCResource {
private final Meter meterHttpRequests;
private final Timer responseDuration;
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
index ab0ba18..fdec017 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
@@ -212,7 +212,7 @@ public class LogviewerLogSearchHandler {
* @param user username
* @param search search string
* @param numMatchesStr the count of maximum matches. Note that this number is with respect to each port, not to each log or each search
- * request
+ * request
* @param portStr worker port, null or '*' if the request wants to search from all worker logs
* @param fileOffsetStr index (offset) of the log files
* @param offsetStr start offset for log file
@@ -311,7 +311,10 @@ public class LogviewerLogSearchHandler {
}
@VisibleForTesting
- Map<String, Object> substringSearch(Path file, String searchString, int numMatches, int startByteOffset) throws InvalidRequestException {
+ Map<String, Object> substringSearch(Path file,
+ String searchString,
+ int numMatches,
+ int startByteOffset) throws InvalidRequestException {
return substringSearch(file, searchString, false, numMatches, startByteOffset);
}
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 9eece46..265d1b1 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -111,6 +111,7 @@ import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class UIHelpers {
private static final Logger LOG = LoggerFactory.getLogger(UIHelpers.class);
private static final Object[][] PRETTY_SEC_DIVIDERS = {
@@ -548,36 +549,6 @@ public class UIHelpers {
public static Map<String, Object> getClusterSummary(ClusterSummary clusterSummary, String user,
Map<String, Object> conf) {
Map<String, Object> result = new HashMap();
- List<SupervisorSummary> supervisorSummaries = clusterSummary.get_supervisors();
- List<TopologySummary> topologySummaries = clusterSummary.get_topologies();
-
- int usedSlots =
- supervisorSummaries.stream().mapToInt(
- SupervisorSummary::get_num_used_workers).sum();
- int totalSlots =
- supervisorSummaries.stream().mapToInt(
- SupervisorSummary::get_num_workers).sum();
-
- int totalTasks =
- topologySummaries.stream().mapToInt(
- TopologySummary::get_num_tasks).sum();
- int totalExecutors =
- topologySummaries.stream().mapToInt(
- TopologySummary::get_num_executors).sum();
-
- double supervisorTotalMemory =
- supervisorSummaries.stream().mapToDouble(x -> x.get_total_resources().getOrDefault(
- Constants.COMMON_TOTAL_MEMORY_RESOURCE_NAME,
- x.get_total_resources().get(Config.SUPERVISOR_MEMORY_CAPACITY_MB)
- )
- ).sum();
-
- double supervisorTotalCpu =
- supervisorSummaries.stream().mapToDouble(x -> x.get_total_resources().getOrDefault(
- Constants.COMMON_CPU_RESOURCE_NAME,
- x.get_total_resources().get(Config.SUPERVISOR_CPU_CAPACITY)
- )
- ).sum();
if (MEMORIZED_VERSIONS.get() == null) {
//Races are okay this is just to avoid extra work for each page load.
@@ -602,15 +573,47 @@ public class UIHelpers {
result.put("user", user);
result.put("stormVersion", VersionInfo.getVersion());
result.put("stormVersionInfo", MEMORIZED_FULL_VERSION.get());
+ List<SupervisorSummary> supervisorSummaries = clusterSummary.get_supervisors();
result.put("supervisors", supervisorSummaries.size());
result.put("topologies", clusterSummary.get_topologies_size());
+
+ int usedSlots =
+ supervisorSummaries.stream().mapToInt(
+ SupervisorSummary::get_num_used_workers).sum();
result.put("slotsUsed", usedSlots);
+
+ int totalSlots =
+ supervisorSummaries.stream().mapToInt(
+ SupervisorSummary::get_num_workers).sum();
result.put("slotsTotal", totalSlots);
result.put("slotsFree", totalSlots - usedSlots);
+
+ List<TopologySummary> topologySummaries = clusterSummary.get_topologies();
+ int totalTasks =
+ topologySummaries.stream().mapToInt(
+ TopologySummary::get_num_tasks).sum();
result.put("tasksTotal", totalTasks);
+
+ int totalExecutors =
+ topologySummaries.stream().mapToInt(
+ TopologySummary::get_num_executors).sum();
result.put("executorsTotal", totalExecutors);
+
+ double supervisorTotalMemory =
+ supervisorSummaries.stream().mapToDouble(x -> x.get_total_resources().getOrDefault(
+ Constants.COMMON_TOTAL_MEMORY_RESOURCE_NAME,
+ x.get_total_resources().get(Config.SUPERVISOR_MEMORY_CAPACITY_MB)
+ )
+ ).sum();
result.put("totalMem", supervisorTotalMemory);
+
+ double supervisorTotalCpu =
+ supervisorSummaries.stream().mapToDouble(x -> x.get_total_resources().getOrDefault(
+ Constants.COMMON_CPU_RESOURCE_NAME,
+ x.get_total_resources().get(Config.SUPERVISOR_CPU_CAPACITY)
+ )
+ ).sum();
result.put("totalCpu", supervisorTotalCpu);
double supervisorUsedMemory =
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIServer.java
index 0dbc95c..7cc0129 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIServer.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIServer.java
@@ -57,6 +57,7 @@ import org.slf4j.LoggerFactory;
* Main class.
*
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class UIServer {
public static final Logger LOG = LoggerFactory.getLogger(UIServer.class);
@@ -103,9 +104,6 @@ public class UIServer {
UIHelpers.configSsl(jettyServer, httpsPort, httpsKsPath, httpsKsPassword, httpsKsType, httpsKeyPassword,
httpsTsPath, httpsTsPassword, httpsTsType, httpsNeedClientAuth, httpsWantClientAuth);
-
- StormMetricsRegistry metricsRegistry = new StormMetricsRegistry();
-
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
jettyServer.setHandler(context);
@@ -119,6 +117,7 @@ public class UIServer {
UIHelpers.configFilters(context, filterConfigurationList);
+ StormMetricsRegistry metricsRegistry = new StormMetricsRegistry();
ResourceConfig resourceConfig =
new ResourceConfig()
.packages("org.apache.storm.daemon.ui.resources")
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
index 3f9c36b..eb92f2c 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
@@ -112,7 +112,7 @@ public class AuthorizedUserFilter implements ContainerRequestFilter {
Map topoConf = null;
if (annotation.needsTopoId()) {
final String topoId = containerRequestContext.getUriInfo().getPathParameters().get("id").get(0);
- try (NimbusClient nimbusClient = NimbusClient.getConfiguredClient(conf)){
+ try (NimbusClient nimbusClient = NimbusClient.getConfiguredClient(conf)) {
topoConf = (Map) JSONValue.parse(nimbusClient.getClient().getTopologyConf(topoId));
} catch (AuthorizationException ae) {
LOG.error("Nimbus isn't allowing {} to access the topology conf of {}. {}", ReqContext.context(), topoId, ae.get_msg());
@@ -155,11 +155,11 @@ public class AuthorizedUserFilter implements ContainerRequestFilter {
return;
}
- LOG.warn(" principal {} is trying to impersonate {} but {} has no authorizer configured. "
- + "This is a potential security hole. Please see SECURITY.MD to learn how to "
- + "configure an impersonation authorizer.",
- reqContext.realPrincipal().toString(), reqContext.principal().toString(),
- conf.get(DaemonConfig.NIMBUS_IMPERSONATION_AUTHORIZER));
+ LOG.warn(" principal {} is trying to impersonate {} but {} has no authorizer configured. "
+ + "This is a potential security hole. Please see SECURITY.MD to learn how to "
+ + "configure an impersonation authorizer.",
+ reqContext.realPrincipal().toString(), reqContext.principal().toString(),
+ conf.get(DaemonConfig.NIMBUS_IMPERSONATION_AUTHORIZER));
}
}