This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c7cacd18d8e7322ec3525f45a81b44608172725e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 09:43:42 2016 +0100 Numerious code cleaning --- .../ObserveSwingApplicationConfig.java | 3 +- .../observe/application/swing/ObserveCLAction.java | 9 +- .../swing/db/constants/ConnexionStatus.java | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 8 +- .../swing/ui/content/ContentUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIModel.java | 122 ++++++++++----------- .../swing/ui/storage/StorageUILauncher.java | 5 - .../swing/ui/storage/StorageUIModel.java | 5 - .../swing/ui/tree/navigation/NavigationTree.java | 5 - .../application/swing/ui/util/BooleanEditor.java | 3 +- .../AutotSelectRowAndShowPopupActionSupport.java | 3 - .../configuration/user/ObserveWebUsersHelper.java | 2 +- .../controller/v1/DataSourceServiceController.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 10 +- .../observe/entities/longline/SetLonglineImpl.java | 10 -- .../services/rest/http/ObserveRequestBuilder.java | 3 +- .../ng/ReferentialSynchronizeServiceTopia.java | 6 - .../validate/ValidationMessageDetector.java | 6 +- .../topia/service/sql/MigrateTestsDatabases.java | 6 +- .../java/fr/ird/observe/services/dto/IdHelper.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 8 +- .../ird/observe/test/TestClassResourceSupport.java | 2 +- .../toolbox/GenerateWebmotionMappingMojo.java | 2 +- 24 files changed, 88 insertions(+), 140 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index 9f2211f..ccf74f4 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -40,7 +40,6 @@ import org.nuiton.version.Versions; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -155,7 +154,7 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat delegate.setConfigFileName(confFileName); } - public void initConfig(Properties p, String... args) throws IOException, ArgumentsParserException { + public void initConfig(Properties p, String... args) throws ArgumentsParserException { Version version = null; ApplicationConfig applicationConfig = get(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java index 56ec52f..727dbce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.application.swing; -import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigAction; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigAction; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.application.swing.ui.ObserveMainUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminStep; @@ -34,7 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Console; -import java.io.IOException; import java.util.Arrays; import java.util.EnumSet; @@ -172,7 +171,7 @@ public class ObserveCLAction { // getConfig().setOption(AbstractDataSourceMigration.AUTO_MIGRATE, "false"); if (operation == ObstunaAdminAction.UPDATE || - operation == ObstunaAdminAction.CREATE) { + operation == ObstunaAdminAction.CREATE) { getConfig().setObstunaCanMigrate(true); } @@ -182,7 +181,7 @@ public class ObserveCLAction { launchAction(t(launcher.getTitle()), runnable); } - public void launchH2ServerMode() throws InterruptedException { + public void launchH2ServerMode() { if (!config.isLocalStorageExist()) { if (log.isErrorEnabled()) { @@ -196,7 +195,7 @@ public class ObserveCLAction { } } - public void createId(String className, int nbId) throws IOException { + public void createId(String className, int nbId) { disableMainUI(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java index f95fc0c..43c78c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java @@ -34,6 +34,6 @@ public enum ConnexionStatus { /** lorsque le test de connexion a abouti */ SUCCESS, /** lorsque le test de connexion a echoue */ - FAILED; + FAILED } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index 5fe80ee..847cba1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -70,7 +70,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple addAdminWorker(ui.getStartButton().getToolTipText(), this::doAction); } - public WizardState doAction() throws Exception { + public WizardState doAction() { if (log.isDebugEnabled()) { log.debug(this); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index e154f7c..a0039a6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -27,7 +27,6 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; -import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.config.ConfigModel; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; @@ -41,8 +40,8 @@ import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.service.data.DeleteTripRequest; import fr.ird.observe.services.service.data.DeleteTripResult; import fr.ird.observe.services.service.data.ExportTripRequest; @@ -124,11 +123,6 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple return model.getDataSynchroModel(); } - @Override - public void updateState(AdminTabUI ui, WizardState newState) { - super.updateState(ui, newState); - } - public void doStartAction() { addAdminWorker(getUi().getStartAction().getToolTipText(), this::doStartAction0); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 0462159..29344b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -693,7 +693,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return ObserveSwingApplicationContext.get().getOpenDataManager(); } - protected boolean doSave(E bean) throws Exception { + protected boolean doSave(E bean) { return false; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java index 5c68172..c6bf35d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java @@ -94,36 +94,36 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends ReferentialDto.PROPERTY_NEED_COMMENT }; - /** liste des proprietes presents sur les entites taillePoidsAble */ - private final static String[] DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES = { - LengthWeightParameterDto.PROPERTY_START_DATE, - LengthWeightParameterDto.PROPERTY_END_DATE, - LengthWeightParameterDto.PROPERTY_OCEAN, - LengthWeightParameterDto.PROPERTY_SPECIES, - LengthWeightParameterDto.PROPERTY_SEX, - LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, - LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA, - LengthWeightParameterDto.PROPERTY_COEFFICIENTS, - LengthWeightParameterDto.PROPERTY_MEAN_LENGTH, - LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT - }; - - /** liste des proprietes presents sur les entites i18n */ - private final static String[] DEFAULT_I18N_PROPERTIES = { - I18nReferentialDto.PROPERTY_LABEL1, - I18nReferentialDto.PROPERTY_LABEL2, - I18nReferentialDto.PROPERTY_LABEL3, - I18nReferentialDto.PROPERTY_LABEL4, - I18nReferentialDto.PROPERTY_LABEL5, - I18nReferentialDto.PROPERTY_LABEL6, - I18nReferentialDto.PROPERTY_LABEL7, - I18nReferentialDto.PROPERTY_LABEL8 - }; +// /** liste des proprietes presents sur les entites taillePoidsAble */ +// private final static String[] DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES = { +// LengthWeightParameterDto.PROPERTY_START_DATE, +// LengthWeightParameterDto.PROPERTY_END_DATE, +// LengthWeightParameterDto.PROPERTY_OCEAN, +// LengthWeightParameterDto.PROPERTY_SPECIES, +// LengthWeightParameterDto.PROPERTY_SEX, +// LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, +// LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA, +// LengthWeightParameterDto.PROPERTY_COEFFICIENTS, +// LengthWeightParameterDto.PROPERTY_MEAN_LENGTH, +// LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT +// }; + +// /** liste des proprietes presents sur les entites i18n */ +// private final static String[] DEFAULT_I18N_PROPERTIES = { +// I18nReferentialDto.PROPERTY_LABEL1, +// I18nReferentialDto.PROPERTY_LABEL2, +// I18nReferentialDto.PROPERTY_LABEL3, +// I18nReferentialDto.PROPERTY_LABEL4, +// I18nReferentialDto.PROPERTY_LABEL5, +// I18nReferentialDto.PROPERTY_LABEL6, +// I18nReferentialDto.PROPERTY_LABEL7, +// I18nReferentialDto.PROPERTY_LABEL8 +// }; private static final long serialVersionUID = 1L; - /** la liste des propriétés du bean a charger */ - private final String[] properties; +// /** la liste des propriétés du bean a charger */ +// private final String[] properties; /** la liste des propriétés faisant partie de la clef metier */ private final String[] naturalIds; @@ -158,8 +158,8 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends // la clef naturelle par defaut est la premiere des properties this.naturalIds = useDefault ? new String[]{DEFAULT_PROPERTIES[0]} : naturalIds; - List<String> properties = buildProperties(useDefault, extraProperties); - this.properties = properties.toArray(new String[properties.size()]); +// List<String> properties = buildProperties(useDefault, extraProperties); +// this.properties = properties.toArray(new String[properties.size()]); List<String> bindings = buildDataBindings(useDefault, extraBindings); this.dataBinding = bindings.toArray(new String[bindings.size()]); @@ -185,37 +185,37 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends firePropertyChange(PROPERTY_SELECTED_BEAN, oldvalue, selectedBean); } - /** - * construction de la liste des propriétés a binder pour une entite. - * - * @param usedefault un drapeau pour savoir si on doit conserver la premiere valeur par defaut - * @param properties les propriétés supplémentaires a ajouter en plus de - * celles communes - * @return la liste des toutes les proprietes utilises sur l'entite edite dans l'ui - */ - private final List<String> buildProperties(boolean usedefault, String[] properties) { - - List<String> result = new ArrayList<>(); - result.addAll(Arrays.asList(DEFAULT_PROPERTIES)); - if (properties != null) { - result.addAll(Arrays.asList(properties)); - } - Class<E> beanType = getBeanType(); - - if (I18nReferentialDto.class.isAssignableFrom(beanType)) { - result.addAll(Arrays.asList(DEFAULT_I18N_PROPERTIES)); - } - if (LengthWeightParameterDto.class.isAssignableFrom(beanType)) { - result.addAll(Arrays.asList(DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES)); - } - if (!usedefault) { - - // on supprime le premiere valeur - result.remove(DEFAULT_PROPERTIES[0]); - } - return result; - - } +// /** +// * construction de la liste des propriétés a binder pour une entite. +// * +// * @param usedefault un drapeau pour savoir si on doit conserver la premiere valeur par defaut +// * @param properties les propriétés supplémentaires a ajouter en plus de +// * celles communes +// * @return la liste des toutes les proprietes utilises sur l'entite edite dans l'ui +// */ +// private final List<String> buildProperties(boolean usedefault, String[] properties) { +// +// List<String> result = new ArrayList<>(); +// result.addAll(Arrays.asList(DEFAULT_PROPERTIES)); +// if (properties != null) { +// result.addAll(Arrays.asList(properties)); +// } +// Class<E> beanType = getBeanType(); +// +// if (I18nReferentialDto.class.isAssignableFrom(beanType)) { +// result.addAll(Arrays.asList(DEFAULT_I18N_PROPERTIES)); +// } +// if (LengthWeightParameterDto.class.isAssignableFrom(beanType)) { +// result.addAll(Arrays.asList(DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES)); +// } +// if (!usedefault) { +// +// // on supprime le premiere valeur +// result.remove(DEFAULT_PROPERTIES[0]); +// } +// return result; +// +// } /** * construction de la liste des databindings utiliser pour une entite. @@ -225,7 +225,7 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends * ceux communs * @return la liste de tous les databindings utilises sur l'entite edite dans l'ui */ - private final List<String> buildDataBindings(boolean usedefault, String[] dataBinding) { + private List<String> buildDataBindings(boolean usedefault, String[] dataBinding) { List<String> result = new ArrayList<>(); result.addAll(Arrays.asList(DEFAULT_DATABINDING)); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java index 7eb1229..0c1bd1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java @@ -419,11 +419,6 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod } @Override - public void start() { - super.start(); - } - - @Override protected StorageUI createUI(JAXXContext context, Window mainUI, Class<StorageUI> storageUIClass, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 891f7dd..7379942 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1250,11 +1250,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { this.excludeSteps = excludeSteps; } - @Override - public void destroy() { - super.destroy(); - } - public void setShowMigrationSql(boolean showMigrationSql) { boolean oldValue = pgConfig.isShowMigrationSql(); pgConfig.setShowMigrationSql(showMigrationSql); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index 03ac7c9..fc134d2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -154,11 +154,6 @@ public class NavigationTree extends JXTree { } - @Override - public String getStringAt(int row) { - return super.getStringAt(row); - } - public NavigationTreeModel getTreeModel() { return (NavigationTreeModel) getModel(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java index 3c8147d..307a9dc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java @@ -104,8 +104,7 @@ public class BooleanEditor extends JComboBox { ValueEntry that = (ValueEntry) o; - if (!text.equals(that.text)) return false; - return value == that.value; + return text.equals(that.text) && value == that.value; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java index 39438ad..6682ac7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java @@ -48,14 +48,11 @@ public abstract class AutotSelectRowAndShowPopupActionSupport { /** Logger. */ private static final Log log = LogFactory.getLog(AutotSelectRowAndShowPopupActionSupport.class); - private final JScrollPane pane; - private final JTable table; private final JPopupMenu popup; protected AutotSelectRowAndShowPopupActionSupport(JScrollPane pane, final JTable table, JPopupMenu popup) { - this.pane = pane; this.table = table; this.popup = popup; diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java index 1273a6a..d0b8735 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java @@ -58,7 +58,7 @@ public class ObserveWebUsersHelper { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveWebUsersHelper.class); - public ObserveWebUsersImmutable load(ObserveWebDatabases databases, File file) throws InvalidObserveWebUsersException, InvalidObserveWebUserException, InvalidObserveWebUserPermissionException { + public ObserveWebUsersImmutable load(ObserveWebDatabases databases, File file) throws InvalidObserveWebUserException, InvalidObserveWebUserPermissionException { ObserveWebUsersBean observeWebUsersBean = loadBean(file); validateObserveWebUsersBean(databases, observeWebUsersBean); diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index ca739d2..0b7574f 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -156,7 +156,7 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport Optional<String> optionalDatabaseName = dataSourceConfigurationRest.getOptionalDatabaseName(); ObserveWebSecurityApplicationContext securityApplicationContext = getSecurityApplicationContext(); - return securityApplicationContext.getDataSourceConfiguration(login, password, optionalDatabaseName); + return securityApplicationContext.getDataSourceConfiguration(login, password, optionalDatabaseName.orElse(null)); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index 9585c28..4c610b8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -159,15 +159,11 @@ public class ObserveWebSecurityApplicationContext implements Closeable { * Si la base n'est pas spécifiée, on utilise alors la base par défaut du serveur. * * @param userLogin le login de l'utilisateur - * @param optionalDatabaseName le nom de la base à utiliser + * @param databaseName le nom de la base à utiliser * @return la configuration de source de données associée à l'utilisateur et la base donnée * @throws UnknownObserveWebUserForDatabaseException si l'utilisateur n'est pas connu */ - public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, Optional<String> optionalDatabaseName) throws UnknownObserveWebUserForDatabaseException { - - // Get database name - String databaseName; - databaseName = optionalDatabaseName.orElse(defaultDatabaseName); + public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, String databaseName) throws UnknownObserveWebUserForDatabaseException { // Get data source configuration key cache String userKey = getUserKey(userLogin, databaseName); @@ -198,7 +194,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable { } - public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, String userPassword, Optional<String> optionalDatabaseName) { + public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, String userPassword, String optionalDatabaseName) { if (Strings.isNullOrEmpty(userLogin)) { throw new UserLoginNotFoundException(); diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java index a751eac..89fa7b3 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java @@ -127,16 +127,6 @@ public class SetLonglineImpl extends SetLonglineAbstract { } @Override - public Float getHaulingEndLongitude() { - return super.getHaulingEndLongitude(); - } - - @Override - public Float getHaulingEndLatitude() { - return super.getHaulingEndLatitude(); - } - - @Override public Date getSettingStartDate() { return settingStartTimeStamp == null ? null : DateUtil.getDay(settingStartTimeStamp); } diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java index d53306e..737704d 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java @@ -32,7 +32,6 @@ import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.Objects; import java.util.function.Supplier; @@ -108,7 +107,7 @@ public class ObserveRequestBuilder { return addParameter(parameterName, json); } - public ObserveRequestBuilder addParameter(String parameterName, Collection<?> toJsonList) throws IOException { + public ObserveRequestBuilder addParameter(String parameterName, Collection<?> toJsonList) { // we must add values with same paramName to get List<?> in service for (Object toJson : toJsonList) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java index ebad548..48b7f4f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java @@ -25,7 +25,6 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.ng; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeSqlsRequest; -import fr.ird.observe.services.topia.ObserveServiceContextTopia; import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,11 +43,6 @@ public class ReferentialSynchronizeServiceTopia extends ObserveServiceTopia impl private static final TimeLog timeLog = new TimeLog(ReferentialSynchronizeServiceTopia.class); @Override - public void setServiceContext(ObserveServiceContextTopia serviceContext) { - super.setServiceContext(serviceContext); - } - - @Override public ReferentialSynchronizeSqlsRequest produceSqlsRequest(ReferentialSynchronizeRequest request) { long startTime = TimeLog.getTime(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java index 8ec3db4..79d2592 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java @@ -278,13 +278,11 @@ public class ValidationMessageDetector { protected boolean alreadyContains(Collection<ValidationMessage> currentMessages, ValidationMessage validationMessage) { return currentMessages .stream() - .filter( + .anyMatch( message -> message.getScope().equals(validationMessage.getScope()) && message.getFieldName().equals(validationMessage.getFieldName()) && message.getMessage().equals(validationMessage.getMessage()) - ) - .findFirst() - .isPresent(); + ); } protected TopiaEntity getTopiaValue(Object value) { diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java index 159100f..1f1b278 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java @@ -107,7 +107,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @DatabaseNameConfiguration(DatabaseName.dataForTestUnidirectionalReferentialSynchro) @Test @Ignore - public void migrateDataForTestUnidirectionalReferentialSynchroDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + public void migrateDataForTestUnidirectionalReferentialSynchroDb() throws IOException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); @@ -115,13 +115,13 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test - public void migrateEmptyPgDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + public void migrateEmptyPgDb() throws IOException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres().addSchema(); dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(DatabaseName.empty_pg.name(), service.produceAddSqlScript(request)); } - private void migrate(AddSqlScriptProducerResult dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + private void migrate(AddSqlScriptProducerResult dump) throws IOException { migrate(topiaTestMethodResource.getDbName(), dump); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java b/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java index cc7f6f4..1a4e473 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java @@ -51,7 +51,7 @@ public class IdHelper extends GeneratedIdHelper { } public static <BeanType extends IdDto> boolean exists(Collection<BeanType> source, String id) { - return source.stream().filter(newIdPredicate(id)::test).findFirst().isPresent(); + return source.stream().anyMatch(newIdPredicate(id)::test); // return Iterables.tryFind(source, newIdPredicate(id)).isPresent(); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java index 089099b..5c444d4 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java @@ -47,13 +47,11 @@ public class RouteDto extends GeneratedRouteDto { public boolean isTimeAvailable(String activitySeineId, Date time) { Date currentTime = DateUtil.getTime(time, false, false); - return ! getActivitySeine() + return !getActivitySeine() .stream() - .filter(activity -> + .anyMatch(activity -> Objects.equals(currentTime, activity.getTimeSecond()) - && ! Objects.equals(activitySeineId, activity.getId())) - .findFirst() - .isPresent(); + && ! Objects.equals(activitySeineId, activity.getId())); } public ActivitySeineStubDto getPreviousActivity(String activitySeineId) { diff --git a/test/src/main/java/fr/ird/observe/test/TestClassResourceSupport.java b/test/src/main/java/fr/ird/observe/test/TestClassResourceSupport.java index b8fa2b4..2ee4fa6 100644 --- a/test/src/main/java/fr/ird/observe/test/TestClassResourceSupport.java +++ b/test/src/main/java/fr/ird/observe/test/TestClassResourceSupport.java @@ -118,7 +118,7 @@ public abstract class TestClassResourceSupport implements TestRule { }; } - protected void before(Description description) throws IOException { + protected void before(Description description) { Class<?> testClass = description.getTestClass(); if (log.isDebugEnabled()) { diff --git a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java index e8a07c2..05b30ae 100644 --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java @@ -236,7 +236,7 @@ public class GenerateWebmotionMappingMojo extends ToolboxMojoSupport { this.verbose = verbose; } - private void generateForClass(Class<?> sourceClass, String targetClassName, Map<String, String> rules) throws MissingMethodException, MismatchMethodParameterNameException, MissingClassException, IOException, ClassNotFoundException { + private void generateForClass(Class<?> sourceClass, String targetClassName, Map<String, String> rules) { Objects.requireNonNull(sourceClass); Objects.requireNonNull(targetClassName); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.