Projects >> legacy-jclouds >>d57fb93211626848451cdefce7fd6f8edcf2c63d

Chunk
Conflicting content 
   @Provides
   @Singleton
<<<<<<< HEAD:common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java
   protected ServiceAsyncClient provideServiceClient(AsyncClientFactory factory) {
      return factory.create(ServiceAsyncClient.class);
=======
   protected IdentityServiceAsyncClient provideIdentityServiceClient(AsyncClientFactory factory) {
      return factory.create(IdentityServiceAsyncClient.class);
>>>>>>> bf58be7a6d6c601ebb6f82ff743d353e09544fb6:common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeyStoneAuthenticationModule.java
   }
   
   @Singleton
Solution content 
   @Provides
   @Singleton
   protected ServiceAsyncClient provideServiceClient(AsyncClientFactory factory) {
      return factory.create(ServiceAsyncClient.class);
   }
   
   @Singleton
File
AuthenticationServiceModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
 */
public class BaseKeystoneRestClientExpectTest extends BaseRestClientExpectTest {

<<<<<<< HEAD:common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java
   protected static final String tenantId = "12346637803162";

   protected static final String username = "user@jclouds.org";
   protected static final String password = "Password1234";
   protected static final HttpRequest initialAuthWithPasswordCredentials = HttpRequest
            .builder()
            .method("POST")
            .endpoint(URI.create("http://localhost:5000/v2.0/tokens"))
            .headers(ImmutableMultimap.of(HttpHeaders.ACCEPT, "application/json"))
            .payload(
                     payloadFromStringWithContentType(
                              format(
                                       "{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"},\"tenantId\":\"%s\"}}",
                                       username, password, tenantId), "application/json")).build();
=======
   public BaseKeyStoneRestClientExpectTest() {
      // username:tenantId
      identity = "user@jclouds.org:40806637803162";
      credential = "Password1234";
   }
>>>>>>> bf58be7a6d6c601ebb6f82ff743d353e09544fb6:common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeyStoneRestClientExpectTest.java

   protected static final String accessKey = "FH6FU8GMZFLKP5BUR2X1";
   protected static final String secretKey = "G4QWed0lh5SH7kBrcvOM1cHygKWk81EBt+Hr1dsl";
Solution content 
 */
public class BaseKeystoneRestClientExpectTest extends BaseRestClientExpectTest {

   protected static final String tenantId = "12346637803162";

   protected static final String username = "user@jclouds.org";
   protected static final String password = "Password1234";
   protected static final HttpRequest initialAuthWithPasswordCredentials = HttpRequest
            .builder()
            .method("POST")
            .endpoint(URI.create("http://localhost:5000/v2.0/tokens"))
            .headers(ImmutableMultimap.of(HttpHeaders.ACCEPT, "application/json"))
            .payload(
                     payloadFromStringWithContentType(
                              format(
                                       "{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"},\"tenantId\":\"%s\"}}",
                                       username, password, tenantId), "application/json")).build();

   protected static final String accessKey = "FH6FU8GMZFLKP5BUR2X1";
   protected static final String secretKey = "G4QWed0lh5SH7kBrcvOM1cHygKWk81EBt+Hr1dsl";
File
BaseKeystoneRestClientExpectTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method invocation
Chunk
Conflicting content 
            .headers(ImmutableMultimap.of(HttpHeaders.ACCEPT, "application/json"))
            .payload(
                     payloadFromStringWithContentType(
<<<<<<< HEAD:common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java
                              format(
                                       "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
                                       accessKey, secretKey, tenantId), "application/json")).build();

   public BaseKeystoneRestClientExpectTest() {
      identity = tenantId + ":" + accessKey;
      credential = secretKey;
   }

=======
                              "{\"auth\":{\"passwordCredentials\":{\"username\":\"user@jclouds.org\",\"password\":\"Password1234\"},\"tenantId\":\"40806637803162\"}}",
                              "application/json")).build();
>>>>>>> bf58be7a6d6c601ebb6f82ff743d353e09544fb6:common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeyStoneRestClientExpectTest.java

   protected String authToken = "Auth_4f173437e4b013bee56d1007";
Solution content 
            .headers(ImmutableMultimap.of(HttpHeaders.ACCEPT, "application/json"))
            .payload(
                     payloadFromStringWithContentType(
                              format(
                                       "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
                                       accessKey, secretKey, tenantId), "application/json")).build();

   public BaseKeystoneRestClientExpectTest() {
      identity = tenantId + ":" + accessKey;
      credential = secretKey;
   }

   protected String authToken = "Auth_4f173437e4b013bee56d1007";
File
BaseKeystoneRestClientExpectTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method invocation