Projects >> ambari >>fefcdf5db65d07c2f755e40d89823ad799fc6c30

Chunk
Conflicting content 
  @Produces("text/plain")
  @Path("{keyName}")
  public String getKey( @PathParam("keyName") String keyName) {
<<<<<<< HEAD
    if (LOG.isDebugEnabled()) {
      LOG.debug("Looking for keyName " + keyName);
    }
=======
    LOG.debug("Looking for keyName " + keyName);
>>>>>>> 7546f20237ec7c18116edb9f4efda4f5eb9932ca
    return persistKeyVal.getValue(keyName);
  }
Solution content 
  @Produces("text/plain")
  @Path("{keyName}")
  public String getKey( @PathParam("keyName") String keyName) {
    LOG.debug("Looking for keyName " + keyName);
    return persistKeyVal.getValue(keyName);
  }
File
PersistKeyValueService.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
<<<<<<< HEAD
=======
import com.google.inject.persist.Transactional;
>>>>>>> 7546f20237ec7c18116edb9f4efda4f5eb9932ca

/**
 * Resource provider for cluster stack versions resources.
Solution content 
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
import com.google.inject.persist.Transactional;

/**
 * Resource provider for cluster stack versions resources.
File
ClusterStackVersionResourceProvider.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
<<<<<<< HEAD
=======
import org.apache.ambari.server.orm.dao.HostComponentStateDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
import org.apache.ambari.server.orm.dao.HostVersionDAO;
>>>>>>> 7546f20237ec7c18116edb9f4efda4f5eb9932ca
import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
Solution content 
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
import org.apache.ambari.server.orm.dao.HostComponentStateDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
import org.apache.ambari.server.orm.dao.HostVersionDAO;
import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
File
ClusterStackVersionResourceProviderTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class);
    resourceTypeDAO = injector.getInstance(ResourceTypeDAO.class);
    stackDAO = injector.getInstance(StackDAO.class);
<<<<<<< HEAD
=======
    clusterDAO = injector.getInstance(ClusterDAO.class);
    hostDAO = injector.getInstance(HostDAO.class);

>>>>>>> 7546f20237ec7c18116edb9f4efda4f5eb9932ca
  }

  @After
Solution content 
    ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class);
    resourceTypeDAO = injector.getInstance(ResourceTypeDAO.class);
    stackDAO = injector.getInstance(StackDAO.class);
    clusterDAO = injector.getInstance(ClusterDAO.class);
    hostDAO = injector.getInstance(HostDAO.class);
  }

  @After
File
ClusterStackVersionResourceProviderTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation