Projects >> accumulo >>61b76b507356ec2d5650b011ec22bd550ccbbd56

Chunk
Conflicting content
import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.core.zookeeper.ZooUtil;
<<<<<<< HEAD
import org.apache.commons.configuration.PropertiesConfiguration;
=======
import org.apache.accumulo.trace.instrument.Trace;
>>>>>>> f5c7f05af7bdb95a2485bc0566bd2c4968f1427f
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.UserGroupInformation;
Solution content
import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.UserGroupInformation;
File
ClientOpts.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.PropertyType;
<<<<<<< HEAD
=======
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.configuration.AbstractConfiguration;
>>>>>>> f5c7f05af7bdb95a2485bc0566bd2c4968f1427f
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
Solution content
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.PropertyType;
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
File
ClientConfiguration.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content
  }

  @Test
<<<<<<< HEAD:core/src/test/java/org/apache/accumulo/core/client/ClientConfigurationTest.java
  public void testSasl() {
    ClientConfiguration conf = new ClientConfiguration(Collections. emptyList());
    assertEquals("false", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    conf.withSasl(false);
    assertEquals("false", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    conf.withSasl(true);
    assertEquals("true", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    final String primary = "accumulo";
    conf.withSasl(true, primary);
    assertEquals(primary, conf.get(ClientProperty.KERBEROS_SERVER_PRIMARY));
  }

=======
  public void testMultipleValues() throws ConfigurationException {
    String val = "comma,separated,list";
    PropertiesConfiguration propertiesConfiguration = new PropertiesConfiguration();
    propertiesConfiguration.setListDelimiter('\0');
    propertiesConfiguration.addProperty(ClientProperty.INSTANCE_ZK_HOST.getKey(), val);
    ClientConfiguration conf = new ClientConfiguration(propertiesConfiguration);
    assertEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(1, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());

    conf = new ClientConfiguration(new PropertiesConfiguration("multi-valued.client.conf"));
    assertNotEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(3, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());

    conf = new ClientConfiguration("multi-valued.client.conf");
    assertEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(1, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());
  }
>>>>>>> f5c7f05af7bdb95a2485bc0566bd2c4968f1427f:core/src/test/java/org/apache/accumulo/core/conf/ClientConfigurationTest.java
}
Solution content
  }

  @Test
  public void testSasl() {
    ClientConfiguration conf = new ClientConfiguration(Collections. emptyList());
    assertEquals("false", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    conf.withSasl(false);
    assertEquals("false", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    conf.withSasl(true);
    assertEquals("true", conf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED));
    final String primary = "accumulo";
    conf.withSasl(true, primary);
    assertEquals(primary, conf.get(ClientProperty.KERBEROS_SERVER_PRIMARY));
  }

  @Test
  public void testMultipleValues() throws ConfigurationException {
    String val = "comma,separated,list";

    // not the recommended way to construct a client configuration, but it works
    PropertiesConfiguration propertiesConfiguration = new PropertiesConfiguration();
    propertiesConfiguration.setDelimiterParsingDisabled(true);
    propertiesConfiguration.addProperty(ClientProperty.INSTANCE_ZK_HOST.getKey(), val);
    propertiesConfiguration.load(new StringReader(ClientProperty.TRACE_SPAN_RECEIVERS.getKey() + "=" + val));
    ClientConfiguration conf = new ClientConfiguration(propertiesConfiguration);
    assertEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(1, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());
    assertEquals(val, conf.get(ClientProperty.TRACE_SPAN_RECEIVERS));
    assertEquals(1, conf.getList(ClientProperty.TRACE_SPAN_RECEIVERS.getKey()).size());

    // incorrect usage that results in not being able to use multi-valued properties
    conf = new ClientConfiguration(new PropertiesConfiguration("multi-valued.client.conf"));
    assertNotEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(3, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());
    assertNotEquals(val, conf.get(ClientProperty.TRACE_SPAN_RECEIVERS));
    assertEquals(3, conf.getList(ClientProperty.TRACE_SPAN_RECEIVERS.getKey()).size());

    // recommended usage
    conf = new ClientConfiguration("multi-valued.client.conf");
    assertEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(1, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());
    assertEquals(val, conf.get(ClientProperty.TRACE_SPAN_RECEIVERS));
    assertEquals(1, conf.getList(ClientProperty.TRACE_SPAN_RECEIVERS.getKey()).size());

    // only used internally
    Map map = new HashMap<>();
    map.put(ClientProperty.INSTANCE_ZK_HOST.getKey(), val);
    map.put(ClientProperty.TRACE_SPAN_RECEIVERS.getKey(), val);
    conf = new ClientConfiguration(new MapConfiguration(map));
    assertEquals(val, conf.get(ClientProperty.INSTANCE_ZK_HOST));
    assertEquals(1, conf.getList(ClientProperty.INSTANCE_ZK_HOST.getKey()).size());
    assertEquals(val, conf.get(ClientProperty.TRACE_SPAN_RECEIVERS));
    assertEquals(1, conf.getList(ClientProperty.TRACE_SPAN_RECEIVERS.getKey()).size());
  }
}
File
ClientConfigurationTest.java
Developer's decision
Manual
Kind of conflict
Method declaration
Chunk
Conflicting content
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.commons.configuration.ConfigurationException;
<<<<<<< HEAD:shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.apache.log4j.Logger;
>>>>>>> f5c7f05af7bdb95a2485bc0566bd2c4968f1427f:core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java

import com.beust.jcommander.DynamicParameter;
import com.beust.jcommander.IStringConverter;
Solution content
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.beust.jcommander.DynamicParameter;
import com.beust.jcommander.IStringConverter;
File
ShellOptionsJC.java
Developer's decision
Combination
Kind of conflict
Import