aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/metadata/metadata-repository-api
diff options
context:
space:
mode:
Diffstat (limited to 'archiva-modules/metadata/metadata-repository-api')
-rw-r--r--archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java8
-rw-r--r--archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml4
2 files changed, 7 insertions, 5 deletions
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index e94ff0969..b8903dfea 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -93,7 +93,7 @@ public class DefaultMetadataResolver
*/
@Inject
@Named( value = "cache#namespaces" )
- private Cache<String, Collection<String>> namespacesCache;
+ private Cache<String, List<String>> namespacesCache;
@Override
public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,
@@ -193,7 +193,7 @@ public class DefaultMetadataResolver
try
{
- Collection<String> namespaces = namespacesCache.get( repoId );
+ List<String> namespaces = namespacesCache.get( repoId );
if ( namespaces != null )
{
return namespaces;
@@ -246,7 +246,7 @@ public class DefaultMetadataResolver
{
MetadataRepository metadataRepository = session.getRepository();
String cacheKey = repoId + "-" + namespace;
- Collection<String> namespaces = namespacesCache.get( cacheKey );
+ List<String> namespaces = namespacesCache.get( cacheKey );
if ( namespaces == null )
{
namespaces = metadataRepository.getChildNamespaces( session, repoId, namespace );
@@ -299,7 +299,7 @@ public class DefaultMetadataResolver
Collection<String> exclusions = new ArrayList<>( projects );
String cacheKey = repoId + "-" + namespace;
- Collection<String> namespaces = namespacesCache.get( cacheKey );
+ List<String> namespaces = namespacesCache.get( cacheKey );
if ( namespaces == null )
{
namespaces = metadataRepository.getChildNamespaces( session, repoId, namespace );
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml b/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
index 06b3213a5..6f4964fa4 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
@@ -41,11 +41,13 @@
<bean name="cache#namespaces" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="java.util.ArrayList"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
- <property name="name" value="usersCache"/>
+ <property name="name" value="namespaces"/>
<property name="timeToIdleSeconds" value="600"/>
<property name="timeToLiveSeconds" value="600"/>
</bean>