Skip to content

Commit

Permalink
Removed positional parameters in SQL and HQL queries
Browse files Browse the repository at this point in the history
  • Loading branch information
@car031
car031 committed Jul 18, 2023
1 parent 678b635 commit 80166a9
Show file tree
Hide file tree
Showing 35 changed files with 375 additions and 309 deletions.
171 changes: 87 additions & 84 deletions logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import javax.sql.DataSource;

import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
Expand All @@ -24,6 +25,7 @@
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.support.rowset.SqlRowSet;

import com.logicaldoc.core.metadata.Attribute;
Expand Down Expand Up @@ -148,36 +150,6 @@ public List<T> findByWhere(String where, String order, Integer max) throws Persi
return findByWhere(where, (Map<String, Object>) null, order, max);
}

@Override
public List<T> findByWhere(String where, Object[] values, String order, Integer max) throws PersistenceException {
List<T> coll = new ArrayList<>();
try {
String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY)
? ORDER_BY + " " + order
: order;
String query = "from " + entityClass.getCanonicalName() + DEFAULT_WHERE_PREAMBLE
+ (StringUtils.isNotEmpty(where) ? AND + where + ") " : " ")
+ (StringUtils.isNotEmpty(sorting) ? sorting : " ");
coll = findByObjectQuery(query, values, max);
return coll;
} catch (Exception e) {
throw new PersistenceException(e);
}
}

@Override
public List<T> findByObjectQuery(String query, Object[] values, Integer max) throws PersistenceException {
List<T> coll = new ArrayList<>();
try {
logQuery(query);
Query<T> queryObject = prepareQueryForObject(query, values, max);
coll = queryObject.list();
return coll;
} catch (Exception e) {
throw new PersistenceException(e);
}
}

@Override
public List<T> findByWhere(String where, Map<String, Object> parameters, String order, Integer max)
throws PersistenceException {
Expand Down Expand Up @@ -214,20 +186,6 @@ protected void logQuery(String query) {
log.debug("Execute query: {}", query);
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public List findByQuery(String query, Object[] values, Integer max) throws PersistenceException {
List<Object> coll = new ArrayList<>();
try {
logQuery(query);
Query queryObject = prepareQuery(query, values, max);
coll = queryObject.list();
return coll;
} catch (Exception e) {
throw new PersistenceException(e);
}
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public List findByQuery(String query, Map<String, Object> parameters, Integer max) throws PersistenceException {
Expand Down Expand Up @@ -439,7 +397,7 @@ private void applyParamsAndLimit(Object[] values, Integer max, @SuppressWarnings
*/
protected Query<Object[]> prepareQuery(String expression, Map<String, Object> values, Integer max) {
Query<Object[]> queryObject = sessionFactory.getCurrentSession().createQuery(expression, Object[].class);
applyParamsAndLimit(values, max, queryObject);
applyParametersAndLimit(values, max, queryObject);
return queryObject;
}

Expand All @@ -456,7 +414,7 @@ protected Query<Object[]> prepareQuery(String expression, Map<String, Object> va
*/
protected Query<Long> prepareQueryForLong(String expression, Map<String, Object> values, Integer max) {
Query<Long> queryObject = sessionFactory.getCurrentSession().createQuery(expression, Long.class);
applyParamsAndLimit(values, max, queryObject);
applyParametersAndLimit(values, max, queryObject);
return queryObject;
}

Expand All @@ -473,7 +431,7 @@ protected Query<Long> prepareQueryForLong(String expression, Map<String, Object>
*/
protected Query<T> prepareQueryForObject(String expression, Map<String, Object> values, Integer max) {
Query<T> queryObject = sessionFactory.getCurrentSession().createQuery(expression, entityClass);
applyParamsAndLimit(values, max, queryObject);
applyParametersAndLimit(values, max, queryObject);
return queryObject;
}

Expand All @@ -490,14 +448,14 @@ protected Query<T> prepareQueryForObject(String expression, Map<String, Object>
@SuppressWarnings("rawtypes")
protected Query prepareQueryForUpdate(String expression, Map<String, Object> values, Integer max) {
Query queryObject = sessionFactory.getCurrentSession().createQuery(expression);
applyParamsAndLimit(values, max, queryObject);
applyParametersAndLimit(values, max, queryObject);
return queryObject;
}

private void applyParamsAndLimit(Map<String, Object> values, Integer max, @SuppressWarnings("rawtypes")
private void applyParametersAndLimit(Map<String, Object> parameters, Integer max, @SuppressWarnings("rawtypes")
Query queryObject) {
if (values != null)
for (Map.Entry<String, Object> entry : values.entrySet())
if (parameters != null)
for (Map.Entry<String, Object> entry : parameters.entrySet())
queryObject.setParameter(entry.getKey(), entry.getValue());

if (max != null && max > 0)
Expand Down Expand Up @@ -565,71 +523,106 @@ else if (srcQuery.startsWith("select"))
return outQuery;
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public List query(String sql, Object[] args, RowMapper rowMapper, Integer maxRows) throws PersistenceException {
List list = new ArrayList();
@SuppressWarnings({ "rawtypes", "unchecked" })
public List query(String sql, RowMapper rowMapper, Integer maxRows) throws PersistenceException {
try {
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);

JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
if (maxRows != null)
jdbcTemplate.setMaxRows(maxRows);
if (args != null)
list = jdbcTemplate.query(insertTopClause(sql, maxRows), args, rowMapper);
else
list = jdbcTemplate.query(insertTopClause(sql, maxRows), rowMapper);
return list;
return jdbcTemplate.query(insertTopClause(sql, maxRows), rowMapper);
} catch (Exception e) {
throw new PersistenceException(e);
}

}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public List queryForList(String sql, Object[] args, Class elementType, Integer maxRows)
@SuppressWarnings({ "rawtypes", "unchecked" })
public List query(String sql, Map<String, Object> parameters, RowMapper rowMapper, Integer maxRows)
throws PersistenceException {
if (MapUtils.isEmpty(parameters))
return query(sql, rowMapper, maxRows);
try {
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
return jdbcTemplate.query(insertTopClause(sql, maxRows), parameters, rowMapper);
} catch (Exception e) {
throw new PersistenceException(e);
}

}

List list = new ArrayList();
@SuppressWarnings({ "rawtypes" })
@Override
public List queryForList(String sql, Class elementType) throws PersistenceException {
return queryForList(sql, elementType, null);
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public List queryForList(String sql, Class elementType, Integer maxRows) throws PersistenceException {
try {
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
if (maxRows != null)
jdbcTemplate.setMaxRows(maxRows);
if (args != null)
list = jdbcTemplate.queryForList(insertTopClause(sql, maxRows), args, elementType);
else
list = jdbcTemplate.queryForList(insertTopClause(sql, maxRows), elementType);
return list;
return jdbcTemplate.queryForList(insertTopClause(sql, maxRows), elementType);
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new PersistenceException(e);
}
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public SqlRowSet queryForRowSet(String sql, Object[] args, Integer maxRows) throws PersistenceException {
public List queryForList(String sql, Map<String, Object> prameters, Class elementType, Integer maxRows)
throws PersistenceException {

if (MapUtils.isEmpty(prameters))
return queryForList(sql, elementType, maxRows);

try {
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
return jdbcTemplate.queryForList(insertTopClause(sql, maxRows), prameters, elementType);
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new PersistenceException(e);
}
}

@Override
public SqlRowSet queryForRowSet(String sql, Integer maxRows) throws PersistenceException {
try {
SqlRowSet rs = null;
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
if (maxRows != null)
jdbcTemplate.setMaxRows(maxRows);
if (args != null)
rs = jdbcTemplate.queryForRowSet(insertTopClause(sql, maxRows), args);
else
rs = jdbcTemplate.queryForRowSet(insertTopClause(sql, maxRows));
rs = jdbcTemplate.queryForRowSet(insertTopClause(sql, maxRows));
return new SqlRowSetWrapper(rs);
} catch (Exception e) {
throw new PersistenceException(e);
}
}

@SuppressWarnings("rawtypes")
@Override
public List queryForList(String sql, Class elementType) throws PersistenceException {
return queryForList(sql, null, elementType, null);
public SqlRowSet queryForRowSet(String sql, Map<String, Object> parameters, Integer maxRows)
throws PersistenceException {
if (MapUtils.isEmpty(parameters))
return queryForRowSet(sql, maxRows);

try {
SqlRowSet rs = null;
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
rs = jdbcTemplate.queryForRowSet(insertTopClause(sql, maxRows), parameters);
return new SqlRowSetWrapper(rs);
} catch (Exception e) {
throw new PersistenceException(e);
}
}

@Override
Expand All @@ -651,11 +644,14 @@ public long queryForLong(String sql) throws PersistenceException {
}

@Override
public long queryForLong(String sql, Object... args) throws PersistenceException {
public long queryForLong(String sql, Map<String, Object> parameters) throws PersistenceException {
if (MapUtils.isEmpty(parameters))
return queryForLong(sql);

try {
DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
return jdbcTemplate.queryForObject(sql, Long.class, args);
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
return jdbcTemplate.queryForObject(sql, parameters, Long.class);
} catch (NullPointerException | EmptyResultDataAccessException e) {
return 0L;
} catch (Exception e) {
Expand Down Expand Up @@ -748,14 +744,17 @@ public int bulkUpdate(String expression, Map<String, Object> parameters) throws
}

@Override
public int jdbcUpdate(String statement, Object... args) throws PersistenceException {
public int jdbcUpdate(String statement, Map<String, Object> parameters) throws PersistenceException {
if (!checkStoringAspect())
return 0;

if (MapUtils.isEmpty(parameters))
return jdbcUpdate(statement);

DataSource dataSource = (DataSource) Context.get().getBean(DATA_SOURCE);
try {
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
return jdbcTemplate.update(statement, args);
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
return jdbcTemplate.update(statement, parameters);
} catch (Exception e) {
throw new PersistenceException(e);
}
Expand Down Expand Up @@ -822,8 +821,12 @@ protected int cleanOldRecords(int ttl, String tableName, String dateColumn) thro
cal.add(Calendar.DAY_OF_MONTH, -ttl);
Date ldDate = cal.getTime();

updates = jdbcUpdate("UPDATE " + tableName + " SET ld_deleted = 1, ld_lastmodified = ?"
+ " WHERE ld_deleted = 0 AND " + dateColumn + " < ?", today, ldDate);
Map<String, Object> params = new HashMap<>();
params.put("today", today);
params.put("ldDate", ldDate);

updates = jdbcUpdate("UPDATE " + tableName + " SET ld_deleted = 1, ld_lastmodified = :today"
+ " WHERE ld_deleted = 0 AND " + dateColumn + " < :ldDate", params);

log.info("Removed {} old rows from table {}: ", updates, tableName);
}
Expand Down
Loading

0 comments on commit 80166a9

Please sign in to comment.