Projects >> mifosx >>edef7dbf93a821df9fa6b13f4842408673cae864

Chunk
Conflicting content 
    public boolean isEntityMappingResource() {
        return this.entityName.equalsIgnoreCase("ENTITYMAPPING");
    }
<<<<<<< HEAD

    public boolean isWorkingDaysResource() {
        return this.entityName.equalsIgnoreCase("WORKINGDAYS");
    }

    public boolean isPasswordPreferencesResource() {
        return this.entityName.equalsIgnoreCase(PasswordPreferencesApiConstants.ENTITY_NAME);
    }

=======
    
    public boolean isPaymentTypeResource() {
        return this.entityName.equalsIgnoreCase("PAYMENTTYPE");
    }
>>>>>>> c73e38fc8c030ea35574c96891b0535c9dbbc509
}
Solution content 
    public boolean isEntityMappingResource() {
        return this.entityName.equalsIgnoreCase("ENTITYMAPPING");
    }

    public boolean isWorkingDaysResource() {
        return this.entityName.equalsIgnoreCase("WORKINGDAYS");
    }

    public boolean isPasswordPreferencesResource() {
        return this.entityName.equalsIgnoreCase(PasswordPreferencesApiConstants.ENTITY_NAME);
    }

    public boolean isPaymentTypeResource() {
        return this.entityName.equalsIgnoreCase("PAYMENTTYPE");
    }
}
File
CommandWrapper.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Chunk
Conflicting content 
        return this;
    }

<<<<<<< HEAD
    public CommandWrapperBuilder updateWorkingDays() {
        this.actionName = "UPDATE";
        this.entityName = "WORKINGDAYS";
        this.href = "/workingdays/";
        return this;
    }

    public CommandWrapperBuilder updatePasswordPreferences() {
        this.actionName = "UPDATE";
        this.entityName = PasswordPreferencesApiConstants.ENTITY_NAME;
        this.href = "/" + PasswordPreferencesApiConstants.RESOURCE_NAME;
        return this;
    }

=======
    public CommandWrapperBuilder createPaymentType() {
        this.actionName = "CREATE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = null;
        this.href = "/paymenttype";
        return this;
    }

    public CommandWrapperBuilder updatePaymentType(final Long paymentTypeId) {
        this.actionName = "UPDATE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = paymentTypeId;
        this.href = "/paymenttype/" + paymentTypeId;
        return this;
    }

    public CommandWrapperBuilder deletePaymentType(final Long paymentTypeId) {
        this.actionName = "DELETE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = paymentTypeId;
        this.href = "/paymenttype/" + paymentTypeId;
        return this;
    }
    
>>>>>>> c73e38fc8c030ea35574c96891b0535c9dbbc509
}
Solution content 
        return this;
    }

    public CommandWrapperBuilder updateWorkingDays() {
        this.actionName = "UPDATE";
        this.entityName = "WORKINGDAYS";
        this.href = "/workingdays/";
        return this;
    }

    public CommandWrapperBuilder updatePasswordPreferences() {
        this.actionName = "UPDATE";
        this.entityName = PasswordPreferencesApiConstants.ENTITY_NAME;
        this.href = "/" + PasswordPreferencesApiConstants.RESOURCE_NAME;
        return this;
    }

    public CommandWrapperBuilder createPaymentType() {
        this.actionName = "CREATE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = null;
        this.href = "/paymenttype";
        return this;
    }

    public CommandWrapperBuilder updatePaymentType(final Long paymentTypeId) {
        this.actionName = "UPDATE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = paymentTypeId;
        this.href = "/paymenttype/" + paymentTypeId;
        return this;
    }

    public CommandWrapperBuilder deletePaymentType(final Long paymentTypeId) {
        this.actionName = "DELETE";
        this.entityName = "PAYMENTTYPE";
        this.entityId = paymentTypeId;
        this.href = "/paymenttype/" + paymentTypeId;
        return this;
    }

}
File
CommandWrapperBuilder.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Chunk
Conflicting content 
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
<<<<<<< HEAD
        } else if (wrapper.isWorkingDaysResource()) {
            if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateWorkingDaysCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else if (wrapper.isPasswordPreferencesResource()) {
            if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updatePasswordPreferencesCommandHandler", NewCommandSourceHandler.class);

            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
=======

        } else if (wrapper.isPaymentTypeResource()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createPaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updatePaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isDelete()) {
                handler = this.applicationContext.getBean("deletePaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

>>>>>>> c73e38fc8c030ea35574c96891b0535c9dbbc509
        } else {

            throw new UnsupportedCommandException(wrapper.commandName());
Solution content 
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else if (wrapper.isWorkingDaysResource()) {
            if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateWorkingDaysCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else if (wrapper.isPasswordPreferencesResource()) {
            if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updatePasswordPreferencesCommandHandler", NewCommandSourceHandler.class);

            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

        } else if (wrapper.isPaymentTypeResource()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createPaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updatePaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isDelete()) {
                handler = this.applicationContext.getBean("deletePaymentTypeCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

        } else {

            throw new UnsupportedCommandException(wrapper.commandName());
File
SynchronousCommandProcessingService.java
Developer's decision
Concatenation
Kind of conflict
If statement