/*
 * Copyright (c) 2011-2017 Nexmo Inc
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
package com.nexmo.quickstart.voice;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.nexmo.client.voice.ncco.Ncco;
import com.nexmo.client.voice.ncco.TalkNcco;
import spark.Request;
import spark.Route;

import java.io.IOException;

import static spark.Spark.*;

public class InboundCall {
    public static void main(String[] args) throws Exception {
        ObjectMapper nccoMapper = new ObjectMapper();

        /*
         * Route to answer incoming calls with an NCCO response.
         */
        Route answerRoute = (req, res) -> {
            String from = extractCaller(req);
            String explodedFrom = String.join(" ", from.split(""));

            TalkNcco message = new TalkNcco(String.format("Thank you for calling from %s", explodedFrom));
            Ncco[] nccos = new Ncco[]{message};

            res.type("application/json");
            return nccoMapper.writer().writeValueAsString(nccos);
        };

        port(3000);

        get("/webhooks/answer", answerRoute);
        post("/webhooks/answer", answerRoute);
    }

    /**
     * Extract the provided 'from' value either from the request params, or JSON body.
     */
    private static String extractCaller(Request req) throws IOException {
        String from = req.queryParams("from");
        if ("GET".equals(req.requestMethod())) {
            return from;
        } else {
            if (from != null) {
                return from;
            } else {
                InboundCallPayload payload = InboundCallPayload.fromJson(req.bodyAsBytes());
                return payload.getFrom();
            }
        }
    }
}

@@ -1695,25 +1695,30 @@
 m = 
-extractCaller(req
+req.queryParams(%22from%22
 );%0A 
@@ -2124,24 +2124,24 @@
 swerRoute);%0A
+
         post
@@ -2184,570 +2184,7 @@
    %7D
-%0A%0A    /**%0A     * Extract the provided 'from' value either from the request params, or JSON body.%0A     */%0A    private static String extractCaller(Request req) throws IOException %7B%0A        String from = req.queryParams(%22from%22);%0A        if (%22GET%22.equals(req.requestMethod())) %7B%0A            return from;%0A        %7D else %7B%0A            if (from != null) %7B%0A                return from;%0A            %7D else %7B%0A                InboundCallPayload payload = InboundCallPayload.fromJson(req.bodyAsBytes());%0A                return payload.getFrom();%0A            %7D%0A        %7D%0A    %7D
 %0A%7D%0A

Simplify InboundCall to match simplified requirements.