/*
 * Licensed 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 com.facebook.presto.client;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

import javax.annotation.concurrent.Immutable;

import java.util.Map;

import static com.google.common.base.MoreObjects.toStringHelper;
import static java.util.Objects.requireNonNull;

/**
 * For use with /v1/statement when you send prepared statements via that
 */
@Immutable
public class QuerySubmission
{
    private final String query;
    private final Map<String, String> preparedStatements;

    @JsonCreator
    public QuerySubmission(
            @JsonProperty("query") String query,
            @JsonProperty("preparedStatements") Map<String, String> preparedStatements)
    {
        this.query = requireNonNull(query, "query is null");
        this.preparedStatements = requireNonNull(preparedStatements, "preparedStatements is null");
    }

    @JsonProperty
    public String getQuery()
    {
        return query;
    }

    @JsonProperty
    public Map<String, String> getPreparedStatements()
    {
        return preparedStatements;
    }

    @Override
    public String toString()
    {
        return toStringHelper(this)
                .add("query", query)
                .add("preparedStatements", preparedStatements)
                .toString();
    }
}

@@ -768,16 +768,52 @@
 til.Map;
+%0Aimport java.util.stream.Collectors;
 %0A%0Aimport
@@ -1330,21 +1330,91 @@
         
-this.
+// Make sure neither query nor preparedstatement ends in semicolon%0A        
 query = 
@@ -1466,16 +1466,69 @@
    this.
+query = query.trim().replaceAll(%22;+$%22, %22%22);%0A%0A        
 prepared
@@ -1602,24 +1602,328 @@
  is null%22);%0A
+        this.preparedStatements = preparedStatements.entrySet()%0A                .stream()%0A                .collect(%0A                        Collectors.toMap(%0A                                entry -%3E entry.getKey(),%0A                                entry -%3E entry.getValue().trim().replaceAll(%22;+%22, %22%22)));%0A
     %7D%0A%0A    @

Remove superfluous semicolons