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 700b9ab63b35b46e0563bede4f8034f92a1eede1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 09:25:58 2016 +0100 Numerious code cleaning --- .../application/swing/ObserveActionExecutor.java | 11 +++----- .../application/swing/ObserveResourceManager.java | 30 +++++----------------- .../ird/observe/application/swing/ui/UIHelper.java | 20 +++++++-------- .../content/MoveActivityLonglinesUIAction.java | 4 +-- .../content/MoveActivitySeinesUIAction.java | 4 +-- .../ui/actions/content/MoveRoutesUIAction.java | 4 +-- .../ReferentialSynchronizeTreeModelsBuilder.java | 16 +++--------- .../longline/GearUseFeaturesLonglineUIHandler.java | 10 +------- .../table/impl/seine/AbstractSampleUIHandler.java | 12 +++------ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 10 +------- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +-- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +-- .../table/impl/seine/TargetSampleUIHandler.java | 4 +-- .../db/impl/ObserveWebDatabaseImmutable.java | 2 +- .../db/impl/ObserveWebDatabasesBean.java | 2 +- .../db/impl/ObserveWebDatabasesImmutable.java | 4 +-- .../ObserveWebSecurityApplicationContext.java | 6 +---- .../migration/H2DataSourceMigration.java | 20 +++------------ .../migration/PGDataSourceMigration.java | 15 +++-------- .../old/DataSourceMigrationForVersion_3_16.java | 5 +--- .../old/DataSourceMigrationForVersion_4_0_1.java | 10 ++------ .../old/DataSourceMigrationForVersion_4_0_RC2.java | 5 +--- .../old/DataSourceMigrationForVersion_4_0_RC3.java | 5 +--- .../service/actions/report/ReportServiceTopia.java | 6 +---- .../service/data/seine/RouteServiceTopia.java | 4 +-- .../dto/referential/ReferentialMultimap.java | 2 +- .../fr/ird/observe/services/gson/ClassAdapter.java | 6 +---- .../services/service/actions/report/Report.java | 2 +- .../service/actions/report/ReportBuilder.java | 5 +--- .../templates/TopiaMetadataModelGenerator.java | 6 +---- 30 files changed, 59 insertions(+), 179 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java index e08a648..b2e8cf1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java @@ -257,14 +257,11 @@ public class ObserveActionExecutor extends ActionExecutor { executorService = new ThreadPoolExecutor(5, 10, 10L, TimeUnit.MINUTES, new LinkedBlockingQueue<>(), threadFactory); - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - if (executorService != null) { - executorService.shutdownNow(); - } + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + if (executorService != null) { + executorService.shutdownNow(); } - }); + })); } return executorService; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java index 7eb68df..9ea07c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java @@ -149,15 +149,10 @@ public class ObserveResourceManager { protected Properties load(URL url) throws IOException { Properties result;// chargement une unique fois de la resource - InputStream in = openInternalStream(url); - try { + try (InputStream in = openInternalStream(url)) { result = new Properties(); result.load(in); - - - } finally { - in.close(); } return result; } @@ -166,30 +161,23 @@ public class ObserveResourceManager { File file, String message) throws IOException { - FileOutputStream out = new FileOutputStream(file); - try { + try (FileOutputStream out = new FileOutputStream(file)) { // on fait une copie brute en ne passant pas par un Properties // qui perd le formatage et les commentaires // chargement des ressources - InputStreamReader in = - new InputStreamReader( - new BufferedInputStream( - openInternalStream(resource.getUrl())), - "utf-8"); // sauvegarde dans le fichier cible - try { + try (InputStreamReader in = new InputStreamReader( + new BufferedInputStream( + openInternalStream(resource.getUrl())), + "utf-8")) { IOUtils.copy(in, out, "utf-8"); - } finally { - in.close(); } if (log.isInfoEnabled()) { log.info(message); } - } finally { - out.close(); } } @@ -308,13 +296,9 @@ public class ObserveResourceManager { File dir = config.get().getOptionAsFile(option.getKey()); createDirectory(dir); - InputStream inputStream = openInternalStream(resource.getUrl()); - try { + try (InputStream inputStream = openInternalStream(resource.getUrl())) { ZipUtil.uncompress(inputStream, dir); return dir; - } finally { - inputStream.close(); - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 9e33bf5..dee9a79 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -240,17 +240,15 @@ public class UIHelper extends SwingUtil { dialog.pack(); dialog.setLocationRelativeTo(mainUI); - final PropertyChangeListener listener = new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - // Let the defaultCloseOperation handle the closing - // if the user closed the window without selecting a button - // (newValue = null in that case). Otherwise, close the dialog. - if (dialog.isVisible() && event.getSource() == pane && - (event.getPropertyName().equals(VALUE_PROPERTY)) && - event.getNewValue() != null && - event.getNewValue() != JOptionPane.UNINITIALIZED_VALUE) { - dialog.setVisible(false); - } + final PropertyChangeListener listener = event -> { + // Let the defaultCloseOperation handle the closing + // if the user closed the window without selecting a button + // (newValue = null in that case). Otherwise, close the dialog. + if (dialog.isVisible() && event.getSource() == pane && + (event.getPropertyName().equals(VALUE_PROPERTY)) && + event.getNewValue() != null && + event.getNewValue() != JOptionPane.UNINITIALIZED_VALUE) { + dialog.setVisible(false); } }; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java index 1d6719a..64eeb64 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java @@ -164,9 +164,7 @@ public class MoveActivityLonglinesUIAction extends AbstractContentUIAction { .findFirst(); // If so, we close it to avoid ending up with an open activity into a closed trip. - if (openActivity.isPresent()) { - openDataManager.closeActivityLongline(openActivity.get()); - } + openActivity.ifPresent(openDataManager::closeActivityLongline); // Let's reload the sub tree of each activities node. // As the change have already be done in database, we just call the child loaders to regenerate the activities nodes sub trees diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java index f99d0fa..e78cdcd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java @@ -155,9 +155,7 @@ public class MoveActivitySeinesUIAction extends AbstractContentUIAction { .findFirst(); // If so, we close it to avoid ending up with an open activity into a closed route. - if (openActivity.isPresent()) { - openDataManager.closeActivitySeine(openActivity.get()); - } + openActivity.ifPresent(openDataManager::closeActivitySeine); // Let's reload the sub tree of each activities node. // As the change have already be done in database, we just call the child loaders to regenerate the activities nodes sub trees diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java index fc9da14..6d2c7ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java @@ -151,9 +151,7 @@ public class MoveRoutesUIAction extends AbstractContentUIAction { .findFirst(); // If so, we close it to avoid ending up with an open route into a closed trip. - if (openRoute.isPresent()) { - openDataManager.closeRoute(openRoute.get()); - } + openRoute.ifPresent(openDataManager::closeRoute); // Let's reload the sub tree of each routes node. // As the change have already be done in database, we just call the child loaders to regenerate the routes nodes sub trees diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index 3701cbf..f99eb06 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -92,30 +92,22 @@ public class ReferentialSynchronizeTreeModelsBuilder { { // Tous les référentiels ajoutés à gauche peuvent être copié à droite Optional<ImmutableSet<ReferentialSynchronizeDiffState>> optionalDiffStates = leftDiff.getAddedReferentials(referentialName); - if (optionalDiffStates.isPresent()) { - addFromLeft(leftRootNode, optionalDiffStates.get(), referentialName, leftAddNode); - } + optionalDiffStates.ifPresent(referentialSynchronizeDiffStates -> addFromLeft(leftRootNode, referentialSynchronizeDiffStates, referentialName, leftAddNode)); } { // Tous les référentiels mises à jour à gauche peuvent être copié à droite Optional<ImmutableSet<ReferentialSynchronizeDiffState>> optionalDiffStates = leftDiff.getUpdatedReferentials(referentialName); - if (optionalDiffStates.isPresent()) { - addFromLeft(leftRootNode, optionalDiffStates.get(), referentialName, leftUpdateNode); - } + optionalDiffStates.ifPresent(referentialSynchronizeDiffStates -> addFromLeft(leftRootNode, referentialSynchronizeDiffStates, referentialName, leftUpdateNode)); } { // Tous les référentiels ajoutés à droite peuvent être supprimé ou désactivés Optional<ImmutableSet<ReferentialSynchronizeDiffState>> optionalDiffStates = rightDiff.getAddedReferentials(referentialName); - if (optionalDiffStates.isPresent()) { - addFromRight(rightRootNode, optionalDiffStates.get(), referentialName, rightAddNode); - } + optionalDiffStates.ifPresent(referentialSynchronizeDiffStates -> addFromRight(rightRootNode, referentialSynchronizeDiffStates, referentialName, rightAddNode)); } { // Tous les référentiels mises à jour à droite peuvent être remis en arrière Optional<ImmutableSet<ReferentialSynchronizeDiffState>> optionalDiffStates = rightDiff.getUpdatedReferentials(referentialName); - if (optionalDiffStates.isPresent()) { - addFromRight(rightRootNode, optionalDiffStates.get(), referentialName, rightUpdateNode); - } + optionalDiffStates.ifPresent(referentialSynchronizeDiffStates -> addFromRight(rightRootNode, referentialSynchronizeDiffStates, referentialName, rightUpdateNode)); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 2efacef..7538154 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -468,15 +468,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // On ne persiste pas les measurements qui sont vides bean.getGearUseFeaturesLongline().stream() .filter(gearUseFeatures -> !gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) - .forEach(gearUseFeatures -> { - Iterator<GearUseFeaturesMeasurementLonglineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); - while (iterator.hasNext()) { - GearUseFeaturesMeasurementLonglineDto gearUseFeaturesMeasurement = iterator.next(); - if (gearUseFeaturesMeasurement.isEmpty()) { - iterator.remove(); - } - } - }); + .forEach(gearUseFeatures -> gearUseFeatures.getGearUseFeaturesMeasurement().removeIf(GearUseFeaturesMeasurementLonglineDto::isEmpty)); SaveResultDto saveResult = getTripLonglineGearUseService().save(bean); saveResult.toDto(bean); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java index 590936c..1ae3367 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java @@ -69,15 +69,9 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, protected AbstractSampleUIHandler() { super(DataContextType.SetSeine); - weightChanged = evt -> { - onWeightChanged((Float) evt.getNewValue()); - }; - lengthChanged = evt -> { - onLengthChanged((Float) evt.getNewValue()); - }; - speciesChanged = evt -> { - onSpeciesChanged((ReferentialReference<SpeciesDto>) evt.getNewValue()); - }; + weightChanged = evt -> onWeightChanged((Float) evt.getNewValue()); + lengthChanged = evt -> onLengthChanged((Float) evt.getNewValue()); + speciesChanged = evt -> onSpeciesChanged((ReferentialReference<SpeciesDto>) evt.getNewValue()); } public abstract void resetIsWeightComputed(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index ea88adc..7781d4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -467,15 +467,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // On ne persiste pas les measurements qui sont vides bean.getGearUseFeaturesSeine().stream() .filter(gearUseFeatures -> !gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) - .forEach(gearUseFeatures -> { - Iterator<GearUseFeaturesMeasurementSeineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); - while (iterator.hasNext()) { - GearUseFeaturesMeasurementSeineDto gearUseFeaturesMeasurement = iterator.next(); - if (gearUseFeaturesMeasurement.isEmpty()) { - iterator.remove(); - } - } - }); + .forEach(gearUseFeatures -> gearUseFeatures.getGearUseFeaturesMeasurement().removeIf(GearUseFeaturesMeasurementSeineDto::isEmpty)); SaveResultDto saveResult = getTripSeineGearUseService().save(bean); saveResult.toDto(bean); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 027a047..e94df8b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -164,9 +164,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } ui.getSizeMeasureType().setSelectedItem(null); - if (sizeMeasureType.isPresent()) { - ui.getSizeMeasureType().setSelectedItem(sizeMeasureType.get()); - } + sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); ui.getSpecies().setData(availableEspeces); UIHelper.askFocus(requestFocus); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 997e808..a193b9b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -373,9 +373,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT Optional<ReferentialReference<SpeciesDto>> optionalSpecies = getWeightCategorySpecies(cat); - if (optionalSpecies.isPresent()) { - usedSpecies.add(optionalSpecies.get()); - } + optionalSpecies.ifPresent(usedSpecies::add); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 586a444..9062463 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -180,9 +180,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar ui.getAcquisitionModeGroup().setSelectedValue(modeSaisieEchantillonEnum); ui.getSizeMeasureType().setSelectedItem(null); - if (sizeMeasureType.isPresent()) { - ui.getSizeMeasureType().setSelectedItem(sizeMeasureType.get()); - } + sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); // on met a jour l'espece ui.getSpecies().setSelectedItem(null); diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java index 6c84d2c..f1d94b7 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java @@ -53,7 +53,7 @@ public class ObserveWebDatabaseImmutable implements ObserveWebDatabase<ObserveWe this.name = name; this.defaultDatabase = defaultDatabase; this.url = url; - this.roles = Maps.uniqueIndex(roles, input -> input.getLogin()); + this.roles = Maps.uniqueIndex(roles, ObserveWebDatabaseRoleImmutable::getLogin); } @Override diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java index 56e72ec..df62f29 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java @@ -59,7 +59,7 @@ public class ObserveWebDatabasesBean implements ObserveWebDatabases<ObserveWebDa public ObserveWebDatabasesImmutable toImmutable() { - return new ObserveWebDatabasesImmutable(Iterables.transform(databases, input -> input.toImmutable())); + return new ObserveWebDatabasesImmutable(Iterables.transform(databases, ObserveWebDatabaseBean::toImmutable)); } public void setDatabases(LinkedHashSet<ObserveWebDatabaseBean> databases) { diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java index 5e9ca65..71cb987 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java @@ -43,7 +43,7 @@ public class ObserveWebDatabasesImmutable implements ObserveWebDatabases<Observe private final ObserveWebDatabaseImmutable defaultDatabase; public ObserveWebDatabasesImmutable(Iterable<ObserveWebDatabaseImmutable> databases) { - this.databases = Maps.uniqueIndex(databases, input -> input.getName()); + this.databases = Maps.uniqueIndex(databases, ObserveWebDatabaseImmutable::getName); ObserveWebDatabaseImmutable defaultDb = null; for (ObserveWebDatabaseImmutable database : databases) { @@ -79,7 +79,7 @@ public class ObserveWebDatabasesImmutable implements ObserveWebDatabases<Observe public ObserveWebDatabasesBean toBean() { ObserveWebDatabasesBean observeWebDatabasesBean = new ObserveWebDatabasesBean(); - observeWebDatabasesBean.setDatabases(Sets.newLinkedHashSet(Iterables.transform(getDatabases(), input -> input.toBean()))); + observeWebDatabasesBean.setDatabases(Sets.newLinkedHashSet(Iterables.transform(getDatabases(), ObserveWebDatabaseImmutable::toBean))); return observeWebDatabasesBean; } 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 98e5fcc..958195c 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 @@ -167,11 +167,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable { // Get database name String databaseName; - if (optionalDatabaseName.isPresent()) { - databaseName = optionalDatabaseName.get(); - } else { - databaseName = defaultDatabaseName; - } + databaseName = optionalDatabaseName.orElse(defaultDatabaseName); // Get data source configuration key cache String userKey = getUserKey(userLogin, databaseName); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java index 59477ae..6f6eb88 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java @@ -123,8 +123,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.Constraints WHERE (CONSTRAINT_TYPE='UNIQUE' OR CONSTRAINT_TYPE='REFERENTIAL') AND TABLE_NAME='%S';", tableName); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -132,8 +131,6 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); @@ -146,8 +143,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.Constraints WHERE CONSTRAINT_TYPE='REFERENTIAL' AND TABLE_NAME='%S';", tableName); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -155,8 +151,6 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); @@ -173,8 +167,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { "AND CONSTRAINT_SCHEMA='%S' " + "AND TABLE_NAME='%S' " + "AND COLUMN_LIST='%S';", schemaName, tableName, columnName); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -182,8 +175,6 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); @@ -214,8 +205,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.Constraints WHERE CONSTRAINT_TYPE='UNIQUE' AND TABLE_NAME='%S';", tableName); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -223,8 +213,6 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java index f58c30c..6327343 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java @@ -166,8 +166,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT conname FROM pg_constraint WHERE ( contype='u' OR contype='f' ) AND conrelid = (SELECT oid FROM pg_class WHERE relname='%s');", tableName.toLowerCase()); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -175,8 +174,6 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); @@ -189,8 +186,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT conname FROM pg_constraint WHERE ( contype='f' ) AND conrelid = (SELECT oid FROM pg_class WHERE relname='%s');", tableName.toLowerCase()); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -198,8 +194,6 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); @@ -300,8 +294,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT conname FROM pg_constraint WHERE ( contype='u' ) AND conrelid = (SELECT oid FROM pg_class WHERE relname='%s');", tableName.toLowerCase()); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String constraintName = set.getString(1); @@ -309,8 +302,6 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } } catch (Exception e) { throw new SQLException("Could not obtain constraints for table " + tableName, e); - } finally { - ps.close(); } }); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java index 3a04a10..703c289 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java @@ -105,8 +105,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration tx.doSqlWork(connection -> { String sql = "SELECT topiaId, seineCircumference, seineDepth, seineBallastWeight FROM OBSERVE_SEINE.TRIP WHERE seineDepth IS NOT NULL OR seineDepth IS NOT NULL OR seineBallastWeight IS NOT NULL;"; - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { SenneData senneData = new SenneData(); @@ -118,8 +117,6 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } } catch (Exception e) { throw new SQLException("Could not obtain trip senne data", e); - } finally { - ps.close(); } }); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java index 00167dd..7a146e3 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java @@ -94,8 +94,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv final Set<SetData> setIds = new LinkedHashSet<>(); tx.doSqlWork(connection -> { String sql = "SELECT topiaId, totalSectionsCount, basketsPerSectionCount, branchlinesPerBasketCount FROM OBSERVE_LONGLINE.SET WHERE HAULINGBREAKS = 0 AND haulingDirectionSameAsSetting IS FALSE;"; - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { SetData setData = new SetData(); @@ -107,8 +106,6 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } } catch (Exception e) { throw new SQLException("Could not obtain SET data", e); - } finally { - ps.close(); } }); @@ -126,8 +123,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv final Multimap<String, String> gearUseFeaturesSeineAndMeasurementIds = LinkedHashMultimap.create(); tx.doSqlWork(connection -> { String sql = "SELECT GEARUSEFEATURES, topiaId FROM OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT;"; - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String gearUseFeaturesSeineId = set.getString(1); @@ -136,8 +132,6 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } } catch (Exception e) { throw new SQLException("Could not obtain GEARUSEFEATURESMEASUREMENT ids", e); - } finally { - ps.close(); } }); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java index 82a01d2..5a89b5c 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -63,8 +63,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat String sql = "select distinct (geartype||'') from observe_common.program"; { - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String gearType = set.getString(1); @@ -73,8 +72,6 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat } catch (Exception e) { throw new SQLException("Could not obtain program gear types", e); - } finally { - ps.close(); } } diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java index 5e270e4..fecfece 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -179,8 +179,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse Integer oid = null; String sqlOid = "SELECT '" + schemaName + "." + tableName + "'::regclass::oid;"; - PreparedStatement ps = connection.prepareStatement(sqlOid); - try { + try (PreparedStatement ps = connection.prepareStatement(sqlOid)) { ResultSet set = ps.executeQuery(); if (set.next()) { oid = set.getInt(1); @@ -189,8 +188,6 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } } catch (Exception e) { throw new SQLException("Could not obtain oid for table" + tableName, e); - } finally { - ps.close(); } return oid; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java index ac70633..84f0e94 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java @@ -232,11 +232,7 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer String length = (String) incoming.getValue(0, row); Integer count = Integer.valueOf(incoming.getValue(1, row).toString()); - MutableInt mutableInt = data.get(length); - if (mutableInt == null) { - mutableInt = new MutableInt(); - data.put(length, mutableInt); - } + MutableInt mutableInt = data.computeIfAbsent(length, k -> new MutableInt()); mutableInt.add(count); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java index 3f5db18..2d75499 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java @@ -109,9 +109,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi for (ActivitySeineStubDto activitySeineDto : activitySeineDtos) { - ActivitySeine activitySeine = Iterables.find( - activitySeines, - TopiaEntities.entityHasId(activitySeineDto.getId())); + ActivitySeine activitySeine = activitySeines.stream().filter(TopiaEntities.entityHasId(activitySeineDto.getId())::apply).findFirst().get(); boolean isFindeVeille = activitySeine.getVesselActivitySeine() != null && ActivitySeineImpl.ACTIVITY_FIN_DE_VEILLE.equals(activitySeine.getVesselActivitySeine().getCode()); diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java index 4d95c5a..fdd07de 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java @@ -46,7 +46,7 @@ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultima } public static <K extends ReferentialDto> ReferentialMultimap<K> of(Class<K> k1, K v1) { - return new ReferentialMultimap<K>(k1, v1); + return new ReferentialMultimap<>(k1, v1); } public static <K extends ReferentialDto> ReferentialMultimap<K> copyOf(Multimap<Class<K>, K> multimap) { diff --git a/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java index 0eed5e0..fe79904 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java @@ -61,11 +61,7 @@ public class ClassAdapter implements JsonSerializer<Class<?>>, JsonDeserializer< public Class<?> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { String className = json.getAsString(); - Class<?> result = CLASS_CACHE.get(className); - if (result == null) { - result = loadClass(className); - CLASS_CACHE.put(className, result); - } + Class<?> result = CLASS_CACHE.computeIfAbsent(className, k -> loadClass(className)); return result; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java index 299da9b..653cd68 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java @@ -153,7 +153,7 @@ public class Report implements Serializable, ObserveDto { } public ReportVariable getRepeatVariable(final String name) { - return Iterables.find(Lists.newArrayList(repeatVariables), reportVariable -> name.equals(reportVariable.getName())); + return Lists.newArrayList(repeatVariables).stream().filter(reportVariable -> name.equals(reportVariable.getName())).findFirst().get(); } public boolean canExecute() { diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java index f6b856e..4b08187 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java @@ -78,11 +78,8 @@ public class ReportBuilder { public List<Report> load(URL definition) throws IOException { properties = new SortedProperties(); - InputStream in = definition.openStream(); - try { + try (InputStream in = definition.openStream()) { properties.load(in); - } finally { - in.close(); } reportNames = detectReportNames(); diff --git a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java index 41cff18..fb935c0 100644 --- a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java +++ b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java @@ -232,11 +232,7 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { Optional<TopiaMetadataEntity> optionalAttributeClass = metadataModel.getOptionalEntity(attributeClass.getName()); TopiaMetadataEntity attributeClazz; - if (optionalAttributeClass.isPresent()) { - attributeClazz = optionalAttributeClass.get(); - } else { - attributeClazz = buildMetadataEntity(attributeClass, metadataModel, oneToManyAssociationInverses); - } + attributeClazz = optionalAttributeClass.orElseGet(() -> buildMetadataEntity(attributeClass, metadataModel, oneToManyAssociationInverses)); if (GeneratorUtil.isNMultiplicity(attr)) { if (GeneratorUtil.isNMultiplicity(attr.getReverseMaxMultiplicity()) && !attr.hasAssociationClass()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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>.