You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/04/26 12:56:42 UTC
[camel-kamelets] 01/02: Remove Solr Kamelets
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch solr-removal
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit aa1c603090579df55e6a2548f78def74b69783ce
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 26 14:51:47 2023 +0200
Remove Solr Kamelets
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/ROOT/nav.adoc | 2 -
kamelets/solr-sink.kamelet.yaml | 94 -------------------
kamelets/solr-source.kamelet.yaml | 104 ---------------------
.../catalog/model/KameletPrefixSchemeEnum.java | 1 -
.../kamelets/catalog/KameletsCatalogTest.java | 2 -
.../main/resources/kamelets/solr-sink.kamelet.yaml | 94 -------------------
.../resources/kamelets/solr-source.kamelet.yaml | 104 ---------------------
templates/bindings/camel-k/solr-sink-binding.yaml | 19 ----
.../bindings/camel-k/solr-source-binding.yaml | 20 ----
templates/bindings/core/solr-sink-binding.yaml | 12 ---
10 files changed, 452 deletions(-)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index c686037d..91053bcf 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -186,8 +186,6 @@
* xref:simple-filter-action.adoc[]
* xref:slack-sink.adoc[]
* xref:slack-source.adoc[]
-* xref:solr-sink.adoc[]
-* xref:solr-source.adoc[]
* xref:splunk-hec-sink.adoc[]
* xref:splunk-sink.adoc[]
* xref:splunk-source.adoc[]
diff --git a/kamelets/solr-sink.kamelet.yaml b/kamelets/solr-sink.kamelet.yaml
deleted file mode 100644
index 2384f76c..00000000
--- a/kamelets/solr-sink.kamelet.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
-kind: Kamelet
-metadata:
- name: solr-sink
- annotations:
- camel.apache.org/kamelet.support.level: "Stable"
- camel.apache.org/catalog.version: "4.0.0-SNAPSHOT"
- camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iODAwIiB3aWR0aD0iMTIwMCIgdmlld0JveD0iLTQwLjYwMDk1IC0zNC4yMTc3NSAzNTEuODc0OSAyMDUuMzA2NSI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIiBjbGlwUGF0aFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTAyLjY1NGgyMDMuMDA1VjBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMgMCAwIC0xLjMzMzMzIDAgMTM2Ljg3MSkiPjxwYXRoIGQ9Ik00MC43NiAzMS43NjNjLTIuMz [...]
- camel.apache.org/provider: "Apache Software Foundation"
- camel.apache.org/kamelet.group: "Solr"
- camel.apache.org/kamelet.namespace: "Search"
- labels:
- camel.apache.org/kamelet.type: "sink"
-spec:
- definition:
- title: "Solr Sink"
- description: |-
- Send documents to Solr Collection.
- required:
- - servers
- - collection
- type: object
- properties:
- collection:
- title: Collection
- description: Solr Collection name
- type: string
- servers:
- title: Servers
- description: Comma separated list of Solr Servers and ports
- type: string
- autocommit:
- title: Autocommit
- description: If autocommit should be enabled or not
- type: boolean
- default: false
- x-descriptors:
- - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
- username:
- title: Username
- description: Username to connect to Solr.
- type: string
- x-descriptors:
- - urn:camel:group:credentials
- password:
- title: Password
- description: Password to connect to Solr.
- type: string
- format: password
- x-descriptors:
- - urn:alm:descriptor:com.tectonic.ui:password
- - urn:camel:group:credentials
- types:
- in:
- mediaType: application/json
- dependencies:
- - "camel:solr"
- - "camel:core"
- - "camel:jackson"
- - "camel:kamelet"
- template:
- from:
- uri: "kamelet:source"
- steps:
- - set-header:
- name: "SolrOperation"
- constant: "INSERT"
- - unmarshal:
- json:
- library: Jackson
- - remove-header:
- name: "content-type"
- - to:
- uri: "solr:{{servers}}/solr/{{collection}}"
- parameters:
- autocommit: "{{autocommit}}"
- username: "{{?username}}"
- password: "{{?password}}"
diff --git a/kamelets/solr-source.kamelet.yaml b/kamelets/solr-source.kamelet.yaml
deleted file mode 100644
index 0c7c0bc6..00000000
--- a/kamelets/solr-source.kamelet.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
-kind: Kamelet
-metadata:
- name: solr-source
- annotations:
- camel.apache.org/kamelet.support.level: "Stable"
- camel.apache.org/catalog.version: "4.0.0-SNAPSHOT"
- camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iODAwIiB3aWR0aD0iMTIwMCIgdmlld0JveD0iLTQwLjYwMDk1IC0zNC4yMTc3NSAzNTEuODc0OSAyMDUuMzA2NSI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIiBjbGlwUGF0aFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTAyLjY1NGgyMDMuMDA1VjBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMgMCAwIC0xLjMzMzMzIDAgMTM2Ljg3MSkiPjxwYXRoIGQ9Ik00MC43NiAzMS43NjNjLTIuMz [...]
- camel.apache.org/provider: "Apache Software Foundation"
- camel.apache.org/kamelet.group: "Solr"
- camel.apache.org/kamelet.namespace: "Search"
- labels:
- camel.apache.org/kamelet.type: "source"
-spec:
- definition:
- title: "Solr Source"
- description: |-
- Query for documents to Solr Collection.
- required:
- - period
- - servers
- - collection
- - query
- type: object
- properties:
- period:
- title: Period between Polls
- description: The interval between fetches to the Solr collection
- type: integer
- default: 10000
- collection:
- title: Collection
- description: Solr Collection name
- type: string
- servers:
- title: Servers
- description: Comma separated list of Solr Servers and ports
- type: string
- query:
- title: Query
- description: The query to submit to Solr
- type: string
- username:
- title: Username
- description: Username to connect to Solr.
- type: string
- x-descriptors:
- - urn:camel:group:credentials
- password:
- title: Password
- description: Password to connect to Solr.
- type: string
- format: password
- x-descriptors:
- - urn:alm:descriptor:com.tectonic.ui:password
- - urn:camel:group:credentials
- types:
- in:
- mediaType: application/json
- dependencies:
- - "camel:solr"
- - "camel:core"
- - "camel:timer"
- - "camel:jackson"
- - "camel:kamelet"
- template:
- from:
- uri: "timer:solr-stream"
- parameters:
- period: "{{period}}"
- steps:
- - set-header:
- name: "SolrOperation"
- constant: "QUERY"
- - set-header:
- name: "CamelSolrQueryString"
- constant: "{{query}}"
- - remove-header:
- name: "content-type"
- - to:
- uri: "solr:{{servers}}/solr/{{collection}}"
- parameters:
- username: "{{?username}}"
- password: "{{?password}}"
- - marshal:
- json:
- library: Jackson
- - to: "kamelet:sink"
diff --git a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index 4e063b8e..863c8380 100644
--- a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++ b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -105,7 +105,6 @@ public enum KameletPrefixSchemeEnum {
scp("scp", "scp"),
sftp("sftp", "sftp"),
slack("slack", "slack"),
- solr("solr", "solr"),
splunk_hec("splunk-hec", "splunk-hec"),
splunk("splunk", "splunk"),
sqlserver("sqlserver", "sql"),
diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 9ddd1840..231275f8 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -237,8 +237,6 @@ public class KameletsCatalogTest {
verifyHeaders("sftp-source", 10);
verifyHeaders("slack-sink", 0);
verifyHeaders("slack-source", 0);
- verifyHeaders("solr-sink", 5);
- verifyHeaders("solr-source", 5);
verifyHeaders("splunk-hec-sink", 1);
verifyHeaders("splunk-sink", 0);
verifyHeaders("splunk-source", 0);
diff --git a/library/camel-kamelets/src/main/resources/kamelets/solr-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/solr-sink.kamelet.yaml
deleted file mode 100644
index 2384f76c..00000000
--- a/library/camel-kamelets/src/main/resources/kamelets/solr-sink.kamelet.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
-kind: Kamelet
-metadata:
- name: solr-sink
- annotations:
- camel.apache.org/kamelet.support.level: "Stable"
- camel.apache.org/catalog.version: "4.0.0-SNAPSHOT"
- camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iODAwIiB3aWR0aD0iMTIwMCIgdmlld0JveD0iLTQwLjYwMDk1IC0zNC4yMTc3NSAzNTEuODc0OSAyMDUuMzA2NSI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIiBjbGlwUGF0aFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTAyLjY1NGgyMDMuMDA1VjBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMgMCAwIC0xLjMzMzMzIDAgMTM2Ljg3MSkiPjxwYXRoIGQ9Ik00MC43NiAzMS43NjNjLTIuMz [...]
- camel.apache.org/provider: "Apache Software Foundation"
- camel.apache.org/kamelet.group: "Solr"
- camel.apache.org/kamelet.namespace: "Search"
- labels:
- camel.apache.org/kamelet.type: "sink"
-spec:
- definition:
- title: "Solr Sink"
- description: |-
- Send documents to Solr Collection.
- required:
- - servers
- - collection
- type: object
- properties:
- collection:
- title: Collection
- description: Solr Collection name
- type: string
- servers:
- title: Servers
- description: Comma separated list of Solr Servers and ports
- type: string
- autocommit:
- title: Autocommit
- description: If autocommit should be enabled or not
- type: boolean
- default: false
- x-descriptors:
- - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
- username:
- title: Username
- description: Username to connect to Solr.
- type: string
- x-descriptors:
- - urn:camel:group:credentials
- password:
- title: Password
- description: Password to connect to Solr.
- type: string
- format: password
- x-descriptors:
- - urn:alm:descriptor:com.tectonic.ui:password
- - urn:camel:group:credentials
- types:
- in:
- mediaType: application/json
- dependencies:
- - "camel:solr"
- - "camel:core"
- - "camel:jackson"
- - "camel:kamelet"
- template:
- from:
- uri: "kamelet:source"
- steps:
- - set-header:
- name: "SolrOperation"
- constant: "INSERT"
- - unmarshal:
- json:
- library: Jackson
- - remove-header:
- name: "content-type"
- - to:
- uri: "solr:{{servers}}/solr/{{collection}}"
- parameters:
- autocommit: "{{autocommit}}"
- username: "{{?username}}"
- password: "{{?password}}"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
deleted file mode 100644
index 0c7c0bc6..00000000
--- a/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
-kind: Kamelet
-metadata:
- name: solr-source
- annotations:
- camel.apache.org/kamelet.support.level: "Stable"
- camel.apache.org/catalog.version: "4.0.0-SNAPSHOT"
- camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iODAwIiB3aWR0aD0iMTIwMCIgdmlld0JveD0iLTQwLjYwMDk1IC0zNC4yMTc3NSAzNTEuODc0OSAyMDUuMzA2NSI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIiBjbGlwUGF0aFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTAyLjY1NGgyMDMuMDA1VjBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMgMCAwIC0xLjMzMzMzIDAgMTM2Ljg3MSkiPjxwYXRoIGQ9Ik00MC43NiAzMS43NjNjLTIuMz [...]
- camel.apache.org/provider: "Apache Software Foundation"
- camel.apache.org/kamelet.group: "Solr"
- camel.apache.org/kamelet.namespace: "Search"
- labels:
- camel.apache.org/kamelet.type: "source"
-spec:
- definition:
- title: "Solr Source"
- description: |-
- Query for documents to Solr Collection.
- required:
- - period
- - servers
- - collection
- - query
- type: object
- properties:
- period:
- title: Period between Polls
- description: The interval between fetches to the Solr collection
- type: integer
- default: 10000
- collection:
- title: Collection
- description: Solr Collection name
- type: string
- servers:
- title: Servers
- description: Comma separated list of Solr Servers and ports
- type: string
- query:
- title: Query
- description: The query to submit to Solr
- type: string
- username:
- title: Username
- description: Username to connect to Solr.
- type: string
- x-descriptors:
- - urn:camel:group:credentials
- password:
- title: Password
- description: Password to connect to Solr.
- type: string
- format: password
- x-descriptors:
- - urn:alm:descriptor:com.tectonic.ui:password
- - urn:camel:group:credentials
- types:
- in:
- mediaType: application/json
- dependencies:
- - "camel:solr"
- - "camel:core"
- - "camel:timer"
- - "camel:jackson"
- - "camel:kamelet"
- template:
- from:
- uri: "timer:solr-stream"
- parameters:
- period: "{{period}}"
- steps:
- - set-header:
- name: "SolrOperation"
- constant: "QUERY"
- - set-header:
- name: "CamelSolrQueryString"
- constant: "{{query}}"
- - remove-header:
- name: "content-type"
- - to:
- uri: "solr:{{servers}}/solr/{{collection}}"
- parameters:
- username: "{{?username}}"
- password: "{{?password}}"
- - marshal:
- json:
- library: Jackson
- - to: "kamelet:sink"
diff --git a/templates/bindings/camel-k/solr-sink-binding.yaml b/templates/bindings/camel-k/solr-sink-binding.yaml
deleted file mode 100644
index 75e9dcaf..00000000
--- a/templates/bindings/camel-k/solr-sink-binding.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
-metadata:
- name: solr-sink-binding
-spec:
- source:
- ref:
- kind: KafkaTopic
- apiVersion: kafka.strimzi.io/v1beta1
- name: my-topic
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
- name: solr-sink
- properties:
- collection: "The Collection"
- servers: "The Servers"
-
\ No newline at end of file
diff --git a/templates/bindings/camel-k/solr-source-binding.yaml b/templates/bindings/camel-k/solr-source-binding.yaml
deleted file mode 100644
index 74c42fc0..00000000
--- a/templates/bindings/camel-k/solr-source-binding.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
-metadata:
- name: solr-source-binding
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
- name: solr-source
- properties:
- collection: "The Collection"
- query: "The Query"
- servers: "The Servers"
- sink:
- ref:
- kind: KafkaTopic
- apiVersion: kafka.strimzi.io/v1beta1
- name: my-topic
-
\ No newline at end of file
diff --git a/templates/bindings/core/solr-sink-binding.yaml b/templates/bindings/core/solr-sink-binding.yaml
deleted file mode 100644
index e8f7d82e..00000000
--- a/templates/bindings/core/solr-sink-binding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- route:
- from:
- uri: "kamelet:timer-source"
- parameters:
- period: 1000
- message: "Hello Camel JBang"
- steps:
- - to:
- uri: "kamelet:solr-sink"
- parameters:
- collection: "The Collection"
- servers: "The Servers"