GitLab

at 2018-03-09T13:33:47Z

Marées sans logbooks : gestion de leurs échantillons - amélioration de l'interface uitlisation de configuration (See #116)

   environment:

     name: test

   script:

-    - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.source.skip -Dmaven.javadoc.skip'; fi

+    - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -U -DperformRelease -Psnapshot'; fi

 .deploy-snapshot: &deploy-snapshot

   environment:

     name: snapshot

   script:

-    - if [ -n "${DEPLOY_SNAPSHOT}" ]; then ultreiaio-maven-execute 'clean deploy -am -pl t3-domain -DperformRelease -Dmaven.source.skip -Dmaven.javadoc.skip'; fi

+    - if [ -n "${DEPLOY_SNAPSHOT}" ]; then ultreiaio-maven-execute 'clean deploy -am -pl t3-domain -DperformRelease -Psnapshot'; fi

 .publish-site: &publish-site

   environment:

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2018.21</version>

+    <version>2018.22</version>

   </parent>

   <groupId>fr.ird.t3</groupId>

     <dependencies>

       <dependency>

-        <groupId>com.healthmarketscience.jackcess</groupId>

-        <artifactId>jackcess</artifactId>

-        <version>1.2.0</version>

-      </dependency>

-

-      <!-- Struts 2 -->

-

-      <dependency>

         <groupId>org.apache.struts</groupId>

         <artifactId>struts2-core</artifactId>

         <version>${struts2Version}</version>

  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

     protected boolean createVirtualVessel;

     protected T3InputProvider inputProvider;

     protected File inputFile;

+    /**

+     * Flag to load only samples only trips

+     *

+     * @see TripType#SAMPLEONLY

+     */

+    private boolean useSamplesOnly;

+    /**

+     * Flag to authorize virtual activity creation (when logbooks are missing).

+     * <p>

+     * By default, let's always authorize it.

+     * <p>

+     * <b>Note:</b> This option is always at false if {@link #useSamplesOnly} is on.

+     *

+     * @see TripType#LOGBOOKMISSING

+     * @see TripType#STANDARD

+     */

+    private boolean canCreateVirtualActivity;

     private TripType tripType;

     public static AnalyzeInputSourceConfiguration newConfiguration(

             T3InputProvider inputProvider,

             File inputFile,

             boolean useWells,

-            TripType tripType,

             boolean canCreateVessel,

-            boolean createVirtualVessel) {

+            boolean createVirtualVessel,

+            boolean useSamplesOnly,

+            boolean canCreateVirtualActivity) {

         AnalyzeInputSourceConfiguration result = new AnalyzeInputSourceConfiguration();

         result.setInputFile(inputFile);

         result.setInputProvider(inputProvider);

         result.setUseWells(useWells);

-        result.setTripType(tripType);

+        result.setTripType(TripType.getTripType(useSamplesOnly, canCreateVirtualActivity));

         result.setCanCreateVessel(canCreateVessel);

         result.setCreateVirtualVessel(createVirtualVessel);

+        result.setCanCreateVirtualActivity(canCreateVirtualActivity);

+        result.setUseSamplesOnly(useSamplesOnly);

         return result;

     }

         return l(locale, "t3.input.AnalyzeInputSource");

     }

+    @Override

+    public boolean isUseSamplesOnly() {

+        return useSamplesOnly;

+    }

+

+    @Override

+    public void setUseSamplesOnly(boolean useSamplesOnly) {

+        this.useSamplesOnly = useSamplesOnly;

+    }

+

+    @Override

+    public boolean isCanCreateVirtualActivity() {

+        return canCreateVirtualActivity;

+    }

+

+    @Override

+    public void setCanCreateVirtualActivity(boolean canCreateVirtualActivity) {

+        this.canCreateVirtualActivity = canCreateVirtualActivity;

+    }

+

     T3InputConfiguration toInputConfiguration() {

         T3InputConfiguration result = new T3InputConfiguration();

         result.setCanCreateVessel(canCreateVessel);

         result.setCreateVirtualVessel(createVirtualVessel);

         result.setTripType(tripType);

         result.setUseWells(useWells);

+        result.setCanCreateVirtualActivity(canCreateVirtualActivity);

+        result.setUseSamplesOnly(useSamplesOnly);

         result.setInputFile(inputFile);

         return result;

     }

 import fr.ird.t3.entities.T3TopiaApplicationContext;

 import fr.ird.t3.entities.T3TopiaPersistenceContext;

 import fr.ird.t3.entities.data.Activity;

-import fr.ird.t3.entities.data.ActivityTopiaDao;

 import fr.ird.t3.entities.data.T3DataEntity;

 import fr.ird.t3.entities.data.Trip;

 import fr.ird.t3.entities.data.TripTopiaDao;

  */

 public class ImportInputSourceAction extends T3Action<ImportInputSourceConfiguration> {

-    //    public static final String PARAM_TRIPS_TO_IMPORT = "tripsToImport";

-//    public static final String PARAM_TRIPS_TO_DELETE = "tripsToDelete";

     private static final Log log = LogFactory.getLog(ImportInputSourceAction.class);

     @InjectDAO(entityType = Trip.class)

     private TripTopiaDao tripDAO;

     @InjectDAO(entityType = Vessel.class)

     private VesselTopiaDao vesselDAO;

-    @InjectDAO(entityType = Activity.class)

-    private ActivityTopiaDao activityDAO;

     @InjectDAO(entityType = Ocean.class)

     private OceanTopiaDao oceanDAO;

     private Set<Trip> tripToDelete;

     @Override

     protected boolean executeAction() {

-

         if (CollectionUtils.isEmpty(trips)) {

-            // no trips at all to import

-            // no commit to do, skip the action

+            // no trips at all to import, no commit to do, skip the action

             return false;

         }

-

         int nbSteps = 0;

         if (CollectionUtils.isNotEmpty(trips)) {

             nbSteps += trips.size();

         if (CollectionUtils.isNotEmpty(tripToDelete)) {

             nbSteps += tripToDelete.size();

         }

-

         setNbSteps(nbSteps);

         log.info(String.format("Nb steps : %d", getNbSteps()));

         if (CollectionUtils.isNotEmpty(tripToDelete)) {

         // Need to flush as we are going to query new data

         getT3TopiaPersistenceContext().get().getHibernateSupport().getHibernateSession().flush();

-

-        String prefix = Activity.class.getName() + "#";

         for (Activity activity : ids) {

             Ocean ocean = oceanDAO.findOceanByActivity(activity);

             activity.setOcean(ocean);

  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

     protected boolean createVirtualVessel;

     protected T3InputProvider inputProvider;

     protected File inputFile;

+    /**

+     * Flag to load only samples only trips

+     *

+     * @see TripType#SAMPLEONLY

+     */

+    private boolean useSamplesOnly;

+    /**

+     * Flag to authorize virtual activity creation (when logbooks are missing).

+     * <p>

+     * By default, let's always authorize it.

+     * <p>

+     * <b>Note:</b> This option is always at false if {@link #useSamplesOnly} is on.

+     *

+     * @see TripType#LOGBOOKMISSING

+     * @see TripType#STANDARD

+     */

+    private boolean canCreateVirtualActivity;

     private Set<Trip> tripsToImport;

     private Set<Trip> tripsToDelete;

         return l(locale, "t3.input.ImportInputSource");

     }

+

+    @Override

+    public boolean isUseSamplesOnly() {

+        return useSamplesOnly;

+    }

+

+    @Override

+    public void setUseSamplesOnly(boolean useSamplesOnly) {

+        this.useSamplesOnly = useSamplesOnly;

+    }

+

+    @Override

+    public boolean isCanCreateVirtualActivity() {

+        return canCreateVirtualActivity;

+    }

+

+    @Override

+    public void setCanCreateVirtualActivity(boolean canCreateVirtualActivity) {

+        this.canCreateVirtualActivity = canCreateVirtualActivity;

+    }

+

     public Set<Trip> getTripsToImport() {

         return tripsToImport;

     }

     void setCreateVirtualVessel(boolean createVirtualVessel);

+    boolean isUseSamplesOnly();

+

+    void setUseSamplesOnly(boolean useSamplesOnly);

+

+    boolean isCanCreateVirtualActivity();

+

+    void setCanCreateVirtualActivity(boolean canCreateVirtualActivity);

+

     T3InputProvider getInputProvider();

     void setInputProvider(T3InputProvider inputProvider);

         if (doIt) {

             String dbName = msConfig.dbName;

             log.debug("Do test for db " + dbName);

-            outputFile = new File(serviceContext.getTestDir().getParentFile().getParentFile(), dbName.replace(".mdb","-result.txt"));

+            outputFile = new File(serviceContext.getTestDir().getParentFile().getParentFile(), dbName.replace(".mdb", "-result.txt"));

             log.info("Will save result in file : " + outputFile);

             outputWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile)));

             File workingDirectory = serviceContext.getApplicationConfiguration().getTreatmentWorkingDirectory("yo", true);

             log.info(new String(Files.readAllBytes(outputFile.toPath())));

         }

     }

+

     void testExecute(OceanFixtures fixture) throws Exception {

         testExecute(fixture, TripType.STANDARD);

     }

+

     void testExecute(OceanFixtures fixture, TripType tripType) throws Exception {

         serviceContext.getMsConfig().setUseWells(false);

-        testExecute(fixture.nbSafe(), fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), tripType, false, false);

+        testExecute(fixture.nbSafe(), fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), tripType);

 //        serviceContext.getMsConfig().setUseWells(true);

 //        testExecute(fixture.nbSafe(), fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), TripType.STANDARD, false, false);

     }

                 nbUnsafe,

                 nbSafeWithoutWell,

                 nbUnsafeWithoutWell,

-                TripType.STANDARD,

-                false,

-                false

+                TripType.STANDARD

         );

     }

                              int nbUnsafe,

                              int nbSafeWithoutWell,

                              int nbUnsafeWithoutWell,

-                             TripType tripType,

-                             boolean canCreateVessel,

-                             boolean createVirtualVessel) throws Exception {

+                             TripType tripType) throws Exception {

         MSAccessTestConfiguration msConfig = serviceContext.getMsConfig();

         if (msConfig.doTest(serviceContext.getTestName())) {

             T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

             AnalyzeInputSourceConfiguration actionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    inputProvider, target, true, tripType, canCreateVessel, createVirtualVessel);

+                    inputProvider,

+                    target,

+                    msConfig.isUseWells(),

+                    false,

+                    false,

+                    tripType != null && tripType == TripType.SAMPLEONLY,

+                    tripType == null || tripType == TripType.LOGBOOKMISSING);

             T3ActionContext<AnalyzeInputSourceConfiguration> context = serviceFactory.newT3ActionContext(actionConfiguration, serviceContext);

             outputWriter.write("----------------------------------------------------\n");

             outputWriter.write(msConfig.accessFile + "\n");

  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

     }

     public void testExecute(OceanFixtures fixtures) throws Exception {

-        testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutWell(), TripType.STANDARD, false, false);

+        testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutWell(), TripType.STANDARD);

     }

     public void testExecute(int nbSafe, int nbUnsafe) throws Exception {

-        testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false);

+        testExecute(nbSafe, nbUnsafe, TripType.STANDARD);

     }

     public void testExecute(int nbSafe, int nbUnsafe,

-                            TripType tripType,

-                            boolean canCreateVessel,

-                            boolean createVirtualVessel) throws Exception {

+                            TripType tripType) throws Exception {

         MSAccessTestConfiguration msConfig = serviceContext.getMsConfig();

         if (msConfig.doTest(serviceContext.getTestName())) {

             AnalyzeInputSourceConfiguration analyzeActionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    inputProvider, target, true, tripType, canCreateVessel, createVirtualVessel);

-

+                    inputProvider,

+                    target,

+                    msConfig.isUseWells(),

+                    false,

+                    false,

+                    tripType != null && tripType == TripType.SAMPLEONLY,

+                    tripType == null || tripType == TripType.LOGBOOKMISSING);

             T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

             T3ActionContext<AnalyzeInputSourceConfiguration> analyzeContext = serviceFactory.newT3ActionContext(analyzeActionConfiguration, serviceContext);

         T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

         AnalyzeInputSourceConfiguration actionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                getInputProvider(), getTarget(), useWells, tripType, false, false);

+                inputProvider,

+                target,

+                msConfig.isUseWells(),

+                false,

+                false,

+                tripType == TripType.SAMPLEONLY,

+                tripType == TripType.LOGBOOKMISSING);

         T3ActionContext<AnalyzeInputSourceConfiguration> context = serviceFactory.newT3ActionContext(actionConfiguration, serviceContext);

                 fixture.nbUnsafe(),

                 fixture.nbSafeWithoutWell(),

                 fixture.nbUnsafeWithoutWell(),

-                tripType,

-                false,

-                false);

+                tripType);

     }

     public FakeT3AvdthServiceContext getServiceContext() {

                                int nbUnsafe,

                                int nbSafeWithoutWell,

                                int nbUnsafeWithoutWell,

-                               TripType tripType,

-                               boolean canCreateVessel,

-                               boolean createVirtualVessel) throws Exception {

+                               TripType tripType) throws Exception {

         MSAccessTestConfiguration msConfig = getMsConfig();

         FakeT3AvdthServiceContext serviceContext = getServiceContext();

         if (msConfig.doTest(serviceContext.getTestName())) {

             T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

             AnalyzeInputSourceConfiguration actionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    getInputProvider(), getTarget(), true, tripType, canCreateVessel, createVirtualVessel);

+                    inputProvider,

+                    target,

+                    msConfig.isUseWells(),

+                    false,

+                    false,

+                    tripType != null && tripType == TripType.SAMPLEONLY,

+                    tripType == null || tripType == TripType.LOGBOOKMISSING);

             T3ActionContext<AnalyzeInputSourceConfiguration> context = serviceFactory.newT3ActionContext(actionConfiguration, serviceContext);

             BufferedWriter outputWriter = getOutputWriter();

         }

     }

-    protected void testExecute2(OceanFixtures fixture, TripType tripType) throws Exception {

-

-        MSAccessTestConfiguration msConfig = getMsConfig();

-        boolean useWells = msConfig.isUseWells();

-        int nbSafe = fixture.nbSafe(useWells);

-        int nbUnsafe = fixture.nbUnsafe(useWells);

-

-        FakeT3AvdthServiceContext serviceContext = getServiceContext();

-

-        T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

-        AnalyzeInputSourceConfiguration actionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                getInputProvider(), getTarget(), useWells, tripType, false, false);

-

-        T3ActionContext<AnalyzeInputSourceConfiguration> context = serviceFactory.newT3ActionContext(actionConfiguration, serviceContext);

-

-        BufferedWriter outputWriter = getOutputWriter();

-        outputWriter.write("----------------------------------------------------\n");

-        outputWriter.write(msConfig.getAccessFile() + "\n");

-        T3Action<AnalyzeInputSourceConfiguration> action;

-

-        action = serviceFactory.newT3Action(AnalyzeInputSourceAction.class, context);

-        Assert.assertNotNull(action);

-        action.run();

-

-        Set<Trip> safeTrips = action.getResultAsSet(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, Trip.class);

-        Assert.assertNotNull(safeTrips);

-        outputWriter.write(String.format("found %d   safe trip(s).\n", safeTrips.size()));

-        Set<Trip> unsafeTrips = action.getResultAsSet(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, Trip.class);

-        Assert.assertNotNull(unsafeTrips);

-        outputWriter.write(String.format("found %d unsafe trip(s).\n", unsafeTrips.size()));

-        List<String> messages;

-        if (msConfig.isLogWarnings() && log.isWarnEnabled()) {

-            messages = action.getWarnMessages();

-            if (CollectionUtils.isNotEmpty(messages)) {

-                for (String message : messages) {

-                    outputWriter.write(String.format("[WARNING] %s\n", message));

-                }

-            }

-        }

-        if (log.isErrorEnabled()) {

-            messages = action.getErrorMessages();

-            if (CollectionUtils.isNotEmpty(messages)) {

-                for (String message : messages) {

-                    outputWriter.write(String.format("[ERROR] %s\n", message));

-                }

-            }

-        }

-        log.info(String.format("\n[%s] (useWells?%b) safe : %d - unsafe : %d\n", msConfig.getDbName(), useWells, safeTrips.size(), unsafeTrips.size()));

-        Assert.assertEquals(nbSafe, safeTrips.size());

-        Assert.assertEquals(nbUnsafe, unsafeTrips.size());

-    }

 }
     }

     protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception {

-        testExecute(fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), tripType, false, false);

+        testExecute(fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), tripType);

     }

-    public void testExecute(int nbSafe, int nbUnsafe,

-                            TripType tripType,

-                            boolean canCreateVessel,

-                            boolean createVirtualVessel) throws Exception {

+    public void testExecute(int nbSafe, int nbUnsafe, TripType tripType) throws Exception {

         MSAccessTestConfiguration msConfig = serviceContext.getMsConfig();

         if (msConfig.doTest(serviceContext.getTestName())) {

             AnalyzeInputSourceConfiguration analyzeActionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    inputProvider, target, true, tripType, canCreateVessel, createVirtualVessel);

+                    inputProvider,

+                    target,

+                    msConfig.isUseWells(),

+                    false,

+                    false,

+                    tripType != null && tripType == TripType.SAMPLEONLY,

+                    tripType == null || tripType == TripType.LOGBOOKMISSING);

             T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

             T3ActionContext<AnalyzeInputSourceConfiguration> analyzeContext =

                     serviceFactory.newT3ActionContext(analyzeActionConfiguration, serviceContext);

  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

 import fr.ird.t3.t3.domain.I18nEnumHelper;

-import static org.nuiton.i18n.I18n.t;

-

 public enum TripType {

     STANDARD,

     SAMPLEONLY,

     LOGBOOKMISSING;

+    public static TripType getTripType(boolean useSamplesOnly, boolean canCreateVirtualActivity) {

+        TripType tripType;

+        if (useSamplesOnly) {

+            tripType = SAMPLEONLY;

+        } else {

+            tripType = canCreateVirtualActivity ? LOGBOOKMISSING : STANDARD;

+        }

+        return tripType;

+    }

+

     public String getLabel() {

         return I18nEnumHelper.getLabel(this);

     }

     }

     public E findOceanByActivity(Activity activity) {

-        GetOceanIdByActivityCoordinateQuery query = new GetOceanIdByActivityCoordinateQuery(activity.getTopiaId());

+        GetOceanIdByCoordinateQuery query = new GetOceanIdByCoordinateQuery(activity.getTopiaId());

         String oceanId = topiaSqlSupport.findSingleResult(query);

         return forTopiaIdEquals(oceanId).findUnique();

     }

-    private static class GetOceanIdByActivityCoordinateQuery extends TopiaSqlQuery<String> {

+    private static class GetOceanIdByCoordinateQuery extends TopiaSqlQuery<String> {

         private final String activity;

-        GetOceanIdByActivityCoordinateQuery(String activity) {

+        GetOceanIdByCoordinateQuery(String activity) {

             this.activity = activity;

         }

  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

  */

 public class T3InputConfiguration {

-    protected boolean useWells;

-

-    protected boolean canCreateVessel;

-

-    protected boolean createVirtualVessel;

-

-    protected TripType tripType;

-

-    protected File inputFile;

+    private boolean useWells;

+    private boolean canCreateVessel;

+    private boolean createVirtualVessel;

+    private boolean useSamplesOnly;

+    private boolean canCreateVirtualActivity;

+    private TripType tripType;

+    private File inputFile;

     private T3TopiaApplicationContext topiaApplicationContext;

         this.inputFile = inputFile;

     }

+    public boolean isUseSamplesOnly() {

+        return useSamplesOnly;

+    }

+

+    public void setUseSamplesOnly(boolean useSamplesOnly) {

+        this.useSamplesOnly = useSamplesOnly;

+    }

+

+    public boolean isCanCreateVirtualActivity() {

+        return canCreateVirtualActivity;

+    }

+

+    public void setCanCreateVirtualActivity(boolean canCreateVirtualActivity) {

+        this.canCreateVirtualActivity = canCreateVirtualActivity;

+    }

+

     public T3TopiaApplicationContext getTopiaApplicationContext() {

         return topiaApplicationContext;

     }

   along with this program.  If not, see <http://www.gnu.org/licenses />.

   #L%

 -->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

   <modelVersion>4.0.0</modelVersion>

   <parent>

     </dependency>

     <dependency>

       <groupId>${project.groupId}</groupId>

-      <artifactId>t3-actions</artifactId>

-      <version>${project.version}</version>

-    </dependency>

-    <dependency>

-      <groupId>${project.groupId}</groupId>

       <artifactId>t3-msaccess-importer</artifactId>

       <version>${project.version}</version>

     </dependency>

       <groupId>commons-logging</groupId>

       <artifactId>commons-logging</artifactId>

     </dependency>

-    <dependency>

-      <groupId>commons-collections</groupId>

-      <artifactId>commons-collections</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>commons-io</groupId>

-      <artifactId>commons-io</artifactId>

-    </dependency>

     <dependency>

       <groupId>com.google.guava</groupId>

       <artifactId>postgresql</artifactId>

       <scope>test</scope>

     </dependency>

-    

+

   </dependencies>

-  <build>

-    <pluginManagement>

-      <plugins>

-        <plugin>

-          <artifactId>maven-surefire-plugin</artifactId>

-          <configuration>

-            <environmentVariables>

-              <doAccessImport>${doAccessImport}</doAccessImport>

-              <executeAll>${executeAll}</executeAll>

-              <lastYear>${lastYear}</lastYear>

-              <exactYear>${exactYear}</exactYear>

-              <!--<jvm>-Xmx2048m</jvm>-->

-            </environmentVariables>

-          </configuration>

-        </plugin>

-      </plugins>

-    </pluginManagement>

-  </build>

-

-  <profiles>

-

-    <profile>

-      <id>run-access-its</id>

-      <activation>

-        <property>

-          <name>performRelease</name>

-          <value>true</value>

-        </property>

-      </activation>

-      <build>

-

-        <defaultGoal>integration-test</defaultGoal>

-        <plugins>

-

-          <plugin>

-            <artifactId>maven-surefire-plugin</artifactId>

-            <executions>

-

-              <execution>

-                <id>all-integration-tests</id>

-                <phase>integration-test</phase>

-                <goals>

-                  <goal>test</goal>

-                </goals>

-                <configuration>

-                  <skip>${skipITs}</skip>

-                  <includes>

-                    <include>**/*IT.java</include>

-                  </includes>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-

-  </profiles>

 </project>
-/*

- * #%L

- * T3 :: Input AVDTH v 33

- * %%

- * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io

- * %%

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Affero General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- * 

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- * 

- * You should have received a copy of the GNU Affero General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * #L%

- */

-package fr.ird.t3.actions.io.input.it;

-

-import fr.ird.t3.actions.T3Action;

-import fr.ird.t3.actions.T3ActionContext;

-import fr.ird.t3.actions.io.input.AnalyzeInputSourceAction;

-import fr.ird.t3.actions.io.input.AnalyzeInputSourceConfiguration;

-import fr.ird.t3.actions.io.input.test.FakeT3AvdthServiceContext;

-import fr.ird.t3.actions.io.input.test.MSAccessTestConfiguration;

-import fr.ird.t3.entities.data.Trip;

-import fr.ird.t3.entities.data.TripType;

-import fr.ird.t3.io.input.T3InputProvider;

-import fr.ird.t3.io.input.avdth.v33.T3InputProviderAvdth33;

-import fr.ird.t3.services.T3InputService;

-import fr.ird.t3.services.T3ServiceFactory;

-import org.apache.commons.collections.CollectionUtils;

-import org.apache.commons.io.FileUtils;

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Assume;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-import java.io.BufferedWriter;

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.OutputStreamWriter;

-import java.util.List;

-import java.util.Set;

-

-/**

- * Tests the action {@link AnalyzeInputSourceAction}.

- *

- * @author Tony Chemit - dev@tchemit.fr

- * @since 1.0

- */

-public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test {

-

-    /** Logger */

-    private static final Log log = LogFactory.getLog(AnalyzeInputSourceActionIT.class);

-    protected static boolean useWells;

-    protected BufferedWriter outputWriter;

-    private final MSAccessTestConfiguration msConfig = new MSAccessTestConfiguration("testExecute_([^_]*)_(.*)", "%s_%s_V33.mdb", T3InputProviderAvdth33.ID);

-    @Rule

-    public final FakeT3AvdthServiceContext serviceContext = new FakeT3AvdthServiceContext(true, msConfig);

-    private File target;

-

-    private T3InputProvider inputProvider;

-

-    @Before

-    public void setUp() throws Exception {

-

-        boolean initOk = serviceContext.isInitOk();

-        Assume.assumeTrue("Could not init db", initOk);

-

-        boolean doIt = msConfig.setup(serviceContext.getTestName());

-

-        if (doIt) {

-

-            String dbName = msConfig.dbName;

-

-            if (log.isDebugEnabled()) {

-                log.debug("Do test for db " + dbName);

-            }

-

-            File outputFile = new File(serviceContext.getTestDir(), "result.txt");

-

-            if (log.isInfoEnabled()) {

-                log.info("Will save result in file : " + outputFile);

-            }

-

-            outputWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile)));

-

-            File workingDirectory =

-                    serviceContext.getApplicationConfiguration().getTreatmentWorkingDirectory("yo", true);

-

-            // push in treatment directory the base to import

-

-            target = new File(workingDirectory, dbName);

-            if (log.isDebugEnabled()) {

-                log.debug("Will copy msaccess from " + msConfig.accessFile + " to " + target);

-            }

-            FileUtils.copyFile(msConfig.accessFile, target);

-

-            inputProvider = serviceContext.newService(T3InputService.class).getProvider(T3InputProviderAvdth33.ID);

-        }

-

-    }

-

-    @After

-    public void tearDown() throws Exception {

-

-        serviceContext.close();

-

-        if (outputWriter != null) {

-

-            outputWriter.flush();

-            outputWriter.close();

-

-        }

-    }

-

-    public void testExecute(int nbSafe,

-                            int nbUnsafe,

-                            int nbSafeWithoutWell,

-                            int nbUnsafeWithoutWell) throws Exception {

-        testExecute(

-                nbSafe,

-                nbUnsafe,

-                nbSafeWithoutWell,

-                nbUnsafeWithoutWell,

-                TripType.STANDARD,

-                false,

-                false

-        );

-    }

-

-    public void testExecute(int nbSafe,

-                            int nbUnsafe,

-                            int nbSafeWithoutWell,

-                            int nbUnsafeWithoutWell,

-                            TripType tripType,

-                            boolean canCreateVessel,

-                            boolean createVirtualVessel) throws Exception {

-

-        if (msConfig.doTest(serviceContext.getTestName())) {

-

-            T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

-

-            AnalyzeInputSourceConfiguration actionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    inputProvider, target, useWells, tripType, canCreateVessel, createVirtualVessel

-            );

-            T3ActionContext<AnalyzeInputSourceConfiguration> context =

-                    serviceFactory.newT3ActionContext(actionConfiguration, serviceContext);

-

-

-            outputWriter.write("----------------------------------------------------\n");

-            outputWriter.write(msConfig.accessFile + "\n");

-            T3Action<AnalyzeInputSourceConfiguration> action;

-

-            action = serviceFactory.newT3Action(AnalyzeInputSourceAction.class, context);

-

-            Assert.assertNotNull(action);

-

-            action.run();

-

-            Set<Trip> safeTrips = action.getResultAsSet(

-                    AnalyzeInputSourceAction.RESULT_SAFE_TRIPS,

-                    Trip.class

-            );

-            Assert.assertNotNull(safeTrips);

-            outputWriter.write("found " + safeTrips.size() + "   safe trip(s).\n");

-            Set<Trip> unsafeTrips = action.getResultAsSet(

-                    AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS,

-                    Trip.class

-            );

-            Assert.assertNotNull(unsafeTrips);

-            outputWriter.write("found " + unsafeTrips.size() + " unsafe trip(s).\n");

-            List<String> messages;

-

-            if (log.isWarnEnabled()) {

-                messages = action.getWarnMessages();

-                if (CollectionUtils.isNotEmpty(messages)) {

-                    for (String message : messages) {

-                        outputWriter.write("[WARNING] " + message + "\n");

-                    }

-                }

-            }

-

-            if (log.isErrorEnabled()) {

-                messages = action.getErrorMessages();

-                if (CollectionUtils.isNotEmpty(messages)) {

-                    for (String message : messages) {

-                        outputWriter.write("[ERROR] " + message + "\n");

-                    }

-                }

-            }

-

-            if (log.isInfoEnabled()) {

-                log.info("\n[" + msConfig.dbName + "] safe : " + safeTrips.size() +

-                        " - unsafe : " + unsafeTrips.size() + "\n");

-            }

-

-            if (useWells) {

-                Assert.assertEquals(nbSafe, safeTrips.size());

-                Assert.assertEquals(nbUnsafe, unsafeTrips.size());

-            } else {

-                Assert.assertEquals(nbSafeWithoutWell, safeTrips.size());

-                Assert.assertEquals(nbUnsafeWithoutWell, unsafeTrips.size());

-            }

-

-        }

-

-

-    }

-

-    public void testExecute(int nbSafe, int nbUnsafe) throws Exception {

-        testExecute(nbSafe, nbUnsafe, nbSafe, nbUnsafe);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2000() throws Exception {

-        testExecute(155, 65, 220, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2001() throws Exception {

-        testExecute(70, 118, 188, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2002() throws Exception {

-        testExecute(103, 125, 227, 1);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2003() throws Exception {

-        testExecute(83, 136, 219, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2004() throws Exception {

-        testExecute(78, 118, 196, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2005() throws Exception {

-        testExecute(78, 110, 186, 2);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2006() throws Exception {

-        testExecute(181, 12, 188, 5);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2007() throws Exception {

-        testExecute(155, 12, 162, 5);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2008() throws Exception {

-        testExecute(146, 34, 174, 6);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2009() throws Exception {

-        testExecute(122, 19, 141, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2011() throws Exception {

-        testExecute(141, 0, 126, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2000() throws Exception {

-        testExecute(318, 36, 354, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2001() throws Exception {

-        testExecute(298, 63, 361, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2002() throws Exception {

-        testExecute(184, 133, 317, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2003() throws Exception {

-        testExecute(218, 157, 375, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2004() throws Exception {

-        testExecute(121, 61, 182, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2005() throws Exception {

-        testExecute(93, 31, 124, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2006() throws Exception {

-        testExecute(70, 27, 97, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2007() throws Exception {

-        testExecute(53, 27, 80, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2008() throws Exception {

-        testExecute(46, 14, 60, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2009() throws Exception {

-        testExecute(64, 21, 85, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ATL_2010() throws Exception {

-        testExecute(75, 13, 80, 8);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2006() throws Exception {

-        testExecute(70, 27, 97, 0, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2007() throws Exception {

-        testExecute(273, 27, 238, 0, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2008() throws Exception {

-        testExecute(46, 14, 60, 0, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2009() throws Exception {

-        testExecute(64, 21, 85, 0, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2010() throws Exception {

-        testExecute(75, 13, 80, 8, TripType.SAMPLEONLY, true, true);

-    }

-}
-/*

- * #%L

- * T3 :: Input AVDTH v 33

- * %%

- * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io

- * %%

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Affero General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- * 

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- * 

- * You should have received a copy of the GNU Affero General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * #L%

- */

-package fr.ird.t3.actions.io.input.it;

-

-import fr.ird.t3.actions.T3ActionContext;

-import fr.ird.t3.actions.io.input.AnalyzeInputSourceAction;

-import fr.ird.t3.actions.io.input.AnalyzeInputSourceConfiguration;

-import fr.ird.t3.actions.io.input.ImportInputSourceAction;

-import fr.ird.t3.actions.io.input.ImportInputSourceConfiguration;

-import fr.ird.t3.actions.io.input.test.FakeT3AvdthServiceContext;

-import fr.ird.t3.actions.io.input.test.MSAccessTestConfiguration;

-import fr.ird.t3.entities.data.Trip;

-import fr.ird.t3.entities.data.TripType;

-import fr.ird.t3.io.input.T3InputProvider;

-import fr.ird.t3.io.input.avdth.v33.T3InputProviderAvdth33;

-import fr.ird.t3.services.T3InputService;

-import fr.ird.t3.services.T3ServiceFactory;

-import org.apache.commons.io.FileUtils;

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Assume;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-import java.io.File;

-import java.util.Set;

-

-/**

- * Tests the action {@link AnalyzeInputSourceAction}.

- *

- * @author Tony Chemit - dev@tchemit.fr

- * @since 1.0

- */

-public class ImportInputSourceActionIT implements T3AVDTHV33Test {

-

-    /** Logger */

-    private static final Log log =

-            LogFactory.getLog(ImportInputSourceActionIT.class);

-

-    private static final MSAccessTestConfiguration msConfig = new MSAccessTestConfiguration("testExecute_([^_]*)_(.*)", "%s_%s_V33.mdb", T3InputProviderAvdth33.ID);

-

-    @Rule

-    public final FakeT3AvdthServiceContext serviceContext = new FakeT3AvdthServiceContext(true, msConfig);

-

-    private T3InputProvider inputProvider;

-

-    private File target;

-

-    @Before

-    public void setUp() throws Exception {

-

-        boolean initOk = serviceContext.isInitOk();

-        Assume.assumeTrue("Could not init db", initOk);

-

-        boolean doIt = msConfig.setup(serviceContext.getTestName());

-        Assume.assumeTrue("Could not init msaccess configuration", doIt);

-

-        String dbName = msConfig.dbName;

-

-        if (log.isDebugEnabled()) {

-            log.debug("Do test for db " + dbName);

-        }

-

-        File workingDirectory =

-                serviceContext.getApplicationConfiguration().getTreatmentWorkingDirectory("yo", true);

-

-        // push in treatment directory the base to import

-

-        target = new File(workingDirectory, dbName);

-        if (log.isDebugEnabled()) {

-            log.debug("Will copy msaccess from " + msConfig.accessFile + " to " + target);

-        }

-        FileUtils.copyFile(msConfig.accessFile, target);

-

-        inputProvider = serviceContext.newService(T3InputService.class).getProvider(msConfig.getProviderId());

-

-    }

-

-    @After

-    public void tearDown() {

-

-        serviceContext.close();

-    }

-

-    public void testExecute(int nbSafe, int nbUnsafe) throws Exception {

-        testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false);

-    }

-

-    public void testExecute(int nbSafe, int nbUnsafe,

-                            TripType tripType,

-                            boolean canCreateVessel,

-                            boolean createVirtualVessel) throws Exception {

-

-        if (msConfig.doTest(serviceContext.getTestName())) {

-

-            AnalyzeInputSourceConfiguration analyzeActionConfiguration = AnalyzeInputSourceConfiguration.newConfiguration(

-                    inputProvider, target, true, tripType, canCreateVessel, createVirtualVessel

-            );

-

-            T3ServiceFactory serviceFactory = serviceContext.getServiceFactory();

-

-            T3ActionContext<AnalyzeInputSourceConfiguration> analyzeContext =

-                    serviceFactory.newT3ActionContext(analyzeActionConfiguration, serviceContext);

-

-            AnalyzeInputSourceAction analyzeAction;

-

-            analyzeAction = serviceFactory.newT3Action(AnalyzeInputSourceAction.class, analyzeContext);

-

-            Assert.assertNotNull(analyzeAction);

-            analyzeAction.run();

-

-            Set<Trip> safeTrips = analyzeAction.getResultAsSet(

-                    AnalyzeInputSourceAction.RESULT_SAFE_TRIPS,

-                    Trip.class

-            );

-            Assert.assertNotNull(safeTrips);

-            Assert.assertEquals(nbSafe, safeTrips.size());

-

-            Set<Trip> unsafeTrips = analyzeAction.getResultAsSet(

-                    AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS,

-                    Trip.class

-            );

-            Assert.assertNotNull(unsafeTrips);

-            Assert.assertEquals(nbUnsafe, unsafeTrips.size());

-

-            if (log.isInfoEnabled()) {

-                log.info("[" + msConfig.dbName + "] safe : " + safeTrips.size() + " - unsafe : " + unsafeTrips.size());

-            }

-

-            ImportInputSourceConfiguration importActionConfiguration = ImportInputSourceConfiguration.newConfiguration(

-                    analyzeActionConfiguration

-            );

-            importActionConfiguration.setTripsToImport(safeTrips);

-

-            T3ActionContext<ImportInputSourceConfiguration> importContext =

-                    serviceFactory.newT3ActionContext(importActionConfiguration, serviceContext);

-

-            // input db is safe, import it in h2 db

-

-            long oldNbTrips;

-            long newNbTrips;

-

-            importActionConfiguration.setTripsToImport(safeTrips);

-

-            oldNbTrips = serviceContext.getT3TopiaPersistenceContext().get().getTripDao().count();

-

-            ImportInputSourceAction importAction =

-                    serviceFactory.newT3Action(ImportInputSourceAction.class, importContext);

-

-            importAction.run();

-

-            newNbTrips = serviceContext.getT3TopiaPersistenceContext().get().getTripDao().count();

-

-            Assert.assertEquals(oldNbTrips + safeTrips.size(), newNbTrips);

-

-        }

-

-

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2000() throws Exception {

-        testExecute(347, 7);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2001() throws Exception {

-        testExecute(351, 10);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2002() throws Exception {

-        testExecute(310, 7);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2003() throws Exception {

-        testExecute(373, 2);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2004() throws Exception {

-        testExecute(179, 3);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2005() throws Exception {

-        testExecute(123, 1);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2006() throws Exception {

-        testExecute(95, 2);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2007() throws Exception {

-        testExecute(80, 0);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2008() throws Exception {

-        testExecute(59, 1);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2009() throws Exception {

-        testExecute(81, 4);

-    }

-

-    @Override

-    @Test

-    public void testExecute_ATL_2010() throws Exception {

-        testExecute(80, 8);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2000() throws Exception {

-        testExecute(217, 3);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2001() throws Exception {

-        testExecute(169, 19);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2002() throws Exception {

-        testExecute(116, 112);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2003() throws Exception {

-        testExecute(99, 120);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2004() throws Exception {

-        testExecute(81, 115);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2005() throws Exception {

-        testExecute(78, 110);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2006() throws Exception {

-        testExecute(181, 12);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2007() throws Exception {

-        testExecute(156, 11);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2008() throws Exception {

-        testExecute(148, 32);

-    }

-

-    @Override

-    @Test

-    public void testExecute_OI_2009() throws Exception {

-        testExecute(127, 14);

-    }

-

-    @Test

-    @Override

-    public void testExecute_OI_2011() throws Exception {

-        testExecute(126, 0);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2006() throws Exception {

-        testExecute(70, 27, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2007() throws Exception {

-        testExecute(53, 27, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2008() throws Exception {

-        testExecute(46, 14, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2009() throws Exception {

-        testExecute(64, 21, TripType.SAMPLEONLY, true, true);

-    }

-

-    @Test

-    @Override

-    public void testExecute_ESATL_2010() throws Exception {

-        testExecute(75, 13, TripType.SAMPLEONLY, true, true);

-    }

-}
-/*

- * #%L

- * T3 :: Input AVDTH v 33

- * %%

- * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io

- * %%

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Affero General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- * 

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- * 

- * You should have received a copy of the GNU Affero General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * #L%

- */

-package fr.ird.t3.actions.io.input.it;

-

-/**

- * Contract to use for all tests on avdth database

- *

- * @author Tony Chemit - dev@tchemit.fr

- * @since 1.0

- */

-public interface T3AVDTHV33Test {

-

-    void testExecute_OI_2000() throws Exception;

-

-    void testExecute_OI_2001() throws Exception;

-

-    void testExecute_OI_2002() throws Exception;

-

-    void testExecute_OI_2003() throws Exception;

-

-    void testExecute_OI_2004() throws Exception;

-

-    void testExecute_OI_2005() throws Exception;

-

-    void testExecute_OI_2006() throws Exception;

-

-    void testExecute_OI_2007() throws Exception;

-

-    void testExecute_OI_2008() throws Exception;

-

-    void testExecute_OI_2009() throws Exception;

-

-    void testExecute_OI_2011() throws Exception;

-

-    void testExecute_ATL_2000() throws Exception;

-

-    void testExecute_ATL_2001() throws Exception;

-

-    void testExecute_ATL_2002() throws Exception;

-

-    void testExecute_ATL_2003() throws Exception;

-

-    void testExecute_ATL_2004() throws Exception;

-

-    void testExecute_ATL_2005() throws Exception;

-

-    void testExecute_ATL_2006() throws Exception;

-

-    void testExecute_ATL_2007() throws Exception;

-

-    void testExecute_ATL_2008() throws Exception;

-

-    void testExecute_ATL_2009() throws Exception;

-

-    void testExecute_ATL_2010() throws Exception;

-

-    void testExecute_ESATL_2006() throws Exception;

-

-    void testExecute_ESATL_2007() throws Exception;

-

-    void testExecute_ESATL_2008() throws Exception;

-

-    void testExecute_ESATL_2009() throws Exception;

-

-    void testExecute_ESATL_2010() throws Exception;

-}
  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

 import fr.ird.t3.io.input.T3InputProvider;

 import fr.ird.t3.services.DecoratorService;

 import fr.ird.t3.web.actions.AbstractRunAction;

+import org.apache.commons.collections.CollectionUtils;

+import org.apache.commons.collections.MapUtils;

+

 import java.util.Collections;

 import java.util.Date;

 import java.util.List;

 import java.util.Map;

 import java.util.Set;

-import org.apache.commons.collections.CollectionUtils;

-import org.apache.commons.collections.MapUtils;

 /**

  * Analyze the given input source.

     private static final long serialVersionUID = 1L;

-    protected int nbUnsafeTrips;

-

-    protected int nbSafeTrips;

-

-    protected int nbTripsToReplace;

-

-    protected boolean needReplace;

-

-    protected boolean valid;

+    private int nbUnsafeTrips;

+    private int nbSafeTrips;

+    private int nbTripsToReplace;

+    private boolean needReplace;

+    private boolean valid;

     /** List of all known input providers. */

     private List<T3InputProvider> inputProviders;

     @Override

     public void prepare() throws Exception {

-

         getT3Session().removeTripListModel();

-

         super.prepare();

-

         inputProviders = Collections.singletonList(getConfiguration().getInputProvider());

     }

-    public final List<T3InputProvider> getInputProviders() {

-        return inputProviders;

-    }

-

     public String prepareResult() {

-

-        T3ActionContext<AnalyzeInputSourceConfiguration> context =

-                getT3ActionContext();

-

-        Set<Trip> safeTrips = context.getResultAsSet(

-                AnalyzeInputSourceAction.RESULT_SAFE_TRIPS,

-                Trip.class

-        );

+        T3ActionContext<AnalyzeInputSourceConfiguration> context = getT3ActionContext();

+        Set<Trip> safeTrips = context.getResultAsSet(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, Trip.class);

         nbSafeTrips = safeTrips.size();

-

-        Set<Trip> unsafeTrips = context.getResultAsSet(

-                AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS,

-                Trip.class

-        );

+        Set<Trip> unsafeTrips = context.getResultAsSet(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, Trip.class);

         nbUnsafeTrips = unsafeTrips.size();

-

-        boolean canImport = CollectionUtils.isEmpty(unsafeTrips) &&

-                            CollectionUtils.isNotEmpty(safeTrips);

-

+        boolean canImport = CollectionUtils.isEmpty(unsafeTrips) && CollectionUtils.isNotEmpty(safeTrips);

         // action is valid, only if there is some safe trips and no unsafe trip

         valid = canImport;

-

         Map<Trip, Trip> tripsToReplace;

-

         if (canImport) {

-

             // find out if there is some existing trip to re-import

-

-            tripsToReplace = context.getResultAsMap(

-                    AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE

-            );

+            tripsToReplace = context.getResultAsMap(AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE);

         } else {

-

             // no trip to replace

             tripsToReplace = Collections.emptyMap();

         }

-

         nbTripsToReplace = tripsToReplace.size();

-

         needReplace = MapUtils.isNotEmpty(tripsToReplace);

-

         return INPUT;

     }

+    @Override

+    protected Map<String, Object> prepareResumeParameters(AnalyzeInputSourceAction action, Exception error, Date startDate, Date endDate) {

+        Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate);

+        T3ActionContext<AnalyzeInputSourceConfiguration> actionContext = getT3ActionContext();

+        Set<Trip> safeTrips = actionContext.getResultAsSet(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, Trip.class);

+        map.put(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, safeTrips);

+        Set<Trip> unsafeTrips = actionContext.getResultAsSet(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, Trip.class);

+        map.put(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, unsafeTrips);

+        Map<Trip, Trip> tripsToReplace = actionContext.getResultAsMap(AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE);

+        map.put(AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE, tripsToReplace);

+        map.put("tripDecorator", getDecorator(Trip.class));

+        map.put("tripDecorator2", getDecorator(Trip.class, DecoratorService.WITH_ID));

+        return map;

+    }

+

+    @SuppressWarnings("unused")

+    public List<T3InputProvider> getInputProviders() {

+        return inputProviders;

+    }

+

+    @SuppressWarnings("unused")

     public int getNbUnsafeTrips() {

         return nbUnsafeTrips;

     }

+    @SuppressWarnings("unused")

     public int getNbSafeTrips() {

         return nbSafeTrips;

     }

+    @SuppressWarnings("unused")

     public int getNbTripsToReplace() {

         return nbTripsToReplace;

     }

+    @SuppressWarnings("unused")

     public boolean isValid() {

         return valid;

     }

+    @SuppressWarnings("unused")

     public boolean isNeedReplace() {

         return needReplace;

     }

-

-    @Override

-    protected Map<String, Object> prepareResumeParameters(AnalyzeInputSourceAction action,

-                                                          Exception error,

-                                                          Date startDate,

-                                                          Date endDate) {

-        Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate);

-

-        T3ActionContext<AnalyzeInputSourceConfiguration> actionContext = getT3ActionContext();

-

-        Set<Trip> safeTrips = actionContext.getResultAsSet(

-                AnalyzeInputSourceAction.RESULT_SAFE_TRIPS,

-                Trip.class

-        );

-        map.put(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, safeTrips);

-        Set<Trip> unsafeTrips = actionContext.getResultAsSet(

-                AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS,

-                Trip.class

-        );

-        map.put(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, unsafeTrips);

-        Map<Trip, Trip> tripsToReplace = actionContext.getResultAsMap(

-                AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE

-        );

-        map.put(AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE, tripsToReplace);

-

-        map.put("tripDecorator", getDecorator(Trip.class));

-

-        map.put("tripDecorator2",

-                getDecorator(Trip.class, DecoratorService.WITH_ID));

-        return map;

-    }

 }
  * it under the terms of the GNU Affero General Public License as published by

  * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * You should have received a copy of the GNU Affero General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  * #L%

  */

 public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeInputSourceConfiguration> {

-    //    public static final String RELOAD_ACTION = "reload";

     private static final long serialVersionUID = 1L;

     private static final Log log = LogFactory.getLog(ConfigureImportDataAction.class);

-    /** Input file that was just uploaded on server */

+    /**

+     * Input file that was just uploaded on server.

+     */

     private File sourceToLoad;

-    /** Name of file to upload */

+    /**

+     * Name of file to upload.

+     */

     private String sourceToLoadFileName;

-    /** flag to use strict mode with wells. */

-    private boolean useWells;

     /**

-     * Trip type to use

-     *

-     * @since 2.3

+     * Flag to use strict mode with wells.

      */

-    private TripType tripType = TripType.STANDARD;

+    private boolean useWells;

     /**

      * flag to authorize creation of missing vessels.

      *

      * @since 1.3.1

      */

     private boolean createVirtualVessel;

+    /**

+     * Flag to load only samples only trips

+     *

+     * @see TripType#SAMPLEONLY

+     */

+    private boolean useSamplesOnly;

+    /**

+     * Flag to authorize virtual activity creation (when logbooks are missing).

+     * <p>

+     * By default, let's always authorize it.

+     * <p>

+     * <b>Note:</b> This option is always at false if {@link #useSamplesOnly} is on.

+     *

+     * @see TripType#LOGBOOKMISSING

+     * @see TripType#STANDARD

+     */

+    private boolean canCreateVirtualActivity;

+

     private long maxSize;

     /** List of all known input providers. */

     private List<T3InputProvider> inputProviders;

         super(AnalyzeInputSourceConfiguration.class);

     }

-    public String getMaxSize() {

-        return StringUtil.convertMemory(maxSize);

-    }

-

-    @Inject(StrutsConstants.STRUTS_MULTIPART_MAXSIZE)

-    public void setMaxSize(String maxSize) {

-        this.maxSize = Long.parseLong(maxSize);

-    }

-

     @Override

     public void prepare() throws Exception {

-

         injectOnly(InjectDAO.class);

-

         if (!isConfigurationInSession()) {

-

             // no yet configuration, can use all input providers

             inputProviders = Arrays.asList(getT3InputService().getProviders());

-

         } else {

-            // as soon as there is a configuration, can only use the

-            // inputProvider from it

-

+            // as soon as there is a configuration, can only use the inputProvider from it

             inputProviders = Collections.singletonList(getConfiguration().getInputProvider());

         }

-

         injectOnly(InjectDecoratedBeans.class);

-

         if (getTreatmentDirectoryPath() == null) {

-

             // first time coming here get a new treatment directory path

-

             File workingDirectory = getApplicationConfig().getTreatmentWorkingDirectory();

-

             long l = System.nanoTime();

-

             File treatmentDirectory = new File(workingDirectory, "importData-" + l);

-

             FileUtil.createDirectoryIfNecessary(treatmentDirectory);

-

-            if (log.isInfoEnabled()) {

-                log.info(String.format("Create a new treatment directory path : %s", treatmentDirectory));

-            }

-

+            log.info(String.format("Create a new treatment directory path : %s", treatmentDirectory));

             setTreatmentDirectoryPath(treatmentDirectory.getAbsolutePath());

         } else {

-

-            if (log.isInfoEnabled()) {

-                log.info(String.format("Use existing treatment directory %s", getTreatmentDirectoryPath()));

-            }

+            log.info(String.format("Use existing treatment directory %s", getTreatmentDirectoryPath()));

         }

     }

     public String doAddSource() throws Exception {

-

-        // this action execution purpose is to add a new source to the

-        // treatment configuration

-        // It will upload the file and place it the correct place (says the

-        // temporary directory of the treatment configuration)

-

-        // file uploaded on server

+        // this action execution purpose is to add a new source to the treatment configuration

+        // It will upload the file and place it the correct place (says the temporary directory of the treatment configuration)

         File upload = getSourceToLoad();

-

         if (upload == null) {

-

             String message = t("t3.error.required.file.to.upload");

             addFieldError("sourceToLoad", message);

             log.error(message);

             return ERROR;

         }

-

         // treatment directory

         File targetDirectory = getTreatmentDirectory();

-

         String filename = getSourceToLoadFileName();

-

         if (ZipUtil.isZipFile(upload)) {

-

             // let's decompress input stream it

             ZipFile zipfile = new ZipFile(upload);

-

             Enumeration<? extends ZipEntry> entries = zipfile.entries();

-

             if (!entries.hasMoreElements()) {

                 String message = t("t3.error.required.one.entry.in.zip.to.upload");

                 addFieldError("sourceToLoad", message);

                 log.error(message);

                 return ERROR;

             }

-

             // get first entry

             ZipEntry zipEntry = entries.nextElement();

-

             // keep the filename of the zip entry

             filename = zipEntry.getName();

-

             File target = new File(targetDirectory, filename);

-

-            if (log.isInfoEnabled()) {

-                log.info(String.format("Will copy loaded zipped entry file %s to treatment configuration directory %s", filename, target));

-            }

+            log.info(String.format("Will copy loaded zipped entry file %s to treatment configuration directory %s", filename, target));

             try (InputStream in = zipfile.getInputStream(zipEntry)) {

                 FileUtils.copyInputStreamToFile(in, target);

             }

         } else {

-

             // target file

             File target = new File(targetDirectory, filename);

-

-            if (log.isInfoEnabled()) {

-                log.info(String.format("Will copy loaded file %s to treatment configuration directory %s", upload, target));

-            }

-

+            log.info(String.format("Will copy loaded file %s to treatment configuration directory %s", upload, target));

             // just copy file

             FileUtils.copyFile(upload, target);

         }

-

         // add the new file to the sources

         setLoadedSource(filename);

-

         // go back to the configuration definition

         return INPUT;

     }

     public String doDeleteSource() throws Exception {

-

         String filename = getLoadedSource();

-

         File targetDirectory = getTreatmentDirectory();

-

-        if (log.isInfoEnabled()) {

-            log.info(String.format("Will delete loaded file %s from %s", filename, targetDirectory));

-        }

+        log.info(String.format("Will delete loaded file %s from %s", filename, targetDirectory));

         File f = new File(targetDirectory, filename);

         if (f.exists()) {

             boolean delete = f.delete();

                 throw new IOException(String.format("Could not delete file %s on server.", f));

             }

         }

-

         setLoadedSource(null);

-

         // go back to the configuration definition

         return INPUT;

     }

         T3InputProvider inputProvider = getT3InputService().getProvider(getInputProviderId());

         File path = getTreatmentDirectory();

         String name = getLoadedSource();

-

         File inputFile = new File(path, name);

-

-        if (log.isInfoEnabled()) {

-            log.info(String.format("Will use input provider : %s", inputProvider));

-            log.info(String.format("Will use input file     : %s", inputFile));

-        }

-

-        // prepare a new action configuration

-        configuration = AnalyzeInputSourceConfiguration.newConfiguration(

-                inputProvider,

-                inputFile,

-                useWells,

-                tripType,

-                canCreateVessel,

-                createVirtualVessel);

-

+        TripType tripType = TripType.getTripType(useSamplesOnly, canCreateVirtualActivity);

+        log.info(String.format("input provider           : %s", inputProvider));

+        log.info(String.format("input file               : %s", inputFile));

+        log.info(String.format("userWells                : %s", useWells));

+        log.info(String.format("tripType                 : %s", tripType));

+        log.info(String.format("canCreateVessel          : %s", canCreateVessel));

+        log.info(String.format("createVirtualVessel      : %s", createVirtualVessel));

+        log.info(String.format("canCreateVirtualActivity : %s", canCreateVirtualActivity));

+        log.info(String.format("useSamplesOnly           : %s", useSamplesOnly));

+        configuration = AnalyzeInputSourceConfiguration.newConfiguration(inputProvider, inputFile, useWells, canCreateVessel, createVirtualVessel, useSamplesOnly, canCreateVirtualActivity);

         prepareActionContext();

         return SUCCESS;

     }

-    public TripType getTripType() {

-        return tripType;

+    @SuppressWarnings("unused")

+    public String getMaxSize() {

+        return StringUtil.convertMemory(maxSize);

     }

-    public void setTripType(TripType tripType) {

-        this.tripType = tripType;

+    @SuppressWarnings("unused")

+    @Inject(StrutsConstants.STRUTS_MULTIPART_MAXSIZE)

+    public void setMaxSize(String maxSize) {

+        this.maxSize = Long.parseLong(maxSize);

     }

+    @SuppressWarnings("unused")

     public Map<String, String> getTripTypes() {

         return tripTypes;

     }

+    @SuppressWarnings("unused")

     public void setTripTypes(Map<String, String> tripTypes) {

         this.tripTypes = tripTypes;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public File getSourceToLoad() {

         return sourceToLoad;

     }

+    @SuppressWarnings("unused")

     public void setSourceToLoad(File sourceToLoad) {

         this.sourceToLoad = sourceToLoad;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public String getSourceToLoadFileName() {

         return sourceToLoadFileName;

     }

+    @SuppressWarnings("unused")

     public void setSourceToLoadFileName(String sourceToLoadFileName) {

         this.sourceToLoadFileName = sourceToLoadFileName;

     }

+    @SuppressWarnings("unused")

     public boolean isUseWells() {

         return useWells;

     }

+    @SuppressWarnings("unused")

     public void setUseWells(boolean useWells) {

         this.useWells = useWells;

     }

+    @SuppressWarnings("unused")

     public boolean isCanCreateVessel() {

         return canCreateVessel;

     }

+    @SuppressWarnings("unused")

     public void setCanCreateVessel(boolean canCreateVessel) {

         this.canCreateVessel = canCreateVessel;

     }

+    @SuppressWarnings("unused")

     public boolean isCreateVirtualVessel() {

         return createVirtualVessel;

     }

+    @SuppressWarnings("unused")

     public void setCreateVirtualVessel(boolean createVirtualVessel) {

         this.createVirtualVessel = createVirtualVessel;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public String getInputProviderId() {

         return inputProviderId;

     }

+    @SuppressWarnings("unused")

     public void setInputProviderId(String inputProviderId) {

         this.inputProviderId = inputProviderId;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public String getLoadedSource() {

         return loadedSource;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public void setLoadedSource(String loadedSource) {

         this.loadedSource = loadedSource;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public String getTreatmentDirectoryPath() {

         return treatmentDirectoryPath;

     }

+    @SuppressWarnings({"unused", "WeakerAccess"})

     public void setTreatmentDirectoryPath(String treatmentDirectoryPath) {

         this.treatmentDirectoryPath = treatmentDirectoryPath;

     }

+    @SuppressWarnings("unused")

+    public boolean isUseSamplesOnly() {

+        return useSamplesOnly;

+    }

+

+    @SuppressWarnings("unused")

+    public void setUseSamplesOnly(boolean useSamplesOnly) {

+        this.useSamplesOnly = useSamplesOnly;

+    }

+

+    @SuppressWarnings("unused")

+    public boolean isCanCreateVirtualActivity() {

+        return canCreateVirtualActivity;

+    }

+

+    @SuppressWarnings("unused")

+    public void setCanCreateVirtualActivity(boolean canCreateVirtualActivity) {

+        this.canCreateVirtualActivity = canCreateVirtualActivity;

+    }

+

+    @SuppressWarnings("unused")

     public final List<T3InputProvider> getInputProviders() {

         return inputProviders;

     }

 public class ImportDataAction extends AbstractRunAction<ImportInputSourceConfiguration, ImportInputSourceAction> {

     private static final long serialVersionUID = 1L;

-

     private static final Log log = LogFactory.getLog(ImportDataAction.class);

     private boolean replaceTrip;

     private boolean valid;

     private int nbImportedTrips;

     private int nbDeletedTrips;

-

-    /** List of all known input providers. */

+    /**

+     * List of all known input providers.

+     */

     private List<T3InputProvider> inputProviders;

     public ImportDataAction() {

         inputProviders = Collections.singletonList(getIncomingConfiguration().getInputProvider());

     }

-    public final List<T3InputProvider> getInputProviders() {

-        return inputProviders;

-    }

-

-    public InputSourceConfiguration getIncomingConfiguration() {

-        Object configuration = getT3ActionContext().getConfiguration();

-        return (InputSourceConfiguration) configuration;

-    }

-

     public String prepareImport() {

-

         // get the action context from analyze

-

-        T3ActionContext<ImportInputSourceConfiguration> actionContext =

-                getT3ActionContext();

-

-        Set<Trip> safeTrips = actionContext.getResultAsSet(

-                AnalyzeInputSourceAction.RESULT_SAFE_TRIPS,

-                Trip.class);

-

-        Map<Trip, Trip> tripToReplace = actionContext.getResultAsMap(

-                AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE

-        );

-

-        if (log.isInfoEnabled()) {

-            log.info("--> Prepare import");

-            log.info("Input provider   : " + getIncomingConfiguration().getInputProvider());

-            log.info("Input file       : " + getIncomingConfiguration().getInputFile());

-            log.info("Use well         : " + getIncomingConfiguration().isUseWells());

-            log.info("Trip type        : " + getIncomingConfiguration().getTripType());

-            log.info("Can Create vessel: " + getIncomingConfiguration().isCanCreateVessel());

-            if (getIncomingConfiguration().isCanCreateVessel()) {

-                log.info("Create virtual vessel: " + getIncomingConfiguration().isCreateVirtualVessel());

-            }

-            log.info("Trips to import  : " + safeTrips.size());

-            log.info("Trips to replace : " + tripToReplace.size());

+        T3ActionContext<ImportInputSourceConfiguration> actionContext = getT3ActionContext();

+        Set<Trip> safeTrips = actionContext.getResultAsSet(AnalyzeInputSourceAction.RESULT_SAFE_TRIPS, Trip.class);

+        Map<Trip, Trip> tripToReplace = actionContext.getResultAsMap(AnalyzeInputSourceAction.RESULT_TRIPS_TO_REPLACE);

+        log.info("--> Prepare import");

+        log.info("Input provider   : " + getIncomingConfiguration().getInputProvider());

+        log.info("Input file       : " + getIncomingConfiguration().getInputFile());

+        log.info("Use well         : " + getIncomingConfiguration().isUseWells());

+        log.info("Trip type        : " + getIncomingConfiguration().getTripType());

+        log.info("Can Create vessel: " + getIncomingConfiguration().isCanCreateVessel());

+        if (getIncomingConfiguration().isCanCreateVessel()) {

+            log.info("Create virtual vessel: " + getIncomingConfiguration().isCreateVirtualVessel());

         }

-

+        log.info("Trips to import  : " + safeTrips.size());

+        log.info("Trips to replace : " + tripToReplace.size());

         Set<Trip> toImportTrips = new HashSet<>();

         Set<Trip> toDeleteTrips = new HashSet<>();

-

         if (isReplaceTrip()) {

-

-            // will replace existing trips

-            // so need to delete before all old trips

+            // will replace existing trips, so need to delete before all old trips

             toDeleteTrips.addAll(tripToReplace.keySet());

-

             // can import all safe trips

             toImportTrips.addAll(safeTrips);

-

         } else {

-

             // do NOT replace old trip

-

             // get all importable trips

             toImportTrips.addAll(safeTrips);

-

             if (MapUtils.isNotEmpty(tripToReplace)) {

-

                 // remove the one which reflect existing trips

                 toImportTrips.removeAll(tripToReplace.values());

             }

         }

-

         // creates the new configuration

-

         ImportInputSourceConfiguration configuration = ImportInputSourceConfiguration.newConfiguration(getIncomingConfiguration());

-

         configuration.setTripsToImport(toImportTrips);

-

         configuration.setTripsToDelete(toDeleteTrips);

-

-        t3ActionContext = getServiceFactory().newT3ActionContext(configuration, getServiceContext()

-        );

-        if (log.isInfoEnabled()) {

-            log.info("Created action context " + t3ActionContext);

-        }

+        t3ActionContext = getServiceFactory().newT3ActionContext(configuration, getServiceContext());

+        log.info("Created action context " + t3ActionContext);

         getT3Session().setActionContext(t3ActionContext);

-

         return SUCCESS;

     }

     public String prepareResult() {

-

         Set<Trip> importedTrips = getConfiguration().getTripsToImport();

-

         nbImportedTrips = importedTrips.size();

+        Set<Trip> deletedTrips = getConfiguration().getTripsToDelete();

+        nbDeletedTrips = deletedTrips.size();

+        return INPUT;

+    }

-        Set<Trip> deletedeTrips = getConfiguration().getTripsToDelete();

+    @Override

+    protected Map<String, Object> prepareResumeParameters(ImportInputSourceAction action, Exception error, Date startDate, Date endDate) {

+        Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate);

+        map.put("tripDecorator", getDecorator(Trip.class, DecoratorService.WITH_ID));

+        return map;

+    }

-        nbDeletedTrips = deletedeTrips.size();

+    @SuppressWarnings("unused")

+    public List<T3InputProvider> getInputProviders() {

+        return inputProviders;

+    }

-        return INPUT;

+    @SuppressWarnings("WeakerAccess")

+    public InputSourceConfiguration getIncomingConfiguration() {

+        Object configuration = getT3ActionContext().getConfiguration();

+        return (InputSourceConfiguration) configuration;

     }

+    @SuppressWarnings("unused")

     public boolean isValid() {

         return valid;

     }

+    @SuppressWarnings("unused")

     public void setValid(boolean valid) {

         this.valid = valid;

     }

+    @SuppressWarnings("unused")

     public int getNbImportedTrips() {

         return nbImportedTrips;

     }

+    @SuppressWarnings("unused")

     public int getNbDeletedTrips() {

         return nbDeletedTrips;

     }

+    @SuppressWarnings("WeakerAccess")

     public boolean isReplaceTrip() {

         return replaceTrip;

     }

+    @SuppressWarnings("unused")

     public void setReplaceTrip(boolean replaceTrip) {

         this.replaceTrip = replaceTrip;

     }

-

-    @Override

-    protected Map<String, Object> prepareResumeParameters(ImportInputSourceAction action,

-                                                          Exception error,

-                                                          Date startDate,

-                                                          Date endDate) {

-        Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate);

-        map.put("tripDecorator", getDecorator(Trip.class, DecoratorService.WITH_ID));

-        return map;

-    }

 }
 t3.common.available.vesselSimpleTypes=Types simplifiés de navire disponibles

 t3.common.available.vessels=Navires disponibles

 t3.common.canCreateVessel=Authorise to create vessels

+t3.common.canCreateVirtualActivity=Authorize to create virtaul activities (for trips with missing logbook)

 t3.common.catchFleet=Flotte des captures

 t3.common.checkPassword=repeat password

 t3.common.configuration=Préférences

 t3.common.available.vesselSimpleTypes=Types simplifiés de navire disponibles

 t3.common.available.vessels=Navires disponibles

 t3.common.canCreateVessel=Autoriser la création de bateaux

+t3.common.canCreateVirtualActivity=Autoriser la création d'acitivités fictive (pour les marées sans livre de bord)

 t3.common.catchFleet=Flotte des captures

 t3.common.checkPassword=Répéter le mot de passe

 t3.common.configuration=Préférences

 <jsp:include page="importDataConfigResume.jsp"/>

 <s:if test="valid">

-

   <%-- Can do the import --%>

-

   <p>

     <s:text name="t3.label.message.trips.safe.to.import">

       <s:param>

       </s:param>

     </s:text>

   </p>

-  

-  <s:form method="post" validate="true" namespace="/io">

+  <s:form method="post" validate="true" namespace="/io">

     <s:if test="needReplace">

       <strong>

-      <s:text name="t3.label.message.trips.to.replace">

-        <s:param>

-          <s:property value="%{nbTripsToReplace}"/>

-        </s:param>

-      </s:text>

+        <s:text name="t3.label.message.trips.to.replace">

+          <s:param>

+            <s:property value="%{nbTripsToReplace}"/>

+          </s:param>

+        </s:text>

       </strong>

       <s:checkbox name="replaceTrip" key="t3.question.confirm.to.replace.trip" value="%{false}"/>

-

     </s:if>

-

-    <s:submit action="prepareImportData"

-              key="t3.action.importData.doImport"

-              align="right"/>

-

+    <s:submit action="prepareImportData" key="t3.action.importData.doImport" align="right"/>

   </s:form>

-

 </s:if>

 <s:else>

   <p>

 <script type="text/javascript">

-  jQuery(document).ready(function () {

-

-    function changeCanCreateVessel(val) {

-      var container = $('[name="createVirtualVessel"]');

-      if (val) {

-        container.attr('disabled', false);

-        container.prop('checked', true);

-      } else {

-        container.attr('disabled', true);

-      }

-    }

-

-    $('[name="canCreateVessel"]').change(function () {

-      changeCanCreateVessel($(this).prop('checked'));

+    jQuery(document).ready(function () {

+        function changeCanCreateVessel(val) {

+            var container = $('[name="createVirtualVessel"]');

+            if (val) {

+                container.attr('disabled', false);

+                container.prop('checked', true);

+            } else {

+                container.attr('disabled', true);

+            }

+        }

+        function changeUseSamplesOnly(val) {

+            var container = $('[name="canCreateVirtualActivity"]');

+            if (val) {

+                container.attr('disabled', false);

+                container.prop('checked', true);

+            } else {

+                container.attr('disabled', true);

+                container.attr('checked', true);

+            }

+        }

+

+        $('[name="canCreateVessel"]').change(function () {

+            changeCanCreateVessel($(this).prop('checked'));

+        });

+        $('[name="useSamplesOnly"]').change(function () {

+            changeUseSamplesOnly($(this).prop('checked'));

+        });

+        changeCanCreateVessel(<s:property value="%{canCreateVessel}"/>);

+        changeUseSamplesOnly(<s:property value="%{useSamplesOnly}"/>);

     });

-

-    changeCanCreateVessel(<s:property value="%{canCreateVessel}"/>);

-  });

 </script>

 <title><s:text name="t3.label.data.configureImportData"/></title>

-

 <h2><s:text name="t3.label.data.configureImportData"/></h2>

 <s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io">

-

   <s:hidden key="treatmentDirectoryPath" label=''/>

-

-  <s:select key="inputProviderId" list="inputProviders" label='%{getText("t3.common.inputProvider")}' listKey="id" listValue="libelle" requiredLabel="true"/>

-

+  <s:select key="inputProviderId" list="inputProviders" label='%{getText("t3.common.inputProvider")}' listKey="id"

+            listValue="libelle" requiredLabel="true"/>

   <s:if test="loadedSource==null">

-

     <s:hidden name="useWells" value="%{useWells}"/>

-

     <s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/>

-

     <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/>

     <br/>

       <s:param value="%{maxSize}"/>

     </s:text>

     </div>

-

   </s:if>

   <s:else>

-

     <s:hidden key="loadedSource" label=''/>

-

-    <s:textfield value="%{loadedSource}" key="t3.common.uploaded.source" disabled="true" requiredLabel="true" size="40"/>

-

+    <s:textfield value="%{loadedSource}" key="t3.common.uploaded.source" disabled="true" requiredLabel="true"

+                 size="40"/>

     <s:checkbox key="useWells" label='%{getText("t3.common.force.useWells")}'/>

-

-    <s:select key="tripType" list="tripTypes" label='%{getText("t3.common.tripType")}' requiredLabel="true"/>

+    <s:checkbox key="samplesOnly" label='%{getText("t3.common.useSamplesOnly")}'/>

+    <s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/>

     <s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/>

     <s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/>

     <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/>

 <%@ taglib prefix="s" uri="/struts-tags" %>

 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>

 <fieldset>

-

   <legend>

     <s:text name="t3.label.importData.config.resume"/>

   </legend>

-

   <s:form>

-    <s:select key="t3.common.inputProvider" list="inputProviders" listKey="id" listValue="libelle" value="%{configuration.inputProvider.id}" disabled="true"/>

+    <s:select key="t3.common.inputProvider" list="inputProviders" listKey="id" listValue="libelle"

+              value="%{configuration.inputProvider.id}" disabled="true"/>

     <s:textfield value="%{configuration.inputFile.name}" key="t3.common.uploaded.source" disabled="true" size="40"/>

     <s:label key="t3.common.useWells" value=""/>

     <s:checkbox name="useWells" value="%{configuration.useWells}" disabled="true" key="t3.common.force.useWells"/>

-    <s:select key="tripType" list="tripTypes" label='%{getText("t3.common.tripType")}' disabled="true" value="%{configuration.tripType}" />

-    <s:checkbox name="canCreateVessel" value="%{configuration.canCreateVessel}" disabled="true" key="t3.common.canCreateVessel"/>

+    <s:checkbox name="samplesOnly" value="%{configuration.samplesOnly}" disabled="true" key="t3.common.samplesOnly"/>

+    <s:checkbox name="canCreateVirtualActivity" value="%{configuration.canCreateVirtualActivity}" disabled="true"

+                key="t3.common.canCreateVirtualActivity"/>

+    <s:checkbox name="canCreateVessel" value="%{configuration.canCreateVessel}" disabled="true"

+                key="t3.common.canCreateVessel"/>

     <s:if test="configuration.canCreateVessel">

-      <s:checkbox name="createVirtualVessel" value="%{configuration.createVirtualVessel}" disabled="true" key="t3.common.createVirtualVessel"/>

+      <s:checkbox name="createVirtualVessel" value="%{configuration.createVirtualVessel}" disabled="true"

+                  key="t3.common.createVirtualVessel"/>

     </s:if>

   </s:form>

-

 </fieldset>

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3

Commits:

27 changed files:

Changes: