oscerd commented on code in PR #14865: URL: https://github.com/apache/camel/pull/14865#discussion_r1682317444
########## components/camel-solr/pom.xml: ########## @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>4.8.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-solr</artifactId> + <packaging>jar</packaging> + <name>Camel :: Solr</name> + <description>Camel Solr Support</description> + + <properties> + <java.awt.headless>true</java.awt.headless> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-support</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-attachments</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.angus</groupId> + <artifactId>angus-mail</artifactId> + <version>2.0.3</version> Review Comment: This should come from the parent pom property placeholder ########## components/camel-solr/pom.xml: ########## @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>4.8.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-solr</artifactId> + <packaging>jar</packaging> + <name>Camel :: Solr</name> + <description>Camel Solr Support</description> + + <properties> + <java.awt.headless>true</java.awt.headless> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-support</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-attachments</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.angus</groupId> + <artifactId>angus-mail</artifactId> + <version>2.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr-version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${solr-zookeeper-version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-test-framework</artifactId> + <version>${solr-version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <!-- exclude rome 0.9 which is not a valid Maven artifact --> + <!-- rome is not a needed dependency --> + <exclusion> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </exclusion> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-extraction</artifactId> + <version>${solr-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.20</version> Review Comment: From parent pom ########## components/camel-solr/pom.xml: ########## @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>4.8.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-solr</artifactId> + <packaging>jar</packaging> + <name>Camel :: Solr</name> + <description>Camel Solr Support</description> + + <properties> + <java.awt.headless>true</java.awt.headless> Review Comment: This should not be declared ########## components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrClientHandlerCloud.java: ########## @@ -0,0 +1,50 @@ +/* + * 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. + */ +package org.apache.camel.component.solr; + +import java.util.List; +import java.util.Optional; + +import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient; + +public class SolrClientHandlerCloud extends SolrClientHandler { + + public SolrClientHandlerCloud(SolrConfiguration solrConfiguration) { + super(solrConfiguration); + } + + protected SolrClient getSolrClient() { + Optional<String> zkChrootOptional = Optional.ofNullable(solrConfiguration.getZkChroot()); + List<String> urlList = getUrlListFrom(solrConfiguration); + CloudHttp2SolrClient.Builder builder = new CloudHttp2SolrClient.Builder( + urlList, + zkChrootOptional); + if (solrConfiguration.getCollection() != null && !solrConfiguration.getCollection().isEmpty()) { + builder.withDefaultCollection(solrConfiguration.getCollection()); + } + // if (solrConfiguration.getConnectionTimeout() != null) { Review Comment: It should be possible if we declare the param in the configuration ########## components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrClientHandlerCloud.java: ########## @@ -0,0 +1,50 @@ +/* + * 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. + */ +package org.apache.camel.component.solr; + +import java.util.List; +import java.util.Optional; + +import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient; + +public class SolrClientHandlerCloud extends SolrClientHandler { + + public SolrClientHandlerCloud(SolrConfiguration solrConfiguration) { + super(solrConfiguration); + } + + protected SolrClient getSolrClient() { + Optional<String> zkChrootOptional = Optional.ofNullable(solrConfiguration.getZkChroot()); + List<String> urlList = getUrlListFrom(solrConfiguration); + CloudHttp2SolrClient.Builder builder = new CloudHttp2SolrClient.Builder( + urlList, + zkChrootOptional); + if (solrConfiguration.getCollection() != null && !solrConfiguration.getCollection().isEmpty()) { + builder.withDefaultCollection(solrConfiguration.getCollection()); + } + // if (solrConfiguration.getConnectionTimeout() != null) { Review Comment: Is it possible to set the connection Timeout? ########## components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java: ########## @@ -0,0 +1,144 @@ +/* + * 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. + */ +package org.apache.camel.component.solr; + +import java.io.File; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.SortedMap; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.apache.http.conn.ssl.TrustSelfSignedStrategy; +import org.apache.http.ssl.SSLContextBuilder; +import org.apache.solr.client.solrj.embedded.SSLConfig; +import org.apache.solr.client.solrj.impl.Http2SolrClient; +import org.apache.solr.embedded.JettyConfig; +import org.apache.solr.embedded.JettySolrRunner; +import org.eclipse.jetty.servlet.ServletHolder; + +// Create embedded's Solrs for testing, +// based on SolrJettyTestBase +public final class JettySolrFactory { + + public static final File TEST_KEYSTORE = new File("./target/test-classes/solrtest.keystore"); + private static final String TEST_KEYSTORE_PATH = TEST_KEYSTORE.getAbsolutePath(); + private static final String TEST_KEYSTORE_PASSWORD = "secret"; + private static boolean mockedSslClient; + private static int dataDirNo; + + private JettySolrFactory() { + // Util class + } + + private static SSLConfig buildSSLConfig(boolean useSsl, boolean sslClientAuth) { + SSLConfig sslConfig = new SSLConfig( + useSsl, false, TEST_KEYSTORE_PATH, TEST_KEYSTORE_PASSWORD, + TEST_KEYSTORE_PATH, TEST_KEYSTORE_PASSWORD); + return sslConfig; + } + + private static void installAllTrustingClientSsl() + throws KeyManagementException, + NoSuchAlgorithmException, KeyStoreException { + SSLContextBuilder builder = new SSLContextBuilder(); + builder.loadTrustMaterial(null, new TrustSelfSignedStrategy()); + + // // Create a trust manager that does not validate certificate chains + final TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() { + @Override + public void checkClientTrusted(final X509Certificate[] chain, final String authType) { + } + + @Override + public void checkServerTrusted(final X509Certificate[] chain, final String authType) { + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } + } }; + final SSLContext sslContext = SSLContext.getInstance("TLS"); + sslContext.init(null, trustAllCerts, new java.security.SecureRandom()); + SSLContext.setDefault(sslContext); + + // // Install the all-trusting trust manager Review Comment: Do we need this comments? ########## components/camel-solr/pom.xml: ########## @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>4.8.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-solr</artifactId> + <packaging>jar</packaging> + <name>Camel :: Solr</name> + <description>Camel Solr Support</description> + + <properties> + <java.awt.headless>true</java.awt.headless> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-support</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-attachments</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.angus</groupId> + <artifactId>angus-mail</artifactId> + <version>2.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr-version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${solr-zookeeper-version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-test-framework</artifactId> + <version>${solr-version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <!-- exclude rome 0.9 which is not a valid Maven artifact --> + <!-- rome is not a needed dependency --> + <exclusion> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </exclusion> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-extraction</artifactId> + <version>${solr-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.20</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.20</version> Review Comment: From parent pom ########## components/camel-solr/src/main/docs/solr-component.adoc: ########## @@ -0,0 +1,170 @@ += Solr Component +:doctitle: Solr +:shortname: solr +:artifactid: camel-solr +:description: Perform operations against Apache Lucene Solr. +:since: 2.9 Review Comment: This is a new component so the first version should be 4.8.0 and not 2.9 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
