You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by af...@apache.org on 2016/05/25 02:12:34 UTC
sqoop git commit: SQOOP-2867: Sqoop2: ResTiliency: Define one single
constant for all
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 4a8e27600 -> 9fea04e6f
SQOOP-2867: Sqoop2: ResTiliency: Define one single constant for all
(Boglarka Egyed via Abraham Fine)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/9fea04e6
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/9fea04e6
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/9fea04e6
Branch: refs/heads/sqoop2
Commit: 9fea04e6fc3b3812a2e11b5e4df033363ac33ccf
Parents: 4a8e276
Author: Abraham Fine <af...@apache.org>
Authored: Tue May 24 19:09:13 2016 -0700
Committer: Abraham Fine <af...@apache.org>
Committed: Tue May 24 19:09:13 2016 -0700
----------------------------------------------------------------------
.../apache/sqoop/client/request/ConnectorResourceRequest.java | 3 ++-
.../org/apache/sqoop/client/request/JobResourceRequest.java | 3 ++-
.../org/apache/sqoop/client/request/LinkResourceRequest.java | 3 ++-
.../java/org/apache/sqoop/common/SqoopProtocolConstants.java | 2 ++
.../org/apache/sqoop/handler/AuthorizationRequestHandler.java | 3 ++-
.../java/org/apache/sqoop/handler/ConnectorRequestHandler.java | 5 +++--
.../main/java/org/apache/sqoop/handler/JobRequestHandler.java | 3 ++-
.../main/java/org/apache/sqoop/handler/LinkRequestHandler.java | 3 ++-
.../java/org/apache/sqoop/handler/SubmissionRequestHandler.java | 3 ++-
9 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/client/src/main/java/org/apache/sqoop/client/request/ConnectorResourceRequest.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/sqoop/client/request/ConnectorResourceRequest.java b/client/src/main/java/org/apache/sqoop/client/request/ConnectorResourceRequest.java
index 1556e34..f8beeb1 100644
--- a/client/src/main/java/org/apache/sqoop/client/request/ConnectorResourceRequest.java
+++ b/client/src/main/java/org/apache/sqoop/client/request/ConnectorResourceRequest.java
@@ -18,6 +18,7 @@
package org.apache.sqoop.client.request;
import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticatedURL;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.json.ConnectorBean;
import org.apache.sqoop.json.JSONUtils;
import org.json.simple.JSONObject;
@@ -41,7 +42,7 @@ public class ConnectorResourceRequest extends ResourceRequest {
public ConnectorBean read(String serverUrl, String connectorName) {
String response;
if (connectorName == null) {
- response = super.get(serverUrl + RESOURCE + "all");
+ response = super.get(serverUrl + RESOURCE + SqoopProtocolConstants.ALL);
} else {
response = super.get(serverUrl + RESOURCE + connectorName);
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/client/src/main/java/org/apache/sqoop/client/request/JobResourceRequest.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/sqoop/client/request/JobResourceRequest.java b/client/src/main/java/org/apache/sqoop/client/request/JobResourceRequest.java
index 5394493..138a01a 100644
--- a/client/src/main/java/org/apache/sqoop/client/request/JobResourceRequest.java
+++ b/client/src/main/java/org/apache/sqoop/client/request/JobResourceRequest.java
@@ -18,6 +18,7 @@
package org.apache.sqoop.client.request;
import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticatedURL;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.json.JSONUtils;
import org.apache.sqoop.json.JobBean;
import org.apache.sqoop.json.SubmissionBean;
@@ -61,7 +62,7 @@ public class JobResourceRequest extends ResourceRequest {
public JobBean read(String serverUrl, String jobArg) {
String response;
if (jobArg == null) {
- response = super.get(serverUrl + RESOURCE + "all");
+ response = super.get(serverUrl + RESOURCE + SqoopProtocolConstants.ALL);
} else {
response = super.get(serverUrl + RESOURCE + UrlSafeUtils.urlPathEncode(jobArg));
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/client/src/main/java/org/apache/sqoop/client/request/LinkResourceRequest.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/sqoop/client/request/LinkResourceRequest.java b/client/src/main/java/org/apache/sqoop/client/request/LinkResourceRequest.java
index bf674df..b7378ea 100644
--- a/client/src/main/java/org/apache/sqoop/client/request/LinkResourceRequest.java
+++ b/client/src/main/java/org/apache/sqoop/client/request/LinkResourceRequest.java
@@ -18,6 +18,7 @@
package org.apache.sqoop.client.request;
import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticatedURL;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.json.JSONUtils;
import org.apache.sqoop.json.LinkBean;
import org.apache.sqoop.json.ValidationResultBean;
@@ -47,7 +48,7 @@ public class LinkResourceRequest extends ResourceRequest {
public LinkBean read(String serverUrl, String linkArg) {
String response;
if (linkArg == null) {
- response = super.get(serverUrl + LINK_RESOURCE + "all");
+ response = super.get(serverUrl + LINK_RESOURCE + SqoopProtocolConstants.ALL);
} else {
response = super.get(serverUrl + LINK_RESOURCE + UrlSafeUtils.urlPathEncode(linkArg));
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/common/src/main/java/org/apache/sqoop/common/SqoopProtocolConstants.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/common/SqoopProtocolConstants.java b/common/src/main/java/org/apache/sqoop/common/SqoopProtocolConstants.java
index 29927c0..9816231 100644
--- a/common/src/main/java/org/apache/sqoop/common/SqoopProtocolConstants.java
+++ b/common/src/main/java/org/apache/sqoop/common/SqoopProtocolConstants.java
@@ -38,6 +38,8 @@ public final class SqoopProtocolConstants {
public static final String JSON_CONTENT_TYPE =
"application/json; charset=\"" + charset + "\"";
+ public static final String ALL = "all";
+
private SqoopProtocolConstants() {
// Disable explicit object creation
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/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 8d4d72b..013838c 100644
--- a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
@@ -20,6 +20,7 @@ package org.apache.sqoop.handler;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.core.SqoopConfiguration;
import org.apache.sqoop.error.code.CommonRepositoryError;
import org.apache.sqoop.repository.Repository;
@@ -149,7 +150,7 @@ public class AuthorizationRequestHandler implements RequestHandler {
} else {
// get all roles in the system
manager.logAuditEvent(ctx.getUserName(),
- ctx.getRequest().getRemoteAddr(), "get", "roles", "all");
+ ctx.getRequest().getRemoteAddr(), "get", "roles", SqoopProtocolConstants.ALL);
return new RoleBean(handler.getAllRoles());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/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 c760689..6f20902 100644
--- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
@@ -26,6 +26,7 @@ import java.util.ResourceBundle;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.connector.ConnectorManager;
import org.apache.sqoop.json.ConnectorBean;
import org.apache.sqoop.json.JsonBean;
@@ -53,11 +54,11 @@ public class ConnectorRequestHandler implements RequestHandler {
LOG.info("ConnectorRequestHandler handles cname: " + cIdentifier);
- if (cIdentifier.equals("all")) {
+ if (cIdentifier.equals(SqoopProtocolConstants.ALL)) {
connectors = ConnectorManager.getInstance().getConnectorConfigurables();
configParamBundles = ConnectorManager.getInstance().getResourceBundles(locale);
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
- ctx.getRequest().getRemoteAddr(), "get", "connectors", "all");
+ ctx.getRequest().getRemoteAddr(), "get", "connectors", SqoopProtocolConstants.ALL);
// Authorization check
connectors = AuthorizationEngine.filterResource(ctx.getUserName(), MResource.TYPE.CONNECTOR, connectors);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/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 c86f8f0..2a1f18e 100644
--- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
@@ -29,6 +29,7 @@ import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
import org.apache.sqoop.common.Direction;
import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.connector.ConnectorManager;
import org.apache.sqoop.connector.spi.SqoopConnector;
import org.apache.sqoop.driver.Driver;
@@ -266,7 +267,7 @@ public class JobRequestHandler implements RequestHandler {
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(), ctx.getRequest().getRemoteAddr(), "get", "job", jobName);
- if(jobName.equals("all")) { // Return all links (by perhaps only for given connector)
+ if(jobName.equals(SqoopProtocolConstants.ALL)) { // Return all links (by perhaps only for given connector)
String connectorName = ctx.getParameterValue(CONNECTOR_NAME_QUERY_PARAM);
if(StringUtils.isEmpty(connectorName)) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/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 b44ae87..801347a 100644
--- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
@@ -26,6 +26,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.connector.ConnectorManager;
import org.apache.sqoop.connector.spi.SqoopConnector;
import org.apache.sqoop.json.JSONUtils;
@@ -189,7 +190,7 @@ public class LinkRequestHandler implements RequestHandler {
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(), ctx.getRequest().getRemoteAddr(), "get", "link", linkName);
- if(linkName.equals("all")) { // Return all links (by perhaps only for given connector)
+ if(linkName.equals(SqoopProtocolConstants.ALL)) { // Return all links (by perhaps only for given connector)
String connectorName = ctx.getParameterValue(CONNECTOR_NAME_QUERY_PARAM);
if(StringUtils.isEmpty(connectorName)) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/9fea04e6/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 06c4478..4f3bd6c 100644
--- a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.common.SqoopProtocolConstants;
import org.apache.sqoop.json.JsonBean;
import org.apache.sqoop.json.SubmissionBean;
import org.apache.sqoop.model.MJob;
@@ -54,7 +55,7 @@ public class SubmissionRequestHandler implements RequestHandler {
} else {
// all submissions in the system
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
- ctx.getRequest().getRemoteAddr(), "get", "submissions", "all");
+ ctx.getRequest().getRemoteAddr(), "get", "submissions", SqoopProtocolConstants.ALL);
return getSubmissions(ctx);
}
}