[T3-commits] [Git][ultreiaio/ird-t3][develop] up pg gav, fix some config getter, i18n, ready to release \o/

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a122771a by Tony CHEMIT at 2017-04-10T13:31:27+02:00 up pg gav, fix some config getter, i18n, ready to release \o/ - - - - - 27 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java - t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java - t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java → t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java - t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java - t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java - t3-domain/src/main/java/fr/ird/t3/services/UserService.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java - t3-domain/src/main/resources/t3-datadb.properties - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - + t3-installer/src/main/assembly/dist/debug.sh - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - t3-installer/src/main/resources/log4j.properties - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/pom.xml - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <struts2Version>2.3.14</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <h2Version>1.3.176</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.4.1212.jre7</postgresqlVersion> <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>5.1.3.Final</hibernateVersion> <slf4jVersion>1.7.25</slf4jVersion> @@ -274,7 +274,7 @@ <!-- base postgres --> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -120,7 +120,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -161,7 +161,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Config.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -28,7 +28,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; @@ -145,11 +144,11 @@ public class T3Config extends GeneratedT3Config { } public List<Integer> getLevel2DefaultSpeciesAsList() { - return Arrays.asList(getLevel2DefaultSpecies()); + return get().getOptionAsList(T3ConfigOption.LEVEL2_DEFAULT_SPECIES.getKey()).getOptionAsInt(); } public List<Integer> getLevel3DefaultSpeciesAsList() { - return Arrays.asList(getLevel3DefaultSpecies()); + return get().getOptionAsList(T3ConfigOption.LEVEL3_DEFAULT_SPECIES.getKey()).getOptionAsInt(); } public boolean isUpdateSchema() { ===================================== t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java @@ -22,17 +22,16 @@ package fr.ird.t3; */ import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.services.T3ServiceContext; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; import java.nio.file.Paths; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -44,7 +43,7 @@ import org.nuiton.version.Version; * <p> * Created on 30/01/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ public class T3SqlScriptsImporter { @@ -56,12 +55,7 @@ public class T3SqlScriptsImporter { protected ImmutableSet<File> scriptsFile; - public static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = new Predicate<File>() { - @Override - public boolean apply(File input) { - return !input.getName().toLowerCase().contains("specieslengthstep.sql"); - } - }; + public static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = input -> !input.getName().toLowerCase().contains("specieslengthstep.sql"); public static void importReferential(File buildRootDirectory, T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { @@ -98,12 +92,7 @@ public class T3SqlScriptsImporter { public void prepare() { - List<String> scriptsName = Lists.newArrayList(scriptsDirectory.list(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".sql"); - } - })); + List<String> scriptsName = Lists.newArrayList(scriptsDirectory.list((dir, name) -> name.endsWith(".sql"))); Collections.sort(scriptsName); ImmutableSet.Builder<File> filesBuilder = ImmutableSet.builder(); @@ -117,20 +106,20 @@ public class T3SqlScriptsImporter { return scriptsFile; } - public void importScripts(T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { + public void importScripts(T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException { for (File scriptFile : scriptsFile) { if (log.isInfoEnabled()) { log.info(" o Loading sql script ...(" + scriptFile.getName() + ")"); } - if (filePredicate.apply(scriptFile)) { + if (filePredicate.test(scriptFile)) { loadScript(serviceContext, scriptFile); } } } - protected void loadScript(T3ServiceContext serviceContext, File script) throws TopiaException, IOException { + protected void loadScript(T3ServiceContext serviceContext, File script) throws IOException { T3ScriptHelper.loadScript(serviceContext.getApplicationContext(), script); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java @@ -24,7 +24,7 @@ package fr.ird.t3.entities; /** * Created on 26/01/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ public class CountAndWeight { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java → t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java @@ -22,21 +22,33 @@ package fr.ird.t3.entities; */ import java.io.File; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; -import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.jdbc.JdbcHelper; /** * Created by tchemit on 03/04/17. * * @author Tony Chemit - dev@tchemit.fr */ -public class T3JdbcH2Helper extends JdbcH2Helper { +public class T3JdbcHelper extends JdbcHelper { - public T3JdbcH2Helper(JdbcConfiguration jdbcConfiguration) { + public T3JdbcHelper(JdbcConfiguration jdbcConfiguration) { super(jdbcConfiguration); } - @Override + public void executeSql(String sql) { + try (Connection connection = openConnection()) { + try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + preparedStatement.execute(); + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + public void backup(File file, boolean compress) { String options = ""; if (compress) { @@ -44,4 +56,5 @@ public class T3JdbcH2Helper extends JdbcH2Helper { } runSelectOnString("SCRIPT TO '" + file.getAbsolutePath() + "'" + options); } + } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java @@ -35,10 +35,7 @@ import java.sql.Statement; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; -import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.topia.persistence.support.TopiaSqlWork; import org.nuiton.util.sql.SqlFileReader; @@ -58,38 +55,35 @@ public class T3ScriptHelper { if (log.isInfoEnabled()) { log.info("Export database to file " + outputFile); } - new T3JdbcH2Helper(rootTx.getConfiguration()).backup(outputFile, false); + rootTx.newJdbcHelper().backup(outputFile, false); } - public static void loadReferentiel(TopiaApplicationContext tx, String location) throws IOException, TopiaException { + public static void loadReferentiel(T3TopiaApplicationContext tx, String location) throws IOException, TopiaException { try (InputStream resourceAsStream = T3EntityHelper.class.getResourceAsStream(location)) { loadScript(tx, resourceAsStream); } } - public static void loadScript(TopiaApplicationContext tx, InputStream resourceAsStream) throws IOException, TopiaException { + public static void loadScript(T3TopiaApplicationContext tx, InputStream resourceAsStream) throws IOException, TopiaException { String script = IOUtils.toString(resourceAsStream, Charsets.UTF_8.name()); - new JdbcHelper(tx.getConfiguration()).runUpdate(script); - } + tx.newJdbcHelper().executeSql(script); - public static void loadScript(TopiaApplicationContext tx, File file) throws IOException, TopiaException { + } - InputStream resourceAsStream = new FileInputStream(file); + public static void loadScript(T3TopiaApplicationContext tx, File file) throws IOException, TopiaException { - try { + try (InputStream resourceAsStream = new FileInputStream(file)) { loadScript(tx, resourceAsStream); - } finally { - resourceAsStream.close(); } } - public static void loadScriptLineByLine(TopiaApplicationContext tx, File script, PropertyChangeListener listener) throws TopiaException, IOException { + public static void loadScriptLineByLine(T3TopiaApplicationContext tx, File script, PropertyChangeListener listener) throws TopiaException, IOException { try (BufferedReader stream = new BufferedReader(new InputStreamReader(new FileInputStream(script), Charsets.UTF_8))) { - try (T3TopiaPersistenceContext persistenceContext = (T3TopiaPersistenceContext) tx.newPersistenceContext()) { + try (T3TopiaPersistenceContext persistenceContext = tx.newPersistenceContext()) { persistenceContext.getSqlSupport().doSqlWork(new TopiaSqlWork() { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java @@ -106,6 +106,10 @@ public class T3TopiaApplicationContext extends AbstractT3TopiaApplicationContext return new T3TopiaApplicationContext(topiaConfiguration); } + public T3JdbcHelper newJdbcHelper() { + return new T3JdbcHelper(getConfiguration()); + } + private T3TopiaApplicationContext(TopiaConfiguration topiaConfiguration) { super(topiaConfiguration); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java @@ -26,7 +26,7 @@ package fr.ird.t3.entities.data; * <p> * Created on 01/02/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr * @see SampleWell#getRfMinus10UsageStatus() * @see SampleWell#getRfPlus10UsageStatus() () * @since 2.0 ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java @@ -29,7 +29,7 @@ import java.util.List; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr */ public class WeightCategories { ===================================== t3-domain/src/main/java/fr/ird/t3/services/UserService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/UserService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/UserService.java @@ -68,7 +68,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste user.setPassword(newPassword); T3User userToSave = userDAO.create(user); userDAO.update(userToSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void updateUser(T3User user) throws Exception { @@ -84,7 +84,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste userToSave.setPassword(encodePassword(user.getPassword())); } userDAO.update(userToSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void deleteUser(String userId) throws Exception { @@ -93,18 +93,17 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste throw new IllegalArgumentException("Could not find user with id : " + userId); } userDAO.delete(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void addUserT3Database(String userId, - UserT3Database dbConfiguration) throws Exception { + public void addUserT3Database(String userId, UserT3Database dbConfiguration) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); UserT3Database dbConfigurationtoSave = userT3DatabaseDAODAO.create(dbConfiguration); user.addUserT3Database(dbConfigurationtoSave); userDAO.update(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void updateUserT3Database(UserT3Database dbConfiguration) throws Exception { @@ -113,11 +112,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste UserT3Database dbConfigurationtoSave = getUserT3Database(dbconfigurationId); updateDatabaseConfiguration(dbConfiguration, dbConfigurationtoSave); userT3DatabaseDAODAO.update(dbConfigurationtoSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void removeUserT3Database(String userId, - String dbconfigurationId) throws Exception { + public void removeUserT3Database(String userId, String dbconfigurationId) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -126,11 +124,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste getUserT3Database(dbconfigurationId); user.removeUserT3Database(dbConfigurationtoSave); userDAO.update(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void addOutputDatabase(String userId, - UserOutputDatabase dbConfiguration) throws Exception { + public void addOutputDatabase(String userId, UserOutputDatabase dbConfiguration) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -138,7 +135,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste userOutputDatabaseDAO.create(dbConfiguration); user.addUserOutputDatabase(dbConfigurationtoSave); userDAO.update(user); - getT3UserTopiaPersistenceContext().get().commit(); + commit(); } public void updateUserOuputDatabase( @@ -149,11 +146,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste getUserOutputDatabase(dbconfigurationId); updateDatabaseConfiguration(dbConfiguration, dbConfigurationtoSave); userOutputDatabaseDAO.update(dbConfigurationtoSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void removeOutputDatabaseConfiguration(String userId, - String dbconfigurationId) throws Exception { + public void removeOutputDatabaseConfiguration(String userId, String dbconfigurationId) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -163,7 +159,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste user.removeUserOutputDatabase(dbConfigurationtoSave); userDAO.update(user); - getT3UserTopiaPersistenceContext().get().commit(); + commit(); } public UserT3Database getUserT3Database(String dbconfigurationId) throws TopiaException { @@ -186,21 +182,23 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste return dbConfigurationtoSave; } - public boolean checkPassword(T3User user, - String password) throws Exception { + public boolean checkPassword(T3User user, String password) throws Exception { String s = encodePassword(password); return s.equals(user.getPassword()); } - public static String encodePassword(String password) { + private static String encodePassword(String password) { return StringUtil.encodeMD5(password); } - protected void updateDatabaseConfiguration(UserDatabase dbConfiguration, - UserDatabase dbConfigurationtoSave) throws TopiaException { + private void updateDatabaseConfiguration(UserDatabase dbConfiguration, UserDatabase dbConfigurationtoSave) { dbConfigurationtoSave.setDescription(dbConfiguration.getDescription()); dbConfigurationtoSave.setUrl(dbConfiguration.getUrl()); dbConfigurationtoSave.setLogin(dbConfiguration.getLogin()); } + private void commit() { + getT3UserTopiaPersistenceContext().get().commit(); + } + } ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java @@ -36,7 +36,7 @@ import org.nuiton.version.Version; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ public abstract class T3MigrationCallbackSupport extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java @@ -29,7 +29,7 @@ import org.nuiton.version.Versions; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ public class T3MigrationCallbackV2_0 extends T3MigrationCallbackSupport { ===================================== t3-domain/src/main/resources/t3-datadb.properties ===================================== --- a/t3-domain/src/main/resources/t3-datadb.properties +++ b/t3-domain/src/main/resources/t3-datadb.properties @@ -19,7 +19,7 @@ # #L% ### # DB configuration -hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect hibernate.connection.driver_class=org.postgresql.Driver hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider hibernate.show_sql=false ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -131,7 +131,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -132,7 +132,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -132,7 +132,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -75,7 +75,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-installer/src/main/assembly/dist/debug.sh ===================================== --- /dev/null +++ b/t3-installer/src/main/assembly/dist/debug.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 -Xmx1024M -Xms512M -jar ${project.build.finalName}.jar "db.properties" "scripts/ddl" "scripts/referential" "scripts/zones" ===================================== t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java +++ b/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java @@ -24,7 +24,6 @@ package fr.ird.t3.tools; import com.google.common.base.Preconditions; -import com.google.common.base.Predicates; import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; @@ -158,7 +157,7 @@ public class T3ApplicationInstaller { log.info("4/6 - Loading ddl from " + dllScriptsImporter.getScriptsFile().size() + " scripts."); } - dllScriptsImporter.importScripts(serviceContext, Predicates.<File>alwaysTrue()); + dllScriptsImporter.importScripts(serviceContext, file -> true); T3SqlScriptsImporter referentialScriptsImporter = new T3SqlScriptsImporter(referentialScriptsDirectory); referentialScriptsImporter.prepare(); @@ -167,7 +166,7 @@ public class T3ApplicationInstaller { if (log.isInfoEnabled()) { log.info("5/6 - Load referential from " + referentialScriptsImporter.getScriptsFile().size() + " scripts."); } - referentialScriptsImporter.importScripts(serviceContext, Predicates.<File>alwaysTrue()); + referentialScriptsImporter.importScripts(serviceContext, file -> true); File unzipDirectory = createUnzipDirectory("postgis-data"); ===================================== t3-installer/src/main/resources/log4j.properties ===================================== --- a/t3-installer/src/main/resources/log4j.properties +++ b/t3-installer/src/main/resources/log4j.properties @@ -39,3 +39,5 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( # levels log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate.orm.deprecation=ERROR +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -164,7 +164,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java @@ -107,9 +107,7 @@ public class T3ApplicationListener implements ServletContextListener { log.info("Configuration initialized."); T3ApplicationContext applicationContext = new T3ApplicationContext(); - T3ApplicationContext.setT3ApplicationContext( - sce.getServletContext(), applicationContext - ); + T3ApplicationContext.setT3ApplicationContext(sce.getServletContext(), applicationContext); // initialize configuration applicationContext.setConfiguration(configuration); @@ -138,8 +136,7 @@ public class T3ApplicationListener implements ServletContextListener { ); // init database (and create minimal admin user if required) - initInternalDatabase(applicationContext, - serviceContext); + initInternalDatabase(applicationContext, serviceContext); } @Override @@ -216,9 +213,7 @@ public class T3ApplicationListener implements ServletContextListener { applicationContext.setInternalRootContext(internalRootContext); - boolean schemaNeedUpdate = - !isInternalSchemaCreated(internalRootContext) || - configuration.isUpdateSchema(); + boolean schemaNeedUpdate = !isInternalSchemaCreated(internalRootContext) || configuration.isUpdateSchema(); if (schemaNeedUpdate) { @@ -230,8 +225,7 @@ public class T3ApplicationListener implements ServletContextListener { } try { - createAdminUser(serviceContext, - applicationContext.getInternalRootContext()); + createAdminUser(serviceContext, applicationContext.getInternalRootContext()); } catch (Exception e) { throw new IllegalStateException( ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -75,7 +75,7 @@ t3.common.currentDirection=Direction du courant t3.common.currentVelocity=Vitesse du courant t3.common.database.general.caracteristics=Statistiques générales t3.common.database.ocean.caracteristics=Statistiques de l'océan -t3.common.database.tripsWithAllData=Marées avec totues les données calculées (%s / %s) +t3.common.database.tripsWithAllData=Marées avec toutes les données calculées (%s / %s) t3.common.database.tripsWithNoData=Marées avec aucune donnée calculée (%s / %s) t3.common.database.tripsWithSomeData=Marées avec une partie des données calculées (%s / %s) t3.common.date=Date View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a122771a3edc08f1bf1b5323700917c1a...