You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by hs...@apache.org on 2015/09/25 06:32:33 UTC
sqoop git commit: SQOOP-2544. Sqoop2: Drop connectors servlet
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 bf09850c3 -> 7e5075b2a
SQOOP-2544. Sqoop2: Drop connectors servlet
(Jarcec via Hari)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/7e5075b2
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7e5075b2
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7e5075b2
Branch: refs/heads/sqoop2
Commit: 7e5075b2af2705e8a04ee94a769642aba6095a1f
Parents: bf09850
Author: Hari Shreedharan <hs...@apache.org>
Authored: Thu Sep 24 21:31:25 2015 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Sep 24 21:31:25 2015 -0700
----------------------------------------------------------------------
.../sqoop/handler/ConnectorRequestHandler.java | 15 +------
.../sqoop/server/v1/ConnectorsServlet.java | 44 --------------------
server/src/main/webapp/WEB-INF/web.xml | 12 ------
3 files changed, 2 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7e5075b2/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 f9c1de2..ef898db 100644
--- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
@@ -26,7 +26,6 @@ import java.util.ResourceBundle;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
-import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.connector.ConnectorManager;
import org.apache.sqoop.json.ConnectorBean;
import org.apache.sqoop.json.ConnectorsBean;
@@ -35,29 +34,19 @@ import org.apache.sqoop.model.MConnector;
import org.apache.sqoop.model.MResource;
import org.apache.sqoop.security.authorization.AuthorizationEngine;
import org.apache.sqoop.server.RequestContext;
-import org.apache.sqoop.server.RequestContext.Method;
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);
- private static final String CONNECTORS_PATH = "connectors";
-
public ConnectorRequestHandler() {
LOG.info("ConnectorRequestHandler initialized");
}
@Override
public JsonBean handleEvent(RequestContext ctx) {
- // connector only support GET requests
- if (ctx.getMethod() != Method.GET) {
- throw new SqoopException(ServerError.SERVER_0002, "Unsupported HTTP method for connector:"
- + ctx.getMethod());
- }
-
List<MConnector> connectors;
Map<Long, ResourceBundle> configParamBundles;
Locale locale = ctx.getAcceptLanguageHeader();
@@ -65,7 +54,7 @@ public class ConnectorRequestHandler implements RequestHandler {
LOG.info("ConnectorRequestHandler handles cid: " + cIdentifier);
- if (ctx.getPath().contains(CONNECTORS_PATH) || cIdentifier.equals("all")) {
+ if (cIdentifier.equals("all")) {
connectors = ConnectorManager.getInstance().getConnectorConfigurables();
configParamBundles = ConnectorManager.getInstance().getResourceBundles(locale);
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
@@ -81,7 +70,7 @@ public class ConnectorRequestHandler implements RequestHandler {
// NOTE: connectorId is a fallback for older sqoop clients if any, since we want to primarily use unique conenctorNames
String cName = HandlerUtils.getConnectorNameFromIdentifier(cIdentifier);
- configParamBundles = new HashMap<Long, ResourceBundle>();
+ configParamBundles = new HashMap<>();
MConnector connector = ConnectorManager.getInstance().getConnectorConfigurable(cName);
configParamBundles.put(connector.getPersistenceId(),
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7e5075b2/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
deleted file mode 100644
index 8184e2d..0000000
--- a/server/src/main/java/org/apache/sqoop/server/v1/ConnectorsServlet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sqoop.server.v1;
-
-import org.apache.sqoop.handler.ConnectorRequestHandler;
-import org.apache.sqoop.json.JsonBean;
-import org.apache.sqoop.server.RequestContext;
-import org.apache.sqoop.server.RequestHandler;
-import org.apache.sqoop.server.SqoopProtocolServlet;
-
-/**
- * Displays all connectors registered in sqoop
- * GET v1/connectors
- */
-@SuppressWarnings("serial")
-public class ConnectorsServlet extends SqoopProtocolServlet {
- private static final long serialVersionUID = 1L;
-
- private RequestHandler connectorRequestHandler;
-
- public ConnectorsServlet() {
- connectorRequestHandler = new ConnectorRequestHandler();
- }
-
- @Override
- protected JsonBean handleGetRequest(RequestContext ctx) throws Exception {
- return connectorRequestHandler.handleEvent(ctx);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7e5075b2/server/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 94cea1c..aa295ec 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -74,18 +74,6 @@ limitations under the License.
<url-pattern>/v1/connector/*</url-pattern>
</servlet-mapping>
- <!-- Connectors servlet -->
- <servlet>
- <servlet-name>v1.ConnectorsServlet</servlet-name>
- <servlet-class>org.apache.sqoop.server.v1.ConnectorServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>v1.ConnectorsServlet</servlet-name>
- <url-pattern>/v1/connectors/*</url-pattern>
- </servlet-mapping>
-
<!-- Driver servlet -->
<servlet>
<servlet-name>v1.DriverServlet</servlet-name>