Projects >> mifosx >>a37edf45d8de6e8fe3903db414565d06380fb195

Chunk
Conflicting content 
    private final String depositPeriod = "14";
    private final String depositPeriodFrequencyId = MONTHS;
    private String submittedOnDate = "";
<<<<<<< HEAD
=======
    private String savingsId = null;
    private boolean transferInterest = false;
>>>>>>> 4d2913be8f003dc192854fdfa24ebc7b6bfa1f2e

    public String build(final String clientId, final String productId, final String validFrom, final String validTo,
            final String penalInterestType) {
Solution content 
    private final String depositPeriod = "14";
    private final String depositPeriodFrequencyId = MONTHS;
    private String submittedOnDate = "";
    private String savingsId = null;
    private boolean transferInterest = false;

    public String build(final String clientId, final String productId, final String validFrom, final String validTo,
            final String penalInterestType) {
File
FixedDepositAccountHelper.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        map.put("depositPeriod", this.depositPeriod);
        map.put("depositPeriodFrequencyId", this.depositPeriodFrequencyId);
        map.put("submittedOnDate", this.submittedOnDate);
<<<<<<< HEAD
=======
        map.put("linkAccountId", savingsId);
        map.put("transferInterestToSavings", transferInterest);
>>>>>>> 4d2913be8f003dc192854fdfa24ebc7b6bfa1f2e

        String fixedDepositAccountJson = new Gson().toJson(map);
        System.out.println(fixedDepositAccountJson);
Solution content 
        map.put("depositPeriod", this.depositPeriod);
        map.put("depositPeriodFrequencyId", this.depositPeriodFrequencyId);
        map.put("submittedOnDate", this.submittedOnDate);
        map.put("linkAccountId", savingsId);
        map.put("transferInterestToSavings", transferInterest);

        String fixedDepositAccountJson = new Gson().toJson(map);
        System.out.println(fixedDepositAccountJson);
File
FixedDepositAccountHelper.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        return this;
    }

<<<<<<< HEAD
=======
    public FixedDepositAccountHelper withSavings(final String savingsId) {
        this.savingsId = savingsId;
        return this;
    }

    public FixedDepositAccountHelper transferInterest(final boolean transferInterest) {
        this.transferInterest = transferInterest;
        return this;
    }

    public FixedDepositAccountHelper withLockinPeriodFrequency(final String lockingPeriodFrequencyType, final String lockinPeriodFrequency) {
        this.lockingPeriodFrequencyType = lockingPeriodFrequencyType;
        this.lockinPeriodFrequency = lockinPeriodFrequency;
        return this;
    }
>>>>>>> 4d2913be8f003dc192854fdfa24ebc7b6bfa1f2e
}
Solution content 
        return this;
    }

    public FixedDepositAccountHelper withSavings(final String savingsId) {
        this.savingsId = savingsId;
        return this;
    }

    public FixedDepositAccountHelper transferInterest(final boolean transferInterest) {
        this.transferInterest = transferInterest;
        return this;
    }

    public FixedDepositAccountHelper withLockinPeriodFrequency(final String lockingPeriodFrequencyType, final String lockinPeriodFrequency) {
        this.lockingPeriodFrequencyType = lockingPeriodFrequencyType;
        this.lockinPeriodFrequency = lockinPeriodFrequency;
        return this;
    }
}
File
FixedDepositAccountHelper.java
Developer's decision
Version 2
Kind of conflict
Method declaration