Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 699e9f79 by Tony CHEMIT at 2018-09-20T15:57:42Z improve logs (validators are now warns a lot too much :() - - - - - ee5c5ef0 by Tony CHEMIT at 2018-09-20T16:28:44Z [LL] Après migration l'UI v7 n'affiche plus qu'une seule des captures de chaque opération de pêche - Closes #1068 - - - - - 6 changed files: - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - server-configuration/src/main/resources/log4j2.xml - server-configuration/src/main/resources/observeweb-log4j2.xml Changes: ===================================== client-configuration/src/main/resources/log4j2.xml ===================================== @@ -53,6 +53,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -53,6 +53,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== @@ -62,6 +62,8 @@ public class DataSourceMigrationForVersion_6_0 extends MigrationVersionResource executor.addScript("01", "evol_8374_delete_sonarUsed"); executor.addScript("02", "evol_7886_catch_add_set_idx"); + migrateIdx(executor, "observe_longline", "catch", "set"); + executor.addScript("04", "evol_6832_branchlineComposition_add_tracelineLength"); executor.addScript("05", "evol_6999_nonTargetCatch_add_well"); executor.addScript("06", "evol_8375_setSeine_add_booleans"); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java ===================================== @@ -23,18 +23,10 @@ package fr.ird.observe.persistence.migration; */ import com.google.auto.service.AutoService; -import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - /** * Created on 27/10/16. * @@ -56,47 +48,11 @@ public class DataSourceMigrationForVersion_7_0 extends MigrationVersionResource executor.addScript("03", "add_order_on_seine_catches"); executor.addScript("04", "add_order_on_seine_samples"); - migrateIdx(executor, "nonTargetCatch", "set"); - migrateIdx(executor, "targetCatch", "set"); - migrateIdx(executor, "targetLength", "targetSample"); - migrateIdx(executor, "nonTargetLength", "nonTargetSample"); - - } - - private void migrateIdx(MigrationVersionResourceExecutor executor, String mainTable, String field) { - List<Pair<String, String>> result = executor.findMultipleResult(new MigrateIdxSqlQuery(mainTable, field)); - String currentId = null; - int position = 0; - for (Pair<String, String> pair : result) { - String parentId = pair.getLeft(); - if (!parentId.equals(currentId)) { - position = 0; - currentId = parentId; - } - String id = pair.getRight(); - executor.writeSql(String.format("UPDATE observe_seine.%s SET %s_idx = %d WHERE topiaId = '%s';", mainTable, field, position++, id)); - } + migrateIdx(executor, "observe_seine", "nonTargetCatch", "set"); + migrateIdx(executor, "observe_seine", "targetCatch", "set"); + migrateIdx(executor, "observe_seine", "targetLength", "targetSample"); + migrateIdx(executor, "observe_seine", "nonTargetLength", "nonTargetSample"); } - private static class MigrateIdxSqlQuery extends TopiaSqlQuery<Pair<String, String>> { - - private final String mainTable; - private final String field; - - private MigrateIdxSqlQuery(String mainTable, String field) { - this.mainTable = mainTable; - this.field = field; - } - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement(String.format("select %s, topiaId FROM observe_seine.%s order by %s, topiaCreateDate", field, mainTable, field)); - } - - @Override - public Pair<String, String> prepareResult(ResultSet resultSet) throws SQLException { - return Pair.of(resultSet.getString(1), resultSet.getString(2)); - } - } } ===================================== server-configuration/src/main/resources/log4j2.xml ===================================== @@ -37,6 +37,10 @@ <Logger name="org.nuiton.topia" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> ===================================== server-configuration/src/main/resources/observeweb-log4j2.xml ===================================== @@ -50,6 +50,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f193d8a5c69e4b51ec9fcfa0b3e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f193d8a5c69e4b51ec9fcfa0b3e... You're receiving this email because of your account on gitlab.com.