patricker commented on a change in pull request #3041: NIFI-5224 Added SolrClientService. URL: https://github.com/apache/nifi/pull/3041#discussion_r243410468
########## File path: nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/services/solr/SolrClientServiceImpl.java ########## @@ -0,0 +1,92 @@ +/* + * 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.nifi.services.solr; + +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.solr.client.solrj.SolrClient; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.apache.nifi.processors.solr.SolrUtils.BASIC_PASSWORD; +import static org.apache.nifi.processors.solr.SolrUtils.BASIC_USERNAME; +import static org.apache.nifi.processors.solr.SolrUtils.COLLECTION; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_CONNECTION_TIMEOUT; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_LOCATION; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_MAX_CONNECTIONS; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_MAX_CONNECTIONS_PER_HOST; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_SOCKET_TIMEOUT; +import static org.apache.nifi.processors.solr.SolrUtils.SOLR_TYPE; +import static org.apache.nifi.processors.solr.SolrUtils.SSL_CONTEXT_SERVICE; +import static org.apache.nifi.processors.solr.SolrUtils.ZK_CLIENT_TIMEOUT; +import static org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT; +import static org.apache.nifi.processors.solr.SolrUtils.createSolrClient; + +public class SolrClientServiceImpl extends AbstractControllerService implements SolrClientService { + private static final List<PropertyDescriptor> DESCRIPTORS; + + static PropertyDescriptor makeRequired(PropertyDescriptor _desc) { + return new PropertyDescriptor.Builder() + .fromPropertyDescriptor(_desc) + .required(true) + .build(); + } + + static { + List<PropertyDescriptor> _temp = new ArrayList<>(); + + _temp.add(makeRequired(SOLR_TYPE)); + _temp.add(makeRequired(SOLR_LOCATION)); + _temp.add(COLLECTION); Review comment: If you define a collection in the service, and also define a collection in the processor properties, the service takes effect, but there is no validation error on the processor. I think it would make sense to fail validation if the user provides both a service and enters in values for properties that are overridden by the service; otherwise it's confusing from a UI perspective. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
