[Git][ultreiaio/ird-observe][develop] 2 commits: update pom

17 Aug 2023


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


Commits:
9fdd4573 by Tony Chemit at 2023-08-17T18:31:51+02:00
update pom

- - - - -
3d7b7b70 by Tony Chemit at 2023-08-17T18:31:51+02:00
La valeur de configuration instance.security.key n'est pas bien enregistrée même si elle est présente dans les fichiers de configuration commun (/var/local/observe-server/.conf/9.x) - Closes #2769

- - - - -


3 changed files:

- client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- pom.xml
- server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java


Changes:

=====================================
client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
=====================================
@@ -141,9 +141,9 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
      *
      * @since 1.5
      */
-    private final String[] doNotSave = new String[]{
+    private final Set<String> doNotSave = Set.of(
 //            ClientConfigOption.OBSTUNA_PASSWORD.getKey(),
-            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(),};
+            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey());
 
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z");
     /**


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2023.37</version>
+    <version>2023.40</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <artifactId>ird-observe</artifactId>


=====================================
server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java
=====================================
@@ -42,6 +42,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 /**
  * Web server configuration.
@@ -90,9 +92,13 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
         ServerConfig fakeConfig = new ServerConfig(setCommonExtraConfigDirectory(setConfigFileName(init)), true);
         fakeConfig.initFirst();
 
+        // Get extra scope options (if any)
+        Properties extraProperties = new Properties();
+        fakeConfig.get().putAll(extraProperties, ApplicationConfigScope.EXTRA);
+        extraProperties.put(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);
         // Now that common files are ready, starts a normal configuration without system file and without migration possible
         ApplicationConfigInit realInit = ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM)
-                .addDefaults(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);
+                .setDefaults(extraProperties);
 
         ServerConfig config = new ServerConfig(setInstanceExtraConfigDirectory(setConfigFileName(realInit)));
         config.init(true);
@@ -143,7 +149,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
         File extraConfigFile = get().getExtraConfigFile();
         if (Files.notExists(extraConfigFile.toPath())) {
             log.info(String.format("Save common configuration file to: %s", extraConfigFile));
-            ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());
+            ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());
         }
 
         File log4jConfigurationFile = getCommonLog4jConfigurationFile();
@@ -174,7 +180,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
         // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2735
 
         log.info(String.format("Save instance configuration file to: %s", extraConfigFile));
-        ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());
+        ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());
 
         if (log.isInfoEnabled()) {
             String message = getConfigurationDescription();



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/38138697cd596f3c7016983d5...

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

    

Tony CHEMIT (＠tchemit)

tags

participants (1)