Projects >> citrus >>22d891821ce94ed7868c8ff157bc7d0deef31a87

Chunk
Conflicting content
import com.consol.citrus.adapter.handler.XmlTestExecutingMessageHandler;
import com.consol.citrus.dsl.CitrusTestBuilder;
import com.consol.citrus.exceptions.CitrusRuntimeException;
<<<<<<< HEAD
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
=======
import com.consol.citrus.message.MessageHandler;
import com.consol.citrus.server.AbstractServer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.*;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
>>>>>>> 93136fd26e9e8b809d918e81c39ac76d4a81dc01
import org.springframework.integration.Message;

/**
Solution content
import com.consol.citrus.adapter.handler.XmlTestExecutingMessageHandler;
import com.consol.citrus.dsl.CitrusTestBuilder;
import com.consol.citrus.exceptions.CitrusRuntimeException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.integration.Message;

/**
File
TestExecutingMessageHandler.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content
     */
    protected void prepareExecution(Message request, CitrusTestBuilder testBuilder) {
    }
<<<<<<< HEAD
=======

    /**
     * Sets the task executor. Usually some async task executor for test execution in
     * separate thread instance.
     *
     * @param taskExecutor
     */
    public void setTaskExecutor(TaskExecutor taskExecutor) {
        this.taskExecutor = taskExecutor;
    }

    /**
     * Creates Citrus Spring bean application context with basic beans and settings for Citrus. Custom
     * messageHandlerContext should hold various test builder beans for later dispatching and test execution.
     * @throws Exception
     */
    public void afterPropertiesSet() throws Exception {
        if (responseMessageHandler == null) {
            MessageChannelConnectingMessageHandler channelConnectingMessageHandler = new MessageChannelConnectingMessageHandler();
            channelConnectingMessageHandler.setChannelName(name + AbstractServer.DEFAULT_CHANNEL_ID_SUFFIX);
            channelConnectingMessageHandler.setBeanFactory(applicationContext);
            responseMessageHandler = channelConnectingMessageHandler;
        }

        if (getMessageHandlerMapping() == null) {
            SpringBeanMessageHandlerMapping messageHandlerMapping = new SpringBeanMessageHandlerMapping();
            messageHandlerMapping.setApplicationContext(applicationContext);
            setMessageHandlerMapping(messageHandlerMapping);
        }
    }

    /**
     * Injects this handlers bean name.
     * @param name
     */
    public void setBeanName(String name) {
        this.name = name;
    }

    /**
     * Sets the response message handler delegate.
     * @param responseMessageHandler
     */
    public void setResponseMessageHandler(MessageHandler responseMessageHandler) {
        this.responseMessageHandler = responseMessageHandler;
    }

    /**
     * Injects Spring bean application context this handler is managed by.
     * @param applicationContext
     * @throws BeansException
     */
    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
        this.applicationContext = applicationContext;
    }
>>>>>>> 93136fd26e9e8b809d918e81c39ac76d4a81dc01
}
Solution content
     */
    protected void prepareExecution(Message request, CitrusTestBuilder testBuilder) {
    }
}
File
TestExecutingMessageHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration