connection mode using DrillConnectionMode enum
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0e4d8c8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0e4d8c8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0e4d8c8 Branch: refs/heads/master Commit: f0e4d8c88f9e17cf66441cf820f2cddc69740c3b Parents: 84fa80f Author: Fabrizio Spataro <fabrizio.spat...@bizmate.it> Authored: Fri Oct 14 12:13:05 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Oct 17 13:11:28 2016 +0200 ---------------------------------------------------------------------- .../src/main/docs/drill-component.adoc | 6 +++--- .../camel/component/drill/DrillComponent.java | 7 ------- .../component/drill/DrillConnectionMode.java | 21 ++++++++++++++++++++ .../camel/component/drill/DrillEndpoint.java | 15 +++++++------- .../camel/component/drill/EndpointTest.java | 2 +- .../camel/component/drill/ProducerTest.java | 7 +++---- 6 files changed, 35 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/main/docs/drill-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/docs/drill-component.adoc b/components/camel-drill/src/main/docs/drill-component.adoc index 6da5f4a..0999a96 100644 --- a/components/camel-drill/src/main/docs/drill-component.adoc +++ b/components/camel-drill/src/main/docs/drill-component.adoc @@ -59,11 +59,11 @@ The DRILL component supports 5 endpoint options which are listed below: | port | producer | 2181 | Integer | Connection port | clusterId | producer | | String | Cluster ID https://drill.apache.org/docs/using-the-jdbc-driver/determining-the-cluster-id | directory | producer | | String | Drill directory in ZooKeeper -| mode | producer | zk | String | Connection mode: +| mode | producer | zk | DrillConnectionMode | Connection mode: - - zk: Zookeeper + - DrillConnectionMode.ZK: Zookeeper - - drillbit: Drillbit direct connection + - DrillConnectionMode.DRILLBIT: Drillbit direct connection https://drill.apache.org/docs/using-the-jdbc-driver/ |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillComponent.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillComponent.java index dfb0108..449ff12 100644 --- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillComponent.java +++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillComponent.java @@ -28,10 +28,6 @@ import org.apache.camel.impl.UriEndpointComponent; */ public class DrillComponent extends UriEndpointComponent { - protected enum DrillConnectionMode { - ZK, DRILLBIT - } - public DrillComponent() { super(DrillEndpoint.class); } @@ -46,9 +42,6 @@ public class DrillComponent extends UriEndpointComponent { setProperties(endpoint, parameters); endpoint.setHost(remaining); - // check mode - DrillConnectionMode.valueOf(endpoint.getMode().toUpperCase()); - return endpoint; } } http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillConnectionMode.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillConnectionMode.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillConnectionMode.java new file mode 100644 index 0000000..f0795c2 --- /dev/null +++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillConnectionMode.java @@ -0,0 +1,21 @@ +/** + * 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.drill; + +public enum DrillConnectionMode { + ZK, DRILLBIT +} http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java index 93c174b..e2c4cef 100644 --- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java +++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java @@ -26,7 +26,6 @@ import oadd.org.apache.commons.lang.StringUtils; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.component.drill.DrillComponent.DrillConnectionMode; import org.apache.camel.impl.DefaultPollingEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; @@ -53,8 +52,8 @@ public class DrillEndpoint extends DefaultPollingEndpoint { private String directory = ""; @UriParam(defaultValue = "") private String clusterId = ""; - @UriParam(defaultValue = "zk") - private String mode = "zk"; + @UriParam(defaultValue = "ZK") + private DrillConnectionMode mode = DrillConnectionMode.ZK; /** * creates a drill endpoint @@ -81,11 +80,11 @@ public class DrillEndpoint extends DefaultPollingEndpoint { public String toJDBCUri() { String url = "jdbc:drill:"; - if (mode.toUpperCase().equals(DrillConnectionMode.DRILLBIT.name())) { + if (mode.equals(DrillConnectionMode.DRILLBIT)) { // TODO JIRA BUG connection mode - url += mode + "=" + host; + url += mode.name().toLowerCase() + "=" + host; } else { - url += mode + "=" + host + ":" + port; + url += mode.name().toLowerCase() + "=" + host + ":" + port; } if (StringUtils.isNotBlank(directory)) { @@ -166,11 +165,11 @@ public class DrillEndpoint extends DefaultPollingEndpoint { * * @return */ - public String getMode() { + public DrillConnectionMode getMode() { return mode; } - public void setMode(String mode) { + public void setMode(DrillConnectionMode mode) { this.mode = mode; } http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java index ad95a4b..f7c32fd 100644 --- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java +++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java @@ -26,7 +26,7 @@ public class EndpointTest extends CamelTestSupport { private static final Integer PORT = 4000; private static final String DIRECTORY = "directory"; private static final String CLUSTERID = "clusterId"; - private static final String MODE = "zk"; + private static final DrillConnectionMode MODE = DrillConnectionMode.ZK; @Test public void testZKJdbcURL() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/f0e4d8c8/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java index fd5888d..f3c8050 100644 --- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java +++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.drill; import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.drill.DrillComponent.DrillConnectionMode; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Ignore; @@ -29,8 +28,8 @@ import org.junit.Test; public class ProducerTest extends CamelTestSupport { private final String host = "localhost"; - private final String mode = DrillConnectionMode.DRILLBIT.name().toLowerCase(); - private final String query = "select * from schema.db"; + private final DrillConnectionMode mode = DrillConnectionMode.DRILLBIT; + private final String query = "select * from query"; @Test public void testProducer() throws Exception { @@ -46,7 +45,7 @@ public class ProducerTest extends CamelTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("direct:in").setHeader(DrillConstants.DRILL_QUERY, constant(query)).to("drill://" + host + "?mode=" + mode).log("${body}").to("mock:result"); + from("direct:in").setHeader(DrillConstants.DRILL_QUERY, constant(query)).to("drill://" + host + "?mode=" + mode.name()).log("${body}").to("mock:result"); } }; }
