Fix merge

A30002503 · Jul 16, 2019 · cbe3127 · cbe3127
1 parent c6c8070
commit cbe3127
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/src/main/scala/ai/tripl/arc/extract/HTTPExtract.scala b/src/main/scala/ai/tripl/arc/extract/HTTPExtract.scala
@@ -33,7 +33,7 @@ class HTTPExtract extends PipelineStagePlugin {
     import ai.tripl.arc.config.ConfigUtils._
     implicit val c = config
 
-    val expectedKeys = "type" :: "name" :: "description" :: "environments" :: "inputView" :: "inputURI" :: "outputView" :: "body" :: "headers" :: "method" :: "numPartitions" :: "partitionBy" :: "persist" :: "validStatusCodes" :: "params" :: Nil
+    val expectedKeys = "type" :: "name" :: "description" :: "environments" :: "inputView" :: "inputURI" :: "outputView" :: "body" :: "headers" :: "method" :: "numPartitions" :: "partitionBy" :: "persist" :: "validStatusCodes" :: "uriField" :: "bodyField" :: "params" :: Nil
     val name = getValue[String]("name")
     val description = getOptionalValue[String]("description")
     val inputView = if(c.hasPath("inputView")) getValue[String]("inputView") else Right("")

diff --git a/src/test/scala/ai/tripl/arc/extract/HTTPExtractSuite.scala b/src/test/scala/ai/tripl/arc/extract/HTTPExtractSuite.scala
@@ -82,19 +82,6 @@ class HTTPExtractSuite extends FunSuite with BeforeAndAfter {
     }
   }
 
-  class PostPayloadEchoHandler extends AbstractHandler {
-    override def handle(target: String, request: HttpServletRequest, response: HttpServletResponse, dispatch: Int) = {
-      if (HttpConnection.getCurrentConnection.getRequest.getMethod == "POST" ) {
-        response.setContentType("text/html")
-        response.setStatus(HttpServletResponse.SC_OK)
-        response.getWriter().print(Source.fromInputStream(request.getInputStream).mkString)
-      } else {
-        response.setStatus(HttpServletResponse.SC_FORBIDDEN)
-      }
-      HttpConnection.getCurrentConnection.getRequest.setHandled(true) 
-    }
-  }    
-
   class EmptyHandler extends AbstractHandler {
     override def handle(target: String, request: HttpServletRequest, response: HttpServletResponse, dispatch: Int) = {
       response.setContentType("text/html")
@@ -203,7 +190,6 @@ class HTTPExtractSuite extends FunSuite with BeforeAndAfter {
     }
   }
 
-
   test("HTTPExtract: Can read data (GET)") {
     implicit val spark = session
     import spark.implicits._
@@ -226,9 +212,7 @@ class HTTPExtractSuite extends FunSuite with BeforeAndAfter {
         numPartitions=None,
         partitionBy=Nil,
         method="GET",
-        body=None,
-        uriField=None,
-        bodyField=None        
+        body=None     
       )
     ).get
 
@@ -269,9 +253,7 @@ class HTTPExtractSuite extends FunSuite with BeforeAndAfter {
         numPartitions=None,
         partitionBy=Nil,
         method="POST",
-        body=None,
-        uriField=None,
-        bodyField=None
+        body=None
       )
     ).get
 
@@ -466,9 +448,7 @@ class HTTPExtractSuite extends FunSuite with BeforeAndAfter {
         numPartitions=None,
         partitionBy=Nil,
         method="GET",
-        body=None,
-        uriField=None,
-        bodyField=None
+        body=None
       )
     ).get