[camel] branch master updated: Fix camel-drill OSGi support

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b8fdb5f  Fix camel-drill OSGi support
b8fdb5f is described below

commit b8fdb5fe0d4fe2af740a140e4513b4b8002faf41
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu May 9 12:00:19 2019 +0200

    Fix camel-drill OSGi support
---
 .../camel/component/drill/DrillEndpoint.java       |  3 +-
 .../camel/component/drill/util/StringUtils.java    | 43 ++++++++++++++++++++++
 .../karaf/features/src/main/resources/features.xml |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

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 a4a7410..e7eab72 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
@@ -21,11 +21,10 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
-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.util.StringUtils;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
diff --git 
a/components/camel-drill/src/main/java/org/apache/camel/component/drill/util/StringUtils.java
 
b/components/camel-drill/src/main/java/org/apache/camel/component/drill/util/StringUtils.java
new file mode 100644
index 0000000..f05e844
--- /dev/null
+++ 
b/components/camel-drill/src/main/java/org/apache/camel/component/drill/util/StringUtils.java
@@ -0,0 +1,43 @@
+/*
+ * 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.util;
+
+public class StringUtils {
+
+    private StringUtils() {
+    }
+
+    public static boolean isBlank(String str) {
+        int strLen;
+        if (str != null && (strLen = str.length()) != 0) {
+            for(int i = 0; i < strLen; ++i) {
+                if (!Character.isWhitespace(str.charAt(i))) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            return true;
+        }
+    }
+
+    public static boolean isNotBlank(String str) {
+        return !isBlank(str);
+    }
+
+}
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a88b3ce..444e1d1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -810,7 +810,7 @@
   <feature name='camel-drill' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <feature version='${spring-version-range}'>spring-jdbc</feature>
-       <bundle 
dependency='true'>wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-version}</bundle>
+       <bundle 
dependency='true'>wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-version}$Export-Package=org.apache.drill.*&amp;Import-Package=!org.apache.drill.*,!oadd.*&amp;Private-Package=oadd.*</bundle>
     <bundle>mvn:org.apache.camel/camel-drill/${project.version}</bundle>
   </feature>
   <feature name='camel-dozer' version='${project.version}' start-level='50'>