[Git][ultreiaio/ird-observe][develop] 2 commits: By default nothing to do on closing ServicesProvider.

7 Dec 2020


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
0920f857 by Tony Chemit at 2020-12-07T15:50:43+01:00
By default nothing to do on closing ServicesProvider.

- - - - -
4642347a by Tony Chemit at 2020-12-07T21:55:02+01:00
Reconnaissance des paramètres de sécurité - See #1638

- - - - -


3 changed files:

- client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java
- toolkit/service/src/main/java/fr/ird/observe/spi/ServicesProvider.java


Changes:

=====================================
client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java
=====================================
@@ -85,7 +85,6 @@ import javax.swing.Icon;
 import javax.swing.JOptionPane;
 import javax.swing.event.EventListenerList;
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Iterator;
@@ -262,7 +261,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple
         } finally {
             try {
                 servicesProvider.close();
-            } catch (IOException e) {
+            } catch (Exception e) {
                 log.error("Could not close properly services provider", e);
             }
             ObserveUtil.cleanMemory();
@@ -285,7 +284,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple
             ObserveUtil.cleanMemory();
             try {
                 servicesProvider.close();
-            } catch (IOException e) {
+            } catch (Exception e) {
                 log.error("Could not close properly services provider", e);
             }
             connection = null;


=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java
=====================================
@@ -77,11 +77,11 @@ public class RolesTableModel extends AbstractTableModel {
         Collections.sort(roles);
         for (ObserveDbUserDto role : roles) {
             String name = role.getName();
-            if (name.endsWith("-referentiel") || name.endsWith("-referential")) {
+            if (name.equals("referentiel") || name.equals("referential") || name.endsWith("-referentiel") || name.endsWith("-referential")) {
                 role.setRole(ObserveDbRole.REFERENTIAL);
-            } else if (name.endsWith("-technicien") || name.endsWith("-technical")) {
+            } else if (name.equals("technicien") || name.equals("technical") || name.endsWith("-technicien") || name.endsWith("-technical")) {
                 role.setRole(ObserveDbRole.TECHNICAL);
-            } else if (name.endsWith("-utilisateur") || name.endsWith("-user")) {
+            } else if (name.equals("utilisateur") || name.equals("user") ||name.endsWith("-utilisateur") || name.endsWith("-user")) {
                 role.setRole(ObserveDbRole.USER);
             }
         }


=====================================
toolkit/service/src/main/java/fr/ird/observe/spi/ServicesProvider.java
=====================================
@@ -35,4 +35,8 @@ import java.io.Closeable;
 public interface ServicesProvider extends Closeable {
 
     <S extends ObserveService> S getService(Class<S> serviceType);
+
+    default void close() {
+        // do nothing
+    }
 }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fe18f76aee7505b7fef4d1a2...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fe18f76aee7505b7fef4d1a2...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)