Migrate to Apache Commons Configuration 2

Currently this does not work because of some POM dependencies.
Evolveum · Dec 10, 2019 · 017ef1f · 017ef1f
1 parent 82381c2
commit 017ef1f
Show file tree

Hide file tree

Showing 48 changed files with 110 additions and 112 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -377,12 +377,12 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>1.8.3</version>
+                <version>1.9.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils-core</artifactId>
-                <version>1.8.3</version>
+                <version>1.9.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -395,23 +395,23 @@
                 <version>3.2.2</version>
             </dependency>
             <dependency>
-                <groupId>commons-configuration</groupId>
-                <artifactId>commons-configuration</artifactId>
-                <version>1.6</version>
-                <exclusions>
-                    <exclusion> <!-- Conflicting version with Spring core -->
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion> <!-- Conflicting version with Jasper Reports -->
-                        <groupId>commons-digester</groupId>
-                        <artifactId>commons-digester</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-beanutils</groupId>
-                        <artifactId>commons-beanutils</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-configuration2</artifactId>
+                <version>2.5</version>
+<!--                <exclusions>-->
+<!--                    <exclusion> &lt;!&ndash; Conflicting version with Spring core &ndash;&gt;-->
+<!--                        <groupId>commons-logging</groupId>-->
+<!--                        <artifactId>commons-logging</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion> &lt;!&ndash; Conflicting version with Jasper Reports &ndash;&gt;-->
+<!--                        <groupId>commons-digester</groupId>-->
+<!--                        <artifactId>commons-digester</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>commons-beanutils</groupId>-->
+<!--                        <artifactId>commons-beanutils</artifactId>-->
+<!--                    </exclusion>-->
+<!--                </exclusions>-->
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -710,8 +710,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java b/...c/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
@@ -28,7 +28,7 @@
 import com.evolveum.midpoint.web.page.admin.PageAdmin;
 import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceVisualizationDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -36,7 +36,7 @@
 
 import com.evolveum.midpoint.repo.cache.CacheRegistry;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.io.IOUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ConverterLocator;

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java
@@ -10,7 +10,7 @@
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;

diff --git a/infra/common/pom.xml b/infra/common/pom.xml
@@ -74,8 +74,8 @@
             <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java b/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2018 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -8,7 +8,7 @@
 
 import javax.annotation.PostConstruct;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
 import com.evolveum.midpoint.schema.internals.InternalsConfig;

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
@@ -21,7 +21,7 @@
 import com.evolveum.midpoint.util.logging.*;
 import com.evolveum.midpoint.util.statistics.OperationExecutionLogger;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 

diff --git a/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java b/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.common.configuration.api;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/...on/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java b/...on/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java
@@ -7,12 +7,12 @@
 
 package com.evolveum.midpoint.common.configuration.api;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 public interface RuntimeConfiguration {
 
     /**
-     * Return symbolic name of the component in configuration subsytem.
+     * Return symbolic name of the component in configuration subsystem.
      *  Samples:
      *  <li>
      *      <ul>repository -> midpoint.repository</ul>

diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
@@ -143,8 +143,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.schema.internals;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 /**
  * @author semancik

diff --git a/model/model-common/pom.xml b/model/model-common/pom.xml
@@ -138,8 +138,8 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>

diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.model.common;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/...ommon/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java b/...ommon/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
@@ -14,8 +14,8 @@
 import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.prism.crypto.KeyStoreBasedProtectorBuilder;
 import com.evolveum.midpoint.repo.api.RepositoryService;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
 
 import com.evolveum.midpoint.repo.common.ObjectResolver;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;

diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
@@ -141,8 +141,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
@@ -11,11 +11,8 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.wf.impl.processors.ChangeProcessor;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;

diff --git a/...flow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java b/...flow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
@@ -11,7 +11,6 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.wf.impl.util.MiscHelper;
-import org.apache.commons.configuration.Configuration;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;

diff --git a/provisioning/ucf-impl-connid/pom.xml b/provisioning/ucf-impl-connid/pom.xml
@@ -65,8 +65,8 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/...n/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java b/...n/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
@@ -35,7 +35,7 @@
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.schema.MutablePrismSchema;
 import com.evolveum.midpoint.util.MiscUtil;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.identityconnectors.common.Version;
 import org.identityconnectors.common.security.Encryptor;
 import org.identityconnectors.common.security.EncryptorFactory;
@@ -192,10 +192,9 @@ public void initialize() {
         }
 
         // Scan all provided directories
-        @SuppressWarnings("unchecked")
-        List<String> dirs = config.getList("scanDirectory");
-        for (String dir : dirs) {
-            bundleURIs.addAll(scanDirectory(dir));
+        List<Object> dirs = config.getList("scanDirectory");
+        for (Object dir : dirs) {
+            bundleURIs.addAll(scanDirectory(dir.toString()));
         }
 
         for (URI u : bundleURIs) {

diff --git a/repo/audit-api/pom.xml b/repo/audit-api/pom.xml
@@ -39,8 +39,8 @@
             <version>4.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
 
         <dependency>

diff --git a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java
@@ -7,7 +7,7 @@
 
 package com.evolveum.midpoint.audit.api;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 /**
  * @author lazyman

diff --git a/repo/audit-impl/pom.xml b/repo/audit-impl/pom.xml
@@ -60,8 +60,8 @@
             <version>4.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/.../audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java b/.../audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java
@@ -10,7 +10,7 @@
 import com.evolveum.midpoint.audit.api.AuditService;
 import com.evolveum.midpoint.audit.api.AuditServiceFactory;
 import com.evolveum.midpoint.audit.api.AuditServiceFactoryException;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 /**
  * @author lazyman

diff --git a/repo/repo-api/pom.xml b/repo/repo-api/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>

diff --git a/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java b/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java
@@ -7,7 +7,7 @@
 
 package com.evolveum.midpoint.repo.api;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 
 public interface RepositoryServiceFactory {
 

diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml
@@ -71,8 +71,8 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...l-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java b/...l-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
@@ -7,12 +7,11 @@
 
 package com.evolveum.midpoint.repo.sql.testing;
 
-import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.repo.api.RepositoryServiceFactoryException;
 import com.evolveum.midpoint.repo.sql.SqlRepositoryFactory;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.File;

diff --git a/repo/repo-sql-impl/pom.xml b/repo/repo-sql-impl/pom.xml
@@ -126,8 +126,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
@@ -17,8 +17,10 @@
 
 import java.util.List;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.SubnodeConfiguration;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.tree.ImmutableNode;
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -60,8 +62,8 @@ public synchronized void init(Configuration config) throws AuditServiceFactoryEx
         try {
             repositoryFactory.init(config);
             auditService = new SqlAuditServiceImpl(repositoryFactory);
-            List<SubnodeConfiguration> subConfigColumns = ((SubnodeConfiguration)config).configurationsAt(CONF_AUDIT_SERVICE_COLUMNS);
-            for(SubnodeConfiguration subConfigColumn : subConfigColumns) {
+            List<HierarchicalConfiguration<ImmutableNode>> subConfigColumns = ((BaseHierarchicalConfiguration)config).childConfigurationsAt(CONF_AUDIT_SERVICE_COLUMNS);
+            for(Configuration subConfigColumn : subConfigColumns) {
                 String columnName = getStringFromConfig(subConfigColumn, CONF_AUDIT_SERVICE_COLUMN_NAME);
                 String eventRecordPropertyName = getStringFromConfig(subConfigColumn, CONF_AUDIT_SERVICE_EVENT_RECORD_PROPERTY_NAME);
                 auditService.getCustomColumn().put(eventRecordPropertyName, columnName);

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
@@ -15,7 +15,7 @@
 import com.evolveum.midpoint.util.exception.SystemException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.h2.Driver;