Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

6 changed files:

Changes:

  • client-configuration/src/main/resources/log4j2.xml
    ... ... @@ -53,6 +53,10 @@
    53 53 
           <AppenderRef ref="console"/>
    54 54 
           <AppenderRef ref="File"/>
    55 55 
         </Logger>
    56 
    +    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    57 
    +      <AppenderRef ref="console"/>
    58 
    +      <AppenderRef ref="File"/>
    59 
    +    </Logger>
    56 60 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    57 61 
           <AppenderRef ref="console"/>
    58 62 
           <AppenderRef ref="File"/>

  • client-configuration/src/main/resources/observe-log4j2.xml
    ... ... @@ -53,6 +53,10 @@
    53 53 
           <AppenderRef ref="console"/>
    54 54 
           <AppenderRef ref="File"/>
    55 55 
         </Logger>
    56 
    +    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    57 
    +      <AppenderRef ref="console"/>
    58 
    +      <AppenderRef ref="File"/>
    59 
    +    </Logger>
    56 60 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    57 61 
           <AppenderRef ref="console"/>
    58 62 
           <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
    62 62
    63 63 
             executor.addScript("01", "evol_8374_delete_sonarUsed");
    64 64 
             executor.addScript("02", "evol_7886_catch_add_set_idx");
    65 
    +        migrateIdx(executor, "observe_longline", "catch", "set");
    66 
    +
    65 67 
             executor.addScript("04", "evol_6832_branchlineComposition_add_tracelineLength");
    66 68 
             executor.addScript("05", "evol_6999_nonTargetCatch_add_well");
    67 69 
             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;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.apache.commons.lang3.tuple.Pair;
    27 
    -import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    28 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    29 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    30 28 
     import org.nuiton.version.Versions;
    31 29
    32 
    -import java.sql.Connection;
    33 
    -import java.sql.PreparedStatement;
    34 
    -import java.sql.ResultSet;
    35 
    -import java.sql.SQLException;
    36 
    -import java.util.List;
    37 
    -
    38 30 
     /**
    39 31 
      * Created on 27/10/16.
    40 32 
      *
    ... ... @@ -56,47 +48,11 @@ public class DataSourceMigrationForVersion_7_0 extends MigrationVersionResource
    56 48 
             executor.addScript("03", "add_order_on_seine_catches");
    57 49 
             executor.addScript("04", "add_order_on_seine_samples");
    58 50
    59 
    -        migrateIdx(executor, "nonTargetCatch", "set");
    60 
    -        migrateIdx(executor, "targetCatch", "set");
    61 
    -        migrateIdx(executor, "targetLength", "targetSample");
    62 
    -        migrateIdx(executor, "nonTargetLength", "nonTargetSample");
    63 
    -
    64 
    -    }
    65 
    -
    66 
    -    private void migrateIdx(MigrationVersionResourceExecutor executor, String mainTable, String field) {
    67 
    -        List<Pair<String, String>> result = executor.findMultipleResult(new MigrateIdxSqlQuery(mainTable, field));
    68 
    -        String currentId = null;
    69 
    -        int position = 0;
    70 
    -        for (Pair<String, String> pair : result) {
    71 
    -            String parentId = pair.getLeft();
    72 
    -            if (!parentId.equals(currentId)) {
    73 
    -                position = 0;
    74 
    -                currentId = parentId;
    75 
    -            }
    76 
    -            String id = pair.getRight();
    77 
    -            executor.writeSql(String.format("UPDATE observe_seine.%s SET %s_idx = %d WHERE topiaId = '%s';", mainTable, field, position++, id));
    78 
    -        }
    51 
    +        migrateIdx(executor, "observe_seine", "nonTargetCatch", "set");
    52 
    +        migrateIdx(executor, "observe_seine", "targetCatch", "set");
    53 
    +        migrateIdx(executor, "observe_seine", "targetLength", "targetSample");
    54 
    +        migrateIdx(executor, "observe_seine", "nonTargetLength", "nonTargetSample");
    79 55 
         }
    80 56
    81 
    -    private static class MigrateIdxSqlQuery extends TopiaSqlQuery<Pair<String, String>> {
    82 
    -
    83 
    -        private final String mainTable;
    84 
    -        private final String field;
    85 
    -
    86 
    -        private MigrateIdxSqlQuery(String mainTable, String field) {
    87 
    -            this.mainTable = mainTable;
    88 
    -            this.field = field;
    89 
    -        }
    90 
    -
    91 
    -        @Override
    92 
    -        public PreparedStatement prepareQuery(Connection connection) throws SQLException {
    93 
    -            return connection.prepareStatement(String.format("select %s, topiaId FROM observe_seine.%s order by %s, topiaCreateDate", field, mainTable, field));
    94 
    -        }
    95 
    -
    96 
    -        @Override
    97 
    -        public Pair<String, String> prepareResult(ResultSet resultSet) throws SQLException {
    98 
    -            return Pair.of(resultSet.getString(1), resultSet.getString(2));
    99 
    -        }
    100 
    -    }
    101 57 
     }
    102 58

  • server-configuration/src/main/resources/log4j2.xml
    ... ... @@ -37,6 +37,10 @@
    37 37 
         <Logger name="org.nuiton.topia" level="info" additivity="false">
    38 38 
           <AppenderRef ref="console"/>
    39 39 
         </Logger>
    40 
    +    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    41 
    +      <AppenderRef ref="console"/>
    42 
    +      <AppenderRef ref="File"/>
    43 
    +    </Logger>
    40 44 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    41 45 
           <AppenderRef ref="console"/>
    42 46 
         </Logger>

  • server-configuration/src/main/resources/observeweb-log4j2.xml
    ... ... @@ -50,6 +50,10 @@
    50 50 
           <AppenderRef ref="console"/>
    51 51 
           <AppenderRef ref="File"/>
    52 52 
         </Logger>
    53 
    +    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    54 
    +      <AppenderRef ref="console"/>
    55 
    +      <AppenderRef ref="File"/>
    56 
    +    </Logger>
    53 57 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    54 58 
           <AppenderRef ref="console"/>
    55 59 
           <AppenderRef ref="File"/>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.