You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/04/13 13:59:19 UTC
[camel-k] branch master updated: fix(dsl): The fromF DSL should be
parsed during HTTP endpoint discovery
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 04eda9b fix(dsl): The fromF DSL should be parsed during HTTP endpoint discovery
04eda9b is described below
commit 04eda9bcf2513646bf232cb48603e4aa5c28a79f
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue Apr 13 14:45:35 2021 +0200
fix(dsl): The fromF DSL should be parsed during HTTP endpoint discovery
---
pkg/util/source/inspector.go | 2 ++
pkg/util/source/inspector_groovy.go | 4 ++--
pkg/util/source/inspector_java_script.go | 4 ++--
pkg/util/source/inspector_java_source.go | 3 +--
pkg/util/source/inspector_kotlin.go | 3 +--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go
index ff9471e..550d334 100644
--- a/pkg/util/source/inspector.go
+++ b/pkg/util/source/inspector.go
@@ -34,7 +34,9 @@ const (
var (
singleQuotedFrom = regexp.MustCompile(`from\s*\(\s*'([a-zA-Z0-9-]+:[^']+)'`)
+ singleQuotedFromF = regexp.MustCompile(`fromF\s*\(\s*'([a-zA-Z0-9-]+:[^']+)'`)
doubleQuotedFrom = regexp.MustCompile(`from\s*\(\s*"([a-zA-Z0-9-]+:[^"]+)"`)
+ doubleQuotedFromF = regexp.MustCompile(`fromF\s*\(\s*"([a-zA-Z0-9-]+:[^"]+)"`)
singleQuotedTo = regexp.MustCompile(`\.to\s*\(\s*'([a-zA-Z0-9-]+:[^']+)'`)
singleQuotedToD = regexp.MustCompile(`\.toD\s*\(\s*'([a-zA-Z0-9-]+:[^']+)'`)
singleQuotedToF = regexp.MustCompile(`\.toF\s*\(\s*'([a-zA-Z0-9-]+:[^']+)'`)
diff --git a/pkg/util/source/inspector_groovy.go b/pkg/util/source/inspector_groovy.go
index b6db6e9..1a49f71 100644
--- a/pkg/util/source/inspector_groovy.go
+++ b/pkg/util/source/inspector_groovy.go
@@ -22,17 +22,17 @@ import (
"github.com/apache/camel-k/pkg/util"
)
-// GroovyInspector --
type GroovyInspector struct {
baseInspector
}
-// Extract --
func (i GroovyInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
from := util.FindAllDistinctStringSubmatch(
source.Content,
singleQuotedFrom,
doubleQuotedFrom,
+ singleQuotedFromF,
+ doubleQuotedFromF,
)
to := util.FindAllDistinctStringSubmatch(
source.Content,
diff --git a/pkg/util/source/inspector_java_script.go b/pkg/util/source/inspector_java_script.go
index 00dba9a..dfc4b04 100644
--- a/pkg/util/source/inspector_java_script.go
+++ b/pkg/util/source/inspector_java_script.go
@@ -22,17 +22,17 @@ import (
"github.com/apache/camel-k/pkg/util"
)
-// JavaScriptInspector --
type JavaScriptInspector struct {
baseInspector
}
-// Extract --
func (i JavaScriptInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
from := util.FindAllDistinctStringSubmatch(
source.Content,
singleQuotedFrom,
doubleQuotedFrom,
+ singleQuotedFromF,
+ doubleQuotedFromF,
)
to := util.FindAllDistinctStringSubmatch(
source.Content,
diff --git a/pkg/util/source/inspector_java_source.go b/pkg/util/source/inspector_java_source.go
index 6e0386f..354370f 100644
--- a/pkg/util/source/inspector_java_source.go
+++ b/pkg/util/source/inspector_java_source.go
@@ -22,16 +22,15 @@ import (
"github.com/apache/camel-k/pkg/util"
)
-// JavaSourceInspector --
type JavaSourceInspector struct {
baseInspector
}
-// Extract --
func (i JavaSourceInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
from := util.FindAllDistinctStringSubmatch(
source.Content,
doubleQuotedFrom,
+ doubleQuotedFromF,
)
to := util.FindAllDistinctStringSubmatch(
source.Content,
diff --git a/pkg/util/source/inspector_kotlin.go b/pkg/util/source/inspector_kotlin.go
index 7dab24a..6de0a23 100644
--- a/pkg/util/source/inspector_kotlin.go
+++ b/pkg/util/source/inspector_kotlin.go
@@ -22,16 +22,15 @@ import (
"github.com/apache/camel-k/pkg/util"
)
-// KotlinInspector --
type KotlinInspector struct {
baseInspector
}
-// Extract --
func (i KotlinInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
from := util.FindAllDistinctStringSubmatch(
source.Content,
doubleQuotedFrom,
+ doubleQuotedFromF,
)
to := util.FindAllDistinctStringSubmatch(
source.Content,