chore: code cleanup

apache · Jun 20, 2019 · 253358b · 253358b
1 parent e9fc7b1
commit 253358b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 5 deletions.
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
@@ -72,6 +72,7 @@
     </dependencies>
 
     <build>
+        <defaultGoal>exec:java</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
@@ -68,6 +68,7 @@
     </dependencies>
 
     <build>
+        <defaultGoal>exec:java</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/...untime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy b/...untime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.k.groovy.dsl
 
+
 import org.apache.camel.support.IntrospectionSupport
+import org.apache.camel.support.PropertyBindingSupport
 
 class ComponentConfiguration {
     private final org.apache.camel.Component component
@@ -47,13 +49,13 @@ class ComponentConfiguration {
             }
         }
 
-        if (!IntrospectionSupport.setProperty(component, name, value, true)) {
+        if (!PropertyBindingSupport.bindProperty(component.camelContext, component, name, value)) {
             throw new MissingMethodException(name, this.component.class, args as Object[])
         }
     }
 
     def propertyMissing(String name, value) {
-        if (!IntrospectionSupport.setProperty(component, name, value, true)) {
+        if (!PropertyBindingSupport.bindProperty(component.camelContext, component, name, value,)) {
             throw new MissingMethodException(name, this.component.class, value)
         }
     }

diff --git a/camel-k-runtime-servlet/src/main/java/org/apache/camel/k/servlet/ServletEndpoint.java b/camel-k-runtime-servlet/src/main/java/org/apache/camel/k/servlet/ServletEndpoint.java
@@ -48,6 +48,7 @@ public ServletEndpoint(CamelContext context, String bindHost, int bindPort, Stri
         this.path = path;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void doStart() throws Exception {
         DeploymentInfo servletBuilder = Servlets.deployment()

diff --git a/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java b/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
@@ -21,7 +21,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.StringHelper;
 
 public class KnativeComponent extends DefaultComponent {
@@ -101,7 +101,7 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
         final KnativeConfiguration conf = getKnativeConfiguration();
 
         // set properties from the endpoint uri
-        IntrospectionSupport.setProperties(getCamelContext().getTypeConverter(), conf, parameters);
+        PropertyBindingSupport.bindProperties(getCamelContext(), conf, parameters);
 
         return new KnativeEndpoint(uri, this, Knative.Type.valueOf(type), target, conf);
     }

diff --git a/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java b/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java
@@ -78,7 +78,8 @@ public KnativeServiceDefinition lookupServiceOrDefault(Knative.Type type, String
     //
     // ************************
 
-     private Optional<KnativeServiceDefinition> lookup(Knative.Type type, String name) {
+    @SuppressWarnings("unchecked")
+    private Optional<KnativeServiceDefinition> lookup(Knative.Type type, String name) {
          final String contextPath = StringHelper.after(name, "/");
          final String serviceName = (contextPath == null) ? name : StringHelper.before(name, "/");
 
@@ -176,6 +177,7 @@ public static KnativeEnvironment mandatoryLoadFromResource(CamelContext context,
     //
     // ************************
 
+    @SuppressWarnings("unchecked")
     public final static class KnativeServiceDefinition extends DefaultServiceDefinition {
         @JsonCreator
         public KnativeServiceDefinition(

diff --git a/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeSupport.java b/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeSupport.java
@@ -30,6 +30,7 @@ public static boolean hasStructuredContent(Exchange exchange) {
         return Objects.equals(exchange.getIn().getHeader(Exchange.CONTENT_TYPE), Knative.MIME_STRUCTURED_CONTENT_MODE);
     }
 
+    @SafeVarargs
     public static <K, V> Map<K, V> mergeMaps(Map<K, V> map, Map<K, V>... maps) {
         Map<K, V> answer = new HashMap<>();
 

diff --git a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java
@@ -64,6 +64,7 @@ private V01() {
         };
     };
 
+    @SuppressWarnings("unchecked")
     public static final Function<KnativeEndpoint, Processor> CONSUMER = (KnativeEndpoint endpoint) -> {
         return exchange -> {
             if (!KnativeSupport.hasStructuredContent(exchange)) {

diff --git a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java
@@ -64,6 +64,7 @@ private V02() {
         };
     };
 
+    @SuppressWarnings("unchecked")
     public static final Function<KnativeEndpoint, Processor> CONSUMER = (KnativeEndpoint endpoint) -> {
         return exchange -> {
             if (!KnativeSupport.hasStructuredContent(exchange)) {