nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1062: removed rawtype from MapTypeHandler

This commit is contained in:
Mustapha Zorgati 2020-01-29 20:37:39 +01:00
parent a1f1e72afc
commit fbba8e879e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/taskana-core/src/main/java/pro/taskana/impl/persistence/MapTypeHandler.java
View File

@ -17,16 +17,16 @@ import org.slf4j.LoggerFactory;
* *
* @author EH * @author EH
*/ */
@SuppressWarnings("rawtypes") public class MapTypeHandler extends BaseTypeHandler<Map<String, Object>> {
public class MapTypeHandler extends BaseTypeHandler<Map> {
private static final Logger LOGGER = LoggerFactory.getLogger(MapTypeHandler.class); private static final Logger LOGGER = LoggerFactory.getLogger(MapTypeHandler.class);
@Override @Override
public void setNonNullParameter(PreparedStatement ps, int i, Map parameter, JdbcType jdbcType) public void setNonNullParameter(
PreparedStatement ps, int i, Map<String, Object> parameter, JdbcType jdbcType)
throws SQLException { throws SQLException {
if (parameter != null && parameter.size() > 0) { if (parameter != null && parameter.size() > 0) {
LOGGER.debug("Input-Map before serializing: ", parameter); LOGGER.debug("Input-Map before serializing: {}", parameter);
// Convert Map to JSON string // Convert Map to JSON string
JSONObject jsonObj = new JSONObject(parameter); JSONObject jsonObj = new JSONObject(parameter);
ps.setString(i, jsonObj.toString()); ps.setString(i, jsonObj.toString());
@ -36,7 +36,8 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
} }
@Override @Override
public Map getNullableResult(ResultSet rs, String columnName) throws SQLException { public Map<String, Object> getNullableResult(ResultSet rs, String columnName)
throws SQLException {
String fieldValue = rs.getString(columnName); String fieldValue = rs.getString(columnName);
if (fieldValue != null) { if (fieldValue != null) {
return convertToMap(fieldValue); return convertToMap(fieldValue);
@ -45,7 +46,7 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
} }
@Override @Override
public Map getNullableResult(ResultSet rs, int columnIndex) throws SQLException { public Map<String, Object> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
String fieldValue = rs.getString(columnIndex); String fieldValue = rs.getString(columnIndex);
if (fieldValue != null) { if (fieldValue != null) {
return convertToMap(fieldValue); return convertToMap(fieldValue);
@ -54,7 +55,8 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
} }
@Override @Override
public Map getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { public Map<String, Object> getNullableResult(CallableStatement cs, int columnIndex)
throws SQLException {
String fieldValue = cs.getString(columnIndex); String fieldValue = cs.getString(columnIndex);
if (fieldValue != null) { if (fieldValue != null) {
return convertToMap(fieldValue); return convertToMap(fieldValue);
@ -62,7 +64,7 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
return null; return null;
} }
private Map convertToMap(String fieldValue) { private Map<String, Object> convertToMap(String fieldValue) {
JSONObject jsonObj = new JSONObject(fieldValue); JSONObject jsonObj = new JSONObject(fieldValue);
return jsonObj.toMap(); return jsonObj.toMap();
} }