You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/08 21:02:11 UTC
[maven] 02/02: [MNG-7324] extract config classes to separate
package from domain
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7129_Modello
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d539242171d48203f53a10511ef04af97c5b040b
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Nov 8 22:02:06 2021 +0100
[MNG-7324] extract config classes to separate package from domain
---
.../apache/maven/caching/CacheControllerImpl.java | 10 +++---
.../maven/caching/DefaultPluginScanConfig.java | 2 +-
.../apache/maven/caching/MojoExecutionManager.java | 2 +-
.../org/apache/maven/caching/PluginScanConfig.java | 2 +-
.../apache/maven/caching/PluginScanConfigImpl.java | 6 ++--
.../maven/caching/checksum/MavenProjectInput.java | 9 +++--
.../org/apache/maven/caching/xml/CacheConfig.java | 8 ++---
.../apache/maven/caching/xml/CacheConfigImpl.java | 38 +++++++++++-----------
.../org/apache/maven/caching/xml/DtoUtils.java | 2 +-
.../org/apache/maven/caching/xml/XmlService.java | 6 ++--
maven-core/src/main/mdo/cache-config.mdo | 2 +-
.../apache/maven/caching/xml/CacheConfigTest.java | 4 +--
12 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java b/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
index 05e56a5..0114952 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
@@ -31,9 +31,8 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.caching.checksum.KeyUtils;
import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.domain.Scm;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashFactory;
+import org.apache.maven.caching.config.PropertyNameType;
+import org.apache.maven.caching.config.TrackedPropertyType;
import org.apache.maven.caching.domain.ArtifactType;
import org.apache.maven.caching.domain.BuildDiffType;
import org.apache.maven.caching.domain.CacheReportType;
@@ -41,8 +40,9 @@ import org.apache.maven.caching.domain.CompletedExecutionType;
import org.apache.maven.caching.domain.DigestItemType;
import org.apache.maven.caching.domain.ProjectReportType;
import org.apache.maven.caching.domain.ProjectsInputInfoType;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
+import org.apache.maven.caching.domain.Scm;
+import org.apache.maven.caching.hash.HashAlgorithm;
+import org.apache.maven.caching.hash.HashFactory;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.CacheSource;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java b/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
index 8229435..e29bf72 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
@@ -19,7 +19,7 @@ package org.apache.maven.caching;
* under the License.
*/
-import org.apache.maven.caching.domain.DirScanConfigType;
+import org.apache.maven.caching.config.DirScanConfigType;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java b/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
index a6e1936..a03babb 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
@@ -20,8 +20,8 @@ package org.apache.maven.caching;
*/
import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.caching.config.TrackedPropertyType;
import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.DtoUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
index a3af7b6..4e88263 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
@@ -19,7 +19,7 @@ package org.apache.maven.caching;
* under the License.
*/
-import org.apache.maven.caching.domain.DirScanConfigType;
+import org.apache.maven.caching.config.DirScanConfigType;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
index 1c5ea65..a743c62 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
@@ -20,9 +20,9 @@ package org.apache.maven.caching;
*/
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.domain.DirScanConfigType;
-import org.apache.maven.caching.domain.TagNameType;
-import org.apache.maven.caching.domain.TagScanConfigType;
+import org.apache.maven.caching.config.DirScanConfigType;
+import org.apache.maven.caching.config.TagNameType;
+import org.apache.maven.caching.config.TagScanConfigType;
import javax.annotation.Nonnull;
import java.util.List;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java b/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
index 56fbaed..c569a21 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
@@ -19,7 +19,6 @@ package org.apache.maven.caching.checksum;
* under the License.
*/
-
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.StringUtils;
@@ -33,13 +32,13 @@ import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.ProjectUtils;
import org.apache.maven.caching.RemoteArtifactsRepository;
import org.apache.maven.caching.ScanConfigProperties;
-import org.apache.maven.caching.domain.Exclude;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashChecksum;
+import org.apache.maven.caching.config.Exclude;
+import org.apache.maven.caching.config.Include;
import org.apache.maven.caching.hash.HashFactory;
import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.Include;
import org.apache.maven.caching.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.hash.HashAlgorithm;
+import org.apache.maven.caching.hash.HashChecksum;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.DtoUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
index a9dd950..acd79f3 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
@@ -21,11 +21,11 @@ package org.apache.maven.caching.xml;
import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.checksum.MultimoduleDiscoveryStrategy;
-import org.apache.maven.caching.domain.Exclude;
+import org.apache.maven.caching.config.Exclude;
+import org.apache.maven.caching.config.Include;
+import org.apache.maven.caching.config.PropertyNameType;
+import org.apache.maven.caching.config.TrackedPropertyType;
import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.Include;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
index df8eb26..e1cb63d 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
@@ -26,26 +26,26 @@ import org.apache.maven.caching.DefaultPluginScanConfig;
import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.PluginScanConfigImpl;
import org.apache.maven.caching.checksum.MultimoduleDiscoveryStrategy;
-import org.apache.maven.caching.domain.AttachedOutputs;
-import org.apache.maven.caching.domain.Exclude;
-import org.apache.maven.caching.domain.Include;
-import org.apache.maven.caching.domain.Local;
-import org.apache.maven.caching.domain.ProjectDiscoveryStrategy;
-import org.apache.maven.caching.domain.Remote;
+import org.apache.maven.caching.config.AttachedOutputs;
+import org.apache.maven.caching.config.Exclude;
+import org.apache.maven.caching.config.Include;
+import org.apache.maven.caching.config.Local;
+import org.apache.maven.caching.config.ProjectDiscoveryStrategy;
+import org.apache.maven.caching.config.Remote;
+import org.apache.maven.caching.config.CacheType;
+import org.apache.maven.caching.config.ConfigurationType;
+import org.apache.maven.caching.config.CoordinatesBaseType;
+import org.apache.maven.caching.config.ExecutablesType;
+import org.apache.maven.caching.config.ExecutionConfigurationScanType;
+import org.apache.maven.caching.config.ExecutionControlType;
+import org.apache.maven.caching.config.ExecutionIdsListType;
+import org.apache.maven.caching.config.GoalReconciliationType;
+import org.apache.maven.caching.config.GoalsListType;
+import org.apache.maven.caching.config.PluginConfigurationScanType;
+import org.apache.maven.caching.config.PluginSetType;
+import org.apache.maven.caching.config.PropertyNameType;
+import org.apache.maven.caching.config.TrackedPropertyType;
import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.CacheType;
-import org.apache.maven.caching.domain.ConfigurationType;
-import org.apache.maven.caching.domain.CoordinatesBaseType;
-import org.apache.maven.caching.domain.ExecutablesType;
-import org.apache.maven.caching.domain.ExecutionConfigurationScanType;
-import org.apache.maven.caching.domain.ExecutionControlType;
-import org.apache.maven.caching.domain.ExecutionIdsListType;
-import org.apache.maven.caching.domain.GoalReconciliationType;
-import org.apache.maven.caching.domain.GoalsListType;
-import org.apache.maven.caching.domain.PluginConfigurationScanType;
-import org.apache.maven.caching.domain.PluginSetType;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java b/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
index 7bd2d2b..43be43c 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
@@ -23,11 +23,11 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.caching.ProjectUtils;
+import org.apache.maven.caching.config.TrackedPropertyType;
import org.apache.maven.caching.domain.ArtifactType;
import org.apache.maven.caching.domain.CompletedExecutionType;
import org.apache.maven.caching.domain.DigestItemType;
import org.apache.maven.caching.domain.PropertyValueType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.model.Dependency;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java b/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
index 6419c8f..d0ef1a7 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
@@ -19,9 +19,9 @@ package org.apache.maven.caching.xml;
* under the License.
*/
-import org.apache.maven.caching.domain.CacheType;
-import org.apache.maven.caching.domain.io.xpp3.CacheConfigXpp3Reader;
-import org.apache.maven.caching.domain.io.xpp3.CacheConfigXpp3Writer;
+import org.apache.maven.caching.config.CacheType;
+import org.apache.maven.caching.config.io.xpp3.CacheConfigXpp3Reader;
+import org.apache.maven.caching.config.io.xpp3.CacheConfigXpp3Writer;
import org.apache.maven.caching.domain.io.xpp3.CacheDiffXpp3Reader;
import org.apache.maven.caching.domain.io.xpp3.CacheDiffXpp3Writer;
import org.apache.maven.caching.domain.io.xpp3.CacheDomainXpp3Reader;
diff --git a/maven-core/src/main/mdo/cache-config.mdo b/maven-core/src/main/mdo/cache-config.mdo
index 99cbec0..68bbea1 100644
--- a/maven-core/src/main/mdo/cache-config.mdo
+++ b/maven-core/src/main/mdo/cache-config.mdo
@@ -30,7 +30,7 @@ under the License.
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.domain</value>
+ <value>org.apache.maven.caching.config</value>
</default>
</defaults>
diff --git a/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java b/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
index c589181..911cb68 100644
--- a/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
+++ b/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
@@ -19,12 +19,10 @@ package org.apache.maven.caching.xml;
* under the License.
*/
-import org.apache.maven.caching.domain.CacheType;
+import org.apache.maven.caching.config.CacheType;
import org.junit.Test;
import java.io.InputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
public class CacheConfigTest {