/*
 * Copyright 2012-2016 the original author or authors.
 *
 * Licensed 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.springframework.boot.autoconfigure.solr;

import java.io.IOException;

import javax.annotation.PreDestroy;

import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;

import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;

/**
 * {@link EnableAutoConfiguration Auto-configuration} for Solr 4.x.
 *
 * @author Christoph Strobl
 * @since 1.1.0
 */
@Configuration
@ConditionalOnClass({ HttpSolrClient.class, CloudSolrClient.class })
@EnableConfigurationProperties(SolrProperties.class)
public class SolrAutoConfiguration {

	private final SolrProperties properties;

	private SolrClient solrClient;

	public SolrAutoConfiguration(SolrProperties properties) {
		this.properties = properties;
	}

	@PreDestroy
	public void close() throws IOException {
		if (this.solrClient != null) {
			this.solrClient.close();
		}
	}

	@Bean
	@ConditionalOnMissingBean
	public SolrClient solrClient() {
		this.solrClient = createSolrClient();
		return this.solrClient;
	}

	private SolrClient createSolrClient() {
		if (StringUtils.hasText(this.properties.getZkHost())) {
			return new CloudSolrClient(this.properties.getZkHost());
		}
		return new HttpSolrClient(this.properties.getHost());
	}

}

@@ -673,74 +673,8 @@
 r;%0A%0A
-import java.io.IOException;%0A%0Aimport javax.annotation.PreDestroy;%0A%0A
 impo
@@ -1776,132 +1776,8 @@
 %09%7D%0A%0A
-%09@PreDestroy%0A%09public void close() throws IOException %7B%0A%09%09if (this.solrClient != null) %7B%0A%09%09%09this.solrClient.close();%0A%09%09%7D%0A%09%7D%0A%0A
 %09@Be

Remove SolrAutoConfiguration @PreDestroy