Projects >> openstack-java-sdk >>bd9ff5edd71f046f93f8d9b684748e3426df9bb9

Chunk
Conflicting content 
		// Let' show our available tenants
		IdentityResource identity = session.getAuthenticationClient().root();
<<<<<<< HEAD
		Iterable tenants = identity.tenants().list();
=======

		Iterable tenants = identity.tenants().list();
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a
		for (Tenant tenant : tenants) {
			System.out.println(tenant);
		}
Solution content 
		// Let' show our available tenants
		IdentityResource identity = session.getAuthenticationClient().root();
		Iterable tenants = identity.tenants().list();
		for (Tenant tenant : tenants) {
			System.out.println(tenant);
		}
File
Test.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.openstack.model.compute.Server;
import org.openstack.model.identity.Access;
import org.openstack.model.identity.Service;
<<<<<<< HEAD
import org.openstack.model.identity.Access.Token;
=======
import org.openstack.model.identity.keystone.KeyStoneService;
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a

import com.google.common.base.Function;
import com.google.common.base.Joiner;
Solution content 
import org.openstack.model.identity.Access;
import org.openstack.model.identity.Access.Token;
import org.openstack.model.identity.Service;

import com.google.common.base.Function;
import com.google.common.base.Joiner;
File
OpenstackSession.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
	void setPublicURL(String publicURL);

<<<<<<< HEAD
    @XmlAttribute
    private String versionList;

    public String getRegion() {
        return region;
    }

    public void setRegion(String region) {
        this.region = region;
    }

    public String getTenantId() {
        return tenantId;
    }

    public void setTenantId(String tenantId) {
        this.tenantId = tenantId;
    }

    public String getInternalURL() {
        return internalURL;
    }

    public void setInternalURL(String internalURL) {
        this.internalURL = internalURL;
    }

    public String getPublicURL() {
        return publicURL;
    }

    public void setPublicURL(String publicURL) {
        this.publicURL = publicURL;
    }

	@Override
	public String toString() {
		return "ServiceEndpoint [region=" + region + ", tenantId=" + tenantId + ", internalURL=" + internalURL
				+ ", publicURL=" + publicURL + ", publicURL2=" + publicURL2 + ", adminURL=" + adminURL + ", versionId="
				+ versionId + ", versionList=" + versionList + "]";
	}

    // @XmlElement
    // private ServiceVersion version;

    
}
=======
}
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a
Solution content 
	void setPublicURL(String publicURL);

}
File
ServiceEndpoint.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Comment
Method declaration
Chunk
Conflicting content 
<<<<<<< HEAD
=======
import java.util.List;

import org.openstack.client.cli.OpenstackCliContext;
import org.openstack.client.common.OpenstackComputeClient;
import org.openstack.client.compute.TenantResource;
import org.openstack.client.compute.ext.SecurityGroupsResource;
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a
import org.openstack.model.compute.SecurityGroup;

import com.fathomdb.cli.CliContext;
Solution content 
import java.util.List;

import org.openstack.client.cli.OpenstackCliContext;
import org.openstack.model.compute.SecurityGroup;

import com.fathomdb.cli.CliContext;
File
SecurityGroupNameAutoCompleter.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	public List doComplete(CliContext contextObject, String prefix) throws Exception {
		List strings = Lists.newArrayList();

<<<<<<< HEAD
		OpenstackCliContext context = (OpenstackCliContext) contextObject;
		for (SecurityGroup securityGroup : context.getCache().getSecurityGroups(true)) {
			strings.add(securityGroup.getName());
		}
		addSuffix(strings, " ");
=======
        OpenstackCliContext osContext = (OpenstackCliContext) context;
        OpenstackComputeClient computeClient = osContext.getComputeClient();
        List securityGroups = computeClient.root().extension(SecurityGroupsResource.class).list().getList();
        for (SecurityGroup securityGroup : securityGroups) {
            strings.add(securityGroup.getName());
        }
        addSuffix(strings, " ");
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a

		return strings;
	}
Solution content 
	public List doComplete(CliContext contextObject, String prefix) throws Exception {
		List strings = Lists.newArrayList();

		OpenstackCliContext context = (OpenstackCliContext) contextObject;
		for (SecurityGroup securityGroup : context.getCache().getSecurityGroups(true)) {
			strings.add(securityGroup.getName());
		}
		addSuffix(strings, " ");

		return strings;
	}
File
SecurityGroupNameAutoCompleter.java
Developer's decision
Version 1
Kind of conflict
Cast expression
For statement
Method invocation
Variable
Chunk
Conflicting content 
package org.openstack.client.cli.commands;

<<<<<<< HEAD
public class ListSecurityGroups extends OpenstackCliCommandRunnerBase {
	public ListSecurityGroups() {
		super("list", "securitygroups");
	}

	@Override
	public Object runCommand() throws Exception {
		return getCache().getSecurityGroups(false);
	}
=======
import org.openstack.client.cli.OpenstackCliContext;
import org.openstack.client.common.OpenstackComputeClient;
import org.openstack.client.compute.ext.SecurityGroupsResource;
import org.openstack.model.compute.SecurityGroupList;

public class ListSecurityGroups extends OpenstackCliCommandRunnerBase {
    public ListSecurityGroups() {
        super("list", "securitygroups");
    }

    @Override
    public Object runCommand() throws Exception {
        OpenstackCliContext context = getContext();
        OpenstackComputeClient tenant = context.getComputeClient();
        SecurityGroupList sgs = tenant.root().extension(SecurityGroupsResource.class).list();
        return sgs.getList();
    }
>>>>>>> 1cad0b0fe368bc3431c9b6ad081cc21e29cdd49a

}
Solution content 
package org.openstack.client.cli.commands;

public class ListSecurityGroups extends OpenstackCliCommandRunnerBase {
	public ListSecurityGroups() {
		super("list", "securitygroups");
	}

	@Override
	public Object runCommand() throws Exception {
		return getCache().getSecurityGroups(false);
	}

}
File
ListSecurityGroups.java
Developer's decision
Version 1
Kind of conflict
Annotation
Class signature
Import
Method declaration