This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 71813fb7db18632162e8efaa3c59f9a6de7ffffe
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Thu Jun 20 10:48:21 2019 +0200
chore: code cleanup
---
camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml | 1 +
camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml | 1 +
.../org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy | 6 ++++--
.../src/main/java/org/apache/camel/k/servlet/ServletEndpoint.java | 1 +
.../java/org/apache/camel/component/knative/KnativeComponent.java | 4 ++--
.../java/org/apache/camel/component/knative/KnativeEnvironment.java | 4 +++-
.../java/org/apache/camel/component/knative/KnativeSupport.java | 1 +
.../src/main/java/org/apache/camel/component/knative/ce/V01.java | 1 +
.../src/main/java/org/apache/camel/component/knative/ce/V02.java | 1 +
9 files changed, 15 insertions(+), 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
index f17cfc1..cbb4273 100644
--- 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
index 65d6612..a3cff98 100644
--- 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/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
index b60f61b..7ef304b 100644
---
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
+++
b/camel-k-runtime-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
index 075b112..ff41ebf 100644
---
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 class ServletEndpoint extends ServiceSupport {
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
index 8c1e2bf..dff3bc0 100644
---
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 java.util.Map;
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 @@ public class KnativeComponent extends DefaultComponent {
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
index 78dd114..7037db1 100644
---
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 class KnativeEnvironment {
//
// ************************
- 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 class KnativeEnvironment {
//
// ************************
+ @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
index 111e5f5..919eba5 100644
---
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 final class KnativeSupport {
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
index 1b369fa..1e9c1cc 100644
--- 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 @@ final class 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
index 5b124b6..9174b32 100644
--- 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 @@ final class V02 {
};
};
+ @SuppressWarnings("unchecked")
public static final Function<KnativeEndpoint, Processor> CONSUMER =
(KnativeEndpoint endpoint) -> {
return exchange -> {
if (!KnativeSupport.hasStructuredContent(exchange)) {
