[camel] branch master updated: CAMEL-14775: camel-cxf - Move OSGi blueprint out into camel-cxf-blueprint

[da...@apache.org]

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

davsclaus 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 388c4da  CAMEL-14775: camel-cxf - Move OSGi blueprint out into camel-cxf-blueprint
388c4da is described below

commit 388c4dad70ea43bdf1ae5d42671a595c2821c19b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 24 11:42:01 2020 +0100

    CAMEL-14775: camel-cxf - Move OSGi blueprint out into camel-cxf-blueprint
---
 .../cxf/{ => blueprint}/CxfBlueprintEndpoint.java       | 17 +++--------------
 .../cxf/blueprint/EndpointDefinitionParser.java         |  1 -
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
similarity index 84%
rename from components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
rename to components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
index 96be055..205b879 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
@@ -14,20 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cxf;
+package org.apache.camel.component.cxf.blueprint;
 
 import org.apache.camel.blueprint.BlueprintCamelContext;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.component.cxf.CxfComponent;
+import org.apache.camel.component.cxf.CxfEndpoint;
 import org.apache.cxf.BusFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.blueprint.container.BlueprintContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class CxfBlueprintEndpoint extends CxfEndpoint {
 
-    private static final Logger LOG = LoggerFactory.getLogger(CxfBlueprintEndpoint.class);
-
     private BlueprintContainer blueprintContainer;
     private BundleContext bundleContext;
     private BlueprintCamelContext blueprintCamelContext;
@@ -53,14 +50,6 @@ public class CxfBlueprintEndpoint extends CxfEndpoint {
     // Package private methods
     // -------------------------------------------------------------------------
 
-
-    @Override
-    protected void checkName(Object value, String name) {
-        if (ObjectHelper.isEmpty(value)) {
-            LOG.warn("The " + name + " of " + this.getEndpointUri() + " is empty, cxf will try to load the first one in wsdl for you.");
-        }
-    }
-
     public BlueprintContainer getBlueprintContainer() {
         return blueprintContainer;
     }
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
index 5370a40..d288f0b 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
@@ -24,7 +24,6 @@ import org.w3c.dom.NamedNodeMap;
 
 import org.apache.aries.blueprint.ParserContext;
 import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
-import org.apache.camel.component.cxf.CxfBlueprintEndpoint;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.osgi.framework.BundleContext;