diff --git a/jqm-all/jqm-api-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java b/jqm-all/jqm-api-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java index 1ef63005a..6dad23fc1 100644 --- a/jqm-all/jqm-api-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java +++ b/jqm-all/jqm-api-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java @@ -69,7 +69,7 @@ /** * Main JQM client API entry point. */ -final class JdbcClient implements JqmClient, JqmClientEnqueueCallback, JqmClientQuerySubmitCallback +public final class JdbcClient implements JqmClient, JqmClientEnqueueCallback, JqmClientQuerySubmitCallback { private static Logger jqmlogger = LoggerFactory.getLogger(JdbcClient.class); private static final int IN_CLAUSE_LIMIT = 500; @@ -1014,7 +1014,8 @@ private String getStringPredicate(String fieldName, List filterValues, L private String getIntPredicate(String fieldName, Integer filterValue, List prms) { - if (filterValue == null) { + if (filterValue == null) + { return ""; } return getLongPredicate(fieldName, filterValue.longValue(), prms); diff --git a/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java b/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java index b78792c9b..dbb19ad80 100644 --- a/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java +++ b/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java @@ -35,6 +35,7 @@ import com.enioka.api.admin.RUserDto; import com.enioka.api.admin.VersionDto; import com.enioka.jqm.client.api.JqmClientException; +import com.enioka.jqm.client.jdbc.api.JdbcClient; import com.enioka.jqm.jdbc.DbConn; import com.enioka.jqm.model.GlobalParameter; import com.enioka.jqm.model.JobDef; @@ -747,12 +748,9 @@ public InputStream getNewCertificate(@PathParam("id") long userId) @GET public InputStream SS(@PathParam("nodeName") String nodeName, @QueryParam("latest") int latest, @Context HttpServletResponse res) { - // TODO - /* - * InputStream fs = ((JdbcClient) JqmClientFactory.getClient()).getEngineLog(nodeName, latest); res.setHeader("Content-Disposition", - * "attachment; filename=" + nodeName + ".log"); return fs; - */ - return null; + InputStream fs = ((JdbcClient) Helpers.getClient()).getEngineLog(nodeName, latest); + res.setHeader("Content-Disposition", "attachment; filename=" + nodeName + ".log"); + return fs; } }