/*
 * Copyright (c) 2010-2017. Axon Framework
 * 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.axonframework.boot.autoconfig;

import org.axonframework.commandhandling.CommandBus;
import org.axonframework.commandhandling.distributed.AnnotationRoutingStrategy;
import org.axonframework.commandhandling.distributed.CommandBusConnector;
import org.axonframework.commandhandling.distributed.CommandRouter;
import org.axonframework.serialization.Serializer;
import org.axonframework.springcloud.commandhandling.SpringCloudCommandRouter;
import org.axonframework.springcloud.commandhandling.SpringCloudHttpBackupCommandRouter;
import org.axonframework.springcloud.commandhandling.SpringHttpCommandBusConnector;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.web.client.RestTemplate;

@Configuration
@AutoConfigureAfter(JpaAutoConfiguration.class)
@AutoConfigureBefore(JGroupsAutoConfiguration.class)
@ConditionalOnProperty("axon.distributed.enabled")
@ConditionalOnClass(name = {
        "org.axonframework.springcloud.commandhandling.SpringCloudCommandRouter",
        "org.axonframework.springcloud.commandhandling.SpringCloudHttpBackupCommandRouter",
        "org.axonframework.springcloud.commandhandling.SpringHttpCommandBusConnector",
        "org.springframework.cloud.client.discovery.DiscoveryClient",
        "org.springframework.web.client.RestTemplate"
})
public class SpringCloudAutoConfiguration {

    @Bean
    @Primary
    @ConditionalOnMissingBean
    @ConditionalOnBean(DiscoveryClient.class)
    @ConditionalOnProperty("axon.distributed.spring-cloud.fallback-to-http-get")
    public CommandRouter springCloudHttpBackupCommandRouter(DiscoveryClient discoveryClient,
                                                            RestTemplate restTemplate,
                                                            @Value("${axon.distributed.spring-cloud.fallback-url}") String messageRoutingInformationEndpoint) {
        return new SpringCloudHttpBackupCommandRouter(discoveryClient,
                                                      new AnnotationRoutingStrategy(),
                                                      restTemplate,
                                                      messageRoutingInformationEndpoint);
    }

    @Bean
    @ConditionalOnMissingBean
    @ConditionalOnBean(DiscoveryClient.class)
    public CommandRouter springCloudCommandRouter(DiscoveryClient discoveryClient) {
        return new SpringCloudCommandRouter(discoveryClient, new AnnotationRoutingStrategy());
    }

    @Bean
    @ConditionalOnMissingBean
    public CommandBusConnector springHttpCommandBusConnector(@Qualifier("localSegment") CommandBus localSegment,
                                                             RestTemplate restTemplate,
                                                             Serializer serializer) {
        return new SpringHttpCommandBusConnector(localSegment, restTemplate, serializer);
    }

    @Bean
    @ConditionalOnMissingBean
    public RestTemplate restTemplate() {
        return new RestTemplate();
    }
}

@@ -643,16 +643,79 @@
 onfig;%0A%0A
+import org.axonframework.boot.DistributedCommandBusProperties;%0A
 import o
@@ -759,16 +759,16 @@
 andBus;%0A
-
 import o
@@ -1276,32 +1276,95 @@
 ndBusConnector;%0A
+import org.springframework.beans.factory.annotation.Autowired;%0A
 import org.sprin
@@ -1414,67 +1414,8 @@
 er;%0A
-import org.springframework.beans.factory.annotation.Value;%0A
 impo
@@ -2772,16 +2772,88 @@
 tion %7B%0A%0A
+    @Autowired%0A    private DistributedCommandBusProperties properties;%0A%0A
     @Bea
@@ -3206,166 +3206,8 @@
 late
-,%0A                                                            @Value(%22$%7Baxon.distributed.spring-cloud.fallback-url%7D%22) String messageRoutingInformationEndpoint
 ) %7B%0A
@@ -3490,41 +3490,52 @@
     
-messageRoutingInformationEndpoint
+properties.getSpringCloud().getFallbackUrl()
 );%0A 

Replace @Value for @Autowired