Projects >> cadmium >>d887281bfa886ac0b222d414c31d04eb8c134ea2

Chunk
Conflicting content 
  protected CommandAction updateFailed;
  
  @Inject
<<<<<<< HEAD
  @Named("MAINTENANCE")
  protected CommandAction maintenance;
=======
  @Named("HISTORY_REQUEST")
  protected CommandAction historyRequest;
  
  @Inject
  @Named("HISTORY_RESPONSE")
  protected CommandAction historyResponse;
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d
  
  private Map actionMap = null;
Solution content 
  protected CommandAction updateFailed;
  
  @Inject
  @Named("MAINTENANCE")
  protected CommandAction maintenance;
 
  @Inject
  @Named("HISTORY_REQUEST")
  protected CommandAction historyRequest;
  
  @Inject
  @Named("HISTORY_RESPONSE")
  protected CommandAction historyResponse;
  
  private Map actionMap = null;
File
CommandMapProvider.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
      actionMap.put(ProtocolMessage.UPDATE, update);
      actionMap.put(ProtocolMessage.UPDATE_DONE, updateDone);
      actionMap.put(ProtocolMessage.UPDATE_FAILED, updateFailed);
<<<<<<< HEAD
      actionMap.put(ProtocolMessage.MAINTENANCE, maintenance);
=======
      actionMap.put(ProtocolMessage.HISTORY_REQUEST, historyRequest);
      actionMap.put(ProtocolMessage.HISTORY_RESPONSE, historyResponse);
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d
      
      actionMap = Collections.unmodifiableMap(actionMap);
    }
Solution content 
      actionMap.put(ProtocolMessage.UPDATE, update);
      actionMap.put(ProtocolMessage.UPDATE_DONE, updateDone);
      actionMap.put(ProtocolMessage.UPDATE_FAILED, updateFailed);
      actionMap.put(ProtocolMessage.MAINTENANCE, maintenance);
      actionMap.put(ProtocolMessage.HISTORY_REQUEST, historyRequest);
      actionMap.put(ProtocolMessage.HISTORY_RESPONSE, historyResponse);
      
      actionMap = Collections.unmodifiableMap(actionMap);
    }
File
CommandMapProvider.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.meltmedia.cadmium.core.commands.CommandMapProvider;
import com.meltmedia.cadmium.core.commands.CommandResponse;
import com.meltmedia.cadmium.core.commands.CurrentStateCommandAction;
<<<<<<< HEAD
import com.meltmedia.cadmium.core.commands.MaintenanceCommandAction;
=======
import com.meltmedia.cadmium.core.commands.HistoryRequestCommandAction;
import com.meltmedia.cadmium.core.commands.HistoryResponseCommandAction;
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d
import com.meltmedia.cadmium.core.commands.StateUpdateCommandAction;
import com.meltmedia.cadmium.core.commands.SyncCommandAction;
import com.meltmedia.cadmium.core.commands.UpdateCommandAction;
Solution content 
import com.meltmedia.cadmium.core.commands.CommandMapProvider;
import com.meltmedia.cadmium.core.commands.CommandResponse;
import com.meltmedia.cadmium.core.commands.CurrentStateCommandAction;
import com.meltmedia.cadmium.core.commands.MaintenanceCommandAction;
import com.meltmedia.cadmium.core.commands.HistoryRequestCommandAction;
import com.meltmedia.cadmium.core.commands.HistoryResponseCommandAction;
import com.meltmedia.cadmium.core.commands.StateUpdateCommandAction;
import com.meltmedia.cadmium.core.commands.SyncCommandAction;
import com.meltmedia.cadmium.core.commands.UpdateCommandAction;
File
CadmiumListener.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import com.meltmedia.cadmium.servlets.MaintenanceFilter;
import com.meltmedia.cadmium.servlets.RedirectFilter;
import com.meltmedia.cadmium.servlets.SslRedirectFilter;
<<<<<<< HEAD
import com.meltmedia.cadmium.servlets.jersey.MaintenanceService;
=======
import com.meltmedia.cadmium.servlets.jersey.HistoryService;
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d
import com.meltmedia.cadmium.servlets.jersey.UpdateService;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
Solution content 
import com.meltmedia.cadmium.servlets.MaintenanceFilter;
import com.meltmedia.cadmium.servlets.RedirectFilter;
import com.meltmedia.cadmium.servlets.SslRedirectFilter;
import com.meltmedia.cadmium.servlets.jersey.MaintenanceService;
import com.meltmedia.cadmium.servlets.jersey.HistoryService;
import com.meltmedia.cadmium.servlets.jersey.UpdateService;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
File
CadmiumListener.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
            .annotatedWith(Names.named(ProtocolMessage.UPDATE_FAILED.name()))
            .to(UpdateFailedCommandAction.class).in(Scopes.SINGLETON);
        bind(CommandAction.class)
<<<<<<< HEAD
        .annotatedWith(Names.named(ProtocolMessage.MAINTENANCE.name()))
        .to(MaintenanceCommandAction.class).in(Scopes.SINGLETON);
=======
            .annotatedWith(Names.named(ProtocolMessage.HISTORY_REQUEST.name()))
            .to(HistoryRequestCommandAction.class).in(Scopes.SINGLETON);
        bind(CommandAction.class)
            .annotatedWith(Names.named(ProtocolMessage.HISTORY_RESPONSE.name()))
            .to(HistoryResponseCommandAction.class).in(Scopes.SINGLETON);
        
        bind(CommandResponse.class)
            .annotatedWith(Names.named(ProtocolMessage.HISTORY_RESPONSE.name()))
            .to(HistoryResponseCommandAction.class).in(Scopes.SINGLETON);
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d

        bind(new TypeLiteral>() {}).annotatedWith(Names.named("commandMap")).toProvider(CommandMapProvider.class);
Solution content 
            .annotatedWith(Names.named(ProtocolMessage.UPDATE_FAILED.name()))
            .to(UpdateFailedCommandAction.class).in(Scopes.SINGLETON);
        bind(CommandAction.class)
            .annotatedWith(Names.named(ProtocolMessage.MAINTENANCE.name()))
            .to(MaintenanceCommandAction.class).in(Scopes.SINGLETON);
        bind(CommandAction.class)
            .annotatedWith(Names.named(ProtocolMessage.HISTORY_REQUEST.name()))
            .to(HistoryRequestCommandAction.class).in(Scopes.SINGLETON);
        bind(CommandAction.class)
            .annotatedWith(Names.named(ProtocolMessage.HISTORY_RESPONSE.name()))
            .to(HistoryResponseCommandAction.class).in(Scopes.SINGLETON);

        bind(new TypeLiteral>() {}).annotatedWith(Names.named("commandMap")).toProvider(CommandMapProvider.class);
File
CadmiumListener.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
        // Bind Jersey Endpoints
        bind(UpdateService.class).asEagerSingleton();
<<<<<<< HEAD
        bind(MaintenanceService.class).asEagerSingleton();
=======
        bind(HistoryService.class).asEagerSingleton();
>>>>>>> b44734a8411be18fa4c29f78f532990e6bce159d
      }
    };
  }
Solution content 
        // Bind Jersey Endpoints
        bind(UpdateService.class).asEagerSingleton();
        bind(MaintenanceService.class).asEagerSingleton();
        bind(HistoryService.class).asEagerSingleton();
      }
    };
  }
File
CadmiumListener.java
Developer's decision
Concatenation
Kind of conflict
Method invocation