Projects >> jcommune >>2a2d1c249ac1aea6f0d14a960c60b63e06bf0749

Chunk
Conflicting content 
        User newUser = new User(username, email, "password");
        newUser.setFirstName("first name");
        newUser.setLastName("last name");
<<<<<<< HEAD
        try {
            newUser.setEncodedUsername(username);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
        return newUser;
    }
=======
        newUser.setUsername(username);
        newUser.setPassword("password");
        return newUser;
    }
    
    /**
     * @return {@link User} with deference from default user values.
     * @see {@link ObjectsFactory#getDefaultUser()}. 
     */
    public static User getAnotherUser(){
        User newUser = new User();
        newUser.setUsername("anotherUsername");
        newUser.setFirstName("another first name");
        newUser.setLastName("another last name");
        newUser.setEmail("another@mail.com");
        newUser.setPassword("anotherPassword");
        return newUser;
    }
>>>>>>> 9c70ae4194dd63fada32e35b74ed880a7cd03418

    public static Post getDefaultPost() {
        return new Post(persist(getDefaultUser()), "post content");
Solution content 
        User newUser = new User(username, email, "password");
        newUser.setFirstName("first name");
        newUser.setLastName("last name");
        return newUser;
    }

    public static Post getDefaultPost() {
        return new Post(persist(getDefaultUser()), "post content");
File
ObjectsFactory.java
Developer's decision
Combination
Kind of conflict
Comment
Method declaration
Method invocation
Return statement
Try statement
Variable
Chunk
Conflicting content 
    private AclManager aclManager;

    private User getUser() {
<<<<<<< HEAD
        User user = new User(USERNAME, null, PASSWORD);
        try {
            user.setEncodedUsername(ENCODED_USERNAME);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
=======
        User user = new User();
        user.setUsername(USERNAME);
        user.setPassword(PASSWORD);
>>>>>>> 9c70ae4194dd63fada32e35b74ed880a7cd03418
        return user;
    }
Solution content 
    private AclManager aclManager;

    private User getUser() {
        return new User(USERNAME, "email", PASSWORD);
    }
File
SecurityServiceImplTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
    }
    
    private User getUser() {
<<<<<<< HEAD
        User newUser = new User(USER_NAME, EMAIL, PASSWORD);
        try {
            newUser.setEncodedUsername(ENCODED_USER_NAME);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
=======
        User newUser = new User();
        newUser.setUsername(USER_NAME);
>>>>>>> 9c70ae4194dd63fada32e35b74ed880a7cd03418
        newUser.setFirstName(FIRST_NAME);
        newUser.setLastName(LAST_NAME);
        return newUser;
Solution content 
    }
    
    private User getUser() {
        User newUser = new User(USER_NAME, EMAIL, PASSWORD);
        newUser.setFirstName(FIRST_NAME);
        newUser.setLastName(LAST_NAME);
        return newUser;
File
UserControllerTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
    }

    private User getUser() {
<<<<<<< HEAD
        User newUser = new User(USER_NAME, EMAIL, PASSWORD);
        try {
            newUser.setEncodedUsername(ENCODED_USER_NAME);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
=======
        User newUser = new User();
        newUser.setUsername(USER_NAME);
>>>>>>> 9c70ae4194dd63fada32e35b74ed880a7cd03418
        newUser.setFirstName(FIRST_NAME);
        newUser.setLastName(LAST_NAME);
        return newUser;
Solution content 
    }
    
    private User getUser() {
        User newUser = new User(USER_NAME, EMAIL, PASSWORD);
        newUser.setFirstName(FIRST_NAME);
        newUser.setLastName(LAST_NAME);
        return newUser;
File
UserDataInterceptorTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Try statement
Variable