You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2015/08/25 18:09:36 UTC
sqoop git commit: SQOOP-2523: Sqoop2: Findbugs: Fix warning in server
module
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 9f076edb0 -> 4014c7fbf
SQOOP-2523: Sqoop2: Findbugs: Fix warning in server module
(Colin Ma via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/4014c7fb
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/4014c7fb
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/4014c7fb
Branch: refs/heads/sqoop2
Commit: 4014c7fbf3d833fb8f933c2de1298a822b30b0f8
Parents: 9f076ed
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Tue Aug 25 09:09:12 2015 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Tue Aug 25 09:09:12 2015 -0700
----------------------------------------------------------------------
common/src/main/java/org/apache/sqoop/json/VersionBean.java | 2 +-
.../org/apache/sqoop/handler/AuthorizationRequestHandler.java | 2 +-
.../java/org/apache/sqoop/handler/ConnectorRequestHandler.java | 1 +
.../java/org/apache/sqoop/handler/DriverRequestHandler.java | 1 +
.../src/main/java/org/apache/sqoop/handler/HandlerUtils.java | 6 +++---
.../main/java/org/apache/sqoop/handler/JobRequestHandler.java | 1 +
.../main/java/org/apache/sqoop/handler/LinkRequestHandler.java | 1 +
.../org/apache/sqoop/handler/SubmissionRequestHandler.java | 4 ++--
.../java/org/apache/sqoop/handler/VersionRequestHandler.java | 1 +
.../src/main/java/org/apache/sqoop/server/RequestHandler.java | 2 +-
.../java/org/apache/sqoop/server/SqoopProtocolServlet.java | 1 +
.../src/main/java/org/apache/sqoop/server/VersionServlet.java | 1 +
.../java/org/apache/sqoop/server/v1/AuthorizationServlet.java | 1 +
.../java/org/apache/sqoop/server/v1/ConfigurableServlet.java | 1 +
.../main/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 ++
.../src/main/java/org/apache/sqoop/server/v1/JobServlet.java | 1 +
.../src/main/java/org/apache/sqoop/server/v1/JobsServlet.java | 1 +
.../src/main/java/org/apache/sqoop/server/v1/LinkServlet.java | 1 +
.../src/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/common/src/main/java/org/apache/sqoop/json/VersionBean.java
----------------------------------------------------------------------
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 c43d944..2d5327a 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 @@ import org.json.simple.JSONObject;
@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";
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
----------------------------------------------------------------------
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 bdac1de..43f0417 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.io.IOException;
import java.util.List;
public class AuthorizationRequestHandler implements RequestHandler {
-
+ private static final long serialVersionUID = 1L;
/**
* enum for representing the actions supported on the authorization
*/
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
----------------------------------------------------------------------
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 7c428b8..23f6c63 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.RequestHandler;
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);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java
----------------------------------------------------------------------
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 81efb89..95a3291 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.RequestContext.Method;
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);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java
----------------------------------------------------------------------
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 68b1300..5fcde52 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 class HandlerUtils {
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 class HandlerUtils {
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 class HandlerUtils {
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
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
----------------------------------------------------------------------
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 7f8ddbd..13ebb35 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.apache.sqoop.validation.Status;
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 {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
----------------------------------------------------------------------
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 8a6beb8..aa7e5ff 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.apache.sqoop.validation.ConfigValidationResult;
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);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
----------------------------------------------------------------------
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 5c349a2..f2a6758 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.RequestHandler;
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 class SubmissionRequestHandler implements RequestHandler {
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);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
----------------------------------------------------------------------
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 2eaa0ac..588218b 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 @@ import org.apache.sqoop.server.common.ServerError;
* 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);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/RequestHandler.java
----------------------------------------------------------------------
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 02eb837..d66f867 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 @@ package org.apache.sqoop.server;
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";
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java
----------------------------------------------------------------------
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 6b76b0b..92bdc9c 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 @@ import org.apache.sqoop.json.JsonBean;
@SuppressWarnings("serial")
public class SqoopProtocolServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
private static final Logger LOG =
Logger.getLogger(SqoopProtocolServlet.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/VersionServlet.java
----------------------------------------------------------------------
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 a62c9ce..4fef797 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 @@ import org.apache.sqoop.json.JsonBean;
*/
@SuppressWarnings("serial")
public class VersionServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler versionRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/AuthorizationServlet.java
----------------------------------------------------------------------
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 162fbee..bf71aab 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class AuthorizationServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler authorizationRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/ConfigurableServlet.java
----------------------------------------------------------------------
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 c2aaeda..4263701 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class ConfigurableServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler configurableRequestHandler;
private static String CONNECTOR_CONFIGURABLE = "connector";
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/ConnectorServlet.java
----------------------------------------------------------------------
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 2bc06ac..5daebc1 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class ConnectorServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler connectorRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java
----------------------------------------------------------------------
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 f58275e..8184e2d 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class ConnectorsServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler connectorRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/DriverServlet.java
----------------------------------------------------------------------
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 192d866..7df307f 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class DriverServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
+
private RequestHandler driverRequestHandler;
public DriverServlet() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/JobServlet.java
----------------------------------------------------------------------
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 280b479..7767132 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class JobServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler jobRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/JobsServlet.java
----------------------------------------------------------------------
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 5184a0b..97366cd 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class JobsServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler jobRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/LinkServlet.java
----------------------------------------------------------------------
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 0e2e176..3fb542f 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class LinkServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler linkRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/LinksServlet.java
----------------------------------------------------------------------
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 d249d6c..d2ae0f7 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class LinksServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler linkRequestHandler;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/4014c7fb/server/src/main/java/org/apache/sqoop/server/v1/SubmissionsServlet.java
----------------------------------------------------------------------
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 5337fdd..cb15401 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 @@ import org.apache.sqoop.server.SqoopProtocolServlet;
*/
@SuppressWarnings("serial")
public class SubmissionsServlet extends SqoopProtocolServlet {
+ private static final long serialVersionUID = 1L;
private RequestHandler submissionRequestHandler;