[camel-k] 05/05: chore: fix lints
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 74f0be7a7460092bad45cb89f258e4dae3741874
Author: Tadayoshi Sato
AuthorDate: Tue Nov 29 17:40:22 2022 +0900
chore: fix lints
---
pkg/util/source/inspector.go | 9 -
pkg/util/source/inspector_groovy_test.go | 8
pkg/util/source/inspector_java_script_test.go | 8
pkg/util/source/inspector_java_source_test.go | 8
pkg/util/source/inspector_kotlin_test.go | 8
pkg/util/source/inspector_xml.go | 3 +--
pkg/util/source/inspector_xml_test.go | 8
7 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go
index bda89542e..783662b0d 100644
--- a/pkg/util/source/inspector.go
+++ b/pkg/util/source/inspector.go
@@ -249,7 +249,7 @@ func (i *baseInspector) discoverDependencies(source
v1.SourceSpec, meta *Metadat
i.addDependency(dep, meta)
}
// some components require additional
dependency resolution based on URI
- i.addDependenciesFromUri(uri, scheme, meta)
+ i.addDependenciesFromURI(uri, scheme, meta)
}
}
}
@@ -263,7 +263,7 @@ func (i *baseInspector) discoverDependencies(source
v1.SourceSpec, meta *Metadat
i.addDependency(dep, meta)
}
// some components require additional
dependency resolution based on URI
- i.addDependenciesFromUri(uri, scheme, meta)
+ i.addDependenciesFromURI(uri, scheme, meta)
}
}
}
@@ -310,9 +310,8 @@ func (i *baseInspector) addDependency(dependency string,
meta *Metadata) {
meta.Dependencies.Add(dependency)
}
-func (i *baseInspector) addDependenciesFromUri(uri string, scheme
*v1.CamelScheme, meta *Metadata) {
- switch scheme.ID {
- case "dataformat":
+func (i *baseInspector) addDependenciesFromURI(uri string, scheme
*v1.CamelScheme, meta *Metadata) {
+ if scheme.ID == "dataformat" {
// dataformat:name:(marshal|unmarshal)[?options]
parts := strings.Split(uri, ":")
if len(parts) < 3 {
diff --git a/pkg/util/source/inspector_groovy_test.go
b/pkg/util/source/inspector_groovy_test.go
index e082d9d74..5dc3f05ae 100644
--- a/pkg/util/source/inspector_groovy_test.go
+++ b/pkg/util/source/inspector_groovy_test.go
@@ -106,12 +106,12 @@ func TestGroovyKamelet(t *testing.T) {
}
}
-const groovyJsonEip = `
+const groovyJSONEip = `
from("direct:start")
.unmarshal().json()
`
-const groovyJsonJacksonEip = `
+const groovyJSONJacksonEip = `
from("direct:start")
.unmarshal().json(JsonLibrary.Jackson)
`
@@ -137,11 +137,11 @@ func TestGroovyDataFormat(t *testing.T) {
deps []string
}{
{
- source: groovyJsonEip,
+ source: groovyJSONEip,
deps: []string{"camel:jackson"},
},
{
- source: groovyJsonJacksonEip,
+ source: groovyJSONJacksonEip,
deps: []string{"camel:jackson"},
},
{
diff --git a/pkg/util/source/inspector_java_script_test.go
b/pkg/util/source/inspector_java_script_test.go
index 59f53f476..05d5efa89 100644
--- a/pkg/util/source/inspector_java_script_test.go
+++ b/pkg/util/source/inspector_java_script_test.go
@@ -88,12 +88,12 @@ func TestJavaScriptKamelet(t *testing.T) {
}
}
-const javaScriptJsonEip = `
+const javaScriptJSONEip = `
from('direct:start')
.unmarshal().json()
`
-const javaScriptJsonJacksonEip = `
+const javaScriptJSONJacksonEip = `
from('direct:start')
.unmarshal().json(JsonLibrary.Jackson)
`
@@ -119,11 +119,11 @@ func TestJavaScriptDataFormat(t *testing.T) {
deps []string
}{
{
- source: javaScriptJsonEip,
+ source: javaScriptJSONEip,
deps: []string{"camel:jackson"},
},
{
- source: javaScriptJsonJacksonEip,
+ source: javaScriptJSONJacksonEip,
deps: []string{"camel:jackson"},
},
{
diff --git a/pkg/util/source/inspector_java_source_test.go
b/pkg/util/source/inspector_java_source_test.go
index 6fddf4203..d84a0d868 100644
--- a/pkg/util/source/inspector_java_source_test.go
+++
[camel-k] 05/05: chore: fix lints
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9406a84a1b5713301b2c73c37ed3436e4a15ee2b
Author: Tadayoshi Sato
AuthorDate: Tue Nov 29 16:45:47 2022 +0900
chore: fix lints
---
pkg/util/source/inspector.go | 7 +++
pkg/util/source/inspector_groovy_test.go | 8
pkg/util/source/inspector_java_script_test.go | 8
pkg/util/source/inspector_java_source_test.go | 8
pkg/util/source/inspector_kotlin_test.go | 8
pkg/util/source/inspector_xml.go | 3 +--
pkg/util/source/inspector_xml_test.go | 8
7 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go
index 8ab840f6d..694cad3b8 100644
--- a/pkg/util/source/inspector.go
+++ b/pkg/util/source/inspector.go
@@ -354,16 +354,15 @@ func (i *baseInspector) addDependencies(uri string, meta
*Metadata, consumer boo
}
// some components require additional dependency resolution based on URI
- if err := i.addDependenciesFromUri(uri, scheme, meta); err != nil {
+ if err := i.addDependenciesFromURI(uri, scheme, meta); err != nil {
return err
}
return nil
}
-func (i *baseInspector) addDependenciesFromUri(uri string, scheme
*v1.CamelScheme, meta *Metadata) error {
- switch scheme.ID {
- case "dataformat":
+func (i *baseInspector) addDependenciesFromURI(uri string, scheme
*v1.CamelScheme, meta *Metadata) error {
+ if scheme.ID == "dataformat" {
// dataformat:name:(marshal|unmarshal)[?options]
parts := strings.Split(uri, ":")
if len(parts) < 3 {
diff --git a/pkg/util/source/inspector_groovy_test.go
b/pkg/util/source/inspector_groovy_test.go
index e082d9d74..5dc3f05ae 100644
--- a/pkg/util/source/inspector_groovy_test.go
+++ b/pkg/util/source/inspector_groovy_test.go
@@ -106,12 +106,12 @@ func TestGroovyKamelet(t *testing.T) {
}
}
-const groovyJsonEip = `
+const groovyJSONEip = `
from("direct:start")
.unmarshal().json()
`
-const groovyJsonJacksonEip = `
+const groovyJSONJacksonEip = `
from("direct:start")
.unmarshal().json(JsonLibrary.Jackson)
`
@@ -137,11 +137,11 @@ func TestGroovyDataFormat(t *testing.T) {
deps []string
}{
{
- source: groovyJsonEip,
+ source: groovyJSONEip,
deps: []string{"camel:jackson"},
},
{
- source: groovyJsonJacksonEip,
+ source: groovyJSONJacksonEip,
deps: []string{"camel:jackson"},
},
{
diff --git a/pkg/util/source/inspector_java_script_test.go
b/pkg/util/source/inspector_java_script_test.go
index 59f53f476..05d5efa89 100644
--- a/pkg/util/source/inspector_java_script_test.go
+++ b/pkg/util/source/inspector_java_script_test.go
@@ -88,12 +88,12 @@ func TestJavaScriptKamelet(t *testing.T) {
}
}
-const javaScriptJsonEip = `
+const javaScriptJSONEip = `
from('direct:start')
.unmarshal().json()
`
-const javaScriptJsonJacksonEip = `
+const javaScriptJSONJacksonEip = `
from('direct:start')
.unmarshal().json(JsonLibrary.Jackson)
`
@@ -119,11 +119,11 @@ func TestJavaScriptDataFormat(t *testing.T) {
deps []string
}{
{
- source: javaScriptJsonEip,
+ source: javaScriptJSONEip,
deps: []string{"camel:jackson"},
},
{
- source: javaScriptJsonJacksonEip,
+ source: javaScriptJSONJacksonEip,
deps: []string{"camel:jackson"},
},
{
diff --git a/pkg/util/source/inspector_java_source_test.go
b/pkg/util/source/inspector_java_source_test.go
index 6fddf4203..d84a0d868 100644
--- a/pkg/util/source/inspector_java_source_test.go
+++ b/pkg/util/source/inspector_java_source_test.go
@@ -88,12 +88,12 @@ func TestJavaSourceKamelet(t *testing.T) {
}
}
-const javaSourceJsonEip = `
+const javaSourceJSONEip = `
from("direct:start")
.unmarshal().json();
`
-const javaSourceJsonJacksonEip = `
+const javaSourceJSONJacksonEip = `
from("direct:start")
.unmarshal().json(JsonLibrary.Jackson);
`
@@ -119,11 +119,11 @@ func TestJavaSourceDataFormat(t *testing.T) {
deps []string
}{
{
- source: javaSourceJsonEip,
+ source: javaSourceJSONEip,
deps: []string{"camel:jackson"},
},
{
- source: javaSourceJsonJacksonEip,
+ source:
