Projects >> jtalks-common >>9c70ae4194dd63fada32e35b74ed880a7cd03418

Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     *
=======
>>>>>>> 79e5b55318992870d7536f08baa8bd1f18fa47c1
     * @return encoded username
     */
    public String getEncodedUsername() {
Solution content 
    }

    /**
     * @return encoded username
     */
    public String getEncodedUsername() {
File
User.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     *
     * @param encodedUsername encoded username to set
     */
    public void setEncodedUsername(String encodedUsername) {
        this.encodedUsername = encodedUsername;
=======
     * Encode username using {@code URLEncoder} with UTF-8 encoding.
     *
     * @param username username
     * @throws UnsupportedEncodingException if requested encoding not supported
     */
    public void setEncodedUsername(String username) throws UnsupportedEncodingException {
        this.encodedUsername = URLEncoder.encode(username, "UTF-8");
>>>>>>> 79e5b55318992870d7536f08baa8bd1f18fa47c1
    }
}
Solution content 
    }

    /**
     * @param encodedUsername encoded username to set
     */
    public void setEncodedUsername(String encodedUsername) {
        this.encodedUsername = encodedUsername;
    }
}
File
User.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Method signature
Chunk
Conflicting content 
<<<<<<< HEAD
     *                                 when encoding is not supported
     * @see User
     */
    User registerUser(User user) throws DuplicateUserException, DuplicateEmailException;
=======
    User registerUser(User user)
            throws DuplicateUserException, DuplicateEmailException, UnsupportedEncodingException;
>>>>>>> 79e5b55318992870d7536f08baa8bd1f18fa47c1

    /**
     * Updates user last login time to current time.
Solution content 
     * @see User
     */
    User registerUser(User user) throws DuplicateUserException, DuplicateEmailException;


    /**
     * Updates user last login time to current time.
File
UserService.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
     * {@inheritDoc}
     */
    @Override
<<<<<<< HEAD
    public User registerUser(User user) throws DuplicateUserException, DuplicateEmailException {
=======
    public User registerUser(User user) 
            throws DuplicateUserException, DuplicateEmailException, UnsupportedEncodingException {
>>>>>>> 79e5b55318992870d7536f08baa8bd1f18fa47c1
        if (isUserExist(user)) {
            String msg = "User " + user.getUsername() + " already exists!";
            logger.warn(msg);
Solution content 
     * {@inheritDoc}
     */
    @Override
    public User registerUser(User user) throws DuplicateUserException, DuplicateEmailException {
        if (isUserExist(user)) {
            String msg = "User " + user.getUsername() + " already exists!";
            logger.warn(msg);
File
TransactionalUserService.java
Developer's decision
Version 1
Kind of conflict
Method signature