/*
 * Copyright 2015 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.cloud.dataflow.admin.config;

import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration;
import org.springframework.cloud.Cloud;
import org.springframework.cloud.CloudConnector;
import org.springframework.cloud.CloudFactory;
import org.springframework.cloud.dataflow.module.deployer.ModuleDeployer;
import org.springframework.cloud.dataflow.module.deployer.lattice.LrpModuleDeployer;
import org.springframework.cloud.dataflow.module.deployer.lattice.TaskModuleDeployer;
import org.springframework.cloud.lattice.connector.LatticeConnector;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.data.redis.connection.RedisConnectionFactory;

/**
 * Configuration used when running <i>in a cloud</i>, triggered by cloud profiles (cloud, lattice).
 *
 * @author Mark Fisher
 * @author Thomas Risberg
 * @author Ilayaperumal Gopinathan
 */
@Configuration
@Profile("cloud")
public class CloudConfiguration {

	@AutoConfigureBefore(RedisAutoConfiguration.class)
	protected static class RedisConfig {

		@Bean
		public Cloud cloud(CloudFactory cloudFactory) {
			return cloudFactory.getCloud();
		}

		@Bean
		@ConditionalOnMissingBean(CloudFactory.class)
		public CloudFactory cloudFactory() {
			return new CloudFactory();
		}

		@Bean
		RedisConnectionFactory redisConnectionFactory(Cloud cloud) {
			return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null);
		}
	}

	@Profile("lattice")
	protected static class LatticeConfig {

		@Bean
		public ModuleDeployer processModuleDeployer() {
			return new LrpModuleDeployer();
		}

		@Bean
		public ModuleDeployer taskModuleDeployer() {
			return new TaskModuleDeployer();
		}

		@Bean
		public CloudFactory cloudFactory() {
			return new LatticeCloudFactory();
		}
	}

	private static class LatticeCloudFactory extends CloudFactory {

		@Override
		public void registerCloudConnector(CloudConnector cloudConnector) {
			// Make sure we only register Lattice connector in case of Lattice environment
			// Since lattice environment also has `VCAP_APPLICATION` as environment property, the CloudFoundry connector
			// can also be matched as the possible cloud connectors. Hence, we exclude CF connector on lattice.
			if (cloudConnector instanceof LatticeConnector) {
				super.registerCloudConnector(cloudConnector);
			}
		}
	}
}

@@ -739,90 +739,8 @@
 re;%0A
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;%0A
 impo
@@ -1970,51 +1970,26 @@
 %0A%09%09@
-ConditionalOnMissingBean(CloudFactory.class
+Profile(%22!lattice%22
 )%0A%09%09

Use profile check for CloudFactory bean