Skip to content

Commit

Permalink
CAMEL-21479 Remove deprecated SolrConstants.CamelSolrClient to preven…
Browse files Browse the repository at this point in the history 
…t build issue with SolrEndpointBuilderFactory
  • Loading branch information
@Paul-Blanchaert @davsclaus
Paul-Blanchaert authored and davsclaus committed Jan 27, 2025
1 parent 63130a0 commit ba2fb08
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
7 changes: 3 additions & 4 deletions catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
"size": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The size of the response.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SIZE" },
"from": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The starting index of the response.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_FROM" },
"solrClient": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrClient", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr client to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_CLIENT" },
"CamelSolrClient": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": true, "deprecationNote": "Use header 'solrClient' instead", "autowired": false, "secret": false, "description": "The solr client to use for the request. Deprecation note: Use header 'solrClient' instead", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_CLIENT_DEPRECATED" },
"solrParams": { "index": 11, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrParams", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr parameters to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_PARAMS" },
"deleteByQuery": { "index": 12, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "For the delete instruction, interprete body as query\/queries instead of id\/ids.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_DELETE_BY_QUERY" },
"Content-Type": { "index": 13, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type is used to identify the type when inserting files.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_CONTENT_TYPE" }
"solrParams": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrParams", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr parameters to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_PARAMS" },
"deleteByQuery": { "index": 11, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "For the delete instruction, interprete body as query\/queries instead of id\/ids.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_DELETE_BY_QUERY" },
"Content-Type": { "index": 12, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type is used to identify the type when inserting files.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_CONTENT_TYPE" }
},
"properties": {
"host": { "index": 0, "kind": "path", "displayName": "Host", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "configuration", "description": "The solr instance host name (set to 'default' to use the host name defined on component level)" },
Expand Down
7 changes: 3 additions & 4 deletions ...nts/camel-solr/src/generated/resources/META-INF/org/apache/camel/component/solr/solr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
"size": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The size of the response.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SIZE" },
"from": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The starting index of the response.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_FROM" },
"solrClient": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrClient", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr client to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_CLIENT" },
"CamelSolrClient": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": true, "deprecationNote": "Use header 'solrClient' instead", "autowired": false, "secret": false, "description": "The solr client to use for the request. Deprecation note: Use header 'solrClient' instead", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_CLIENT_DEPRECATED" },
"solrParams": { "index": 11, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrParams", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr parameters to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_PARAMS" },
"deleteByQuery": { "index": 12, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "For the delete instruction, interprete body as query\/queries instead of id\/ids.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_DELETE_BY_QUERY" },
"Content-Type": { "index": 13, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type is used to identify the type when inserting files.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_CONTENT_TYPE" }
"solrParams": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "SolrParams", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The solr parameters to use for the request.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_SOLR_PARAMS" },
"deleteByQuery": { "index": 11, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "For the delete instruction, interprete body as query\/queries instead of id\/ids.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_DELETE_BY_QUERY" },
"Content-Type": { "index": 12, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type is used to identify the type when inserting files.", "constantName": "org.apache.camel.component.solr.SolrConstants#PARAM_CONTENT_TYPE" }
},
"properties": {
"host": { "index": 0, "kind": "path", "displayName": "Host", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "configuration", "description": "The solr instance host name (set to 'default' to use the host name defined on component level)" },
Expand Down
4 changes: 0 additions & 4 deletions components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ public interface SolrConstants {
String PARAM_FROM = "from";
@Metadata(description = "The solr client to use for the request.", javaType = "SolrClient")
String PARAM_SOLR_CLIENT = "solrClient";
@Deprecated
@Metadata(description = "The solr client to use for the request.", javaType = "String",
deprecationNote = "Use header 'solrClient' instead")
String PARAM_SOLR_CLIENT_DEPRECATED = "CamelSolrClient";
@Metadata(description = "The solr parameters to use for the request.", javaType = "SolrParams")
String PARAM_SOLR_PARAMS = "solrParams";
@Metadata(description = "For the delete instruction, interprete body as query/queries instead of id/ids.",
Expand Down

0 comments on commit ba2fb08

Please sign in to comment.