GitLab

at 2021-03-20T09:24:05+01:00

Petits ajustements sur le gestionnaire de connection - Closes #1816

update pom

Fix referenceProperty on Simple Data

     }

 

     private void copyDirectoryToZip(Path rootFile, ZipOutputStream zipOutputStream) throws IOException {

+        if (Files.notExists(rootFile )) {

+            return;

+        }

         Path rootFileParent = rootFile.getParent();

         Files.walk(rootFile).filter(Files::isRegularFile).forEach(p -> copyFileToZip(rootFileParent, p, zipOutputStream));

     }

 import fr.ird.observe.services.service.BabModelVersionException;

 import fr.ird.observe.services.service.DataSourceService;

 import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;

-import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException;

 import fr.ird.observe.services.service.DatabaseNotFoundException;

 import fr.ird.observe.services.service.ObserveService;

 import fr.ird.observe.services.service.referential.ObserveReferentialCache;

 import javax.swing.Icon;

 import javax.swing.JOptionPane;

 import javax.swing.event.EventListenerList;

+import java.io.File;

 import java.nio.file.Files;

 import java.nio.file.Path;

 import java.util.Iterator;

     }

 

     public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException {

-        checkIsNotAlreadyOpen();

+        checkIsNotOpen();

         fireNewMessage(t("observe.ui.datasource.storage.message.opening", getLabel()));

         fireOpening();

         DataSourceService dataSourceService = servicesProvider.getDataSourceService();

     public void create(DataSourceCreateConfigurationDto createDto)

             throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException,

             DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException {

-        checkIsNotAlreadyOpen();

+        checkIsNotOpen();

         fireNewMessage(t("observe.ui.datasource.storage.message.creating", getLabel()));

         fireOpening();

         DataSourceService dataSourceService = servicesProvider.getDataSourceService();

         }

     }

 

-    public void destroy() throws DatabaseDestroyNotAuthorizedException {

-        checkIsOpen();

+    public void destroy() {

+        checkIsNotOpen();

         fireNewMessage(t("observe.ui.datasource.storage.message.destroying", getLabel()));

-        fireClosing();

-        referentialCache.close();

         try {

-            DataSourceService dataSourceService = servicesProvider.getDataSourceService();

-            dataSourceService.destroy();

+            destroy0();

         } finally {

             ObserveUtil.cleanMemory();

-            try {

-                servicesProvider.close();

-            } catch (Exception e) {

-                log.error("Could not close properly services provider", e);

-            }

-            setConnection(null);

             fireNewMessage(t("observe.ui.datasource.storage.message.destroyed", getLabel()));

-            fireClosed();

         }

     }

 

     }

 

     public ObserveDataSourceInformation checkCanConnect(boolean canBeEmpty) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException {

-        checkIsNotAlreadyOpen();

+        checkIsNotOpen();

         DataSourceService dataSourceService = servicesProvider.getDataSourceService();

         ObserveDataSourceInformation dataSourceInformation = canBeEmpty ? dataSourceService.checkCanConnectOrBeEmpty(getConfiguration()) : dataSourceService.checkCanConnect(getConfiguration());

         setOwner(dataSourceInformation.isOwner());

         }

     }

 

-    private void checkIsNotAlreadyOpen() {

-        if (isOpen()) {

-            throw new IllegalStateException("Connection is already open");

-        }

-    }

-

     private void checkIsNotOpen() {

         if (isOpen()) {

             throw new IllegalStateException("Connection is open");

     public String getSummaryText() {

         return ObserveSwingDataSourceTemplate.generate(this);

     }

+

+

+    public void destroy0() {

+

+        if (!isLocal()) {

+            throw new IllegalStateException("CAN NOT DESTROY A NONE LOCAL DATABASE");

+        }

+        ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = (ObserveDataSourceConfigurationTopiaH2) getConfiguration();

+        File databaseFile = dataSourceConfigurationH2.getDatabaseFile();

+        if (!databaseFile.delete()) {

+            throw new IllegalStateException("could not delete " + databaseFile);

+        }

+    }

+

 }
                 DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto();

                 createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI()));

 

-                ObserveSwingDataSource dataSource = dataSourcesManager.newTemporaryH2DataSource("check-" + backupStorage.getName());

-                try {

-                    dataSource.create(createDto);

-                } finally {

-                    dataSource.destroy();

+                try (ObserveSwingDataSource dataSource = dataSourcesManager.newTemporaryH2DataSource("check-" + backupStorage.getName())) {

+                    try {

+                        dataSource.create(createDto);

+                    } finally {

+                        dataSource.destroy();

+                    }

                 }

 

                 backupStorage.setVerified(true);

                 if (response == 1) {

                     // creation de la base locale

                     initMode = DataSourceInitMode.CREATE;

+                    dbModes.add(DataSourceConnectMode.LOCAL);

                     title = I18n.n("observe.runner.initStorage.title.create.local.db");

                 } else {

                     // connexion à une base distante

         boolean currentDataSourceIsLocal = currentDataSource != null && currentDataSource.isLocal();

         boolean doBackupLocal = localStorageExist && model.isDoBackup();

         boolean doDestroyLocal = localStorageExist && model.getChooseDb().getInitModel().isOnCreateMode();

-        boolean doOpenLocal = (currentDataSourceIsLocal || localStorageExist) && (doBackupLocal || doDestroyLocal);

+        boolean doOpenLocal = !currentDataSourceIsLocal && doBackupLocal;

         boolean doCloseCurrentDataSource = currentDataSource != null && !doOpenLocal;

 

         return ImmutableList.of(

                 new OpenLocalDataSourceActionStep(actionContext, doOpenLocal),

                 // Backup local data source

                 new BackupLocalDataSourceActionStep(actionContext, doBackupLocal),

-                // Destroy local data source

-                new DestroyLocalDataSourceActionStep(actionContext, doDestroyLocal),

                 // Close local data source

                 new CloseLocalDataSourceActionStep(actionContext, doOpenLocal),

+                // Destroy local data source

+                new DestroyLocalDataSourceActionStep(actionContext, doDestroyLocal),

                 // Close current data source

                 new CloseCurrentDataSourceActionStep(actionContext, doCloseCurrentDataSource));

     }

     }

 

     @Override

-    public void doAction0(ActionWithSteps<LoadingDataSourceContext> mainAction) throws Exception {

+    public void doAction0(ActionWithSteps<LoadingDataSourceContext> mainAction) {

         ObserveSwingDataSource localDataSource = Objects.requireNonNull(actionContext.getLocalDataSource());

         log.info(String.format("Destroy local data source %s", localDataSource));

         try {

         newDataSource.setProgressModel(actionContext.getProgressModel());

 

         DataSourceInitModel initModel = model.getChooseDb().getInitModel();

-        boolean useLocalDataSource = initModel.isOnConnectModeLocal();

+        boolean useLocalDataSource = initModel.isOnConnectMode() && initModel.isOnConnectModeLocal();

 

         if (useLocalDataSource) {

             // try an explicit data source migration

                 log.error(String.format("could not get local data source information: %s", newDataSource), e);

                 throw e;

             }

-

+            //FIXME Add User to migrate or cancel

             try {

                 newDataSource.migrateData(dataSourceInformation, config.getModelVersion());

                 incrementsProgress();

     public void setCapabilitiesDescriptor(Map<String, List<CapabilityDescriptor>> capabilities) {

         capabilitiesDescriptor = capabilities;

     }

+

+    @Override

+    public String getReferenceProperty() {

+        return "getParentReference()";

+    }

 }
 

         @Override

         public Builder createBuilder(String contentUiType, String nodeType) {

-            String selectTypeName = generator.detectCapabilities.parentRelations.get(generator.packageName + "." + nodeType).replace(generator.packageName, generator.dtoPackage).replace("UINavigationNode", "Dto");

-            return newBuilder(contentUiType, nodeType)

+            String parentNode = generator.detectCapabilities.parentRelations.get(generator.packageName + "." + nodeType).replace("UINavigationNode", "Dto");

+            String selectTypeName = parentNode.replace(generator.packageName, generator.dtoPackage);

+

+            if (selectTypeName.startsWith(parentNode)) {

+                // parent node is not in this package

+                selectTypeName = null;

+            }

+            Builder builder = newBuilder(contentUiType, nodeType)

                     .setModule()

-                    .setSubNode()

                     .setDtoTypeFromNodeType()

                     .setMainDtoTypeFromDtoType()

                     .setDtoReferenceTypeFromMainDtoType()

                     .setNodeDataTypeFromDtoType()

                     .setServiceTypeFromDtoType()

                     .setServiceParentTypeFromParentType();

+            if (selectTypeName != null) {

+                builder.setSubNode();

+            }

+            return builder;

         }

 

         @Override

             serviceParentMethod = serviceParentMethodPrefix + StringUtils.capitalize(serviceParentType.getSimpleName());

         }

         if (extraType == null) {

-            if (editNode != null && selectNode != null && selectNode.getType().equals(editNode.getType())) {

+            if (generator.getDescriptor().getContentNodeType() != ContentNodeType.SIMPLE && editNode != null && selectNode != null && selectNode.getType().equals(editNode.getType())) {

                 imports.add(MoveAction.class.getName());

                 imports.add(MoveRequestBuilder.class.getName());

                 String methodName = "getBrothers";

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2021.22</version>

+    <version>2021.23</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

     <buildDate>${maven.build.timestamp}</buildDate>

 

-    <toolkit.version>5.0.12</toolkit.version>

+    <toolkit.version>5.0.13</toolkit.version>

 

     <lib.version.ognl>3.1.28</lib.version.ognl>

     <!--can't use 1.4.197 (date has changed + blob also)-->

 GET    /api/v1/DataSourceService/checkCanConnectOrBeEmpty                                                                            v1.DataSourceServiceRestApi.checkCanConnectOrBeEmpty

 GET    /api/v1/DataSourceService/close                                                                                               v1.DataSourceServiceRestApi.close

 GET    /api/v1/DataSourceService/create                                                                                              v1.DataSourceServiceRestApi.create

-GET    /api/v1/DataSourceService/destroy                                                                                             v1.DataSourceServiceRestApi.destroy

 GET    /api/v1/DataSourceService/generateHomeId                                                                                      v1.DataSourceServiceRestApi.generateHomeId

 GET    /api/v1/DataSourceService/getUsers                                                                                            v1.DataSourceServiceRestApi.getUsers

 GET    /api/v1/DataSourceService/isIdValid                                                                                           v1.DataSourceServiceRestApi.isIdValid

       <artifactId>junit</artifactId>

       <scope>provided</scope>

     </dependency>

-    <dependency>

-      <groupId>fr.ird.observe</groupId>

-      <artifactId>toolkit-persistence</artifactId>

-    </dependency>

   </dependencies>

 

   <build>

       <plugin>

         <groupId>io.ultreia.java4all.http</groupId>

         <artifactId>http-maven-plugin</artifactId>

+        <version>${lib.version.java4all.http}</version>

         <executions>

           <execution>

             <id>default-generate-api-test</id>

         super.create(service);

     }

 

-    @Override

-    public void destroy(DataSourceService service) {

-        // FIXME:Test Remove super method invocation and implements fixture

-        // actual = service.destroy(getProperty("destroy.id"));

-        // Assert.assertNotNull(actual);

-        super.destroy(service);

-    }

-

     @Override

     public void getUsers(DataSourceService service) {

         // FIXME:Test Remove super method invocation and implements fixture

  */

 

 

+import fr.ird.observe.dto.DataNotFoundException;

 import fr.ird.observe.dto.data.DataFileDto;

-import fr.ird.observe.entities.DataNotFoundException;

-import fr.ird.observe.services.service.DataFileNotFoundException;

 import org.junit.Assert;

 

 public class DataFileServiceFixtures extends GeneratedDataFileServiceFixtures {

     public void getDataFile(DataFileService service) {

 

         try {

-            service.getDataFile(getProperty("getDataFile.id")+"Fake"+System.nanoTime());

+            service.getDataFile(getProperty("getDataFile.id") + "Fake" + System.nanoTime());

             Assert.fail("Should not find a data file for a fake id");

         } catch (DataNotFoundException e) {

             // fine :)

         DataFileDto actual = service.getDataFile(getProperty("getDataFile.id"));

         Assert.assertNotNull(actual);

         Assert.assertNotNull(actual.getContent());

-        Assert.assertEquals(getIntegerProperty("getDataFile.length"),actual.getContent().length);

+        Assert.assertEquals(getIntegerProperty("getDataFile.length"), actual.getContent().length);

 

         actual = service.getDataFile(getProperty("getDataFile.id.sensorUsed"));

         Assert.assertNotNull(actual);

         Assert.assertNotNull(actual.getContent());

-        Assert.assertEquals(getIntegerProperty("getDataFile.sensorUsed.length"),actual.getContent().length);

+        Assert.assertEquals(getIntegerProperty("getDataFile.sensorUsed.length"), actual.getContent().length);

 

     }

 

 import fr.ird.observe.services.service.BabModelVersionException;

 import fr.ird.observe.services.service.DataSourceService;

 import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;

-import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException;

 import fr.ird.observe.services.service.DatabaseNotFoundException;

 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;

 import fr.ird.observe.services.service.sql.SqlScriptProducerService;

         Optional<ObserveTopiaApplicationContext> optionalTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getTopiaApplicationContextIfPresent(dataSourceConfiguration);

         close(dataSourceConfiguration, optionalTopiaApplicationContext.orElse(null));

     }

-

-    @Override

-    public void destroy() throws DatabaseDestroyNotAuthorizedException {

-        ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration = (ObserveDataSourceConfigurationTopiaSupport) serviceContext.getServiceInitializer().optionalConfiguration().orElseThrow(IllegalStateException::new);

-        if (!dataSourceConfiguration.isLocal()) {

-            throw new DatabaseDestroyNotAuthorizedException(getApplicationLocale());

-        }

-

-        Optional<ObserveTopiaApplicationContext> optionalTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getTopiaApplicationContextIfPresent(dataSourceConfiguration);

-        close(dataSourceConfiguration, optionalTopiaApplicationContext.orElse(null));

-

-        ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = (ObserveDataSourceConfigurationTopiaH2) dataSourceConfiguration;

-        File databaseFile = dataSourceConfigurationH2.getDatabaseFile();

-        if (!databaseFile.delete()) {

-            throw new IllegalStateException("could not delete " + databaseFile);

-        }

-    }

+//

+//    @Override

+//    public void destroy() throws DatabaseDestroyNotAuthorizedException {

+//        ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration = (ObserveDataSourceConfigurationTopiaSupport) serviceContext.getServiceInitializer().optionalConfiguration().orElseThrow(IllegalStateException::new);

+//        if (!dataSourceConfiguration.isLocal()) {

+//            throw new DatabaseDestroyNotAuthorizedException(getApplicationLocale());

+//        }

+//

+//        Optional<ObserveTopiaApplicationContext> optionalTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getTopiaApplicationContextIfPresent(dataSourceConfiguration);

+//        close(dataSourceConfiguration, optionalTopiaApplicationContext.orElse(null));

+//

+//        ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = (ObserveDataSourceConfigurationTopiaH2) dataSourceConfiguration;

+//        File databaseFile = dataSourceConfigurationH2.getDatabaseFile();

+//        if (!databaseFile.delete()) {

+//            throw new IllegalStateException("could not delete " + databaseFile);

+//        }

+//    }

 

     @Override

     public void backup(File backupFile) {

 import fr.ird.observe.dto.referential.ReferentialDto;

 import fr.ird.observe.dto.referential.ReferentialLocale;

 import fr.ird.observe.dto.result.SaveResultDto;

-import fr.ird.observe.entities.DataNotFoundException;

+import fr.ird.observe.dto.DataNotFoundException;

 import fr.ird.observe.entities.Entity;

 import fr.ird.observe.entities.ObserveTopiaApplicationContext;

 import fr.ird.observe.entities.ObserveTopiaApplicationContextFactory;

 import fr.ird.observe.dto.data.ll.logbook.ActivitySampleReference;

 import fr.ird.observe.dto.reference.DataDtoReferenceSet;

 import fr.ird.observe.dto.result.SaveResultDto;

-import fr.ird.observe.entities.DataNotFoundException;

+import fr.ird.observe.dto.DataNotFoundException;

 import fr.ird.observe.entities.Entity;

 import fr.ird.observe.entities.ReplicateDataEngine;

 import fr.ird.observe.entities.data.TripAware;

...	...	@@ -113,6 +113,9 @@ public class FeedBackBuilder {
113	113	}
114	114
115	115	private void copyDirectoryToZip(Path rootFile, ZipOutputStream zipOutputStream) throws IOException {
	116	+ if (Files.notExists(rootFile )) {
	117	+ return;
	118	+ }
116	119	Path rootFileParent = rootFile.getParent();
117	120	Files.walk(rootFile).filter(Files::isRegularFile).forEach(p -> copyFileToZip(rootFileParent, p, zipOutputStream));
118	121	}

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

Commits:

18 changed files:

Changes: