Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 76419 invoked from network); 27 Feb 2009 16:23:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Feb 2009 16:23:05 -0000 Received: (qmail 62815 invoked by uid 500); 27 Feb 2009 16:23:05 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 62769 invoked by uid 500); 27 Feb 2009 16:23:05 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 62760 invoked by uid 99); 27 Feb 2009 16:23:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2009 08:23:05 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2009 16:23:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD14A23888CA; Fri, 27 Feb 2009 16:22:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r748572 - in /camel/trunk/components/camel-sql/src: main/java/org/apache/camel/component/sql/SqlConstants.java main/java/org/apache/camel/component/sql/SqlProducer.java test/java/org/apache/camel/component/sql/SqlRouteTest.java Date: Fri, 27 Feb 2009 16:22:43 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090227162243.CD14A23888CA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Fri Feb 27 16:22:42 2009 New Revision: 748572 URL: http://svn.apache.org/viewvc?rev=748572&view=rev Log: CAMEL-1373: CamelCase Added: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java (with props) Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java Added: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java?rev=748572&view=auto ============================================================================== --- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java (added) +++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java Fri Feb 27 16:22:42 2009 @@ -0,0 +1,31 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.camel.component.sql; + +/** + * SQL Constants. + */ +public final class SqlConstants { + + public static final String SQL_UPDATE_COUNT = "CamelSqlUpdateCount"; + + public static final String SQL_ROW_COUNT = "CamelSqlRowCount"; + + private SqlConstants() { + // Utility class + } +} Propchange: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConstants.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java?rev=748572&r1=748571&r2=748572&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java (original) +++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java Fri Feb 27 16:22:42 2009 @@ -31,7 +31,6 @@ import org.springframework.jdbc.core.RowMapperResultSetExtractor; public class SqlProducer extends DefaultProducer { - public static final String UPDATE_COUNT = "org.apache.camel.sql.update-count"; private String query; private JdbcTemplate jdbcTemplate; @@ -67,10 +66,11 @@ RowMapperResultSetExtractor mapper = new RowMapperResultSetExtractor(new ColumnMapRowMapper()); List result = (List) mapper.extractData(ps.getResultSet()); exchange.getOut().setBody(result); + exchange.getIn().setHeader(SqlConstants.SQL_ROW_COUNT, result.size()); // preserve headers exchange.getOut().setHeaders(exchange.getIn().getHeaders()); } else { - exchange.getIn().setHeader(UPDATE_COUNT, ps.getUpdateCount()); + exchange.getIn().setHeader(SqlConstants.SQL_UPDATE_COUNT, ps.getUpdateCount()); } // data is set on exchange so return null Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java?rev=748572&r1=748571&r2=748572&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java (original) +++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java Fri Feb 27 16:22:42 2009 @@ -28,7 +28,6 @@ import org.apache.camel.component.mock.MockEndpoint; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.SingleConnectionDataSource; @@ -88,6 +87,7 @@ public void testListResult() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedHeaderReceived(SqlConstants.SQL_ROW_COUNT, "2"); mock.expectedMessageCount(1); List body = new ArrayList(); body.add("ASF"); @@ -121,16 +121,14 @@ template.sendBody("direct:insert", new Object[] {10, "test", "test"}); mock.assertIsSatisfied(); try { - String projectName = (String)jdbcTemplate - .queryForObject("select project from projects where id = 10", String.class); + String projectName = (String)jdbcTemplate.queryForObject("select project from projects where id = 10", String.class); assertEquals("test", projectName); } catch (EmptyResultDataAccessException e) { fail("no row inserted"); } - Integer actualUpdateCount = mock.getExchanges().get(0).getIn().getHeader(SqlProducer.UPDATE_COUNT, - Integer.class); - assertEquals((Integer)1, actualUpdateCount); + Integer actualUpdateCount = mock.getExchanges().get(0).getIn().getHeader(SqlConstants.SQL_UPDATE_COUNT, Integer.class); + assertEquals((Integer) 1, actualUpdateCount); } public void testNoBody() throws Exception {