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/11 17:48:10 UTC
[maven] branch MNG-7129-master updated: [MNG-7129] rename
(Artifacts/Local)Repository to *CacheRepository
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7129-master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-7129-master by this push:
new bbc8ed7 [MNG-7129] rename (Artifacts/Local)Repository to *CacheRepository
bbc8ed7 is described below
commit bbc8ed75e5f43f29c66ae7883c2217f38b58bbf0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Nov 11 18:48:07 2021 +0100
[MNG-7129] rename (Artifacts/Local)Repository to *CacheRepository
---
.../java/org/apache/maven/caching/CacheControllerImpl.java | 10 +++++-----
.../{ArtifactsRepository.java => CacheRepository.java} | 4 ++--
...{HttpRepositoryImpl.java => HttpCacheRepositoryImpl.java} | 8 ++++----
...calArtifactsRepository.java => LocalCacheRepository.java} | 4 ++--
...ocalRepositoryImpl.java => LocalCacheRepositoryImpl.java} | 12 ++++++------
...teArtifactsRepository.java => RemoteCacheRepository.java} | 4 ++--
.../org/apache/maven/caching/checksum/MavenProjectInput.java | 12 ++++++------
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
index d20b810..26c1643 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
@@ -96,7 +96,7 @@ import static org.apache.maven.caching.CacheResult.failure;
import static org.apache.maven.caching.CacheResult.partialSuccess;
import static org.apache.maven.caching.CacheResult.rebuilded;
import static org.apache.maven.caching.CacheResult.success;
-import static org.apache.maven.caching.HttpRepositoryImpl.BUILDINFO_XML;
+import static org.apache.maven.caching.HttpCacheRepositoryImpl.BUILDINFO_XML;
import static org.apache.maven.caching.checksum.KeyUtils.getVersionlessProjectKey;
import static org.apache.maven.caching.checksum.MavenProjectInput.CACHE_IMPLMENTATION_VERSION;
@@ -115,8 +115,8 @@ public class CacheControllerImpl implements CacheController
private final Logger logger;
private final MavenPluginManager mavenPluginManager;
private final MavenProjectHelper projectHelper;
- private final LocalArtifactsRepository localCache;
- private final RemoteArtifactsRepository remoteCache;
+ private final LocalCacheRepository localCache;
+ private final RemoteCacheRepository remoteCache;
private final CacheConfig cacheConfig;
private final RepositorySystem repoSystem;
private final ArtifactHandlerManager artifactHandlerManager;
@@ -130,8 +130,8 @@ public class CacheControllerImpl implements CacheController
Logger logger,
MavenPluginManager mavenPluginManager,
MavenProjectHelper projectHelper,
- LocalArtifactsRepository localCache,
- RemoteArtifactsRepository remoteCache,
+ LocalCacheRepository localCache,
+ RemoteCacheRepository remoteCache,
CacheConfig cacheConfig,
RepositorySystem repoSystem,
ArtifactHandlerManager artifactHandlerManager,
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/ArtifactsRepository.java b/maven-caching/src/main/java/org/apache/maven/caching/CacheRepository.java
similarity index 95%
rename from maven-caching/src/main/java/org/apache/maven/caching/ArtifactsRepository.java
rename to maven-caching/src/main/java/org/apache/maven/caching/CacheRepository.java
index f3f45cf..d1930ba 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/ArtifactsRepository.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/CacheRepository.java
@@ -27,9 +27,9 @@ import org.apache.maven.execution.MavenSession;
import java.io.IOException;
/**
- * ArtifactsRepository
+ * Cache repository.
*/
-public interface ArtifactsRepository
+public interface CacheRepository
{
Build findBuild( CacheContext context ) throws IOException;
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
similarity index 97%
rename from maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
rename to maven-caching/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
index 9cf169d..3b74e3c 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
@@ -55,11 +55,11 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
/**
- * HttpRepositoryImpl
+ * HTTP remote cache repository implementation.
*/
@Singleton
@Named
-public class HttpRepositoryImpl implements RemoteArtifactsRepository
+public class HttpCacheRepositoryImpl implements RemoteCacheRepository
{
public static final String BUILDINFO_XML = "buildinfo.xml";
@@ -71,7 +71,7 @@ public class HttpRepositoryImpl implements RemoteArtifactsRepository
private final CacheConfig cacheConfig;
@Inject
- public HttpRepositoryImpl( Logger logger, LegacySupport legacySupport,
+ public HttpCacheRepositoryImpl( Logger logger, LegacySupport legacySupport,
XmlService xmlService, CacheConfig cacheConfig )
{
this.logger = logger;
@@ -82,7 +82,7 @@ public class HttpRepositoryImpl implements RemoteArtifactsRepository
@SuppressWarnings( "checkstyle:constantname" )
private static final ThreadLocal<HttpClient> httpClient =
- ThreadLocal.withInitial( HttpRepositoryImpl::newHttpClient );
+ ThreadLocal.withInitial( HttpCacheRepositoryImpl::newHttpClient );
@SuppressWarnings( "checkstyle:magicnumber" )
private static CloseableHttpClient newHttpClient()
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java b/maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
similarity index 94%
rename from maven-caching/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java
rename to maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
index 7728467..c2b55d4 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
@@ -30,9 +30,9 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
/**
- * LocalArtifactsRepository
+ * Local cache repository.
*/
-public interface LocalArtifactsRepository extends ArtifactsRepository
+public interface LocalCacheRepository extends CacheRepository
{
void beforeSave( CacheContext environment ) throws IOException;
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
similarity index 98%
rename from maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
rename to maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
index c162e09..e6589c1 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
@@ -69,11 +69,11 @@ import static org.apache.maven.caching.ProjectUtils.getMultimoduleRoot;
import static org.apache.maven.caching.checksum.MavenProjectInput.CACHE_IMPLMENTATION_VERSION;
/**
- * LocalRepositoryImpl
+ * Local cache repository implementation.
*/
@Singleton
@Named
-public class LocalRepositoryImpl implements LocalArtifactsRepository
+public class LocalCacheRepositoryImpl implements LocalCacheRepository
{
private static final String BUILDINFO_XML = "buildinfo.xml";
@@ -85,16 +85,16 @@ public class LocalRepositoryImpl implements LocalArtifactsRepository
private final Logger logger;
private final LegacySupport legacySupport;
- private final RemoteArtifactsRepository remoteRepository;
+ private final RemoteCacheRepository remoteRepository;
private final XmlService xmlService;
private final CacheConfig cacheConfig;
private final Map<Pair<MavenSession, Dependency>, Optional<Build>> bestBuildCache = new ConcurrentHashMap<>();
@Inject
- public LocalRepositoryImpl(
+ public LocalCacheRepositoryImpl(
Logger logger,
LegacySupport legacySupport,
- RemoteArtifactsRepository remoteRepository,
+ RemoteCacheRepository remoteRepository,
XmlService xmlService,
CacheConfig cacheConfig )
{
@@ -226,7 +226,7 @@ public class LocalRepositoryImpl implements LocalArtifactsRepository
int maxLocalBuildsCached = cacheConfig.getMaxLocalBuildsCached() - 1;
if ( cacheDirs.size() > maxLocalBuildsCached )
{
- cacheDirs.sort( Comparator.comparing( LocalRepositoryImpl::lastModifiedTime ) );
+ cacheDirs.sort( Comparator.comparing( LocalCacheRepositoryImpl::lastModifiedTime ) );
for ( Path dir : cacheDirs.subList( 0, cacheDirs.size() - maxLocalBuildsCached ) )
{
FileUtils.deleteDirectory( dir.toFile() );
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java b/maven-caching/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
similarity index 93%
rename from maven-caching/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java
rename to maven-caching/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
index 9c4f8a1..f2b3fff 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
@@ -27,9 +27,9 @@ import org.apache.maven.caching.xml.build.Artifact;
import org.apache.maven.project.MavenProject;
/**
- * RemoteArtifactsRepository
+ * Remote cache repository.
*/
-public interface RemoteArtifactsRepository extends ArtifactsRepository
+public interface RemoteCacheRepository extends CacheRepository
{
byte[] getArtifactContent( CacheContext context, Artifact artifact ) throws IOException;
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java b/maven-caching/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
index 54c45a4..bcfd6a2 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
@@ -54,10 +54,10 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.caching.Clock;
-import org.apache.maven.caching.LocalArtifactsRepository;
+import org.apache.maven.caching.LocalCacheRepository;
import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.ProjectUtils;
-import org.apache.maven.caching.RemoteArtifactsRepository;
+import org.apache.maven.caching.RemoteCacheRepository;
import org.apache.maven.caching.ScanConfigProperties;
import org.apache.maven.caching.Utils;
import org.apache.maven.caching.hash.HashAlgorithm;
@@ -133,8 +133,8 @@ public class MavenProjectInput
private final Logger logger;
private final MavenProject project;
private final MavenSession session;
- private final LocalArtifactsRepository localCache;
- private final RemoteArtifactsRepository remoteCache;
+ private final LocalCacheRepository localCache;
+ private final RemoteCacheRepository remoteCache;
private final RepositorySystem repoSystem;
private final ArtifactHandlerManager artifactHandlerManager;
private final CacheConfig config;
@@ -156,8 +156,8 @@ public class MavenProjectInput
RepositorySystem repoSystem,
ArtifactHandlerManager artifactHandlerManager,
Logger logger,
- LocalArtifactsRepository localCache,
- RemoteArtifactsRepository remoteCache )
+ LocalCacheRepository localCache,
+ RemoteCacheRepository remoteCache )
{
this.project = project;
this.session = session;