Merge lp:~pbeaman/akiban-server/direct-updates-4 into lp:~akiban-technologies/akiban-server/trunk

[Peter Beaman]

Emit correct response status and content type.

This involved some refactoring because the setting of these header elements needs to occur before the ResponseBuilder calls write on the StreamingOutput. In the case of a NO_CONTENT return type (signified by an output parameter type "void") the builder should not have a StreamingOutput to invoke. However, unlike a previous incarnation this proposal does not significantly change RestResponseBuilder. The only change is support for a settable response MediaType.

Therefore the DirectService#invokeRestFunction is divided into two methods, one to look up the endpoint and the other to invoke it. The prepareRestInvocation method returns a DirectInvocation object that contains the necessary metadata. This includes the JDBCConnection on which the call is being made because that's needed to find the script library. This necessitates a modified try/finally structure in DirectResource to ensure that the connection gets closed.

In DirectResource, the new doCall method conditionally creates a StreamingOutput to complete the call, or invokes the call directly depending on whether it of type void.

New tests verify that the correct response status is returned.

[Mike McMahon (mmcm)]

Seems plausible.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job system-tests-mtr failed at build number 3441: http://172.16.20.104:8080/job/system-tests-mtr/3441/

* view must-pass failed: system-tests-mtr is red

review: Needs Fixing

[lp:~pbeaman/akiban-server/direct-updates-4]

2645. By Peter Beaman on 2013-04-26

Tweaks

=== modified file 'src/main/java/com/akiban/direct/AbstractDirectObject.java'
--- src/main/java/com/akiban/direct/AbstractDirectObject.java	2013-04-24 19:15:51 +0000
+++ src/main/java/com/akiban/direct/AbstractDirectObject.java	2013-04-26 22:25:31 +0000
@@ -500,7 +500,7 @@
                         updateColumns.append(',');
                         updateValues.append(',');
                     }
-                    updateColumns.append(columns[index].columnName);
+                    updateColumns.append('\"').append(columns[index].columnName).append('\"');
                     updateValues.append('?');
                 }
             }

=== modified file 'src/main/java/com/akiban/rest/RestResponseBuilder.java'
--- src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-04-24 15:50:16 +0000
+++ src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-04-26 22:25:31 +0000
@@ -58,6 +58,7 @@
     private String outputBody;
     private String jsonp;
     private int status;
+    private MediaType type;
 
 
     public RestResponseBuilder(HttpServletRequest request, String jsonp) {
@@ -75,6 +76,11 @@
         this.status = status.getStatusCode();
         return this;
     }
+    
+    public RestResponseBuilder type(MediaType type) {
+        this.type = type;
+        return this;
+    }
 
     public RestResponseBuilder body(String outputBody) {
         this.outputBody = outputBody;
@@ -101,7 +107,6 @@
             status(Response.Status.OK);
         }
         Response.ResponseBuilder builder;
-        
         if (this.status == Response.Status.NO_CONTENT.getStatusCode()) {
             builder = Response.status(status).type((MediaType)null);
         } else {
@@ -109,19 +114,12 @@
         }
         if(isJsonp) {
             builder.type(ResourceHelper.APPLICATION_JAVASCRIPT_TYPE);
+        } else if (type != null) {
+            builder.type(type);
         }
         return builder.build();
     }
     
-    public Response build(MediaType type) {
-        if(outputBody == null && outputGenerator == null && jsonp == null) {
-            status(Response.Status.NO_CONTENT);
-        }
-        Response.ResponseBuilder builder = Response.status(status).entity(createStreamingOutput());
-        builder.type(type);
-        return builder.build();
-    }
-
     public static void formatJsonError(StringBuilder builder, String code, String message) {
         builder.append("{\"code\":\"");
         builder.append(code);

=== modified file 'src/main/java/com/akiban/rest/resources/DirectResource.java'
--- src/main/java/com/akiban/rest/resources/DirectResource.java	2013-04-22 20:22:01 +0000
+++ src/main/java/com/akiban/rest/resources/DirectResource.java	2013-04-26 22:25:31 +0000
@@ -45,6 +45,7 @@
 import com.akiban.rest.RestResponseBuilder;
 import com.akiban.rest.RestResponseBuilder.BodyGenerator;
 import com.akiban.server.error.NoSuchSchemaException;
+import com.akiban.server.service.restdml.DirectInvocation;
 import com.akiban.server.service.session.Session;
 import com.akiban.server.service.transaction.TransactionService;
 
@@ -221,68 +222,66 @@
     @Path("/call/{proc}{params:(/.*)?}")
     public Response callGet(@Context final HttpServletRequest request, @PathParam("proc") final String proc,
             @PathParam("params") final String pathParams, @Context final UriInfo uri) {
-        final TableName procName = ResourceHelper.parseTableName(request, proc);
-        ResourceHelper.checkSchemaAccessible(reqs.securityService, request, procName.getSchemaName());
-        final MediaType[] responseType = new MediaType[1];
-
-        return RestResponseBuilder.forRequest(request).body(new BodyGenerator() {
-            @Override
-            public void write(PrintWriter writer) throws Exception {
-                reqs.directService.invokeRestEndpoint(writer, request, "GET", procName, pathParams,
-                        uri.getQueryParameters(), null, responseType);
-            }
-        }).build(responseType[0]);
+        return doCall(request, "GET", proc, pathParams, uri, null);
     }
 
     @POST
     @Path("/call/{proc}{params:(/.*)?}")
     public Response callPost(@Context final HttpServletRequest request, @PathParam("proc") final String proc,
             @PathParam("params") final String pathParams, @Context final UriInfo uri, final byte[] content) {
-        final TableName procName = ResourceHelper.parseTableName(request, proc);
-        ResourceHelper.checkSchemaAccessible(reqs.securityService, request, procName.getSchemaName());
-        final MediaType[] responseType = new MediaType[1];
-
-        return RestResponseBuilder.forRequest(request).body(new BodyGenerator() {
-            @Override
-            public void write(PrintWriter writer) throws Exception {
-                reqs.directService.invokeRestEndpoint(writer, request, "POST", procName, pathParams,
-                        uri.getQueryParameters(), content, responseType);
-            }
-        }).build(responseType[0]);
+        return doCall(request, "POST", proc, pathParams, uri, content);
     }
 
     @PUT
     @Path("/call/{proc}{params:(/.*)?}")
     public Response callPut(@Context final HttpServletRequest request, @PathParam("proc") final String proc,
             @PathParam("params") final String pathParams, @Context final UriInfo uri, final byte[] content) {
-        final TableName procName = ResourceHelper.parseTableName(request, proc);
-        ResourceHelper.checkSchemaAccessible(reqs.securityService, request, procName.getSchemaName());
-        final MediaType[] responseType = new MediaType[1];
-
-        return RestResponseBuilder.forRequest(request).body(new BodyGenerator() {
-            @Override
-            public void write(PrintWriter writer) throws Exception {
-                reqs.directService.invokeRestEndpoint(writer, request, "PUT", procName, pathParams,
-                        uri.getQueryParameters(), content, responseType);
-            }
-        }).build(responseType[0]);
+        return doCall(request, "PUT", proc, pathParams, uri, content);
     }
 
     @DELETE
     @Path("/call/{proc}{params:(/.*)?}")
     public Response callDelete(@Context final HttpServletRequest request, @PathParam("proc") final String proc,
             @PathParam("params") final String pathParams, @Context final UriInfo uri, final byte[] content) {
+        return doCall(request, "DELETE", proc, pathParams, uri, content);
+    }
+    
+    private Response doCall(final HttpServletRequest request, final String method, final String proc, final String pathParams,
+            final UriInfo uri, final byte[] content) {
         final TableName procName = ResourceHelper.parseTableName(request, proc);
         ResourceHelper.checkSchemaAccessible(reqs.securityService, request, procName.getSchemaName());
-        final MediaType[] responseType = new MediaType[1];
-
-        return RestResponseBuilder.forRequest(request).body(new BodyGenerator() {
-            @Override
-            public void write(PrintWriter writer) throws Exception {
-                reqs.directService.invokeRestEndpoint(writer, request, "DELETE", procName, pathParams,
-                        uri.getQueryParameters(), content, responseType);
+
+        RestResponseBuilder builder = RestResponseBuilder.forRequest(request);
+        final DirectInvocation invocation;
+        try {
+            invocation = reqs.directService.prepareRestInvocation(method, procName, pathParams,
+                    uri.getQueryParameters(), content, request);
+            invocation.getEndpointMetadata().setResponseHeaders(builder);
+        } catch (Exception e) {
+            throw builder.wrapException(e);
+        }
+
+        try {
+            if (invocation.getEndpointMetadata().isVoid()) {
+                try {
+                    reqs.directService.invokeRestEndpoint(null, request, method, invocation);
+                } catch (Throwable t) {
+                    throw builder.wrapException(t);
+                }
+                return builder.build();
+            } else {
+                return builder.body(new BodyGenerator() {
+                    @Override
+                    public void write(PrintWriter writer) throws Exception {
+                        reqs.directService.invokeRestEndpoint(writer, request, method, invocation);
+                    }
+                }).build();
             }
-        }).build(responseType[0]);
+        } finally {
+            invocation.finish();
+        }
     }
 
+
+
 }

=== added file 'src/main/java/com/akiban/server/service/restdml/DirectInvocation.java'
--- src/main/java/com/akiban/server/service/restdml/DirectInvocation.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/server/service/restdml/DirectInvocation.java	2013-04-26 22:25:31 +0000
@@ -0,0 +1,62 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.akiban.server.service.restdml;
+
+import java.sql.SQLException;
+
+import com.akiban.ais.model.TableName;
+import com.akiban.sql.embedded.JDBCConnection;
+
+
+public class DirectInvocation {
+    private final JDBCConnection conn;
+    private final TableName procName;
+    private final EndpointMetadata em;
+    private final Object[] args;
+    
+    public DirectInvocation(JDBCConnection conn, TableName procName, EndpointMetadata em, Object[] args) {
+        this.conn = conn;
+        this.procName = procName;
+        this.em = em;
+        this.args = args;
+    }
+
+    public JDBCConnection getConnection() {
+        return conn;
+    }
+    
+    public TableName getProcName() {
+        return procName;
+    }
+    
+    public EndpointMetadata getEndpointMetadata() {
+        return em;
+    }
+
+    public Object[] getArgs() {
+        return args;
+    }
+
+    public void finish() {
+        try {
+            conn.close();
+        } catch (SQLException e) {
+            // probably the least of our problems.
+        }
+    }
+}

=== modified file 'src/main/java/com/akiban/server/service/restdml/DirectService.java'
--- src/main/java/com/akiban/server/service/restdml/DirectService.java	2013-04-04 21:46:56 +0000
+++ src/main/java/com/akiban/server/service/restdml/DirectService.java	2013-04-26 22:25:31 +0000
@@ -20,7 +20,6 @@
 import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
 import com.akiban.ais.model.TableName;
@@ -36,8 +35,11 @@
     public void reportStoredProcedures(PrintWriter writer, HttpServletRequest request, String query, String module,
             Session session, boolean functionsOnly) throws Exception;
 
-    public void invokeRestEndpoint(PrintWriter writer, HttpServletRequest request, String method, TableName procName,
-            String pathParams, MultivaluedMap<String, String> queryParameters, byte[] content, MediaType[] responseType)
-            throws Exception;
+    public DirectInvocation prepareRestInvocation(final String method, final TableName procName,
+            final String pathParams, final MultivaluedMap<String, String> queryParameters, final byte[] content,
+            final HttpServletRequest request) throws Exception;
+        
+    public void invokeRestEndpoint(final PrintWriter writer, final HttpServletRequest request, final String method,
+            final DirectInvocation in) throws Exception;
 
 }

=== modified file 'src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java'
--- src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-26 13:06:29 +0000
+++ src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-26 22:25:31 +0000
@@ -33,8 +33,6 @@
 import java.util.regex.Matcher;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
@@ -50,7 +48,6 @@
 import com.akiban.ais.model.TableName;
 import com.akiban.direct.Direct;
 import com.akiban.rest.RestFunctionRegistrar;
-import com.akiban.rest.RestServiceImpl;
 import com.akiban.rest.resources.ResourceHelper;
 import com.akiban.server.error.DirectEndpointNotFoundException;
 import com.akiban.server.error.DirectTransactionFailedException;
@@ -110,7 +107,8 @@
     private final DXLService dxlService;
     private final EmbeddedJDBCService jdbcService;
     private final RoutineLoader routineLoader;
-
+    
+    
     @Inject
     public DirectServiceImpl(SecurityService securityService, DXLService dxlService, EmbeddedJDBCService jdbcService,
             RoutineLoader routineLoader) {
@@ -334,122 +332,118 @@
         json.writeEndArray();
     }
 
-    @Override
-    public void invokeRestEndpoint(final PrintWriter writer, final HttpServletRequest request, final String method,
-            final TableName procName, final String pathParams, final MultivaluedMap<String, String> queryParameters,
-            final byte[] content, final MediaType[] responseType) throws Exception {
-        try (JDBCConnection conn = jdbcConnection(request, procName.getSchemaName());) {
-            LOG.debug("Invoking {} {}", method, request.getRequestURI());
-            conn.setAutoCommit(false);
-
-            boolean completed = false;
-            int repeat = TRANSACTION_RETRY_COUNT;
-
-            while (--repeat >= 0) {
-                try {
-                    Direct.enter(procName.getSchemaName(), dxlService.ddlFunctions().getAIS(conn.getSession()));
-                    Direct.getContext().setConnection(conn);
-                    conn.beginTransaction();
-                    invokeRestFunction(writer, conn, method, procName, pathParams, queryParameters, content,
-                            request, responseType);
-                    conn.commitTransaction();
-                    completed = true;
-                    return;
-                } catch (RollbackException e) {
-                    if (repeat == 0) {
-                        LOG.error("Transaction failed " + TRANSACTION_RETRY_COUNT + " times: "
-                                + request.getRequestURI());
-                        throw new DirectTransactionFailedException(method, request.getRequestURI());
-                    }
-                } catch (RegistrationException e) {
-                    throw new ScriptLibraryRegistrationException(e);
-                } finally {
-                    try {
-                        if (!completed) {
-                            conn.rollbackTransaction();
-                        }
-                    } finally {
-                        Direct.leave();
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Invokes a function in a script library. The identity of the function is
-     * determined from multiple factors including the schema name, the library
-     * routine name, the URI of the request, the content type of the request,
-     * etc. This method is called by {@link RestServiceImpl} which validates
-     * security and supplies the JDBCConnection
-     */
-
-    private void invokeRestFunction(final PrintWriter writer, JDBCConnection conn, final String method,
-            final TableName procName, final String pathParams, final MultivaluedMap<String, String> queryParameters,
-            final byte[] content, final HttpServletRequest request, final MediaType[] responseType) throws Exception {
-
+    public DirectInvocation prepareRestInvocation(final String method, final TableName procName,
+            final String pathParams, final MultivaluedMap<String, String> queryParameters, final byte[] content,
+            final HttpServletRequest request) throws Exception {
+
+        JDBCConnection conn = jdbcConnection(request, procName.getSchemaName());
         ParamCache cache = new ParamCache();
         final EndpointMap endpointMap = getEndpointMap(conn.getSession());
         final List<EndpointMetadata> list;
         synchronized (endpointMap) {
             list = endpointMap.getMap().get(new EndpointAddress(method, procName));
         }
-
-        EndpointMetadata md = selectEndpoint(list, pathParams, request.getContentType(), responseType, cache);
-        if (md == null) {
+        EndpointMetadata em = selectEndpoint(list, pathParams, request.getContentType(), cache);
+        if (em == null) {
             throw new DirectEndpointNotFoundException(method, request.getRequestURI());
         }
-
-        final Object[] args = createArgsArray(pathParams, queryParameters, content, cache, md);
-
-        final ScriptPool<ScriptLibrary> libraryPool = conn.getRoutineLoader().getScriptLibrary(conn.getSession(),
-                new TableName(procName.getSchemaName(), md.routineName));
+        final Object[] args = createArgsArray(pathParams, queryParameters, content, cache, em);
+        return new DirectInvocation(conn, procName, em, args);
+    }
+
+    public void invokeRestEndpoint(final PrintWriter writer, final HttpServletRequest request, final String method,
+            final DirectInvocation in) throws Exception {
+        LOG.debug("Invoking {} {}", method, request.getRequestURI());
+
+        JDBCConnection conn = in.getConnection();
+        conn.setAutoCommit(false);
+        boolean completed = false;
+        int repeat = TRANSACTION_RETRY_COUNT;
+
+        while (--repeat >= 0) {
+            try {
+                Direct.enter(in.getProcName().getSchemaName(), dxlService.ddlFunctions().getAIS(conn.getSession()));
+                Direct.getContext().setConnection(conn);
+                conn.beginTransaction();
+                invokeRestFunction(writer, in);
+                conn.commitTransaction();
+                completed = true;
+                return;
+            } catch (RollbackException e) {
+                if (repeat == 0) {
+                    LOG.error("Transaction failed " + TRANSACTION_RETRY_COUNT + " times: " + request.getRequestURI());
+                    throw new DirectTransactionFailedException(method, request.getRequestURI());
+                }
+            } catch (RegistrationException e) {
+                throw new ScriptLibraryRegistrationException(e);
+            } finally {
+                try {
+                    if (!completed) {
+                        conn.rollbackTransaction();
+                    }
+                } finally {
+                    Direct.leave();
+                }
+            }
+        }
+    }
+
+
+    private void invokeRestFunction(final PrintWriter writer, DirectInvocation in) throws Exception {
+        EndpointMetadata em = in.getEndpointMetadata();
+        Object[] args = in.getArgs();
+
+        final ScriptPool<ScriptLibrary> libraryPool = in
+                .getConnection()
+                .getRoutineLoader()
+                .getScriptLibrary(in.getConnection().getSession(),
+                        new TableName(in.getProcName().getSchemaName(), em.routineName));
         final ScriptLibrary library = libraryPool.get();
+
         boolean success = false;
         Object result;
 
-        LOG.debug("Endpoint {}", md);
+        LOG.debug("Endpoint {}", in.getEndpointMetadata());
         try {
-            result = library.invoke(md.function, args);
+            result = library.invoke(em.function, args);
             success = true;
         } finally {
             libraryPool.put(library, success);
         }
 
-        switch (md.outParam.type) {
+        switch (em.outParam.type) {
 
         case EndpointMetadata.X_TYPE_STRING:
-            responseType[0] = MediaType.TEXT_PLAIN_TYPE;
             if (result != null) {
                 writer.write(result.toString());
-            } else if (md.outParam.defaultValue != null) {
-                writer.write(md.outParam.defaultValue.toString());
+            } else if (em.outParam.defaultValue != null) {
+                writer.write(em.outParam.defaultValue.toString());
             }
             break;
             
         case EndpointMetadata.X_TYPE_JSON:
-            responseType[0] = MediaType.APPLICATION_JSON_TYPE;
             JsonGenerator json = createJsonGenerator(writer);
             if (result != null) {
                 json.writeObject(result);
-            } else if (md.outParam.defaultValue != null) {
-                json.writeObject(md.outParam.defaultValue);
+            } else if (em.outParam.defaultValue != null) {
+                json.writeObject(em.outParam.defaultValue);
             }
-            json.close();
+            json.flush();
+            break;
+
+        case EndpointMetadata.X_TYPE_VOID:
             break;
 
         case EndpointMetadata.X_TYPE_BYTEARRAY:
-            responseType[0] = MediaType.APPLICATION_OCTET_STREAM_TYPE;
-            // TODO: Unsupported - need to add a path for writing a stream
-            break;
+            /*
+             * intentionally falls through TODO: support X_TYPE_BYTEARRAY
+             */
 
         default:
-            // No response type specified
-            responseType[0] = null;
-            break;
+            assert false : "Invalid output type";
         }
     }
-
+    
     /**
      * Select a registered <code>EndpointMetadata</code> from the supplied list.
      * The first candidate in the list that matches the end-point pattern
@@ -472,8 +466,8 @@
      * @return the selected <code>EndpointMetadata</code> or <code>null</code>.
      */
     EndpointMetadata selectEndpoint(final List<EndpointMetadata> list, final String pathParams,
-            final String requestType, final MediaType[] responseType, ParamCache cache) {
-        EndpointMetadata md = null;
+            final String requestType, ParamCache cache) {
+        EndpointMetadata em = null;
         if (list != null) {
             for (final EndpointMetadata candidate : list) {
                 if (requestType != null && candidate.expectedContentType != null
@@ -483,18 +477,18 @@
                 if (candidate.pattern != null) {
                     Matcher matcher = candidate.getParamPathMatcher(cache, pathParams);
                     if (matcher.matches()) {
-                        md = candidate;
+                        em = candidate;
                         break;
                     }
                 } else {
                     if (pathParams == null || pathParams.isEmpty()) {
-                        md = candidate;
+                        em = candidate;
                         break;
                     }
                 }
             }
         }
-        return md;
+        return em;
     }
 
     /**
@@ -515,17 +509,17 @@
      *            <code>null</code> in the case of a GET request.
      * @param cache
      *            A cache for partial results
-     * @param md
+     * @param em
      *            The <code>EndpointMetadata</code> instance selected by
      *            {@link #selectEndpoint(List, String, String, MediaType[], ParamCache)}
      * @return the argument array
      * @throws Exception
      */
     Object[] createArgsArray(final String pathParams, final MultivaluedMap<String, String> queryParameters,
-            final byte[] content, ParamCache cache, EndpointMetadata md) throws Exception {
-        final Object[] args = new Object[md.inParams.length];
-        for (int index = 0; index < md.inParams.length; index++) {
-            final ParamMetadata pm = md.inParams[index];
+            final byte[] content, ParamCache cache, EndpointMetadata em) throws Exception {
+        final Object[] args = new Object[em.inParams.length];
+        for (int index = 0; index < em.inParams.length; index++) {
+            final ParamMetadata pm = em.inParams[index];
             Object v = pm.source.value(pathParams, queryParameters, content, cache);
             args[index] = EndpointMetadata.convertType(pm, v);
         }

=== modified file 'src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java'
--- src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-26 02:10:55 +0000
+++ src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-26 22:25:31 +0000
@@ -36,6 +36,7 @@
 import javax.ws.rs.core.Response.Status;
 
 import com.akiban.ais.model.TableName;
+import com.akiban.rest.RestResponseBuilder;
 import com.fasterxml.jackson.databind.JsonNode;
 
 /**
@@ -71,6 +72,11 @@
     final static List<String> X_TYPES = Arrays.asList(new String[] { X_TYPE_INT, X_TYPE_LONG, X_TYPE_FLOAT,
             X_TYPE_DOUBLE, X_TYPE_STRING, X_TYPE_DATE, X_TYPE_TIMESTAMP, X_TYPE_BYTEARRAY, X_TYPE_JSON, X_TYPE_VOID });
 
+    /*
+     * TODO: support X_TYPE_BYTEARRAY type
+     */
+    final static List<String> OUT_TYPES = Arrays.asList(new String[] { X_TYPE_STRING, X_TYPE_JSON, X_TYPE_VOID });
+
     private final static Charset UTF8 = Charset.forName("UTF8");
 
     static Object convertType(ParamMetadata pm, Object v) throws Exception {
@@ -88,7 +94,7 @@
         switch (pm.type) {
         case EndpointMetadata.X_TYPE_INT:
             if (v instanceof JsonNode) {
-                if (((JsonNode) v).isInt()) {
+                if (((JsonNode) v).isNumber()) {
                     return ((JsonNode) v).intValue();
                 } else {
                     break;
@@ -99,7 +105,7 @@
             }
         case EndpointMetadata.X_TYPE_LONG:
             if (v instanceof JsonNode) {
-                if (((JsonNode) v).isLong()) {
+                if (((JsonNode) v).isNumber()) {
                     return ((JsonNode) v).longValue();
                 } else {
                     break;
@@ -110,7 +116,7 @@
             }
         case EndpointMetadata.X_TYPE_FLOAT:
             if (v instanceof JsonNode) {
-                if (((JsonNode) v).isFloatingPointNumber()) {
+                if (((JsonNode) v).isNumber()) {
                     return ((JsonNode) v).numberValue().floatValue();
                 } else {
                     break;
@@ -273,7 +279,7 @@
 
     static ParamMetadata createInParameter(final Tokenizer tokens) throws Exception {
         String v = tokens.next(true);
-        ParamMetadata pm = createOutParameter(tokens);
+        ParamMetadata pm = createParameter(tokens);
         if (pm.type == X_TYPE_VOID) {
             throw new IllegalArgumentException("Input parameter may not have type " + X_TYPE_VOID);
         }
@@ -295,6 +301,15 @@
     }
 
     static ParamMetadata createOutParameter(final Tokenizer tokens) throws Exception {
+        ParamMetadata pm = createParameter(tokens);
+        if (!EndpointMetadata.OUT_TYPES.contains(pm.type)) {
+            throw new IllegalArgumentException("Unsuported output parameter type " + pm.type);
+        }
+
+        return pm;
+    }
+
+    static ParamMetadata createParameter(final Tokenizer tokens) throws Exception {
         ParamMetadata pm = new ParamMetadata();
         String v = tokens.nextName(true);
         String type = v.toLowerCase();
@@ -827,4 +842,34 @@
                 && equals(em.pattern, pattern) && equals(em.outParam, outParam) && equals(em.inParams, inParams);
     }
 
+    public void setResponseHeaders(final RestResponseBuilder builder) {
+        switch (outParam.type) {
+
+        case EndpointMetadata.X_TYPE_STRING:
+            builder.type(MediaType.TEXT_PLAIN_TYPE);
+            break;
+
+        case EndpointMetadata.X_TYPE_JSON:
+            builder.type(MediaType.APPLICATION_JSON_TYPE);
+            break;
+
+        case EndpointMetadata.X_TYPE_VOID:
+            builder.type((MediaType)null);
+            builder.status(Status.NO_CONTENT);
+            break;
+
+        case EndpointMetadata.X_TYPE_BYTEARRAY:
+            /*
+             * intentionally falls through TODO: support X_TYPE_BYTEARRAY
+             */
+
+        default:
+            assert false : "Invalid output type";
+        }
+    }
+
+    public boolean isVoid() {
+        return X_TYPE_VOID.equals(outParam.type);
+    }
+
 }

=== added file 'src/test/resources/com/akiban/rest/direct/direct-output-types.body'
--- src/test/resources/com/akiban/rest/direct/direct-output-types.body	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-output-types.body	2013-04-26 22:25:31 +0000
@@ -0,0 +1,26 @@
+function _register(registrar) {
+    registrar.register(
+        "method=GET path=out_string function=out_string in=() out=string");
+    registrar.register(
+        "method=GET path=out_json function=out_json in=() out=json");
+    registrar.register(
+        "method=GET path=out_void function=out_void in=() out=void");
+    registrar.register(
+        "method=GET path=out_void_with_content function=out_void2 in=() out=void");
+};
+
+function out_string() {
+    return "correct";
+}
+
+function out_json() {
+    return {status : "correct"};
+}
+
+function out_void() {
+}
+
+function out_void2() {
+    return "correct";
+}
+

=== added file 'src/test/resources/com/akiban/rest/direct/test-direct-output-types.script'
--- src/test/resources/com/akiban/rest/direct/test-direct-output-types.script	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/direct/test-direct-output-types.script	2013-04-26 22:25:31 +0000
@@ -0,0 +1,34 @@
+# Install a library with two endpoints
+#
+PUT     /direct/library?module=test.output_types&language=Javascript @direct-output-types.body
+EQUALS  {"functions":4}\n
+
+
+GET     /direct/call/test.out_string
+HEADERS responseCode:200
+HEADERS Content-Type:text/plain
+EQUALS  correct\n
+
+GET     /direct/call/test.out_json
+HEADERS responseCode:200
+JSONEQ  {"status":"correct"}
+HEADERS Content-Type:application/json
+
+GET     /direct/call/test.out_void
+HEADERS responseCode:204
+
+GET     /direct/call/test.out_void_with_content
+HEADERS responseCode:204
+
+PUT     /direct/library?module=test.output_types2&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=() out=int");};
+CONTAINS Invalid function specification
+
+PUT     /direct/library?module=test.output_types2&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=() out=date");};
+CONTAINS Invalid function specification
+
+PUT     /direct/library?module=test.output_types2&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=() out=bytearray");};
+CONTAINS Invalid function specification
+
+PUT     /direct/library?module=test.output_types2&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=() out=float");};
+CONTAINS Invalid function specification
+

=== modified file 'src/test/resources/com/akiban/rest/direct/test-updates.script'
--- src/test/resources/com/akiban/rest/direct/test-updates.script	2013-04-22 21:09:54 +0000
+++ src/test/resources/com/akiban/rest/direct/test-updates.script	2013-04-26 22:25:31 +0000
@@ -11,14 +11,15 @@
 # Insert a new customer
 #
 PUT     /direct/call/test.cadd/5 {"name":"Mary Johnson"}
-HEADERS responseCode:200
+HEADERS responseCode:204
+
 GET     /direct/call/test.cnames?prefix=SomeParameterValue
 EQUALS  SomeParameterValue,John Smith,Willy Jones,Jane Smith,Jonathan Smyth,Mary Johnson\n
 
 # Modify customer name
 #
 POST    /direct/call/test.cchange {"cid":5, "name":"Mary Johnston"}
-HEADERS responseCode:200
+HEADERS responseCode:204
 GET     /direct/call/test.cnames?prefix=SomeParameterValue
 EQUALS  SomeParameterValue,John Smith,Willy Jones,Jane Smith,Jonathan Smyth,Mary Johnston\n