Projects >> dropwizard >>841f07cd8cc8f2cdcf18454f28918b59bf24fd88

Chunk
Conflicting content 
import com.yammer.dropwizard.json.ObjectMapperFactory;
import com.yammer.dropwizard.lifecycle.ExecutorServiceManager;
import com.yammer.dropwizard.lifecycle.Managed;
<<<<<<< HEAD
=======
import com.yammer.dropwizard.lifecycle.ServerLifecycleListener;
import com.yammer.dropwizard.logging.Log;
>>>>>>> d98b07f2df0c067c3d784f72b7b41057f717627c
import com.yammer.dropwizard.tasks.GarbageCollectionTask;
import com.yammer.dropwizard.tasks.Task;
import com.yammer.metrics.core.HealthCheck;
Solution content 
import com.yammer.dropwizard.json.ObjectMapperFactory;
import com.yammer.dropwizard.lifecycle.ExecutorServiceManager;
import com.yammer.dropwizard.lifecycle.Managed;
import com.yammer.dropwizard.lifecycle.ServerLifecycleListener;
import com.yammer.dropwizard.tasks.GarbageCollectionTask;
import com.yammer.dropwizard.tasks.Task;
import com.yammer.metrics.core.HealthCheck;
File
Environment.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    private final AggregateLifeCycle lifeCycle;
    private final ObjectMapperFactory objectMapperFactory;
    private SessionHandler sessionHandler;
<<<<<<< HEAD
    private ServletContainer jerseyServletContainer;

=======
    private Server server;
    private ServerLifecycleListener serverListener;
>>>>>>> d98b07f2df0c067c3d784f72b7b41057f717627c

    /**
     * Creates a new environment.
Solution content 
    private final AggregateLifeCycle lifeCycle;
    private final ObjectMapperFactory objectMapperFactory;
    private SessionHandler sessionHandler;
    private ServletContainer jerseyServletContainer;

    private Server server;
    private ServerLifecycleListener serverListener;

    /**
     * Creates a new environment.
File
Environment.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        return sessionHandler;
    }

<<<<<<< HEAD
    public ObjectMapperFactory getObjectMapperFactory() {
        return objectMapperFactory;
    }

    public ResourceConfig getJerseyResourceConfig() {
        return config;
    }

    public ServletContainer getJerseyServletContainer() {
        return jerseyServletContainer;
    }

    public void setJerseyServletContainer(ServletContainer jerseyServletContainer) {
        this.jerseyServletContainer = checkNotNull(jerseyServletContainer);
    }

    public String getName() {
        return name;
=======
    /**
     * Set the Jetty server instance of the environment, notify the listener
     * @param server
     * @throws IllegalStateException if the server has already
     *         been set for this environment
     */
    public void serverStarted(Server s) {
        if (server != null) {
            throw new IllegalStateException("Server already set");
        }
        server = s;
        if (serverListener != null) {
            serverListener.serverStarted();
        }
    }

    /**
     * 
     * @return the Jetty server instance
     */
    public Server getServer() {
        return server;
    }
     
    public void setServerLifecycleListener(ServerLifecycleListener listener) {
        serverListener = listener;
>>>>>>> d98b07f2df0c067c3d784f72b7b41057f717627c
    }
}
Solution content 
        return sessionHandler;
    }

    public ObjectMapperFactory getObjectMapperFactory() {
        return objectMapperFactory;
    }

    public ResourceConfig getJerseyResourceConfig() {
        return config;
    }

    public ServletContainer getJerseyServletContainer() {
        return jerseyServletContainer;
    }

    public void setJerseyServletContainer(ServletContainer jerseyServletContainer) {
        this.jerseyServletContainer = checkNotNull(jerseyServletContainer);
    }

    public String getName() {
        return name;
    }

    /**
     * Set the Jetty server instance of the environment, notify the listener
     *
     * @param server
     * @throws IllegalStateException if the server has already been set for this environment
     */
    public void serverStarted(Server server) {
        if (this.server != null) {
            throw new IllegalStateException("Server already set");
        }
        this.server = server;
        if (serverListener != null) {
            serverListener.serverStarted();
        }
    }

    /**
     * @return the Jetty server instance
     */
    public Server getServer() {
        return server;
    }

    public void setServerLifecycleListener(ServerLifecycleListener listener) {
        serverListener = listener;
    }
}
File
Environment.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method declaration
Method signature
Return statement
Variable
Chunk
Conflicting content 
    @NotNull
    @JsonProperty
<<<<<<< HEAD
    private ImmutableMap contextParameters = ImmutableMap.of();

    @Min(1025)
    @Max(65535)
=======
    protected ImmutableMap contextParameters = ImmutableMap.of();
    
    public enum ConnectorType {
        SOCKET,
        BLOCKING_CHANNEL,
        SELECT_CHANNEL,
        SOCKET_SSL,
        SELECT_CHANNEL_SSL
    }
  
    @PortRange
>>>>>>> d98b07f2df0c067c3d784f72b7b41057f717627c
    @JsonProperty
    private int port = 8080;
Solution content 
    @NotNull
    @JsonProperty
    private ImmutableMap contextParameters = ImmutableMap.of();

    @PortRange
    @JsonProperty
    private int port = 8080;
File
HttpConfiguration.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Enum declaration
Method invocation