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 1556e344..f8beeb10 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 ConnectorResourceRequest(DelegationTokenAuthenticatedURL.Token token){ 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); } 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 5394493c..138a01a6 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 JobBean readByConnector(String serverUrl, String cArg) { 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)); } 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 bf674df7..b7378eac 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 LinkResourceRequest(DelegationTokenAuthenticatedURL.Token token){ 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)); } 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 29927c04..98162317 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 } 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 8d4d72bf..013838c8 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 @@ 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 @@ private JsonBean getRoles(RequestContext ctx) { } 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()); } } 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 c7606898..6f209027 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 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 JsonBean handleEvent(RequestContext ctx) { 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); 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 c86f8f09..2a1f18e6 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.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 @@ private JsonBean getJobs(RequestContext ctx) { 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)) { 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 b44ae87a..801347a0 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.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 @@ private JsonBean getLinks(RequestContext ctx) { 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)) { 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 06c44781..4f3bd6cd 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 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 JsonBean handleEvent(RequestContext ctx) { } 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); } }