Merge pull request eXist-db#4839 from line-o/cleanup/configuration

Cleanup/configuration
line-o · Sep 12, 2023 · f24b781 · f24b781
2 parents d512df8 + 42c5bf0
commit f24b781
Show file tree

Hide file tree

Showing 4 changed files with 914 additions and 1,019 deletions.
diff --git a/exist-core/src/main/java/org/exist/indexing/IndexManager.java b/exist-core/src/main/java/org/exist/indexing/IndexManager.java
@@ -117,8 +117,8 @@ public void prepare(final BrokerPool brokerPool) throws BrokerPoolServiceExcepti
         try {
             if (modConfigs != null) {
                 for (final Configuration.IndexModuleConfig modConfig : modConfigs) {
-                    final String className = modConfig.getClassName();
-                    initIndex(pool, modConfig.getId(), modConfig.getConfig(), dataDir, className);
+                    final String className = modConfig.className();
+                    initIndex(pool, modConfig.id(), modConfig.config(), dataDir, className);
                 }
             }
             // check if a structural index was configured. If not, create one based on default settings.

diff --git a/exist-core/src/main/java/org/exist/storage/StartupTriggersManager.java b/exist-core/src/main/java/org/exist/storage/StartupTriggersManager.java
@@ -55,9 +55,9 @@ public void configure(final Configuration configuration) throws BrokerPoolServic
     public void startPreMultiUserSystem(final DBBroker systemBroker, final Txn transaction) throws BrokerPoolServiceException {
         for(final Configuration.StartupTriggerConfig startupTriggerConfig : startupTriggerConfigs) {
             try {
-                final Class<StartupTrigger> clazz = (Class<StartupTrigger>) Class.forName(startupTriggerConfig.getClazz());
+                final Class<StartupTrigger> clazz = (Class<StartupTrigger>) Class.forName(startupTriggerConfig.clazz());
                 final StartupTrigger startupTrigger = clazz.newInstance();
-                startupTrigger.execute(systemBroker, transaction, startupTriggerConfig.getParams());
+                startupTrigger.execute(systemBroker, transaction, startupTriggerConfig.params());
             } catch(final ClassNotFoundException | IllegalAccessException | InstantiationException e) {
                 LOG.error("Could not call StartupTrigger class: {}. SKIPPING! {}", startupTriggerConfig, e.getMessage(), e);
             } catch(final RuntimeException re) {