Remove url from Response in HTTPSRequest

Andrea-Scuderi · Andrea-Scuderi · commit 7ed69f1215af · 2019-12-21T08:30:15.000Z
diff --git a/Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift b/Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift
@@ -28,7 +28,6 @@ struct Event: Codable {
 }
 
 struct Response: Codable {
-    let url: String
     let content: String
 }
 
@@ -59,7 +58,7 @@ let syncCodableNIOLambda: SyncCodableNIOLambda<Event, Response> = { (event, cont
             }
             return value
         }.map { content -> Response in
-            return Response(url: event.url, content: content)
+            return Response(content: content)
         }
     return future
 }
@@ -92,8 +91,7 @@ let syncDictionaryNIOLambda: SyncDictionaryNIOLambda = { (event, context) throws
             }
             return value
         }.map { content -> [String: Any] in
-            return ["url": url,
-                    "content": content]
+            return ["content": content]
         }
     return future
 }
@@ -126,8 +124,7 @@ let asynchDictionayNIOLambda: AsyncDictionaryNIOLambda = { (event, context, comp
                 }
                 return value
         }.map { content -> [String: Any] in
-            return ["url": url,
-                    "content": content]
+            return ["content": content]
         }
         .wait()
         completion(.success(dictionary))
@@ -160,7 +157,7 @@ let asyncCodableNIOLambda: AsyncCodableNIOLambda<Event, Response> = { (event, co
                 }
                 return value
         }.map { content -> Response in
-            return Response(url: event.url, content: content)
+            return Response(content: content)
         }
         .wait()
         completion(.success(reponse))
@@ -198,7 +195,7 @@ let lambda: SyncCodableLambda<Event, Response> = { (input, context) throws -> Re
     }
     let content = String(data: data, encoding: .utf8) ?? ""
     
-    return Response(url: input.url, content: content)
+    return Response(content: content)
 }
 
 
diff --git a/Examples/HTTPSRequest/outfile.json b/Examples/HTTPSRequest/outfile.json
@@ -1 +1 @@
-{"content":"<!doctype html>\n<html>\n<head>\n    <title>Example Domain<\/title>\n\n    <meta charset=\"utf-8\" \/>\n    <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n    <style type=\"text\/css\">\n    body {\n        background-color: #f0f0f2;\n        margin: 0;\n        padding: 0;\n        font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n        \n    }\n    div {\n        width: 600px;\n        margin: 5em auto;\n        padding: 2em;\n        background-color: #fdfdff;\n        border-radius: 0.5em;\n        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n    }\n    a:link, a:visited {\n        color: #38488f;\n        text-decoration: none;\n    }\n    @media (max-width: 700px) {\n        div {\n            margin: 0 auto;\n            width: auto;\n        }\n    }\n    <\/style>    \n<\/head>\n\n<body>\n<div>\n    <h1>Example Domain<\/h1>\n    <p>This domain is for use in illustrative examples in documents. You may use this\n    domain in literature without prior coordination or asking for permission.<\/p>\n    <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n","url":"https:\/\/www.example.com"}
+{"content":"<!doctype html>\n<html>\n<head>\n    <title>Example Domain<\/title>\n\n    <meta charset=\"utf-8\" \/>\n    <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n    <style type=\"text\/css\">\n    body {\n        background-color: #f0f0f2;\n        margin: 0;\n        padding: 0;\n        font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n        \n    }\n    div {\n        width: 600px;\n        margin: 5em auto;\n        padding: 2em;\n        background-color: #fdfdff;\n        border-radius: 0.5em;\n        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n    }\n    a:link, a:visited {\n        color: #38488f;\n        text-decoration: none;\n    }\n    @media (max-width: 700px) {\n        div {\n            margin: 0 auto;\n            width: auto;\n        }\n    }\n    <\/style>    \n<\/head>\n\n<body>\n<div>\n    <h1>Example Domain<\/h1>\n    <p>This domain is for use in illustrative examples in documents. You may use this\n    domain in literature without prior coordination or asking for permission.<\/p>\n    <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n"}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ struct Event: Codable {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`struct Response: Codable {`
`31`		`- let url: String`
`32`	`31`	`let content: String`
`33`	`32`	`}`
`34`	`33`
`@@ -59,7 +58,7 @@ let syncCodableNIOLambda: SyncCodableNIOLambda<Event, Response> = { (event, cont`
`59`	`58`	`}`
`60`	`59`	`return value`
`61`	`60`	`}.map { content -> Response in`
`62`		`- return Response(url: event.url, content: content)`
	`61`	`+ return Response(content: content)`
`63`	`62`	`}`
`64`	`63`	`return future`
`65`	`64`	`}`
`@@ -92,8 +91,7 @@ let syncDictionaryNIOLambda: SyncDictionaryNIOLambda = { (event, context) throws`
`92`	`91`	`}`
`93`	`92`	`return value`
`94`	`93`	`}.map { content -> [String: Any] in`
`95`		`- return ["url": url,`
`96`		`- "content": content]`
	`94`	`+ return ["content": content]`
`97`	`95`	`}`
`98`	`96`	`return future`
`99`	`97`	`}`
`@@ -126,8 +124,7 @@ let asynchDictionayNIOLambda: AsyncDictionaryNIOLambda = { (event, context, comp`
`126`	`124`	`}`
`127`	`125`	`return value`
`128`	`126`	`}.map { content -> [String: Any] in`
`129`		`- return ["url": url,`
`130`		`- "content": content]`
	`127`	`+ return ["content": content]`
`131`	`128`	`}`
`132`	`129`	`.wait()`
`133`	`130`	`completion(.success(dictionary))`
`@@ -160,7 +157,7 @@ let asyncCodableNIOLambda: AsyncCodableNIOLambda<Event, Response> = { (event, co`
`160`	`157`	`}`
`161`	`158`	`return value`
`162`	`159`	`}.map { content -> Response in`
`163`		`- return Response(url: event.url, content: content)`
	`160`	`+ return Response(content: content)`
`164`	`161`	`}`
`165`	`162`	`.wait()`
`166`	`163`	`completion(.success(reponse))`
`@@ -198,7 +195,7 @@ let lambda: SyncCodableLambda<Event, Response> = { (input, context) throws -> Re`
`198`	`195`	`}`
`199`	`196`	`let content = String(data: data, encoding: .utf8) ?? ""`
`200`	`197`
`201`		`- return Response(url: input.url, content: content)`
	`198`	`+ return Response(content: content)`
`202`	`199`	`}`
`203`	`200`
`204`	`201`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"content":"<!doctype html>\n<html>\n<head>\n <title>Example Domain<\/title>\n\n <meta charset=\"utf-8\" \/>\n <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n <style type=\"text\/css\">\n body {\n background-color: #f0f0f2;\n margin: 0;\n padding: 0;\n font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n \n }\n div {\n width: 600px;\n margin: 5em auto;\n padding: 2em;\n background-color: #fdfdff;\n border-radius: 0.5em;\n box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n }\n a:link, a:visited {\n color: #38488f;\n text-decoration: none;\n }\n @media (max-width: 700px) {\n div {\n margin: 0 auto;\n width: auto;\n }\n }\n <\/style> \n<\/head>\n\n<body>\n<div>\n <h1>Example Domain<\/h1>\n <p>This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.<\/p>\n <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n","url":"https:\/\/www.example.com"}
	`1`	+{"content":"<!doctype html>\n<html>\n<head>\n <title>Example Domain<\/title>\n\n <meta charset=\"utf-8\" \/>\n <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n <style type=\"text\/css\">\n body {\n background-color: #f0f0f2;\n margin: 0;\n padding: 0;\n font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n \n }\n div {\n width: 600px;\n margin: 5em auto;\n padding: 2em;\n background-color: #fdfdff;\n border-radius: 0.5em;\n box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n }\n a:link, a:visited {\n color: #38488f;\n text-decoration: none;\n }\n @media (max-width: 700px) {\n div {\n margin: 0 auto;\n width: auto;\n }\n }\n <\/style> \n<\/head>\n\n<body>\n<div>\n <h1>Example Domain<\/h1>\n <p>This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.<\/p>\n <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n"}