Projects >> iron_mq_java >>c72b46333fc536c56b21a659f968d9eedc0e3382

Chunk
Conflicting content 
    }

    private Reader request(String method, String endpoint, String body) throws IOException {
<<<<<<< HEAD
        String path = cloud.getSuffix() + "/" + apiVersion + "/projects/" + projectId + "/" + endpoint;
        URL url = new URL(cloud.scheme, cloud.host, cloud.port, path);
=======
        String path = "/" + apiVersion + "/projects/" + projectId + "/" + endpoint;
        URL url = new URL(cloud.scheme, cloud.host, cloud.port, cloud.pathPrefix + path);
>>>>>>> 6fc3616f744b33589c2d65ba9fcb03dceb796a4c

        System.out.println(method + " " + url + " " + (method != "GET" ? body : ""));
Solution content 
    }

    private Reader request(String method, String endpoint, String body) throws IOException {
        String path = "/" + apiVersion + "/projects/" + projectId + "/" + endpoint;
        URL url = new URL(cloud.scheme, cloud.host, cloud.port, cloud.pathPrefix + path);

        System.out.println(method + " " + url + " " + (method != "GET" ? body : ""));
File
Client.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
    int port;
    String scheme;
    String host;
import java.net.URL;

public class Cloud {
<<<<<<< HEAD
    final String scheme;
    final String host;
    final int port;
    final String suffix;
=======
    String pathPrefix = "";
>>>>>>> 6fc3616f744b33589c2d65ba9fcb03dceb796a4c

    public static final Cloud ironAWSUSEast = new Cloud("https", "mq-aws-us-east-1.iron.io", 443);
    public static final Cloud ironAWSEUWest = new Cloud("https", "mq-aws-eu-west-1.iron.io", 443);
Solution content 
import java.net.URL;

public class Cloud {
    String scheme;
    String host;
    int port;
    String pathPrefix = "";

    public static final Cloud ironAWSUSEast = new Cloud("https", "mq-aws-us-east-1.iron.io", 443);
    public static final Cloud ironAWSEUWest = new Cloud("https", "mq-aws-eu-west-1.iron.io", 443);
File
Cloud.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        return port;
    }

<<<<<<< HEAD
    public String getSuffix() {
        return suffix == null ? "" : suffix;
=======
    public String getPathPrefix() {
        return pathPrefix;
    }

    public void setPathPrefix(String pathPrefix) {
        this.pathPrefix = pathPrefix;
>>>>>>> 6fc3616f744b33589c2d65ba9fcb03dceb796a4c
    }
}
Solution content 
        return port;
    }

    public String getPathPrefix() {
        return pathPrefix;
    }

    public void setPathPrefix(String pathPrefix) {
        this.pathPrefix = pathPrefix;
    }
}
File
Cloud.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method declaration
Method signature
Return statement