Projects >> messagesource >>5af567629b755ddaea450a8f3ddb6ec5e92d2dea

Chunk
Conflicting content 
 */
public class JdbcMessageProvider implements MessageProvider, MessageAcceptor {

<<<<<<< HEAD
    private static final String QUERY_INSERT = "INSERT INTO %s (%s, %s, %s, %s, %s, %s) VALUES (?, ?, ?, ?, ?, ?)";
    private static final String QUERY_DELETE = "DELETE FROM %s WHERE %s = ?";
    private static final String QUERY_SELECT_BASENAMES = "SELECT DISTINCT %s from %s";
    private static final String QUERY_SELECT_MESSAGES = "SELECT %s,%s,%s,%s,%s FROM %s WHERE %s = ?";
=======
    private static final String QUERY_INSERT =
            "INSERT INTO `%s` (`%s`, `%s`, `%s`, `%s`, `%s`, `%s`) VALUES (?, ?, ?, ?, ?, ?)";
    private static final String QUERY_DELETE = "DELETE FROM `%s` WHERE `%s` = ?";
    private static final String QUERY_SELECT_BASENAMES = "SELECT DISTINCT `%s` from `%s`";
    private static final String QUERY_SELECT_MESSAGES = "SELECT `%s`,`%s`,`%s`,`%s`,`%s` FROM `%s` WHERE %s = ?";
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d

    private JdbcTemplate template;
Solution content 
 */
public class JdbcMessageProvider implements MessageProvider, MessageAcceptor {

    private static final String QUERY_INSERT = "INSERT INTO %s (%s, %s, %s, %s, %s, %s) VALUES (?, ?, ?, ?, ?, ?)";
    private static final String QUERY_DELETE = "DELETE FROM %s WHERE %s = ?";
    private static final String QUERY_SELECT_BASENAMES = "SELECT DISTINCT %s from %s";
    private static final String QUERY_SELECT_MESSAGES = "SELECT %s,%s,%s,%s,%s FROM %s WHERE %s = ?";

    private JdbcTemplate template;
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    public Messages getMessages(String basename) {

        String query =
<<<<<<< HEAD
                String.format(QUERY_SELECT_MESSAGES, addDelimiter(languageColumn), addDelimiter(countryColumn),
                        addDelimiter(variantColumn), addDelimiter(keyColumn), addDelimiter(messageColumn),
                        addDelimiter(tableName), addDelimiter(basenameColumn));
=======
                String.format(QUERY_SELECT_MESSAGES, languageColumn, countryColumn, variantColumn, keyColumn,
                        messageColumn, tableName, basenameColumn);
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d

        return template.query(query, new Object[] { basename }, extractor);
    }
Solution content 
    public Messages getMessages(String basename) {

        String query =
                String.format(QUERY_SELECT_MESSAGES, addDelimiter(languageColumn), addDelimiter(countryColumn),
                        addDelimiter(variantColumn), addDelimiter(keyColumn), addDelimiter(messageColumn),
                        addDelimiter(tableName), addDelimiter(basenameColumn));

        return template.query(query, new Object[] { basename }, extractor);
    }
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        deleteMessages(basename);

        String query =
<<<<<<< HEAD
                String.format(QUERY_INSERT, addDelimiter(tableName), addDelimiter(basenameColumn),
                        addDelimiter(languageColumn), addDelimiter(countryColumn), addDelimiter(variantColumn),
                        addDelimiter(keyColumn), addDelimiter(messageColumn));
=======
                String.format(QUERY_INSERT, tableName, basenameColumn, languageColumn, countryColumn, variantColumn,
                        keyColumn, messageColumn);
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d

        for (Locale locale : messages.getLocales()) {
Solution content 
        deleteMessages(basename);

        String query =
                String.format(QUERY_INSERT, addDelimiter(tableName), addDelimiter(basenameColumn),
                        addDelimiter(languageColumn), addDelimiter(countryColumn), addDelimiter(variantColumn),
                        addDelimiter(keyColumn), addDelimiter(messageColumn));

        for (Locale locale : messages.getLocales()) {
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private void deleteMessages(final String basename) {

<<<<<<< HEAD
        String query = String.format(QUERY_DELETE, addDelimiter(tableName), addDelimiter(basenameColumn));
=======
        String query = String.format(QUERY_DELETE, tableName, basenameColumn);
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d

        template.update(query, basename);
Solution content 
    private void deleteMessages(final String basename) {

        String query = String.format(QUERY_DELETE, addDelimiter(tableName), addDelimiter(basenameColumn));

        template.update(query, basename);
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 

    /**
<<<<<<< HEAD
     * Returns the name of the column holding the information about the basename (string-type)
     * 
     * @return the name of the basename-column
     */
    public String getBasenameColumn() {

        return basenameColumn;
    }


    /**
     * Sets the name of the column holding the information about the basename (string-type)
     * 
     * @param basenameColumn the name of the basename-column
     */
    public void setBasenameColumn(String basenameColumn) {

        this.basenameColumn = basenameColumn;
    }


    /**
=======
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d
     * Sets the name of the table containing the messages
     * 
     * @param tableName the name of the table containing the messages
Solution content 

    /**


    /**
     * Returns the name of the column holding the information about the basename (string-type)
     * 
     * @return the name of the basename-column
     */
    public String getBasenameColumn() {

        return basenameColumn;
    }


    /**
     * Sets the name of the column holding the information about the basename (string-type)
     * 
     * @param basenameColumn the name of the basename-column
     */
    public void setBasenameColumn(String basenameColumn) {

        this.basenameColumn = basenameColumn;
    }
     * Sets the name of the table containing the messages
     * 
     * @param tableName the name of the table containing the messages
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    public List getAvailableBaseNames() {

        List basenames =
<<<<<<< HEAD
                template.queryForList(
                        String.format(QUERY_SELECT_BASENAMES, addDelimiter(basenameColumn), addDelimiter(tableName)),
                        String.class);
=======
                template.queryForList(String.format(QUERY_SELECT_BASENAMES, basenameColumn, tableName), String.class);
>>>>>>> 62cb56ffc122c2bef4361424c579e14cf68e276d
        return basenames;
    }
Solution content 
    public List getAvailableBaseNames() {

        List basenames =
                template.queryForList(
                        String.format(QUERY_SELECT_BASENAMES, addDelimiter(basenameColumn), addDelimiter(tableName)),
                        String.class);
        return basenames;
    }
File
JdbcMessageProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation