Error while deploying integration in Knative based environment apache…

…#436
lburgazzoli · Feb 15, 2019 · 344af95 · 344af95
1 parent 0024079
commit 344af95
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 17 deletions.
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
@@ -140,6 +140,8 @@ func (t *knativeServiceTrait) getServiceFor(e *Environment) (*serving.Service, e
 		envvar.SetVal(&environment, envName, s.Content)
 
 		params := make([]string, 0)
+		params = append(params, "name="+s.Name)
+
 		if s.InferLanguage() != "" {
 			params = append(params, "language="+string(s.InferLanguage()))
 		}

diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
@@ -111,7 +111,7 @@ func TestKnativeTraitWithCompressedSources(t *testing.T) {
 
 		routes := util.LookupEnvVar(vars, "CAMEL_K_ROUTES")
 		assert.NotNil(t, routes)
-		assert.Equal(t, "env:CAMEL_K_ROUTE_000?language=js&compression=true", routes.Value)
+		assert.Equal(t, "env:CAMEL_K_ROUTE_000?name=routes.js&language=js&compression=true", routes.Value)
 
 		route := util.LookupEnvVar(vars, "CAMEL_K_ROUTE_000")
 		assert.NotNil(t, route)
@@ -209,7 +209,7 @@ func TestKnativeTraitWithConfigMapSources(t *testing.T) {
 
 		routes := util.LookupEnvVar(vars, "CAMEL_K_ROUTES")
 		assert.NotNil(t, routes)
-		assert.Equal(t, "env:CAMEL_K_ROUTE_000?language=js&compression=true", routes.Value)
+		assert.Equal(t, "env:CAMEL_K_ROUTE_000?name=routes.js&language=js&compression=true", routes.Value)
 
 		route := util.LookupEnvVar(vars, "CAMEL_K_ROUTE_000")
 		assert.NotNil(t, route)

diff --git a/runtime/camel-k-runtime-core/src/main/java/org/apache/camel/k/Source.java b/runtime/camel-k-runtime-core/src/main/java/org/apache/camel/k/Source.java
@@ -23,16 +23,22 @@
 import org.apache.commons.lang3.StringUtils;
 
 public class Source {
+    private final String name;
     private final String location;
     private final String language;
     private final boolean compressed;
 
-    private Source(String location, String language, boolean compression) {
+    private Source(String name, String location, String language, boolean compression) {
+        this.name = name;
         this.location = location;
         this.language = language;
         this.compressed = compression;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public String getLocation() {
         return location;
     }
@@ -66,7 +72,8 @@ public static Source create(String uri) throws Exception {
         final String query = StringUtils.substringAfter(uri, "?");
         final Map<String, Object> params = URISupport.parseQuery(query);
         final String languageName = (String) params.get("language");
-        final boolean compression = Boolean.valueOf((String) params.get("compression"));
+        final String compression = (String) params.get("compression");
+
 
         String language = languageName;
         if (ObjectHelper.isEmpty(language)) {
@@ -77,7 +84,16 @@ public static Source create(String uri) throws Exception {
             throw new IllegalArgumentException("Unknown language " + language);
         }
 
+        String name = (String) params.get("name");
+        if (name == null) {
+            name = StringUtils.substringAfter(location, ":");
+            name = StringUtils.substringBeforeLast(name, ".");
+
+            if (name.contains("/")) {
+                name = StringUtils.substringAfterLast(name, "/");
+            }
+        }
 
-        return new Source(location, language, compression);
+        return new Source(name, location, language, Boolean.valueOf(compression));
     }
 }
diff --git a/runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java b/runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java
@@ -20,7 +20,6 @@
 import java.util.List;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.k.Constants;
 import org.apache.camel.k.RoutesLoader;
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.Source;
@@ -34,14 +33,13 @@ public List<String> getSupportedLanguages() {
 
     @Override
     public RouteBuilder load(Runtime.Registry registry, Source source) throws Exception {
-        String path = source.getLocation();
-        path = StringUtils.removeStart(path, Constants.SCHEME_CLASSPATH);
-        path = StringUtils.removeEnd(path, ".class");
+        String name = source.getName();
+        name = StringUtils.removeEnd(name, ".class");
 
-        Class<?> type = Class.forName(path);
+        Class<?> type = Class.forName(name);
 
         if (!RouteBuilder.class.isAssignableFrom(type)) {
-            throw new IllegalStateException("The class provided (" + path + ") is not a org.apache.camel.builder.RouteBuilder");
+            throw new IllegalStateException("The class provided (" + source.getLocation() + ") is not a org.apache.camel.builder.RouteBuilder");
         }
 
         return (RouteBuilder)type.newInstance();

diff --git a/...ime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java b/...ime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java
@@ -49,15 +49,15 @@ public void configure() throws Exception {
                 final CamelContext context = getContext();
 
                 try (InputStream is = URIResolver.resolve(context, source)) {
-                    String name = source.getLocation();
-                    name = StringUtils.substringAfter(name, ":");
+                    String name = source.getName();
                     name = StringUtils.removeEnd(name, ".java");
 
-                    if (name.contains("/")) {
-                        name = StringUtils.substringAfterLast(name, "/");
-                    }
+                    // compile the source in memory
+                    String content = IOUtils.toString(is, StandardCharsets.UTF_8);
+                    Reflect compiled = Reflect.compile(name, content);
 
-                    RoutesBuilder builder = Reflect.compile(name, IOUtils.toString(is, StandardCharsets.UTF_8)).create().get();
+                    // create the builder
+                    RoutesBuilder builder = compiled.create().get();
 
                     // Wrap routes builder
                     includeRoutes(builder);

diff --git a/runtime/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java b/runtime/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
@@ -88,6 +88,23 @@ public void testLoadJava() throws Exception {
         assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
     }
 
+    @Test
+    public void testLoadJavaWithNameOverride() throws Exception {
+        Source source = Source.create("classpath:MyRoutesWithNameOverride.java?name=MyRoutes.java");
+        RoutesLoader loader = RuntimeSupport.loaderFor(new DefaultCamelContext(), source);
+        RouteBuilder builder = loader.load(new InMemoryRegistry(), source);
+
+        assertThat(loader).isInstanceOf(JavaSourceLoader.class);
+        assertThat(builder).isNotNull();
+
+        builder.configure();
+
+        List<RouteDefinition> routes = builder.getRouteCollection().getRoutes();
+        assertThat(routes).hasSize(1);
+        assertThat(routes.get(0).getInputs().get(0).getEndpointUri()).isEqualTo("timer:tick");
+        assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
+    }
+
     @Test
     public void testLoadJavaWithNestedClass() throws Exception {
         Source source = Source.create("classpath:MyRoutesWithNestedClass.java");

diff --git a/runtime/camel-k-runtime-jvm/src/test/resources/MyRoutesWithNameOverride.java b/runtime/camel-k-runtime-jvm/src/test/resources/MyRoutesWithNameOverride.java
@@ -0,0 +1,9 @@
+import org.apache.camel.builder.RouteBuilder;
+
+public class MyRoutes extends RouteBuilder {
+    @Override
+    public void configure() throws Exception {
+        from("timer:tick")
+                .to("log:info");
+    }
+}