From 4014c7fbf3d833fb8f933c2de1298a822b30b0f8 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Tue, 25 Aug 2015 09:09:12 -0700 Subject: [PATCH] SQOOP-2523: Sqoop2: Findbugs: Fix warning in server module (Colin Ma via Jarek Jarcec Cecho) --- common/src/main/java/org/apache/sqoop/json/VersionBean.java | 2 +- .../apache/sqoop/handler/AuthorizationRequestHandler.java | 2 +- .../org/apache/sqoop/handler/ConnectorRequestHandler.java | 1 + .../java/org/apache/sqoop/handler/DriverRequestHandler.java | 1 + .../main/java/org/apache/sqoop/handler/HandlerUtils.java | 6 +++--- .../java/org/apache/sqoop/handler/JobRequestHandler.java | 1 + .../java/org/apache/sqoop/handler/LinkRequestHandler.java | 1 + .../org/apache/sqoop/handler/SubmissionRequestHandler.java | 4 ++-- .../org/apache/sqoop/handler/VersionRequestHandler.java | 1 + .../main/java/org/apache/sqoop/server/RequestHandler.java | 2 +- .../java/org/apache/sqoop/server/SqoopProtocolServlet.java | 1 + .../main/java/org/apache/sqoop/server/VersionServlet.java | 1 + .../org/apache/sqoop/server/v1/AuthorizationServlet.java | 1 + .../org/apache/sqoop/server/v1/ConfigurableServlet.java | 1 + .../java/org/apache/sqoop/server/v1/ConnectorServlet.java | 1 + .../java/org/apache/sqoop/server/v1/ConnectorsServlet.java | 1 + .../main/java/org/apache/sqoop/server/v1/DriverServlet.java | 2 ++ .../main/java/org/apache/sqoop/server/v1/JobServlet.java | 1 + .../main/java/org/apache/sqoop/server/v1/JobsServlet.java | 1 + .../main/java/org/apache/sqoop/server/v1/LinkServlet.java | 1 + .../main/java/org/apache/sqoop/server/v1/LinksServlet.java | 1 + .../java/org/apache/sqoop/server/v1/SubmissionsServlet.java | 1 + 22 files changed, 26 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/org/apache/sqoop/json/VersionBean.java b/common/src/main/java/org/apache/sqoop/json/VersionBean.java index c43d9443..2d5327ae 100644 --- a/common/src/main/java/org/apache/sqoop/json/VersionBean.java +++ b/common/src/main/java/org/apache/sqoop/json/VersionBean.java @@ -24,7 +24,7 @@ @InterfaceAudience.Private @InterfaceStability.Unstable -public class VersionBean implements JsonBean { +public class VersionBean implements JsonBean, java.io.Serializable { public static final String BUILD_VERSION = "build-version"; public static final String SOURCE_REVISION = "source-revision"; diff --git a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java index bdac1de9..43f04179 100644 --- a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java @@ -40,7 +40,7 @@ import java.util.List; public class AuthorizationRequestHandler implements RequestHandler { - + private static final long serialVersionUID = 1L; /** * enum for representing the actions supported on the authorization */ diff --git a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java index 7c428b8d..23f6c63d 100644 --- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java @@ -40,6 +40,7 @@ import org.apache.sqoop.server.common.ServerError; public class ConnectorRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(ConnectorRequestHandler.class); diff --git a/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java index 81efb896..95a32916 100644 --- a/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java @@ -29,6 +29,7 @@ import org.apache.sqoop.server.common.ServerError; public class DriverRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(DriverRequestHandler.class); diff --git a/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java b/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java index 68b13000..5fcde52b 100644 --- a/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java +++ b/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java @@ -38,7 +38,7 @@ public static long getJobIdFromIdentifier(String identifier) { jobId = job.getPersistenceId(); } else { try { - jobId = Long.valueOf(identifier); + jobId = Long.parseLong(identifier); } catch (NumberFormatException ex) { // this means name nor Id existed and we want to throw a user friendly // message than a number format exception @@ -60,7 +60,7 @@ public static long getLinkIdFromIdentifier(String identifier) { linkId = link.getPersistenceId(); } else { try { - linkId = Long.valueOf(identifier); + linkId = Long.parseLong(identifier); } catch (NumberFormatException ex) { // this means name nor Id existed and we want to throw a user friendly // message than a number format exception @@ -79,7 +79,7 @@ public static long getConnectorIdFromIdentifier(String identifier) { connectorId = connector.getPersistenceId(); } else { try { - connectorId = Long.valueOf(identifier); + connectorId = Long.parseLong(identifier); } catch (NumberFormatException ex) { // this means name nor Id existed and we want to throw a user friendly // message than a number format exception diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java index 7f8ddbd0..13ebb35b 100644 --- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java @@ -57,6 +57,7 @@ import org.json.simple.JSONObject; public class JobRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; /** enum for representing the actions supported on the job resource*/ enum JobAction { diff --git a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java index 8a6beb8f..aa7e5ff9 100644 --- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java @@ -48,6 +48,7 @@ import org.json.simple.JSONObject; public class LinkRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(LinkRequestHandler.class); diff --git a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java index 5c349a28..f2a67586 100644 --- a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java @@ -33,6 +33,7 @@ import org.apache.sqoop.server.common.ServerError; public class SubmissionRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(SubmissionRequestHandler.class); @@ -48,11 +49,10 @@ public JsonBean handleEvent(RequestContext ctx) { throw new SqoopException(ServerError.SERVER_0002, "Unsupported HTTP method for connector:" + ctx.getMethod()); } - String jobIdentifier = ctx.getLastURLElement(); // submissions per job are ordered by update time // hence the latest submission is on the top if (ctx.getParameterValue(JOB_NAME_QUERY_PARAM) != null) { - jobIdentifier = ctx.getParameterValue(JOB_NAME_QUERY_PARAM); + String jobIdentifier = ctx.getParameterValue(JOB_NAME_QUERY_PARAM); AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(), ctx.getRequest().getRemoteAddr(), "get", "submissionsByJob", jobIdentifier); long jobId = HandlerUtils.getJobIdFromIdentifier(jobIdentifier); diff --git a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java index 2eaa0ac2..588218be 100644 --- a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java @@ -34,6 +34,7 @@ * Get server version and supported protocol versions. */ public class VersionRequestHandler implements RequestHandler { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(VersionRequestHandler.class); diff --git a/server/src/main/java/org/apache/sqoop/server/RequestHandler.java b/server/src/main/java/org/apache/sqoop/server/RequestHandler.java index 02eb8372..d66f8678 100644 --- a/server/src/main/java/org/apache/sqoop/server/RequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/server/RequestHandler.java @@ -20,7 +20,7 @@ import org.apache.sqoop.json.JsonBean; -public interface RequestHandler { +public interface RequestHandler extends java.io.Serializable { static final String CONNECTOR_NAME_QUERY_PARAM = "cname"; static final String JOB_NAME_QUERY_PARAM = "jname"; diff --git a/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java b/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java index 6b76b0b8..92bdc9cf 100644 --- a/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java @@ -35,6 +35,7 @@ @SuppressWarnings("serial") public class SqoopProtocolServlet extends HttpServlet { + private static final long serialVersionUID = 1L; private static final Logger LOG = Logger.getLogger(SqoopProtocolServlet.class); diff --git a/server/src/main/java/org/apache/sqoop/server/VersionServlet.java b/server/src/main/java/org/apache/sqoop/server/VersionServlet.java index a62c9ce9..4fef7971 100644 --- a/server/src/main/java/org/apache/sqoop/server/VersionServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/VersionServlet.java @@ -26,6 +26,7 @@ */ @SuppressWarnings("serial") public class VersionServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler versionRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/AuthorizationServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/AuthorizationServlet.java index 162fbee7..bf71aab7 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/AuthorizationServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/AuthorizationServlet.java @@ -63,6 +63,7 @@ */ @SuppressWarnings("serial") public class AuthorizationServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler authorizationRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/ConfigurableServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/ConfigurableServlet.java index c2aaeda5..42637016 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/ConfigurableServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/ConfigurableServlet.java @@ -35,6 +35,7 @@ */ @SuppressWarnings("serial") public class ConfigurableServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler configurableRequestHandler; private static String CONNECTOR_CONFIGURABLE = "connector"; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/ConnectorServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/ConnectorServlet.java index 2bc06acc..5daebc1a 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/ConnectorServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/ConnectorServlet.java @@ -37,6 +37,7 @@ */ @SuppressWarnings("serial") public class ConnectorServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler connectorRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java index f58275e2..8184e2d0 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java @@ -29,6 +29,7 @@ */ @SuppressWarnings("serial") public class ConnectorsServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler connectorRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/DriverServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/DriverServlet.java index 192d8661..7df307f7 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/DriverServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/DriverServlet.java @@ -31,6 +31,8 @@ */ @SuppressWarnings("serial") public class DriverServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; + private RequestHandler driverRequestHandler; public DriverServlet() { diff --git a/server/src/main/java/org/apache/sqoop/server/v1/JobServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/JobServlet.java index 280b4792..7767132b 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/JobServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/JobServlet.java @@ -74,6 +74,7 @@ */ @SuppressWarnings("serial") public class JobServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler jobRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/JobsServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/JobsServlet.java index 5184a0bd..97366cd5 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/JobsServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/JobsServlet.java @@ -34,6 +34,7 @@ */ @SuppressWarnings("serial") public class JobsServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler jobRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/LinkServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/LinkServlet.java index 0e2e1763..3fb542fc 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/LinkServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/LinkServlet.java @@ -55,6 +55,7 @@ */ @SuppressWarnings("serial") public class LinkServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler linkRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/LinksServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/LinksServlet.java index d249d6c7..d2ae0f70 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/LinksServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/LinksServlet.java @@ -33,6 +33,7 @@ */ @SuppressWarnings("serial") public class LinksServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler linkRequestHandler; diff --git a/server/src/main/java/org/apache/sqoop/server/v1/SubmissionsServlet.java b/server/src/main/java/org/apache/sqoop/server/v1/SubmissionsServlet.java index 5337fdde..cb154017 100644 --- a/server/src/main/java/org/apache/sqoop/server/v1/SubmissionsServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/v1/SubmissionsServlet.java @@ -35,6 +35,7 @@ */ @SuppressWarnings("serial") public class SubmissionsServlet extends SqoopProtocolServlet { + private static final long serialVersionUID = 1L; private RequestHandler submissionRequestHandler;