Projects >> killbill-client-java >>ee1f7f588181635bad0ccfd8fbb615aa19f9b846

Chunk
Conflicting content 
    public static final String QUERY_UNPAID_INVOICES_ONLY = "unpaidInvoicesOnly";
    public static final String QUERY_PAYMENT_METHOD_PLUGIN_NAME = "pluginName";
    public static final String QUERY_WITH_PLUGIN_INFO = "withPluginInfo";
<<<<<<< HEAD
    public static final String QUERY_INVOICE_ID = "invoiceId";
    public static final String QUERY_AUTO_COMMIT = "autoCommit";
=======
    public static final String QUERY_WITH_MIGRATION_INVOICES = "withMigrationInvoices";
>>>>>>> 53c06ac2d2df7c5e0175c8b7e923deb2b786dc2b

    public static final String UPCOMING_INVOICE_TARGET_DATE = "upcomingInvoiceTargetDate";
    public static final String QUERY_START_DATE = "startDate";
Solution content 
    public static final String QUERY_UNPAID_INVOICES_ONLY = "unpaidInvoicesOnly";
    public static final String QUERY_PAYMENT_METHOD_PLUGIN_NAME = "pluginName";
    public static final String QUERY_WITH_PLUGIN_INFO = "withPluginInfo";
    public static final String QUERY_INVOICE_ID = "invoiceId";
    public static final String QUERY_AUTO_COMMIT = "autoCommit";
    public static final String QUERY_WITH_MIGRATION_INVOICES = "withMigrationInvoices";

    public static final String UPCOMING_INVOICE_TARGET_DATE = "upcomingInvoiceTargetDate";
    public static final String QUERY_START_DATE = "startDate";
File
JaxrsResource.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        return httpClient.doPostAndFollowLocation(uri, invoiceItem, queryParams, Invoice.class);
    }

<<<<<<< HEAD
    public InvoiceItem createExternalCharge(final InvoiceItem externalCharge, final DateTime requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final List externalCharges = createExternalCharges(ImmutableList.of(externalCharge), requestedDate, autoPay, autoCommit, createdBy, reason, comment);
        return externalCharges.isEmpty() ? null : externalCharges.get(0);
    }

    public List createExternalCharges(final Iterable externalCharges, final DateTime requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
=======
    public InvoiceItem createExternalCharge(final InvoiceItem externalCharge, @Nullable final LocalDate requestedDate, final Boolean autoPay, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final List externalCharges = createExternalCharges(ImmutableList.of(externalCharge), requestedDate, autoPay, createdBy, reason, comment);
        return externalCharges.isEmpty() ? null : externalCharges.get(0);
    }

    public List createExternalCharges(final Iterable externalCharges, @Nullable final LocalDate requestedDate, final Boolean autoPay, final String createdBy, final String reason, final String comment) throws KillBillClientException {
>>>>>>> 53c06ac2d2df7c5e0175c8b7e923deb2b786dc2b
        final Map> externalChargesPerAccount = new HashMap>();
        for (final InvoiceItem externalCharge : externalCharges) {
            Preconditions.checkNotNull(externalCharge.getAccountId(), "InvoiceItem#accountId cannot be null");
Solution content 
        return httpClient.doPostAndFollowLocation(uri, invoiceItem, queryParams, Invoice.class);
    }

    public InvoiceItem createExternalCharge(final InvoiceItem externalCharge, @Nullable final LocalDate requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final List externalCharges = createExternalCharges(ImmutableList.of(externalCharge), requestedDate, autoPay, autoCommit, createdBy, reason, comment);
        return externalCharges.isEmpty() ? null : externalCharges.get(0);
    }

    public List createExternalCharges(final Iterable externalCharges, @Nullable final LocalDate requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final Map> externalChargesPerAccount = new HashMap>();
        for (final InvoiceItem externalCharge : externalCharges) {
            Preconditions.checkNotNull(externalCharge.getAccountId(), "InvoiceItem#accountId cannot be null");
File
KillBillClient.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method signature
Chunk
Conflicting content 
        return createdExternalCharges;
    }

<<<<<<< HEAD
    private List createExternalCharges(final UUID accountId, final Iterable externalCharges, final DateTime requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final String uri = JaxrsResource.INVOICES_PATH + "/" + JaxrsResource.CHARGES + "/" + accountId;

        final Multimap queryParams = paramsWithAudit(ImmutableMultimap.of(JaxrsResource.QUERY_REQUESTED_DT, requestedDate.toDateTimeISO().toString(),
                                                                                                          JaxrsResource.QUERY_PAY_INVOICE, autoPay.toString(),
                                                                                                          JaxrsResource.QUERY_AUTO_COMMIT, String.valueOf(autoCommit)
                                                                                                         ),
                                                                     createdBy,
                                                                     reason,
                                                                     comment
                                                                    );
=======
    private List createExternalCharges(final UUID accountId, final Iterable externalCharges, @Nullable final LocalDate requestedDate, final Boolean autoPay, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final String uri = JaxrsResource.INVOICES_PATH + "/" + JaxrsResource.CHARGES + "/" + accountId;

        final Multimap params = HashMultimap.create();
        params.put(JaxrsResource.QUERY_PAY_INVOICE, autoPay.toString());
        if (requestedDate != null) {
            params.put(JaxrsResource.QUERY_REQUESTED_DT, requestedDate.toString());
        }
        final Multimap queryParams = paramsWithAudit(params, createdBy, reason, comment);
>>>>>>> 53c06ac2d2df7c5e0175c8b7e923deb2b786dc2b

        return httpClient.doPost(uri, externalCharges, queryParams, InvoiceItems.class);
    }
Solution content 
        return createdExternalCharges;
    }

    private List createExternalCharges(final UUID accountId, final Iterable externalCharges, @Nullable final LocalDate requestedDate, final Boolean autoPay, final Boolean autoCommit, final String createdBy, final String reason, final String comment) throws KillBillClientException {
        final String uri = JaxrsResource.INVOICES_PATH + "/" + JaxrsResource.CHARGES + "/" + accountId;

        final Multimap params = HashMultimap.create();
            params.put(JaxrsResource.QUERY_PAY_INVOICE, autoPay.toString());
            params.put(JaxrsResource.QUERY_AUTO_COMMIT, String.valueOf(autoCommit));
        if (requestedDate != null) {
            params.put(JaxrsResource.QUERY_REQUESTED_DT, requestedDate.toString());
        }
        final Multimap queryParams = paramsWithAudit(params, createdBy, reason, comment);

        return httpClient.doPost(uri, externalCharges, queryParams, InvoiceItems.class);
    }
File
KillBillClient.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Method signature
Variable