Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 4acaac54 by Tony CHEMIT at 2017-04-03T15:13:44+02:00 Use nuiton-config last api (See #257) - - - - - 26 changed files: - t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-domain/pom.xml - + t3-domain/src/main/config/T3.ini - − t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java - t3-domain/src/main/java/fr/ird/t3/T3Configuration.java → t3-domain/src/main/java/fr/ird/t3/T3Config.java - − t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java - t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java - t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java - − t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java - t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java - t3-web/src/main/java/fr/ird/t3/web/T3Session.java - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java Changes: ===================================== t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,8 +20,8 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -59,7 +59,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -78,8 +78,8 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.DATA_DIRECTORY.getKey(), testDir); - applicationConfiguration = new T3Configuration(defaultProps); + defaultProps.put(T3ConfigOption.DATA_DIRECTORY.getKey(), testDir); + applicationConfiguration = new T3Config(defaultProps); try { // where to put h2 database @@ -133,7 +133,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -191,11 +191,38 @@ </includes> <filtering>true</filtering> </resource> + <!-- si on ne met pas ça, les tests ne fonctionnent plus :( --> + <resource> + <directory>target/generated-sources/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </resource> </resources> <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <id>generate-config</id> + <configuration> + <modelName>T3</modelName> + <generatePropertyChangeSupport>true</generatePropertyChangeSupport> + <packageName>fr.ird.t3</packageName> + <useNuitonI18n>true</useNuitonI18n> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <configuration> ===================================== t3-domain/src/main/config/T3.ini ===================================== --- /dev/null +++ b/t3-domain/src/main/config/T3.ini @@ -0,0 +1,154 @@ +description = t3.application.config + +[option contextPath] +description = t3.config.context.path.description +key = context.path +type = string +defaultValue = t3 +transient = true +final = true + +[option dataDirectory] +description = t3.config.data.directory.description +key = data.directory +type = file +defaultValue = /var/local/t3/${context.path} +transient = true +final = true + +[option internalDbDirectory] +description = t3.config.internal.db.directory.description +key = internal.db.directory +type = file +defaultValue = ${data.directory}/db +transient = true +final = true + +[option parameterProfileDirectory] +description = t3.config.parameterProfiles.storage.directory.description +key = parameterProfiles.storage.directory +type = file +defaultValue = ${data.directory}/parameter-profiles +transient = true +final = true + +[option logFile] +description = t3.user.log.file.description +key = user.log.file +type = file +defaultValue = ${data.directory}/t3-log.properties +transient = true +final = true + +[option userLogDirectory] +description = t3.user.log.directory.description +key = user.log.directory +type = file +defaultValue = ${data.directory}/logs +transient = true +final = true + +[option treatmentWorkingDirectory] +description = t3.config.treatment.working.directory.description +key = treatment.working.directory +type = file +defaultValue = ${data.directory}/treatments +transient = true +final = true + +[option stratumWeightRatio] +description = t3.config.stratum.weightRatio.description +key = stratum.weightRatio +type = Float +defaultValue = 250 +transient = true +final = true + +[option rf1MinimumRate] +description = t3.config.rf1.minimumrate.description +key = rf1.minimumrate +type = Float +defaultValue = 0.8 +transient = true +final = true + +[option rf1MaximumRate] +description = t3.config.rf1.maximumrate.description +key = rf1.maximumrate +type = Float +defaultValue = 1.2 +transient = true +final = true + +[option rfTotMax] +description = t3.config.rfTot.maximum.description +key = rfTot.maximum +type = Float +defaultValue = 250 +transient = true +final = true + +[option rfMinus10Max] +description = t3.config.rfMinus10.maximum.description +key = rfMinus10.maximum +type = Float +defaultValue = 500 +transient = true +final = true + +[option rfPlus10Max] +description = t3.config.rfPlus10.maximum.description +key = rfPlus10.maximum +type = Float +defaultValue = 500 +transient = true +final = true + +[option rfMinus10MinNumber] +description = t3.config.rfMinus10.minNumber.description +key = rfMinus10.minNumber +type = Integer +defaultValue = 75 +transient = true +final = true + +[option rfPlus10MinNumber] +description = t3.config.rfPlus10.minNumber.description +key = rfPlus10.minNumber +type = Integer +defaultValue = 75 +transient = true +final = true + +[option weightedSetWeight] +description = t3.config.level0.weightedSetWeight.description +key = level0.weightedSetWeight +type = Float +defaultValue = 40 +transient = true +final = true + +[option level2DefaultSpecies] +description = t3.config.level2.defaultSpecies.description +key = level2.defaultSpecies +type = Integer[] +defaultValue = 1,2,3 +transient = true +final = true + +[option level3DefaultSpecies] +description = t3.config.level3.defaultSpecies.description +key = level3.defaultSpecies +type = Integer[] +defaultValue = 1,2,3,4,5,6 +transient = true +final = true + +[option t3DataVersion] +description = t3.config.data.version.description +key = data.version +type = version +defaultValue = +transient = true +final = true + ===================================== t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java deleted ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * #%L - * T3 :: Domain - * %% - * Copyright (C) 2010 - 2017 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; - -import java.util.Locale; -import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.config.ConfigActionDef; -import org.nuiton.config.ConfigOptionDef; - - -import static org.nuiton.i18n.I18n.l; - -/** - * Application config provider (for site generation). - * - * @author Tony Chemit - dev@tchemit.fr - * @since 1.3.1 - */ -public class T3ApplicationConfigProvider implements ApplicationConfigProvider { - - @Override - public String getName() { - return "t3"; - } - - @Override - public String getDescription(Locale locale) { - return l(locale, "t3.application.config"); - } - - @Override - public ConfigOptionDef[] getOptions() { - return T3ConfigurationOption.values(); - } - - @Override - public ConfigActionDef[] getActions() { - return new ConfigActionDef[0]; - } -} ===================================== t3-domain/src/main/java/fr/ird/t3/T3Configuration.java → t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Configuration.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -27,8 +27,8 @@ import com.google.common.io.Resources; import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.net.URL; import java.nio.file.Files; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; @@ -39,7 +39,6 @@ import org.apache.log4j.PropertyConfigurator; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.version.Version; /** * T3 configuration @@ -47,35 +46,31 @@ import org.nuiton.version.Version; * @author Tony Chemit - dev@tchemit.fr * @since 1.0 */ -public class T3Configuration { +public class T3Config extends GeneratedT3Config { /** Logger. */ - protected static Log log = LogFactory.getLog(T3Configuration.class); + protected static Log log = LogFactory.getLog(T3Config.class); - private final MyApplicationConfig config; + public T3Config(Properties defaultProps) { - public T3Configuration(Properties defaultProps) { - - config = new MyApplicationConfig(); - config.setConfigFileName("t3.conf"); + ApplicationConfig applicationConfig = get(); + applicationConfig.loadDefaultOptions(T3ConfigOption.values()); + applicationConfig.setConfigFileName("t3.conf"); if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - config.loadDefaultOptions(T3ConfigurationOption.values()); if (defaultProps != null) { for (Map.Entry<Object, Object> entry : defaultProps.entrySet()) { - config.setDefaultOption( - String.valueOf(entry.getKey()), - String.valueOf(entry.getValue()) + applicationConfig.setDefaultOption(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()) ); } } } - public T3Configuration() { + public T3Config() { this(null); } @@ -90,13 +85,13 @@ public class T3Configuration { // parse configuration (with no parameters) parse(); - createDirectory(T3ConfigurationOption.DATA_DIRECTORY, + createDirectory(T3ConfigOption.DATA_DIRECTORY, "data directory"); - createDirectory(T3ConfigurationOption.USER_LOG_DIRECTORY, + createDirectory(T3ConfigOption.USER_LOG_DIRECTORY, "user logs directory"); - createDirectory(T3ConfigurationOption.TREATMENT_WORKING_DIRECTORY, + createDirectory(T3ConfigOption.TREATMENT_WORKING_DIRECTORY, "treatment workdir directory"); File log4jConfigurationFile = getLog4jConfigurationFile(); @@ -117,20 +112,18 @@ public class T3Configuration { } - public File getLog4jConfigurationFile() { - return config.getOptionAsFile(T3ConfigurationOption.LOG_FILE.key); - } - - protected void parse() { + public void parse() { try { - config.parse(); + get().parse(); } catch (ArgumentsParserException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse configuration", e); - } + throw new IllegalStateException("Could not parse configuration",e); } } + public File getLog4jConfigurationFile() { + return get().getOptionAsFile(T3ConfigOption.LOG_FILE.getKey()); + } + public File getTreatmentWorkingDirectory(String name, boolean create) { File file = getTreatmentWorkingDirectory(); @@ -148,86 +141,19 @@ public class T3Configuration { } public String getApplicationVersion() { - return config.getOption("application.version"); - } - - public Version getT3DataVersion() { - return config.getOptionAsVersion(T3ConfigurationOption.T3_DATA_VERSION.key); - } - - public URL getApplicationSite() { - return config.getOptionAsURL("application.site.url"); - } - - public File getDataDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.DATA_DIRECTORY.key); - } - - public File getInternalDbDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.INTERNAL_DB_DIRECTORY.key); - } - - public File getParameterProfilePath() { - return config.getOptionAsFile(T3ConfigurationOption.PARAMETER_PROFILE_DIRECTORY.key); - } - - public File getTreatmentWorkingDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.TREATMENT_WORKING_DIRECTORY.key); - } - - public File getUserLogDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.USER_LOG_DIRECTORY.key); + return get().getOption("application.version"); } - public Float getWeightedSetWeight() { - return config.getOptionAsFloat(T3ConfigurationOption.WEIGHTED_SET_WEIGHT.key); + public List<Integer> getLevel2DefaultSpeciesAsList() { + return Arrays.asList(getLevel2DefaultSpecies()); } - public Float getStratumWeightRatio() { - return config.getOptionAsFloat(T3ConfigurationOption.STRATUM_WEIGHT_RATIO.key); - } - - public float getRF1MinimumRate() { - return config.getOptionAsFloat(T3ConfigurationOption.RF1_MINIMUM_RATE.key); - } - - public float getRF1MaximumRate() { - return config.getOptionAsFloat(T3ConfigurationOption.RF1_MAXIMUM_RATE.key); - } - - public int getRFTotMax() { - return config.getOptionAsInt(T3ConfigurationOption.RF_TOT_MAX.key); - } - - public int getRFMinus10Max() { - return config.getOptionAsInt(T3ConfigurationOption.RF_MINUS10_MAX.key); - } - - public int getRFPlus10Max() { - return config.getOptionAsInt(T3ConfigurationOption.RF_PLUS10_MAX.key); - } - - public int getRFMinus10MinNumber() { - return config.getOptionAsInt(T3ConfigurationOption.RF_MINUS10_MIN_NUMBER.key); - } - - public int getRFPlus10MinNumber() { - return config.getOptionAsInt(T3ConfigurationOption.RF_PLUS10_MIN_NUMBER.key); - } - - public List<Integer> getLevel2DefaultSpecies() { - ApplicationConfig.OptionList optionAsList = config.getOptionAsList(T3ConfigurationOption.LEVEL2_DEFAULT_SPECIES.key); - return optionAsList.getOptionAsInt(); - } - - public List<Integer> getLevel3DefaultSpecies() { - ApplicationConfig.OptionList optionAsList = config.getOptionAsList(T3ConfigurationOption.LEVEL3_DEFAULT_SPECIES.key); - return optionAsList.getOptionAsInt(); + public List<Integer> getLevel3DefaultSpeciesAsList() { + return Arrays.asList(getLevel3DefaultSpecies()); } public boolean isUpdateSchema() { - Boolean result = config.getOptionAsBoolean("updateSchema"); - return result != null && result; + return get().getOptionAsBoolean("updateSchema"); } /** @@ -237,9 +163,9 @@ public class T3Configuration { * the directory to create * @param name a name used for logs */ - protected void createDirectory(T3ConfigurationOption key, String name) { + private void createDirectory(T3ConfigOption key, String name) { - File directory = config.getOptionAsFile(key.getKey()); + File directory = get().getOptionAsFile(key.getKey()); Preconditions.checkNotNull( directory, @@ -278,7 +204,7 @@ public class T3Configuration { LogManager.resetConfiguration(); PropertyConfigurator.configure(finalLogConfigurationProperties); - log = LogFactory.getLog(T3Configuration.class); + log = LogFactory.getLog(T3Config.class); if (log.isInfoEnabled()) { log.info("Configuration des logs chargée depuis le fichier " + logFile); } @@ -291,17 +217,10 @@ public class T3Configuration { for (Map.Entry<Object, Object> entry : sourceProperties.entrySet()) { String key = (String) entry.getKey(); String value = (String) entry.getValue(); - String newValue = config.replaceRecursiveOptions(value); + String newValue = get().replaceRecursiveOptions(value); targetProperties.setProperty(key, newValue); } return targetProperties; } - private static class MyApplicationConfig extends ApplicationConfig { - - @Override - public String replaceRecursiveOptions(String option) { - return super.replaceRecursiveOptions(option); - } - } } ===================================== t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java deleted ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * #%L - * T3 :: Domain - * %% - * Copyright (C) 2010 - 2017 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; - -import java.io.File; -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.version.Version; - - -import static org.nuiton.i18n.I18n.n; - -/** - * All T3 configuration options. - * - * @since 1.0 - */ -public enum T3ConfigurationOption implements ConfigOptionDef { - - CONTEXT_PATH( - "context.path", - n("t3.config.context.path.description"), - "t3", - String.class), - - /** Main directory where to put t3 data (logs, and others...). */ - DATA_DIRECTORY( - "data.directory", - n("t3.config.data.directory.description"), - "/var/local/t3/${context.path}", - File.class), - INTERNAL_DB_DIRECTORY( - "internal.db.directory", - n("t3.config.internal.db.directory.description"), - "${data.directory}/db", - File.class), - - PARAMETER_PROFILE_DIRECTORY( - "parameterProfiles.storage.directory", - n("t3.config.parameterProfiles.storage.directory.description"), - "${data.directory}/parameter-profiles", - File.class), - - LOG_FILE( - "user.log.file", - n("t3.user.log.file.description"), - "${data.directory}/t3-log.properties", - File.class), - - USER_LOG_DIRECTORY( - "user.log.directory", - n("t3.user.log.directory.description"), - "${data.directory}/logs", - File.class), - - TREATMENT_WORKING_DIRECTORY( - "treatment.working.directory", - n("t3.config.treatment.working.directory.description"), - "${data.directory}/treatments", - File.class), - STRATUM_WEIGHT_RATIO( - "stratum.weightRatio", - n("t3.config.stratum.weightRatio.description"), - "250", - Float.class), - RF1_MINIMUM_RATE( - "rf1.minimumrate", - n("t3.config.rf1.minimumrate.description"), - "0.8", - Float.class), - RF1_MAXIMUM_RATE( - "rf1.maximumrate", - n("t3.config.rf1.maximumrate.description"), - "1.2", - Float.class), - RF_TOT_MAX( - "rfTot.maximum", - n("t3.config.rfTot.maximum.description"), - "250", - Float.class), - RF_MINUS10_MAX( - "rfMinus10.maximum", - n("t3.config.rfMinus10.maximum.description"), - "500", - Float.class), - RF_PLUS10_MAX( - "rfPlus10.maximum", - n("t3.config.rfPlus10.maximum.description"), - "500", - Float.class), - RF_MINUS10_MIN_NUMBER( - "rfMinus10.minNumber", - n("t3.config.rfMinus10.minNumber.description"), - "75", - Integer.class), - RF_PLUS10_MIN_NUMBER( - "rfPlus10.minNumber", - n("t3.config.rfPlus10.minNumber.description"), - "75", - Integer.class), - WEIGHTED_SET_WEIGHT( - "level0.weightedSetWeight", - n("t3.config.level0.weightedSetWeight.description"), - "40", - Float.class), - LEVEL2_DEFAULT_SPECIES( - "level2.defaultSpecies", - n("t3.config.level2.defaultSpecies.description"), - "1,2,3", // YFT, SKJ, BET - int[].class), - LEVEL3_DEFAULT_SPECIES( - "level3.defaultSpecies", - n("t3.config.level3.defaultSpecies.description"), - "1,2,3,4,5,6", // YFT, SKJ, BET, ALB, LTA, FRI - int[].class), - T3_DATA_VERSION( - "data.version", - n("t3.config.data.version.description"), - "", - Version.class),; - - /** Configuration key. */ - protected final String key; - - /** I18n key of option description */ - protected final String description; - - /** Type of option */ - protected final Class<?> type; - - /** Default value of option. */ - protected String defaultValue; - - T3ConfigurationOption(String key, - String description, - String defaultValue, - Class<?> type) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public boolean isTransient() { - return true; - } - - @Override - public boolean isFinal() { - return true; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public void setTransient(boolean newValue) { - // not used - } - - @Override - public void setFinal(boolean newValue) { - // not used - } -} ===================================== t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java @@ -24,7 +24,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.LocaleProvider; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3Messager; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; @@ -112,7 +112,7 @@ public class T3ActionContext<C extends T3ActionConfiguration> implements T3Messa } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return serviceContext.getApplicationConfiguration(); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java @@ -22,8 +22,8 @@ package fr.ird.t3.entities; */ import com.google.common.base.Charsets; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.entities.user.T3UserImpl; import java.io.File; @@ -49,7 +49,7 @@ public class T3UserTopiaApplicationContext extends AbstractT3UserTopiaApplicatio * @param configuration application configuration where to find db directory * @return the new fresh root context of the internal db */ - public static T3UserTopiaApplicationContext newInternalDb(T3Configuration configuration) { + public static T3UserTopiaApplicationContext newInternalDb(T3Config configuration) { URL dbConfigFile = T3UserTopiaApplicationContext.class.getResource(T3_INTERNAL_DB_PROPERTIES); @@ -60,7 +60,7 @@ public class T3UserTopiaApplicationContext extends AbstractT3UserTopiaApplicatio try (InputStreamReader reader = new InputStreamReader(dbConfigFile.openStream(), Charsets.UTF_8)) { result = new RecursiveProperties(); - String key = T3ConfigurationOption.INTERNAL_DB_DIRECTORY.getKey(); + String key = T3ConfigOption.INTERNAL_DB_DIRECTORY.getKey(); result.setProperty(key, internalDbDirectory.getAbsolutePath()); result.load(reader); ===================================== t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaApplicationContext; @@ -43,7 +43,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { private Locale locale; - private final T3Configuration applicationConfiguration; + private final T3Config applicationConfiguration; private final T3ServiceFactory serviceFactory; @@ -69,7 +69,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { T3TopiaApplicationContext transactionContext, T3UserTopiaPersistenceContext internalTransaction, T3TopiaPersistenceContext transaction, - T3Configuration applicationConfiguration, + T3Config applicationConfiguration, T3ServiceFactory serviceFactory) { return new DefaultT3ServiceContext(locale, internalTransactionContext, @@ -85,7 +85,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { T3TopiaApplicationContext applicationContext, T3UserTopiaPersistenceContext internalTransaction, T3TopiaPersistenceContext transaction, - T3Configuration applicationConfiguration, + T3Config applicationConfiguration, T3ServiceFactory serviceFactory) { this.locale = locale; this.internalApplicationContext = internalApplicationContext; @@ -123,7 +123,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaApplicationContext; @@ -48,7 +48,7 @@ public interface T3ServiceContext { Locale getLocale(); - T3Configuration getApplicationConfiguration(); + T3Config getApplicationConfiguration(); T3ServiceFactory getServiceFactory(); ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; import java.util.Locale; @@ -56,7 +56,7 @@ public class T3ServiceSupport implements T3Service { return serviceContext.getLocale(); } - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return serviceContext.getApplicationConfiguration(); } ===================================== t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider deleted ===================================== --- a/t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider +++ /dev/null @@ -1 +0,0 @@ -fr.ird.t3.T3ApplicationConfigProvider \ No newline at end of file ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -66,7 +66,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -88,7 +88,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -96,7 +96,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex }; realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -151,7 +151,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -61,7 +61,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -83,7 +83,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -92,7 +92,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -146,7 +146,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -61,7 +61,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -83,7 +83,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -92,7 +92,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -146,7 +146,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== 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 @@ -25,7 +25,7 @@ package fr.ird.t3.tools; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3ScriptHelper; @@ -192,7 +192,7 @@ public class T3ApplicationInstaller { // initialize configuration - T3Configuration configuration = new T3Configuration(); + T3Config configuration = new T3Config(); configuration.init(); ===================================== t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java ===================================== --- a/t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java +++ b/t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java @@ -23,8 +23,8 @@ */ package fr.ird.t3.tools; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; @@ -68,7 +68,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; private boolean initOk; @@ -86,8 +86,8 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.DATA_DIRECTORY.getKey(), testDir); - applicationConfiguration = new T3Configuration(defaultProps) { + defaultProps.put(T3ConfigOption.DATA_DIRECTORY.getKey(), testDir); + applicationConfiguration = new T3Config(defaultProps) { @Override public void init() { parse(); @@ -141,7 +141,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java ===================================== --- a/t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java +++ b/t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.io.output.balbaya.v32; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -67,7 +67,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -89,7 +89,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -98,7 +98,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -156,7 +156,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java @@ -23,7 +23,7 @@ package fr.ird.t3.web; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3UserTopiaApplicationContext; import java.util.Map; import java.util.Set; @@ -47,7 +47,7 @@ public class T3ApplicationContext { private static final String APPLICATION_CONTEXT_PARAMETER = "t3ApplicationContext"; /** Application configuration. */ - protected T3Configuration configuration; + protected T3Config configuration; /** Root context for the internal database. */ protected T3UserTopiaApplicationContext internalRootContext; @@ -111,11 +111,11 @@ public class T3ApplicationContext { session.close(); } - public T3Configuration getConfiguration() { + public T3Config getConfiguration() { return configuration; } - public void setConfiguration(T3Configuration configuration) { + public void setConfiguration(T3Config configuration) { this.configuration = configuration; } ===================================== 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 @@ -21,8 +21,8 @@ package fr.ird.t3.web; import fr.ird.converter.FloatConverter; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3UserTopiaApplicationContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; @@ -52,7 +52,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.util.converter.ConverterUtil; /** @@ -100,8 +99,8 @@ public class T3ApplicationListener implements ServletContextListener { // initialize configuration Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.CONTEXT_PATH.getKey(), contextPath); - T3Configuration configuration = new T3Configuration(defaultProps); + defaultProps.put(T3ConfigOption.CONTEXT_PATH.getKey(), contextPath); + T3Config configuration = new T3Config(defaultProps); configuration.init(); log = LogFactory.getLog(T3ApplicationListener.class); @@ -211,7 +210,7 @@ public class T3ApplicationListener implements ServletContextListener { T3ServiceContext serviceContext) { try { - T3Configuration configuration = serviceContext.getApplicationConfiguration(); + T3Config configuration = serviceContext.getApplicationConfiguration(); T3UserTopiaApplicationContext internalRootContext = T3UserTopiaApplicationContext.newInternalDb(configuration); applicationContext.setInternalRootContext(internalRootContext); ===================================== t3-web/src/main/java/fr/ird/t3/web/T3Session.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3Session.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3Session.java @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.actions.T3ActionContext; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -295,7 +295,7 @@ public class T3Session implements Closeable, Serializable { if (result == null) { - T3Configuration configuration = T3ActionSupport.getApplicationConfig(); + T3Config configuration = T3ActionSupport.getApplicationConfig(); File userLogDirectory = configuration.getUserLogDirectory(); String filename = String.format(FILE_LOG_PATTERN, ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java @@ -25,7 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; import fr.ird.t3.entities.data.TripTopiaDao; @@ -154,7 +154,7 @@ public class T3ActionSupport extends BaseAction implements TopiaTransactionAware return getApplicationConfig().getApplicationVersion(); } - public static T3Configuration getApplicationConfig() { + public static T3Config getApplicationConfig() { return getT3ApplicationContext().getConfiguration(); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java @@ -43,7 +43,7 @@ public class ComputeRF1ConfigureAction extends AbstractLevel0ConfigureAction<Com protected void loadDefaultConfiguration(ComputeRF1Configuration config) throws TopiaException { super.loadDefaultConfiguration(config); - config.setMinimumRate(getApplicationConfig().getRF1MinimumRate()); - config.setMaximumRate(getApplicationConfig().getRF1MaximumRate()); + config.setMinimumRate(getApplicationConfig().getRf1MinimumRate()); + config.setMaximumRate(getApplicationConfig().getRf1MaximumRate()); } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java @@ -146,19 +146,19 @@ public class ManageLevel1ConfigurationAction extends AbstractConfigureAction<Lev conf.setFleetIds(ids); // default rftotMax - conf.setRfTotMax(getApplicationConfig().getRFTotMax()); + conf.setRfTotMax(getApplicationConfig().getRfTotMax().intValue()); // default rfMinus10Max - conf.setRfMinus10Max(getApplicationConfig().getRFMinus10Max()); + conf.setRfMinus10Max(getApplicationConfig().getRfMinus10Max().intValue()); // default rfPlus10Max - conf.setRfPlus10Max(getApplicationConfig().getRFPlus10Max()); + conf.setRfPlus10Max(getApplicationConfig().getRfPlus10Max().intValue()); // default rfMinus10MinNumber - conf.setRfMinus10MinNumber(getApplicationConfig().getRFMinus10MinNumber()); + conf.setRfMinus10MinNumber(getApplicationConfig().getRfMinus10MinNumber()); // default rfPlus10MinNumber - conf.setRfPlus10MinNumber(getApplicationConfig().getRFPlus10MinNumber()); + conf.setRfPlus10MinNumber(getApplicationConfig().getRfPlus10MinNumber()); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java @@ -185,7 +185,7 @@ public class ConfigureLevel2Step1Action extends AbstractConfigureAction<Level2Co if (!isValidating() && !configurationInSession) { List<Integer> level2DefaultSpecies = - getApplicationConfig().getLevel2DefaultSpecies(); + getApplicationConfig().getLevel2DefaultSpeciesAsList(); // use default species for (Species aSpecies : conf.getSpecies()) { ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java @@ -182,7 +182,7 @@ public class ConfigureLevel3Step1Action extends AbstractConfigureAction<Level3Co if (!isValidating() && !configurationInSession) { List<Integer> level3DefaultSpecies = - getApplicationConfig().getLevel3DefaultSpecies(); + getApplicationConfig().getLevel3DefaultSpeciesAsList(); // keep default species of level 3 for (Species aSpecies : conf.getSpecies()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/4acaac547cc4a82ef291bc7c478a3e10e...