/*
 * 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 org.jdbi.v3.sqlobject.statement;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;

import org.jdbi.v3.core.extension.HandleSupplier;
import org.jdbi.v3.core.statement.Query;
import org.jdbi.v3.sqlobject.Handler;
import org.jdbi.v3.sqlobject.HandlerFactory;
import org.jdbi.v3.sqlobject.SqlMethodAnnotation;
import org.jdbi.v3.sqlobject.SqlObjects;

/**
 * Used to indicate that a method should execute a query.
 */
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
@SqlMethodAnnotation(SqlQuery.Factory.class)
public @interface SqlQuery {
    /**
     * The query (or query name if using a statement locator) to be executed. The default value will use
     * the method name of the method being annotated. This default behavior is only useful in conjunction
     * with a statement locator.
     *
     * @return the SQL string (or name)
     */
    String value() default "";

    class Factory implements HandlerFactory {
        @Override
        public Handler buildHandler(Class<?> sqlObjectType, Method method) {
            return new QueryHandler(sqlObjectType, method, ResultReturner.forMethod(sqlObjectType, method));
        }
    }

    class QueryHandler extends CustomizingStatementHandler {
        private final Class<?> sqlObjectType;
        private final Method method;
        private final ResultReturner magic;

        QueryHandler(Class<?> sqlObjectType, Method method, ResultReturner magic) {
            super(sqlObjectType, method);
            this.sqlObjectType = sqlObjectType;
            this.method = method;
            this.magic = magic;
        }

        @Override
        public Object invoke(Object target, Object[] args, HandleSupplier handle) {
            String sql = handle.getConfig(SqlObjects.class).getSqlLocator().locate(sqlObjectType, method);
            Query q = handle.getHandle().createQuery(sql);
            applyCustomizers(q, args);

            return magic.map(method, q);
        }
    }
}

@@ -1801,57 +1801,8 @@
 thod
-, ResultReturner.forMethod(sqlObjectType, method)
 );%0A 
@@ -2068,30 +2068,8 @@
 thod
-, ResultReturner magic
 ) %7B%0A
@@ -2217,21 +2217,63 @@
 magic = 
-magic
+ResultReturner.forMethod(sqlObjectType, method)
 ;%0A      

Move ResultReturner into QueryHandler, like UpdateHandler