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