CAMEL-9162: camel-elsql component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fc96ef4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fc96ef4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fc96ef4 Branch: refs/heads/master Commit: 5fc96ef456ec86736b323ef1fdaa9fadf1d750de Parents: 913efcc Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Oct 5 11:52:16 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Oct 5 11:52:16 2015 +0200 ---------------------------------------------------------------------- .../camel/component/elsql/ElSqlDatabaseVendor.java | 16 ++++++++++++++++ .../camel/component/elsql/ElsqlSqlMapSource.java | 6 +----- 2 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5fc96ef4/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElSqlDatabaseVendor.java ---------------------------------------------------------------------- diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElSqlDatabaseVendor.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElSqlDatabaseVendor.java index 28ce85a..a7405d6 100644 --- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElSqlDatabaseVendor.java +++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElSqlDatabaseVendor.java @@ -1,3 +1,19 @@ +/** + * 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.elsql; import com.opengamma.elsql.ElSqlConfig; http://git-wip-us.apache.org/repos/asf/camel/blob/5fc96ef4/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlMapSource.java ---------------------------------------------------------------------- diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlMapSource.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlMapSource.java index aec8d46..725022e 100644 --- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlMapSource.java +++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlMapSource.java @@ -48,12 +48,8 @@ public class ElsqlSqlMapSource extends AbstractSqlParameterSource { public boolean hasValue(String paramName) { if ("body".equals(paramName)) { return true; - } else if (bodyMap.containsKey(paramName)) { - return true; - } else if (headersMap.containsKey(paramName)) { - return true; } else { - return false; + return bodyMap.containsKey(paramName) || headersMap.containsKey(paramName); } }
