/*
 * 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.data.admin.config;

import org.springframework.cloud.config.java.CloudScan;
import org.springframework.cloud.data.module.deployer.ModuleDeployer;
import org.springframework.cloud.data.module.deployer.cloudfoundry.CloudFoundryModuleDeployer;
import org.springframework.cloud.data.module.deployer.lattice.ReceptorModuleDeployer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;

/**
 * Configuration for cloud profiles (cloud, lattice).
 *
 * @author Mark Fisher
 * @author Thomas Risberg
 * @author Ilayaperumal Gopinathan
 */
@Configuration
@Profile("cloud")
@CloudScan
public class CloudConfiguration {

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

		@Bean
		public ModuleDeployer moduleDeployer() {
			return new ReceptorModuleDeployer();
		}
	}

	@Profile("!lattice")
	protected static class CloudFoundryConfig {

		@Bean
		public ModuleDeployer moduleDeployer() {
			return new CloudFoundryModuleDeployer();
		}
	}

}

@@ -695,35 +695,209 @@
 ork.
-cloud.config.java.CloudScan
+boot.autoconfigure.AutoConfigureBefore;%0Aimport org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration;%0Aimport org.springframework.cloud.Cloud;%0Aimport org.springframework.cloud.CloudFactory
 ;%0Aim
@@ -1312,16 +1312,89 @@
 Profile;
+%0Aimport org.springframework.data.redis.connection.RedisConnectionFactory;
 %0A%0A/**%0A *
@@ -1573,19 +1573,8 @@
 d%22)%0A
-@CloudScan%0A
 publ
@@ -1604,16 +1604,347 @@
 tion %7B%0A%0A
+%09@AutoConfigureBefore(RedisAutoConfiguration.class)%0A%09protected static class RedisConfig %7B%0A%0A%09%09@Bean%0A%09%09public Cloud cloud() %7B%0A%09%09%09return new CloudFactory().getCloud();%0A%09%09%7D%0A%0A%09%09@Bean%0A%09%09RedisConnectionFactory redisConnectionFactory(Cloud cloud) %7B%0A%09%09%09return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null);%0A%09%09%7D%0A%09%7D%0A%0A
 %09@Profil

Remove CloudScan from admin cloud config