zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-364 code cleanup

Browse source
This commit is contained in:
anhefti 2022-12-07 08:47:18 +01:00
parent bb660f3953
commit 6198f26a6f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/TableCharsetCheck.java
View file

@ -33,7 +33,10 @@ import ch.ethz.seb.sebserver.webservice.DBIntegrityCheck;
@WebServiceProfile @WebServiceProfile
public class TableCharsetCheck implements DBIntegrityCheck { public class TableCharsetCheck implements DBIntegrityCheck {
private static final String SCHEMA_NAME_PROPERTY = "sebserver.init.database.integrity.check.schema";
private static final String UTF8MB4_GENERAL_CI = "utf8mb4_general_ci"; private static final String UTF8MB4_GENERAL_CI = "utf8mb4_general_ci";
private static final String TABLE_NAME = "TABLE_NAME";
private static final String TABLE_COLLATION = "TABLE_COLLATION";
private static final Logger log = LoggerFactory.getLogger(TableCharsetCheck.class); private static final Logger log = LoggerFactory.getLogger(TableCharsetCheck.class);
@ -45,7 +48,7 @@ public class TableCharsetCheck implements DBIntegrityCheck {
final Environment environment) { final Environment environment) {
super(); super();
this.dataSource = dataSource; this.dataSource = dataSource;
this.schemaName = environment.getProperty("sebserver.init.database.integrity.check.schema", (String) null); this.schemaName = environment.getProperty(SCHEMA_NAME_PROPERTY, (String) null);
} }
@Override @Override
@ -76,9 +79,9 @@ public class TableCharsetCheck implements DBIntegrityCheck {
final ResultSet resultSet = prepareStatement.getResultSet(); final ResultSet resultSet = prepareStatement.getResultSet();
final Map<String, String> tablesWithWrongCollation = new HashMap<>(); final Map<String, String> tablesWithWrongCollation = new HashMap<>();
while (resultSet.next()) { while (resultSet.next()) {
final String collation = resultSet.getString("TABLE_COLLATION"); final String collation = resultSet.getString(TABLE_COLLATION);
if (!UTF8MB4_GENERAL_CI.equals(collation)) { if (!UTF8MB4_GENERAL_CI.equals(collation)) {
tablesWithWrongCollation.put(resultSet.getString("TABLE_NAME"), collation); tablesWithWrongCollation.put(resultSet.getString(TABLE_NAME), collation);
} }
} }