You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/08/06 20:07:33 UTC
[archiva] branch feature/storage_refactoring updated: Refactoring
repository metadata session handling
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/feature/storage_refactoring by this push:
new 21d5cf5 Refactoring repository metadata session handling
21d5cf5 is described below
commit 21d5cf53fe45111fdb030b307715780703032de7
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue Aug 6 22:06:57 2019 +0200
Refactoring repository metadata session handling
---
.../core/repository/AbstractRepositoryPurge.java | 34 +-
.../CleanupReleasedSnapshotsRepositoryPurge.java | 2 +-
...leanupReleasedSnapshotsRepositoryPurgeTest.java | 30 +-
.../repository/DaysOldRepositoryPurgeTest.java | 18 +-
.../repository/RepositoryPurgeConsumerTest.java | 26 +-
.../RetentionCountRepositoryPurgeTest.java | 18 +-
.../metadata/ArchivaMetadataCreationConsumer.java | 36 +-
.../managed/DefaultManagedRepositoryAdmin.java | 22 +-
.../ArchivaRepositoryScanningTaskExecutor.java | 8 +-
.../archiva-rest/archiva-rest-api/pom.xml | 5 +
.../rest/services/DefaultBrowseService.java | 43 +-
.../services/DefaultMergeRepositoriesService.java | 4 +-
.../services/DefaultReportRepositoriesService.java | 4 +-
.../rest/services/DefaultRepositoriesService.java | 62 +-
.../rest/services/DefaultSearchService.java | 2 +-
.../processor/NewArtifactsRssFeedProcessor.java | 10 +-
.../NewVersionsOfArtifactRssFeedProcessor.java | 21 +-
.../NewVersionsOfArtifactRssFeedProcessorTest.java | 28 +-
.../webtest/memory/TestMetadataRepository.java | 5 -
.../metadata/repository/RepositorySession.java | 16 +-
.../repository/RepositorySessionFactory.java | 1 +
.../repository/AbstractMetadataRepositoryTest.java | 2358 ++++++++++----------
.../model/RepositoryWalkingStatisticsProvider.java | 16 +-
.../apache/archiva/audit/DefaultAuditManager.java | 117 +-
.../archiva/audit/MetadataAuditListener.java | 8 +-
.../org/apache/archiva/audit/AuditManagerTest.java | 190 +-
.../cassandra/CassandraMetadataRepositoryTest.java | 4 +-
.../cassandra/RepositoriesNamespaceTest.java | 17 +-
.../repository/jcr/JcrMetadataRepository.java | 2 +-
.../jcr/JcrRepositorySessionFactory.java | 35 +-
.../metadata/repository/jcr/JcrSession.java | 21 +
.../metadata/repository/jcr/RepositoryFactory.java | 58 +-
.../repository/jcr/JcrMetadataRepositoryTest.java | 52 +-
.../JcrRepositoryStatisticsGatheringTest.java | 128 +-
.../src/test/resources/log4j2-test.xml | 1 +
.../reports/RepositoryProblemEventListener.java | 14 +-
.../consumers/DuplicateArtifactsConsumer.java | 5 +-
.../consumers/DuplicateArtifactsConsumerTest.java | 30 +-
.../stats/DefaultRepositoryStatisticsManager.java | 146 +-
.../stats/RepositoryStatisticsManagerTest.java | 158 +-
.../merge/Maven2RepositoryMerger.java | 19 +-
.../merge/Maven2RepositoryMergerTest.java | 25 +-
pom.xml | 3 +-
43 files changed, 2014 insertions(+), 1788 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
index c470615..a8cf4b7 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
@@ -23,10 +23,7 @@ import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.MetadataResolutionException;
-import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.repository.ContentNotFoundException;
import org.apache.archiva.repository.ManagedRepositoryContent;
@@ -203,7 +200,7 @@ public abstract class AbstractRepositoryPurge
{
try
{
- metaResolved.put( metaBaseId, metadataRepository.getArtifacts( , repository.getId( ),
+ metaResolved.put( metaBaseId, metadataRepository.getArtifacts(repositorySession, repository.getId( ),
reference.getGroupId( ), reference.getArtifactId( ), baseVersion ) );
}
catch ( MetadataResolutionException e )
@@ -314,18 +311,22 @@ public abstract class AbstractRepositoryPurge
}
projectLevelMetadata.add( info.projectVersionLevel( ) );
}
- metadataRepository.save( );
+ try {
+ repositorySession.save( );
+ } catch (MetadataSessionException e) {
+ log.error("Could not save sesion {}", e.getMessage());
+ }
Collection<ArtifactMetadata> artifacts = null;
// Get remaining artifacts and remove project if empty
for ( ArtifactInfo info : projectLevelMetadata )
{
try
{
- artifacts = metadataRepository.getArtifacts( , repository.getId( ), info.getNamespace( ),
+ artifacts = metadataRepository.getArtifacts(repositorySession , repository.getId( ), info.getNamespace( ),
info.getName( ), info.getProjectVersion( ) );
if ( artifacts.size( ) == 0 )
{
- metadataRepository.removeProjectVersion( , repository.getId( ),
+ metadataRepository.removeProjectVersion(repositorySession , repository.getId( ),
info.getNamespace( ), info.getName( ), info.getProjectVersion( ) );
log.debug( "Removed project version from MetadataRepository {}", info );
}
@@ -335,7 +336,12 @@ public abstract class AbstractRepositoryPurge
log.error( "Could not remove project version from MetadataRepository {}: {}", info, e.getMessage( ), e );
}
}
- metadataRepository.save( );
+ try {
+ repositorySession.save( );
+ } catch (MetadataSessionException e) {
+ log.error("Could not save sesion {}", e.getMessage());
+
+ }
}
@@ -360,14 +366,18 @@ public abstract class AbstractRepositoryPurge
version = artifactInfo.getProjectVersion( );
MavenArtifactFacet mavenArtifactFacetToCompare = new MavenArtifactFacet( );
mavenArtifactFacetToCompare.setClassifier( artifactInfo.getClassifier( ) );
- metadataRepository.removeArtifact( , repository.getId( ), groupId,
+ metadataRepository.removeArtifact(repositorySession , repository.getId( ), groupId,
artifactId, version, mavenArtifactFacetToCompare );
- metadataRepository.save( );
+ try {
+ repositorySession.save( );
+ } catch (MetadataSessionException e) {
+ log.error("Could not save session {}", e.getMessage());
+ }
}
}
else
{
- metadataRepository.removeArtifact( , artifactMetadata, artifactInfo.getProjectVersion( ) );
+ metadataRepository.removeArtifact(repositorySession , artifactMetadata, artifactInfo.getProjectVersion( ) );
}
}
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index 5c33d44..7030ac7 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -158,7 +158,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
artifactRef.getArtifactId( ), artifactRef.getVersion( ),
artifactFile.getFileName().toString() );
}
- metadataRepository.removeProjectVersion( , repository.getId( ),
+ metadataRepository.removeProjectVersion( repositorySession, repository.getId( ),
artifactRef.getGroupId( ), artifactRef.getArtifactId( ), artifactRef.getVersion( ) );
needsMetadataUpdate = true;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index 034aab9..fdd86cb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -127,7 +127,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
@@ -137,8 +137,8 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Verify the metadataRepository invocations
// complete snapshot version removal for released
- verify(metadataRepository, times(1)).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.3") );
+ verify(metadataRepository, times(1)).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.3") );
// check if the snapshot was removed
assertDeleted( projectRoot + "/2.3-SNAPSHOT" );
@@ -246,11 +246,11 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
List<ArtifactMetadata> ml2 = getArtifactMetadataFromDir(RELEASES_TEST_REPO_ID , projectName, repo.getParent(), releaseDir );
- when(metadataRepository.getArtifacts( , RELEASES_TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , RELEASES_TEST_REPO_ID,
projectNs, projectName, releaseVersion )).thenReturn(ml2);
@@ -260,8 +260,8 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Verify the metadataRepository invocations
// Complete version removal for cleanup
- verify(metadataRepository, times(1)).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
- verify(metadataRepository, never()).removeProjectVersion( , eq(RELEASES_TEST_REPO_ID), eq(projectNs), eq(projectName), eq(releaseVersion) );
+ verify(metadataRepository, times(1)).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(RELEASES_TEST_REPO_ID), eq(projectNs), eq(projectName), eq(releaseVersion) );
// check if the snapshot was removed
@@ -317,13 +317,13 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
List<ArtifactMetadata> m2 = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir2 );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, "2.0.3-SNAPSHOT" )).thenReturn(ml);
List<ArtifactMetadata> m3 = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir3 );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, "2.0.4-SNAPSHOT" )).thenReturn(ml);
@@ -333,11 +333,11 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
// Verify the metadataRepository invocations
// No removal
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.0.3-SNAPSHOT") );
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.0.4-SNAPSHOT") );
- verify(metadataRepository, never()).removeArtifact( , any(ArtifactMetadata.class), any(String.class) );
- verify(metadataRepository, never()).removeArtifact( , any(String.class), any(String.class), any(String.class), any(String.class), any( MetadataFacet.class) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.0.3-SNAPSHOT") );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq("2.0.4-SNAPSHOT") );
+ verify(metadataRepository, never()).removeArtifact(repositorySession , any(ArtifactMetadata.class), any(String.class) );
+ verify(metadataRepository, never()).removeArtifact(repositorySession , any(String.class), any(String.class), any(String.class), any(String.class), any( MetadataFacet.class) );
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
index 36b225e..651e90a 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
@@ -112,7 +112,7 @@ public class DaysOldRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
repoPurge.process( PATH_TO_BY_DAYS_OLD_ARTIFACT );
@@ -120,9 +120,9 @@ public class DaysOldRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(2)).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(2)).removeArtifact(repositorySession , metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -197,7 +197,7 @@ public class DaysOldRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
@@ -206,9 +206,9 @@ public class DaysOldRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(deletedVersions.size())).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(deletedVersions.size())).removeArtifact(repositorySession , metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -296,7 +296,7 @@ public class DaysOldRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts(repositorySession , TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
@@ -305,9 +305,9 @@ public class DaysOldRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion(repositorySession , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(deletedVersions.size())).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(deletedVersions.size())).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
index 2e63c33..d6f634f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
@@ -188,7 +188,7 @@ public class RepositoryPurgeConsumerTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir( TEST_REPO_ID, projectName, repo, vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
Set<String> deletedVersions = new HashSet<>();
deletedVersions.add("1.0RC1-20070504.153317-1");
@@ -197,9 +197,9 @@ public class RepositoryPurgeConsumerTest
repoPurgeConsumer.processFile( PATH_TO_BY_RETENTION_COUNT_ARTIFACT );
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(2)).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(2)).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -291,7 +291,7 @@ public class RepositoryPurgeConsumerTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir( TEST_REPO_ID, projectName, repo, vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
Set<String> deletedVersions = new HashSet<>();
deletedVersions.add("2.2-SNAPSHOT");
@@ -300,9 +300,9 @@ public class RepositoryPurgeConsumerTest
repoPurgeConsumer.processFile( PATH_TO_BY_DAYS_OLD_ARTIFACT );
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(2)).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(2)).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -373,16 +373,16 @@ public class RepositoryPurgeConsumerTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir( TEST_REPO_ID, projectName, repo, vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
repoPurgeConsumer.processFile(
CleanupReleasedSnapshotsRepositoryPurgeTest.PATH_TO_RELEASED_SNAPSHOT_IN_SAME_REPO );
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, never()).removeArtifact( , any(), any() );
- verify(metadataRepository, never()).removeArtifact( , any(), any(), any(), any(), any(MetadataFacet.class) );
+ verify(metadataRepository, never()).removeArtifact( repositorySession, any(), any() );
+ verify(metadataRepository, never()).removeArtifact( repositorySession, any(), any(), any(), any(), any(MetadataFacet.class) );
// check if the snapshot wasn't removed
@@ -436,15 +436,15 @@ public class RepositoryPurgeConsumerTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
repoPurgeConsumer.processFile(
CleanupReleasedSnapshotsRepositoryPurgeTest.PATH_TO_RELEASED_SNAPSHOT_IN_SAME_REPO );
- verify(metadataRepository, times(1)).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, times(1)).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, never()).removeArtifact( , any(), any() );
+ verify(metadataRepository, never()).removeArtifact( repositorySession, any(), any() );
// check if the snapshot was removed
assertDeleted( projectRoot + "/2.3-SNAPSHOT" );
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
index 734df37..ba16bc3 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
@@ -115,7 +115,7 @@ public class RetentionCountRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
@@ -124,9 +124,9 @@ public class RetentionCountRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(deletedVersions.size())).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(deletedVersions.size())).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -202,7 +202,7 @@ public class RetentionCountRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
repoPurge.process( PATH_TO_BY_RETENTION_COUNT_POM );
@@ -210,9 +210,9 @@ public class RetentionCountRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(deletedVersions.size())).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(deletedVersions.size())).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
@@ -290,7 +290,7 @@ public class RetentionCountRepositoryPurgeTest
// Provide the metadata list
List<ArtifactMetadata> ml = getArtifactMetadataFromDir(TEST_REPO_ID , projectName, repo.getParent(), vDir );
- when(metadataRepository.getArtifacts( , TEST_REPO_ID,
+ when(metadataRepository.getArtifacts( repositorySession, TEST_REPO_ID,
projectNs, projectName, projectVersion )).thenReturn(ml);
repoPurge.process( PATH_TO_TEST_ORDER_OF_DELETION );
@@ -298,9 +298,9 @@ public class RetentionCountRepositoryPurgeTest
listenerControl.verify();
// Verify the metadataRepository invocations
- verify(metadataRepository, never()).removeProjectVersion( , eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
+ verify(metadataRepository, never()).removeProjectVersion( repositorySession, eq(TEST_REPO_ID), eq(projectNs), eq(projectName), eq(projectVersion) );
ArgumentCaptor<ArtifactMetadata> metadataArg = ArgumentCaptor.forClass(ArtifactMetadata.class);
- verify(metadataRepository, times(deletedVersions.size())).removeArtifact( , metadataArg.capture(), eq(projectVersion) );
+ verify(metadataRepository, times(deletedVersions.size())).removeArtifact( repositorySession, metadataArg.capture(), eq(projectVersion) );
List<ArtifactMetadata> metaL = metadataArg.getAllValues();
for (ArtifactMetadata meta : metaL) {
assertTrue(meta.getId().startsWith(projectName));
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
index e93b032..f50cbbd 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
@@ -29,10 +29,7 @@ import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest;
import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
@@ -193,14 +190,14 @@ public class ArchivaMetadataCreationConsumer
// read the metadata and update it if it is newer or doesn't exist
artifact.setWhenGathered( whenGathered );
- metadataRepository.updateArtifact( , repoId, project.getNamespace(), project.getId(),
+ metadataRepository.updateArtifact(repositorySession , repoId, project.getNamespace(), project.getId(),
projectVersion, artifact );
if ( createVersionMetadata )
{
- metadataRepository.updateProjectVersion( , repoId, project.getNamespace(),
+ metadataRepository.updateProjectVersion(repositorySession , repoId, project.getNamespace(),
project.getId(), versionMetadata );
}
- metadataRepository.updateProject( , repoId, project );
+ metadataRepository.updateProject(repositorySession , repoId, project );
repositorySession.save();
}
catch ( MetadataRepositoryException e )
@@ -208,27 +205,28 @@ public class ArchivaMetadataCreationConsumer
log.warn(
"Error occurred persisting metadata for artifact:{} (repository:{}); message: {}" ,
path, repoId, e.getMessage(), e );
- repositorySession.revert();
+ try {
+ repositorySession.revert();
+ } catch (MetadataSessionException ex) {
+ log.error("Reverting failed {}", ex.getMessage());
+ }
}
catch ( RepositoryStorageRuntimeException e )
{
log.warn(
"Error occurred persisting metadata for artifact:{} (repository:{}); message: {}",
path, repoId, e.getMessage(), e );
- repositorySession.revert();
- }
- finally
+ try {
+ repositorySession.revert();
+ } catch (MetadataSessionException ex) {
+ log.error("Reverting failed {}", ex.getMessage());
+ }
+ } catch (MetadataSessionException e) {
+ throw new ConsumerException(e.getMessage(), e);
+ } finally
{
repositorySession.close();
}
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
}
@Override
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index c8cf62a..6d7d8d7 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -32,10 +32,7 @@ import org.apache.archiva.indexer.ArchivaIndexManager;
import org.apache.archiva.indexer.IndexManagerFactory;
import org.apache.archiva.indexer.IndexUpdateFailedException;
import org.apache.archiva.metadata.model.facets.AuditEvent;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.components.registry.RegistryException;
@@ -352,7 +349,7 @@ public class DefaultManagedRepositoryAdmin
try
{
MetadataRepository metadataRepository = repositorySession.getRepository();
- metadataRepository.removeRepository( , repository.getId() );
+ metadataRepository.removeRepository(repositorySession , repository.getId() );
//invalidate cache
namespacesCache.remove( repository.getId() );
log.debug( "call repositoryStatisticsManager.deleteStatistics" );
@@ -363,15 +360,12 @@ public class DefaultManagedRepositoryAdmin
{
//throw new RepositoryAdminException( e.getMessage(), e );
log.warn( "skip error during removing repository from MetadataRepository:{}", e.getMessage(), e );
- }
- finally
+ } catch (MetadataSessionException e) {
+ log.warn( "skip error during removing repository from MetadataRepository:{}", e.getMessage(), e );
+ } finally
{
repositorySession.close();
}
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
}
if ( deleteContent )
@@ -526,7 +520,7 @@ public class DefaultManagedRepositoryAdmin
}
}
- catch ( MetadataRepositoryException e )
+ catch (MetadataRepositoryException | MetadataSessionException e )
{
throw new RepositoryAdminException( e.getMessage(), e );
}
@@ -534,10 +528,6 @@ public class DefaultManagedRepositoryAdmin
{
repositorySession.close();
}
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
if ( updateIndexContext )
{
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
index a2d5c6a..2c97314 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
@@ -176,14 +176,14 @@ public class ArchivaRepositoryScanningTaskExecutor
{
throw new TaskExecutionException( "Unable to store updated statistics: " + e.getMessage(), e );
}
- finally
- {
- repositorySession.close();
- }
catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
{
e.printStackTrace( );
}
+ finally
+ {
+ repositorySession.close();
+ }
// log.info( "Scanning for removed repository content" );
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index 4de49d7..0592cc5 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -71,6 +71,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-statistics-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index 1f50870..ee606ae 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -317,18 +317,15 @@ public class DefaultBrowseService
}
return versionMetadata;
- }
- finally
+ } catch (MetadataRepositoryException e) {
+ throw new ArchivaRestServiceException(e.getMessage(), e);
+ } finally
{
if ( repositorySession != null )
{
repositorySession.close();
}
}
- catch ( MetadataRepositoryException e )
- {
- e.printStackTrace( );
- }
}
@@ -479,7 +476,7 @@ public class DefaultBrowseService
}
return sharedModel;
}
- catch ( MetadataResolutionException e )
+ catch (MetadataResolutionException | MetadataRepositoryException e )
{
throw new ArchivaRestServiceException( e.getMessage(),
Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e );
@@ -491,10 +488,6 @@ public class DefaultBrowseService
repositorySession.close();
}
}
- catch ( MetadataRepositoryException e )
- {
- e.printStackTrace( );
- }
}
@Override
@@ -662,11 +655,11 @@ public class DefaultBrowseService
{
MetadataRepository metadataRepository = repositorySession.getRepository();
- metadataRepository.updateProjectVersion( , repositoryId, groupId, artifactId, projectVersionMetadata );
+ metadataRepository.updateProjectVersion(repositorySession , repositoryId, groupId, artifactId, projectVersionMetadata );
repositorySession.save();
}
- catch ( MetadataRepositoryException e )
+ catch (MetadataRepositoryException | MetadataSessionException e )
{
log.error( e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(),
@@ -676,10 +669,6 @@ public class DefaultBrowseService
{
repositorySession.close();
}
- catch ( MetadataSessionException e )
- {
- e.printStackTrace( );
- }
return Boolean.TRUE;
}
@@ -723,11 +712,11 @@ public class DefaultBrowseService
{
MetadataRepository metadataRepository = repositorySession.getRepository();
- metadataRepository.updateProjectVersion( , repositoryId, groupId, artifactId, projectVersionMetadata );
+ metadataRepository.updateProjectVersion(repositorySession , repositoryId, groupId, artifactId, projectVersionMetadata );
repositorySession.save();
}
- catch ( MetadataRepositoryException e )
+ catch (MetadataRepositoryException | MetadataSessionException e )
{
log.error( e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(),
@@ -737,10 +726,6 @@ public class DefaultBrowseService
{
repositorySession.close();
}
- catch ( MetadataSessionException e )
- {
- e.printStackTrace( );
- }
return Boolean.TRUE;
}
@@ -1006,7 +991,7 @@ public class DefaultBrowseService
}
try
{
- List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifacts( , repositoryId );
+ List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifacts(repositorySession , repositoryId );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
@@ -1034,7 +1019,7 @@ public class DefaultBrowseService
}
try
{
- List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByProjectVersionMetadata( , key, value, repositoryId );
+ List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByProjectVersionMetadata(repositorySession , key, value, repositoryId );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
@@ -1062,7 +1047,7 @@ public class DefaultBrowseService
}
try
{
- List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByMetadata( , key, value, repositoryId );
+ List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByMetadata(repositorySession , key, value, repositoryId );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
@@ -1090,7 +1075,7 @@ public class DefaultBrowseService
}
try
{
- List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByProperty( , key, value, repositoryId );
+ List<ArtifactMetadata> artifactMetadatas = repositorySession.getRepository().getArtifactsByProperty(repositorySession , key, value, repositoryId );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
@@ -1137,7 +1122,7 @@ public class DefaultBrowseService
try
{
List<ArtifactMetadata> artifactMetadatas =
- repositorySession.getRepository().searchArtifacts( , repositoryId, text, exact == null ? false : exact );
+ repositorySession.getRepository().searchArtifacts(repositorySession , repositoryId, text, exact == null ? false : exact );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
@@ -1166,7 +1151,7 @@ public class DefaultBrowseService
try
{
List<ArtifactMetadata> artifactMetadatas =
- repositorySession.getRepository().searchArtifacts( , repositoryId, key, text, exact == null ? false : exact );
+ repositorySession.getRepository().searchArtifacts(repositorySession , repositoryId, key, text, exact == null ? false : exact );
return buildArtifacts( artifactMetadatas, repositoryId );
}
catch ( MetadataRepositoryException e )
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
index 39bdc58..38a52ce 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
@@ -128,7 +128,7 @@ public class DefaultMergeRepositoriesService
{
org.apache.archiva.repository.ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(targetRepositoryId);
MetadataRepository metadataRepository = repositorySession.getRepository();
- List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( , sourceRepositoryId );
+ List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts(repositorySession , sourceRepositoryId );
if ( managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.RELEASE) && !managedRepo.getActiveReleaseSchemes().contains(ReleaseScheme.SNAPSHOT) )
{
@@ -174,7 +174,7 @@ public class DefaultMergeRepositoriesService
repositoryMerger.getConflictingArtifacts( repositorySession.getRepository(), sourceRepositoryId,
targetRepositoryId );
MetadataRepository metadataRepository = repositorySession.getRepository();
- List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( , sourceRepositoryId );
+ List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts(repositorySession , sourceRepositoryId );
sourceArtifacts.removeAll( conflictSourceArtifacts );
org.apache.archiva.repository.ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(targetRepositoryId);
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
index 76d4f77..7e1ebc0 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
@@ -173,10 +173,10 @@ public class DefaultReportRepositoriesService
MetadataRepository metadataRepository = repositorySession.getRepository();
for ( String repoId : observableRepositories )
{
- for ( String name : metadataRepository.getMetadataFacets( , repoId, RepositoryProblemFacet.FACET_ID ) )
+ for ( String name : metadataRepository.getMetadataFacets(repositorySession , repoId, RepositoryProblemFacet.FACET_ID ) )
{
RepositoryProblemFacet metadataFacet =
- (RepositoryProblemFacet) metadataRepository.getMetadataFacet( ,
+ (RepositoryProblemFacet) metadataRepository.getMetadataFacet(repositorySession ,
repoId,
RepositoryProblemFacet.FACET_ID, name );
if ( StringUtils.isEmpty( groupId ) || groupId.equals( metadataFacet.getNamespace() ) )
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 7e8fa2c..faa07e8 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -30,11 +30,7 @@ import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.MetadataResolutionException;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.model.VersionedReference;
@@ -703,14 +699,14 @@ public class DefaultRepositoriesService
}
Collection<ArtifactMetadata> artifacts =
- metadataRepository.getArtifacts( , repositoryId, namespace, projectId, version );
+ metadataRepository.getArtifacts(repositorySession , repositoryId, namespace, projectId, version );
for ( ArtifactMetadata artifactMetadata : artifacts )
{
- metadataRepository.removeArtifact( , artifactMetadata, version );
+ metadataRepository.removeArtifact(repositorySession , artifactMetadata, version );
}
- metadataRepository.removeProjectVersion( , repositoryId, namespace, projectId, version );
+ metadataRepository.removeProjectVersion(repositorySession , repositoryId, namespace, projectId, version );
}
catch ( MetadataRepositoryException e )
{
@@ -727,14 +723,14 @@ public class DefaultRepositoriesService
finally
{
- repositorySession.save();
+ try {
+ repositorySession.save();
+ } catch (MetadataSessionException e) {
+ log.error("Session save failed {}", e.getMessage());
+ }
repositorySession.close();
}
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
return Boolean.TRUE;
}
@@ -869,13 +865,13 @@ public class DefaultRepositoriesService
{
String baseVersion = VersionUtil.getBaseVersion( artifact.getVersion() );
artifacts =
- metadataRepository.getArtifacts( , repositoryId, artifact.getGroupId(),
+ metadataRepository.getArtifacts(repositorySession , repositoryId, artifact.getGroupId(),
artifact.getArtifactId(), baseVersion );
}
else
{
artifacts =
- metadataRepository.getArtifacts( , repositoryId, artifact.getGroupId(),
+ metadataRepository.getArtifacts(repositorySession , repositoryId, artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion() );
}
@@ -887,13 +883,13 @@ public class DefaultRepositoriesService
{
// verify metata repository doesn't contains anymore the version
Collection<String> projectVersions =
- metadataRepository.getProjectVersions( , repositoryId,
+ metadataRepository.getProjectVersions(repositorySession , repositoryId,
artifact.getGroupId(), artifact.getArtifactId() );
if ( projectVersions.contains( artifact.getVersion() ) )
{
log.warn( "artifact not found when deleted but version still here ! so force cleanup" );
- metadataRepository.removeProjectVersion( , repositoryId,
+ metadataRepository.removeProjectVersion(repositorySession , repositoryId,
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
}
@@ -924,9 +920,9 @@ public class DefaultRepositoriesService
artifact.getVersion();
MavenArtifactFacet mavenArtifactFacetToCompare = new MavenArtifactFacet();
mavenArtifactFacetToCompare.setClassifier( artifact.getClassifier() );
- metadataRepository.removeArtifact( , repositoryId, groupId, artifactId,
+ metadataRepository.removeArtifact(repositorySession , repositoryId, groupId, artifactId,
version, mavenArtifactFacetToCompare );
- metadataRepository.save();
+ repositorySession.save();
}
}
@@ -934,12 +930,12 @@ public class DefaultRepositoriesService
{
if ( snapshotVersion )
{
- metadataRepository.removeArtifact( ,
+ metadataRepository.removeArtifact(repositorySession ,
artifactMetadata, VersionUtil.getBaseVersion( artifact.getVersion() ) );
}
else
{
- metadataRepository.removeArtifact( ,
+ metadataRepository.removeArtifact(repositorySession ,
artifactMetadata.getRepositoryId(),
artifactMetadata.getNamespace(), artifactMetadata.getProject(),
artifact.getVersion(), artifactMetadata.getId() );
@@ -970,7 +966,7 @@ public class DefaultRepositoriesService
{
throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
}
- catch ( MetadataResolutionException e )
+ catch (MetadataResolutionException | MetadataSessionException e )
{
throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
}
@@ -981,14 +977,14 @@ public class DefaultRepositoriesService
finally
{
- repositorySession.save();
+ try {
+ repositorySession.save();
+ } catch (MetadataSessionException e) {
+ log.error("Could not save sesion {}", e.getMessage());
+ }
repositorySession.close();
}
- catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
- {
- e.printStackTrace( );
- }
return Boolean.TRUE;
}
@@ -1029,16 +1025,16 @@ public class DefaultRepositoriesService
MetadataRepository metadataRepository = repositorySession.getRepository();
- metadataRepository.removeNamespace( , repositoryId, groupId );
+ metadataRepository.removeNamespace(repositorySession , repositoryId, groupId );
// just invalidate cache entry
String cacheKey = repositoryId + "-" + groupId;
namespacesCache.remove( cacheKey );
namespacesCache.remove( repositoryId );
- metadataRepository.save();
+ repositorySession.save();
}
- catch ( MetadataRepositoryException e )
+ catch (MetadataRepositoryException | MetadataSessionException e )
{
log.error( e.getMessage(), e );
throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
@@ -1111,11 +1107,11 @@ public class DefaultRepositoriesService
MetadataRepository metadataRepository = repositorySession.getRepository();
- metadataRepository.removeProject( , repositoryId, groupId, projectId );
+ metadataRepository.removeProject(repositorySession , repositoryId, groupId, projectId );
- metadataRepository.save();
+ repositorySession.save();
}
- catch ( MetadataRepositoryException e )
+ catch (MetadataRepositoryException | MetadataSessionException e )
{
log.error( e.getMessage(), e );
throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
index 10caa30..7764194 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
@@ -234,7 +234,7 @@ public class DefaultSearchService
for ( String repoId : checksumSearch.getRepositories() )
{
Collection<ArtifactMetadata> artifactMetadatas =
- metadataRepository.getArtifactsByChecksum( , repoId, checksumSearch.getChecksum() );
+ metadataRepository.getArtifactsByChecksum( repositorySession, repoId, checksumSearch.getChecksum() );
artifactSet.addAll( buildArtifacts( artifactMetadatas, repoId ) );
}
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
index 789d084..6bac27e 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
@@ -24,6 +24,8 @@ import com.sun.syndication.io.FeedException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.rss.RssFeedEntry;
import org.apache.archiva.rss.RssFeedGenerator;
import org.slf4j.Logger;
@@ -60,6 +62,10 @@ public class NewArtifactsRssFeedProcessor
@Inject
private RssFeedGenerator generator;
+ @Inject
+ private RepositorySessionFactory repositorySessionFactory;
+
+
private Logger log = LoggerFactory.getLogger( NewArtifactsRssFeedProcessor.class );
private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
@@ -91,9 +97,9 @@ public class NewArtifactsRssFeedProcessor
greaterThanThisDate.clear( Calendar.MILLISECOND );
List<ArtifactMetadata> artifacts;
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
- artifacts = metadataRepository.getArtifactsByDateRange( , repoId, greaterThanThisDate.getTime(), null );
+ artifacts = metadataRepository.getArtifactsByDateRange(session , repoId, greaterThanThisDate.getTime(), null );
}
catch ( MetadataRepositoryException e )
{
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
index 68ddc45..daf1864 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
@@ -22,9 +22,9 @@ package org.apache.archiva.rss.processor;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.FeedException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.MetadataResolutionException;
+import org.apache.archiva.metadata.repository.*;
+import org.apache.archiva.repository.Repository;
+import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.rss.RssFeedEntry;
import org.apache.archiva.rss.RssFeedGenerator;
import org.slf4j.Logger;
@@ -57,6 +57,12 @@ public class NewVersionsOfArtifactRssFeedProcessor
@Inject
private RssFeedGenerator generator;
+ @Inject
+ private RepositoryRegistry repositoryRegistry;
+
+ @Inject
+ private RepositorySessionFactory repositorySessionFactory;
+
/**
* Process all versions of the artifact which had a rss feed request.
*/
@@ -80,14 +86,15 @@ public class NewVersionsOfArtifactRssFeedProcessor
throws FeedException
{
List<ArtifactMetadata> artifacts = new ArrayList<>();
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
- for ( String repoId : metadataRepository.getRepositories() )
+ for ( Repository repo : repositoryRegistry.getRepositories() )
{
- Collection<String> versions = metadataRepository.getProjectVersions( , repoId, groupId, artifactId );
+ final String repoId = repo.getId();
+ Collection<String> versions = metadataRepository.getProjectVersions( session, repoId, groupId, artifactId );
for ( String version : versions )
{
- artifacts.addAll( metadataRepository.getArtifacts( , repoId, groupId, artifactId, version ) );
+ artifacts.addAll( metadataRepository.getArtifacts(session , repoId, groupId, artifactId, version ) );
}
}
}
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
index 2a60ae2..da0a0dc 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
@@ -24,6 +24,8 @@ import com.sun.syndication.feed.synd.SyndFeed;
import junit.framework.TestCase;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.rss.RssFeedGenerator;
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
import org.easymock.IMocksControl;
@@ -57,6 +59,10 @@ public class NewVersionsOfArtifactRssFeedProcessorTest
private MetadataRepository metadataRepository;
+ private IMocksControl factoryControl;
+ private RepositorySessionFactory repositorySessionFactory;
+
+
@Before
@Override
public void setUp()
@@ -69,6 +75,9 @@ public class NewVersionsOfArtifactRssFeedProcessorTest
metadataRepositoryControl = createControl();
metadataRepository = metadataRepositoryControl.createMock( MetadataRepository.class );
+
+ factoryControl = createControl();
+ repositorySessionFactory = factoryControl.createMock(RepositorySessionFactory.class);
}
@SuppressWarnings("unchecked")
@@ -89,15 +98,16 @@ public class NewVersionsOfArtifactRssFeedProcessorTest
reqParams.put( RssFeedProcessor.KEY_GROUP_ID, GROUP_ID );
reqParams.put( RssFeedProcessor.KEY_ARTIFACT_ID, ARTIFACT_ID );
- expect( metadataRepository.getRepositories() ).andReturn( Collections.singletonList( TEST_REPO ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO, GROUP_ID, ARTIFACT_ID ) ).andReturn(
- Arrays.asList( "1.0.1", "1.0.2", "1.0.3-SNAPSHOT" ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.1" ) ).andReturn(
- Collections.singletonList( artifact1 ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.2" ) ).andReturn(
- Collections.singletonList( artifact2 ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.3-SNAPSHOT" ) ).andReturn(
- Collections.singletonList( artifact3 ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ expect(metadataRepository.getProjectVersions(session, TEST_REPO, GROUP_ID, ARTIFACT_ID)).andReturn(
+ Arrays.asList("1.0.1", "1.0.2", "1.0.3-SNAPSHOT"));
+ expect(metadataRepository.getArtifacts(session, TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.1")).andReturn(
+ Collections.singletonList(artifact1));
+ expect(metadataRepository.getArtifacts(session, TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.2")).andReturn(
+ Collections.singletonList(artifact2));
+ expect(metadataRepository.getArtifacts(session, TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.3-SNAPSHOT")).andReturn(
+ Collections.singletonList(artifact3));
+ }
metadataRepositoryControl.replay();
SyndFeed feed = newVersionsProcessor.process( reqParams, metadataRepository );
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
index 1557fc6..f2d7cf2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
@@ -94,11 +94,6 @@ public class TestMetadataRepository
return artifacts;
}
- @Override
- public Collection<String> getRepositories()
- {
- return Collections.singletonList( TEST_REPO );
- }
@Override
public Collection<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
index 9ebde6a..36cfcc3 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
@@ -69,18 +69,14 @@ public class RepositorySession
return dirty;
}
- protected void setDirty(boolean value) {
- this.dirty = value;
- }
-
public void save() throws MetadataSessionException
{
- setDirty( false );
+ this.dirty = false;
}
public void revert() throws MetadataSessionException
{
- setDirty( false );
+ this.dirty = false;
}
/**
@@ -127,4 +123,12 @@ public class RepositorySession
{
this.dirty = true;
}
+
+ public void refresh() throws MetadataSessionException {
+
+ }
+
+ public void refreshAndDiscard() throws MetadataSessionException {
+
+ }
}
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactory.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactory.java
index 17e7c13..a4f3b8b 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactory.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactory.java
@@ -28,4 +28,5 @@ public interface RepositorySessionFactory
RepositorySession createSession() throws MetadataRepositoryException;
void close();
+
}
diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index 59de1ba..78b5b4d 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -22,21 +22,9 @@ package org.apache.archiva.metadata.repository;
import junit.framework.TestCase;
import org.apache.archiva.metadata.generic.GenericMetadataFacet;
import org.apache.archiva.metadata.generic.GenericMetadataFacetFactory;
-import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.metadata.model.CiManagement;
-import org.apache.archiva.metadata.model.Dependency;
-import org.apache.archiva.metadata.model.IssueManagement;
-import org.apache.archiva.metadata.model.License;
-import org.apache.archiva.metadata.model.MailingList;
-import org.apache.archiva.metadata.model.MetadataFacet;
-import org.apache.archiva.metadata.model.MetadataFacetFactory;
-import org.apache.archiva.metadata.model.Organization;
-import org.apache.archiva.metadata.model.ProjectMetadata;
-import org.apache.archiva.metadata.model.ProjectVersionMetadata;
-import org.apache.archiva.metadata.model.ProjectVersionReference;
-import org.apache.archiva.metadata.model.Scm;
+import org.apache.archiva.metadata.model.*;
+import org.apache.archiva.repository.Repository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.assertj.core.util.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -44,35 +32,24 @@ import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import java.util.*;
import static org.assertj.core.api.Assertions.assertThat;
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@RunWith(ArchivaSpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml"})
public abstract class AbstractMetadataRepositoryTest
- extends TestCase
-{
+ extends TestCase {
protected static final String OTHER_REPO_ID = "other-repo";
protected MetadataRepository repository;
+ protected RepositorySessionFactory sessionFactory;
protected static final String TEST_REPO_ID = "test";
- protected static final String TEST_PROJECT = "projectId";
+ protected static final String TEST_PROJECT = "myproject";
- protected static final String TEST_NAMESPACE = "namespace";
+ protected static final String TEST_NAMESPACE = "mytest";
protected static final String TEST_PROJECT_VERSION = "1.0";
@@ -80,7 +57,7 @@ public abstract class AbstractMetadataRepositoryTest
private static final String TEST_URL = "http://archiva.apache.org";
- private static final Organization TEST_ORGANIZATION = new Organization( "Apache", "http://apache.org" );
+ private static final Organization TEST_ORGANIZATION = new Organization("Apache", "http://apache.org");
private static final String TEST_FACET_ID = "test-facet-id";
@@ -98,7 +75,7 @@ public abstract class AbstractMetadataRepositoryTest
private static final String TEST_METADATA_VALUE = "testmetadata";
- protected Logger log = LoggerFactory.getLogger( getClass() );
+ protected Logger log = LoggerFactory.getLogger(getClass());
/*
* Used by tryAssert to allow to throw exceptions in the lambda expression.
@@ -114,1785 +91,1863 @@ public abstract class AbstractMetadataRepositoryTest
/*
* Runs the assert method until the assert is successful or the number of retries
- * is reached. Needed because the JCR Oak index update is asynchronous, so updates
- * may not be visible immediately after the modification.
+ * is reached. Needed because the JCR Oak index update is asynchronous, so updates
+ * may not be visible immediately after the modification.
*/
private void tryAssert(AssertFunction func, int retries, int sleepMillis) throws Exception {
Throwable t = null;
int retry = retries;
- while(retry-->0) {
+ while (retry-- > 0) {
try {
func.accept();
return;
- } catch (Exception|AssertionError e ) {
+ } catch (Exception | AssertionError e) {
t = e;
Thread.currentThread().sleep(sleepMillis);
- log.warn("Retrying assert "+retry);
+ log.warn("Retrying assert " + retry);
}
}
- if (retry<=0 && t!=null) {
+ if (retry <= 0 && t != null) {
if (t instanceof RuntimeException) {
- throw (RuntimeException)t;
+ throw (RuntimeException) t;
} else if (t instanceof Exception) {
- throw (Exception)t;
+ throw (Exception) t;
}
}
}
- public static Map<String, MetadataFacetFactory> createTestMetadataFacetFactories()
- {
+ public static Map<String, MetadataFacetFactory> createTestMetadataFacetFactories() {
Map<String, MetadataFacetFactory> factories = new HashMap<>();
- factories.put( TEST_FACET_ID, new MetadataFacetFactory()
- {
+ factories.put(TEST_FACET_ID, new MetadataFacetFactory() {
@Override
- public MetadataFacet createMetadataFacet()
- {
- return new TestMetadataFacet( TEST_METADATA_VALUE );
+ public MetadataFacet createMetadataFacet() {
+ return new TestMetadataFacet(TEST_METADATA_VALUE);
}
@Override
- public MetadataFacet createMetadataFacet( String repositoryId, String name )
- {
- return new TestMetadataFacet( TEST_METADATA_VALUE );
+ public MetadataFacet createMetadataFacet(String repositoryId, String name) {
+ return new TestMetadataFacet(TEST_METADATA_VALUE);
}
- } );
+ });
// add to ensure we don't accidentally create an empty facet ID.
- factories.put( "", new MetadataFacetFactory()
- {
+ factories.put("", new MetadataFacetFactory() {
@Override
- public MetadataFacet createMetadataFacet()
- {
- return new TestMetadataFacet( "", TEST_VALUE );
+ public MetadataFacet createMetadataFacet() {
+ return new TestMetadataFacet("", TEST_VALUE);
}
@Override
- public MetadataFacet createMetadataFacet( String repositoryId, String name )
- {
- return new TestMetadataFacet( "", TEST_VALUE );
+ public MetadataFacet createMetadataFacet(String repositoryId, String name) {
+ return new TestMetadataFacet("", TEST_VALUE);
}
- } );
+ });
// for the getArtifactsByProjectVersionMetadata tests
- factories.put( GenericMetadataFacet.FACET_ID, new GenericMetadataFacetFactory() );
+ factories.put(GenericMetadataFacet.FACET_ID, new GenericMetadataFacetFactory());
return factories;
}
@Test
public void testRootNamespaceWithNoMetadataRepository()
- throws Exception
- {
- Collection<String> namespaces = repository.getRootNamespaces( , TEST_REPO_ID );
- assertThat( namespaces ).isNotNull().isEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ Collection<String> namespaces = repository.getRootNamespaces(session, TEST_REPO_ID);
+ assertThat(namespaces).isNotNull().isEmpty();
+ }
}
@Test
public void testGetNamespaceOnly()
- throws Exception
- {
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isEmpty();
-
- repository.updateNamespace( , TEST_REPO_ID, TEST_NAMESPACE );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isEmpty();
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isNotEmpty().contains(
- TEST_NAMESPACE ).hasSize( 1 );
+ repository.updateNamespace(session, TEST_REPO_ID, TEST_NAMESPACE);
- repository.removeNamespace( , TEST_REPO_ID, TEST_NAMESPACE );
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isNotEmpty().contains(
+ TEST_NAMESPACE).hasSize(1);
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isEmpty();
+ repository.removeNamespace(session, TEST_REPO_ID, TEST_NAMESPACE);
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isEmpty();
+ }
}
@Test
public void testGetProjectOnly()
- throws Exception
- {
- assertNull( repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT ) );
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
- ProjectMetadata project = new ProjectMetadata();
- project.setId( TEST_PROJECT );
- project.setNamespace( TEST_NAMESPACE );
+ assertNull(repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT));
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isEmpty();
+
+ ProjectMetadata project = new ProjectMetadata();
+ project.setId(TEST_PROJECT);
+ project.setNamespace(TEST_NAMESPACE);
- repository.updateProject( , TEST_REPO_ID, project );
+ repository.updateProject(session, TEST_REPO_ID, project);
- project = repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
- assertEquals( TEST_PROJECT, project.getId() );
- assertEquals( TEST_NAMESPACE, project.getNamespace() );
+ project = repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
+ assertEquals(TEST_PROJECT, project.getId());
+ assertEquals(TEST_NAMESPACE, project.getNamespace());
- // test that namespace is also constructed
+ // test that namespace is also constructed
- Collection<String> namespaces = repository.getRootNamespaces( , TEST_REPO_ID );
+ Collection<String> namespaces = repository.getRootNamespaces( session, TEST_REPO_ID);
- assertThat( namespaces ).isNotNull().isNotEmpty().contains( TEST_NAMESPACE ).hasSize( 1 );
+ assertThat(namespaces).isNotNull().isNotEmpty().contains(TEST_NAMESPACE).hasSize(1);
+ }
}
@Test
public void testGetProjectVersionOnly()
- throws Exception
- {
- assertNull( repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) );
- assertNull( repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT ) );
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ assertNull(repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION));
+ assertNull(repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT));
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isEmpty();
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(TEST_PROJECT_VERSION, metadata.getId());
- // test that namespace and project is also constructed
- Collection<String> namespaces = repository.getRootNamespaces( , TEST_REPO_ID );
+ // test that namespace and project is also constructed
+ Collection<String> namespaces = repository.getRootNamespaces(session, TEST_REPO_ID);
- assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_NAMESPACE );
+ assertThat(namespaces).isNotNull().isNotEmpty().hasSize(1).contains(TEST_NAMESPACE);
- ProjectMetadata projectMetadata = repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
- assertNotNull( projectMetadata );
- assertEquals( TEST_PROJECT, projectMetadata.getId() );
- assertEquals( TEST_NAMESPACE, projectMetadata.getNamespace() );
+ ProjectMetadata projectMetadata = repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
+ assertNotNull(projectMetadata);
+ assertEquals(TEST_PROJECT, projectMetadata.getId());
+ assertEquals(TEST_NAMESPACE, projectMetadata.getNamespace());
+ }
}
@Test
public void testGetArtifactOnly()
- throws Exception
- {
- assertThat( new ArrayList<>(
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ) ) ).isNotNull().isEmpty();
- assertThat(
- repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ).isNull();
- assertThat( repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT ) ).isNull();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isEmpty();
+ assertThat(new ArrayList<>(
+ repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION))).isNotNull().isEmpty();
+ assertThat(
+ repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION)).isNull();
+ assertThat(repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT)).isNull();
- ArtifactMetadata metadata = createArtifact();
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isEmpty();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
+ ArtifactMetadata metadata = createArtifact();
- Collection<ArtifactMetadata> artifacts =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- //assertEquals( Collections.singletonList( metadata ), new ArrayList<ArtifactMetadata>( artifacts ) );
- assertThat( artifacts ).containsExactly( metadata );
- // test that namespace, project and project version is also constructed
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
- assertThat( repository.getRootNamespaces( , TEST_REPO_ID ) ).isNotNull().isNotEmpty().contains(
- TEST_NAMESPACE ).hasSize( 1 );
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ //assertEquals( Collections.singletonList( metadata ), new ArrayList<ArtifactMetadata>( artifacts ) );
+ assertThat(artifacts).containsExactly(metadata);
+ // test that namespace, project and project version is also constructed
- ProjectMetadata projectMetadata = repository.getProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
- assertEquals( TEST_PROJECT, projectMetadata.getId() );
- assertEquals( TEST_NAMESPACE, projectMetadata.getNamespace() );
+ assertThat(repository.getRootNamespaces(session, TEST_REPO_ID)).isNotNull().isNotEmpty().contains(
+ TEST_NAMESPACE).hasSize(1);
- ProjectVersionMetadata projectVersionMetadata =
- repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( TEST_PROJECT_VERSION, projectVersionMetadata.getId() );
+ ProjectMetadata projectMetadata = repository.getProject(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
+ assertEquals(TEST_PROJECT, projectMetadata.getId());
+ assertEquals(TEST_NAMESPACE, projectMetadata.getNamespace());
+
+ ProjectVersionMetadata projectVersionMetadata =
+ repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(TEST_PROJECT_VERSION, projectVersionMetadata.getId());
+ }
}
@Test
public void testUpdateProjectVersionMetadataWithNoOtherArchives()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- MailingList mailingList = new MailingList();
- mailingList.setName( "Foo List" );
- mailingList.setOtherArchives( Collections.<String>emptyList() );
- metadata.setMailingLists( Arrays.asList( mailingList ) );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ MailingList mailingList = new MailingList();
+ mailingList.setName("Foo List");
+ mailingList.setOtherArchives(Collections.<String>emptyList());
+ metadata.setMailingLists(Arrays.asList(mailingList));
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(TEST_PROJECT_VERSION, metadata.getId());
- List<MailingList> mailingLists = metadata.getMailingLists();
+ List<MailingList> mailingLists = metadata.getMailingLists();
- assertThat( mailingLists ).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat(mailingLists).isNotNull().isNotEmpty().hasSize(1);
- mailingList = metadata.getMailingLists().get( 0 );
- assertEquals( "Foo List", mailingList.getName() );
+ mailingList = metadata.getMailingLists().get(0);
+ assertEquals("Foo List", mailingList.getName());
- List<String> others = mailingList.getOtherArchives();
- assertThat( others ).isNotNull().isEmpty();
+ List<String> others = mailingList.getOtherArchives();
+ assertThat(others).isNotNull().isEmpty();
+ }
}
@Test
public void testUpdateProjectVersionMetadataWithAllElements()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
-
- metadata.setName( "project name" );
- metadata.setDescription( "project description" );
- metadata.setUrl( "the url" );
-
- MailingList mailingList = new MailingList();
- mailingList.setName( "Foo List" );
- mailingList.setUnsubscribeAddress( "UnsubscribeAddress" );
- mailingList.setSubscribeAddress( "SubscribeAddress" );
- mailingList.setPostAddress( "PostAddress" );
- mailingList.setMainArchiveUrl( "MainArchiveUrl" );
- mailingList.setOtherArchives( Arrays.asList( "other archive" ) );
- metadata.setMailingLists( Arrays.asList( mailingList ) );
-
- Scm scm = new Scm();
- scm.setConnection( "connection" );
- scm.setDeveloperConnection( "dev conn" );
- scm.setUrl( "url" );
- metadata.setScm( scm );
-
- CiManagement ci = new CiManagement();
- ci.setSystem( "system" );
- ci.setUrl( "ci url" );
- metadata.setCiManagement( ci );
-
- IssueManagement tracker = new IssueManagement();
- tracker.setSystem( "system" );
- tracker.setUrl( "issue tracker url" );
- metadata.setIssueManagement( tracker );
-
- metadata.setOrganization( TEST_ORGANIZATION );
-
- License l = new License();
- l.setName( "license name" );
- l.setUrl( "license url" );
- metadata.addLicense( l );
-
- Dependency d = new Dependency();
- d.setArtifactId( "artifactId" );
- d.setClassifier( "classifier" );
- d.setGroupId( "groupId" );
- d.setScope( "scope" );
- d.setSystemPath( "system path" );
- d.setType( "type" );
- d.setVersion( "version" );
- d.setOptional( true );
- metadata.addDependency( d );
-
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
-
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
- assertEquals( TEST_PROJECT_VERSION, metadata.getVersion() );
- assertEquals( "project name", metadata.getName() );
- assertEquals( "project description", metadata.getDescription() );
- assertEquals( "the url", metadata.getUrl() );
-
- assertEquals( "connection", metadata.getScm().getConnection() );
- assertEquals( "dev conn", metadata.getScm().getDeveloperConnection() );
- assertEquals( "url", metadata.getScm().getUrl() );
-
- assertEquals( "system", metadata.getCiManagement().getSystem() );
- assertEquals( "ci url", metadata.getCiManagement().getUrl() );
-
- assertEquals( "system", metadata.getIssueManagement().getSystem() );
- assertEquals( "issue tracker url", metadata.getIssueManagement().getUrl() );
-
- assertEquals( TEST_ORGANIZATION.getName(), metadata.getOrganization().getName() );
- assertEquals( TEST_ORGANIZATION.getUrl(), metadata.getOrganization().getUrl() );
-
- assertEquals( 1, metadata.getMailingLists().size() );
- MailingList retrievedMailingList = metadata.getMailingLists().get( 0 );
- assertEquals( mailingList.getName(), retrievedMailingList.getName() );
- assertEquals( mailingList.getMainArchiveUrl(), retrievedMailingList.getMainArchiveUrl() );
- assertEquals( mailingList.getPostAddress(), retrievedMailingList.getPostAddress() );
- assertEquals( mailingList.getSubscribeAddress(), retrievedMailingList.getSubscribeAddress() );
- assertEquals( mailingList.getUnsubscribeAddress(), retrievedMailingList.getUnsubscribeAddress() );
- assertThat( retrievedMailingList.getOtherArchives() ) //
- .isNotNull() //
- .isNotEmpty() //
- .hasSize( 1 ) //
- .contains( "other archive" );
-
- assertEquals( 1, metadata.getLicenses().size() );
- l = metadata.getLicenses().get( 0 );
- assertEquals( "license name", l.getName() );
- assertEquals( "license url", l.getUrl() );
-
- assertEquals( 1, metadata.getDependencies().size() );
- d = metadata.getDependencies().get( 0 );
- assertEquals( "artifactId", d.getArtifactId() );
- assertEquals( "classifier", d.getClassifier() );
- assertEquals( "groupId", d.getGroupId() );
- assertEquals( "scope", d.getScope() );
- assertEquals( "system path", d.getSystemPath() );
- assertEquals( "type", d.getType() );
- assertEquals( "version", d.getVersion() );
- assertTrue( d.isOptional() );
- }
-
- @Test
- public void testGetRepositories()
- throws Exception
- {
- // currently set up this way so the behaviour of both the test and the mock config return the same repository
- // set as the File implementation just uses the config rather than the content
- repository.updateNamespace( , TEST_REPO_ID, "namespace" );
- repository.updateNamespace( , OTHER_REPO_ID, "namespace" );
-
- Collection<String> repositories = repository.getRepositories();
-
- assertEquals( "repository.getRepositories() -> " + repositories, //
- Sets.newLinkedHashSet( TEST_REPO_ID, OTHER_REPO_ID ), //
- new LinkedHashSet<String>( repositories ) ); //
+ throws Exception {
+
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+
+ metadata.setName("project name");
+ metadata.setDescription("project description");
+ metadata.setUrl("the url");
+
+ MailingList mailingList = new MailingList();
+ mailingList.setName("Foo List");
+ mailingList.setUnsubscribeAddress("UnsubscribeAddress");
+ mailingList.setSubscribeAddress("SubscribeAddress");
+ mailingList.setPostAddress("PostAddress");
+ mailingList.setMainArchiveUrl("MainArchiveUrl");
+ mailingList.setOtherArchives(Arrays.asList("other archive"));
+ metadata.setMailingLists(Arrays.asList(mailingList));
+
+ Scm scm = new Scm();
+ scm.setConnection("connection");
+ scm.setDeveloperConnection("dev conn");
+ scm.setUrl("url");
+ metadata.setScm(scm);
+
+ CiManagement ci = new CiManagement();
+ ci.setSystem("system");
+ ci.setUrl("ci url");
+ metadata.setCiManagement(ci);
+
+ IssueManagement tracker = new IssueManagement();
+ tracker.setSystem("system");
+ tracker.setUrl("issue tracker url");
+ metadata.setIssueManagement(tracker);
+
+ metadata.setOrganization(TEST_ORGANIZATION);
+
+ License l = new License();
+ l.setName("license name");
+ l.setUrl("license url");
+ metadata.addLicense(l);
+
+ Dependency d = new Dependency();
+ d.setArtifactId("artifactId");
+ d.setClassifier("classifier");
+ d.setGroupId("groupId");
+ d.setScope("scope");
+ d.setSystemPath("system path");
+ d.setType("type");
+ d.setVersion("version");
+ d.setOptional(true);
+ metadata.addDependency(d);
+
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(TEST_PROJECT_VERSION, metadata.getId());
+ assertEquals(TEST_PROJECT_VERSION, metadata.getVersion());
+ assertEquals("project name", metadata.getName());
+ assertEquals("project description", metadata.getDescription());
+ assertEquals("the url", metadata.getUrl());
+
+ assertEquals("connection", metadata.getScm().getConnection());
+ assertEquals("dev conn", metadata.getScm().getDeveloperConnection());
+ assertEquals("url", metadata.getScm().getUrl());
+
+ assertEquals("system", metadata.getCiManagement().getSystem());
+ assertEquals("ci url", metadata.getCiManagement().getUrl());
+
+ assertEquals("system", metadata.getIssueManagement().getSystem());
+ assertEquals("issue tracker url", metadata.getIssueManagement().getUrl());
+
+ assertEquals(TEST_ORGANIZATION.getName(), metadata.getOrganization().getName());
+ assertEquals(TEST_ORGANIZATION.getUrl(), metadata.getOrganization().getUrl());
+
+ assertEquals(1, metadata.getMailingLists().size());
+ MailingList retrievedMailingList = metadata.getMailingLists().get(0);
+ assertEquals(mailingList.getName(), retrievedMailingList.getName());
+ assertEquals(mailingList.getMainArchiveUrl(), retrievedMailingList.getMainArchiveUrl());
+ assertEquals(mailingList.getPostAddress(), retrievedMailingList.getPostAddress());
+ assertEquals(mailingList.getSubscribeAddress(), retrievedMailingList.getSubscribeAddress());
+ assertEquals(mailingList.getUnsubscribeAddress(), retrievedMailingList.getUnsubscribeAddress());
+ assertThat(retrievedMailingList.getOtherArchives()) //
+ .isNotNull() //
+ .isNotEmpty() //
+ .hasSize(1) //
+ .contains("other archive");
+
+ assertEquals(1, metadata.getLicenses().size());
+ l = metadata.getLicenses().get(0);
+ assertEquals("license name", l.getName());
+ assertEquals("license url", l.getUrl());
+
+ assertEquals(1, metadata.getDependencies().size());
+ d = metadata.getDependencies().get(0);
+ assertEquals("artifactId", d.getArtifactId());
+ assertEquals("classifier", d.getClassifier());
+ assertEquals("groupId", d.getGroupId());
+ assertEquals("scope", d.getScope());
+ assertEquals("system path", d.getSystemPath());
+ assertEquals("type", d.getType());
+ assertEquals("version", d.getVersion());
+ assertTrue(d.isOptional());
+ }
}
@Test
public void testUpdateProjectVersionMetadataIncomplete()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- metadata.setIncomplete( true );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
-
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( true, metadata.isIncomplete() );
- assertNull( metadata.getCiManagement() );
- assertNull( metadata.getScm() );
- assertNull( metadata.getIssueManagement() );
- assertNull( metadata.getOrganization() );
- assertNull( metadata.getDescription() );
- assertNull( metadata.getName() );
- assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
- assertEquals( TEST_PROJECT_VERSION, metadata.getVersion() );
- assertTrue( metadata.getMailingLists().isEmpty() );
- assertTrue( metadata.getLicenses().isEmpty() );
- assertTrue( metadata.getDependencies().isEmpty() );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ metadata.setIncomplete(true);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(true, metadata.isIncomplete());
+ assertNull(metadata.getCiManagement());
+ assertNull(metadata.getScm());
+ assertNull(metadata.getIssueManagement());
+ assertNull(metadata.getOrganization());
+ assertNull(metadata.getDescription());
+ assertNull(metadata.getName());
+ assertEquals(TEST_PROJECT_VERSION, metadata.getId());
+ assertEquals(TEST_PROJECT_VERSION, metadata.getVersion());
+ assertTrue(metadata.getMailingLists().isEmpty());
+ assertTrue(metadata.getLicenses().isEmpty());
+ assertTrue(metadata.getDependencies().isEmpty());
+ }
}
@Test
public void testUpdateProjectVersionMetadataWithExistingFacets()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- MetadataFacet facet = new TestMetadataFacet( "baz" );
- metadata.addFacet( facet );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
-
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
-
- metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
-
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
- TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- assertEquals( "baz", testFacet.getValue() );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ MetadataFacet facet = new TestMetadataFacet("baz");
+ metadata.addFacet(facet);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(Collections.singleton(TEST_FACET_ID), metadata.getFacetIds());
+
+ metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(Collections.singleton(TEST_FACET_ID), metadata.getFacetIds());
+ TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
+ assertEquals("baz", testFacet.getValue());
+ }
}
@Test
public void testUpdateProjectVersionMetadataWithNoExistingFacets()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- assertThat( metadata.getFacetIds() ).isNotNull().isEmpty();
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ assertThat(metadata.getFacetIds()).isNotNull().isEmpty();
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertThat( metadata.getFacetIds() ).isNotNull().isEmpty();
+ metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertThat(metadata.getFacetIds()).isNotNull().isEmpty();
+ }
}
@Test
public void testUpdateProjectVersionMetadataWithExistingFacetsFacetPropertyWasRemoved()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
- Map<String, String> additionalProps = new HashMap<>();
- additionalProps.put( "deleteKey", "deleteValue" );
+ Map<String, String> additionalProps = new HashMap<>();
+ additionalProps.put("deleteKey", "deleteValue");
- MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz", additionalProps );
- metadata.addFacet( facet );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ MetadataFacet facet = new TestMetadataFacet(TEST_FACET_ID, "baz", additionalProps);
+ metadata.addFacet(facet);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- assertThat( metadata.getFacetIds() ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
+ assertThat(metadata.getFacetIds()).isNotNull().isNotEmpty().hasSize(1).contains(TEST_FACET_ID);
- TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- Map<String, String> facetProperties = testFacet.toProperties();
+ TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
+ Map<String, String> facetProperties = testFacet.toProperties();
- assertEquals( "deleteValue", facetProperties.get( "deleteKey" ) );
+ assertEquals("deleteValue", facetProperties.get("deleteKey"));
- facetProperties.remove( "deleteKey" );
+ facetProperties.remove("deleteKey");
- TestMetadataFacet newTestFacet = new TestMetadataFacet( TEST_FACET_ID, testFacet.getValue(), facetProperties );
- metadata.addFacet( newTestFacet );
+ TestMetadataFacet newTestFacet = new TestMetadataFacet(TEST_FACET_ID, testFacet.getValue(), facetProperties);
+ metadata.addFacet(newTestFacet);
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- assertThat( metadata.getFacetIds() ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
- testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+ assertThat(metadata.getFacetIds()).isNotNull().isNotEmpty().hasSize(1).contains(TEST_FACET_ID);
+ testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
+ assertFalse(testFacet.toProperties().containsKey("deleteKey"));
+ }
}
@Test
public void testGetArtifactsDoesntReturnProjectVersionMetadataFacets()
- throws Exception
- {
- ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
- versionMetadata.setId( TEST_PROJECT_VERSION );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
- MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz" );
- versionMetadata.addFacet( facet );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, versionMetadata );
+ ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
+ versionMetadata.setId(TEST_PROJECT_VERSION);
- ArtifactMetadata artifactMetadata = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifactMetadata );
- repository.save();
+ MetadataFacet facet = new TestMetadataFacet(TEST_FACET_ID, "baz");
+ versionMetadata.addFacet(facet);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, versionMetadata);
- Collection<ArtifactMetadata> artifacts =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- assertEquals( Collections.singletonList( artifactMetadata ), new ArrayList<>( artifacts ) );
+ ArtifactMetadata artifactMetadata = createArtifact();
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifactMetadata);
+ session.save();
- artifacts = repository.getArtifacts( , TEST_REPO_ID );
- assertEquals( Collections.singletonList( artifactMetadata ), new ArrayList<>( artifacts ) );
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ assertEquals(Collections.singletonList(artifactMetadata), new ArrayList<>(artifacts));
- artifacts = repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_SHA1 );
- assertEquals( Collections.singletonList( artifactMetadata ), new ArrayList<>( artifacts ) );
+ artifacts = repository.getArtifacts(session, TEST_REPO_ID);
+ assertEquals(Collections.singletonList(artifactMetadata), new ArrayList<>(artifacts));
- artifacts = repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_MD5 );
- assertEquals( Collections.singletonList( artifactMetadata ), new ArrayList<>( artifacts ) );
+ artifacts = repository.getArtifactsByChecksum(session, TEST_REPO_ID, TEST_SHA1);
+ assertEquals(Collections.singletonList(artifactMetadata), new ArrayList<>(artifacts));
- artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, null, null );
- assertEquals( Collections.singletonList( artifactMetadata ), new ArrayList<>( artifacts ) );
+ artifacts = repository.getArtifactsByChecksum(session, TEST_REPO_ID, TEST_MD5);
+ assertEquals(Collections.singletonList(artifactMetadata), new ArrayList<>(artifacts));
+
+ artifacts = repository.getArtifactsByDateRange(session, TEST_REPO_ID, null, null);
+ assertEquals(Collections.singletonList(artifactMetadata), new ArrayList<>(artifacts));
+ }
}
@Test
public void testUpdateArtifactMetadataWithExistingFacetsFacetPropertyWasRemoved()
- throws Exception
- {
- ArtifactMetadata metadata = createArtifact();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ArtifactMetadata metadata = createArtifact();
- Map<String, String> additionalProps = new HashMap<>();
- additionalProps.put( "deleteKey", "deleteValue" );
+ Map<String, String> additionalProps = new HashMap<>();
+ additionalProps.put("deleteKey", "deleteValue");
- MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz", additionalProps );
- metadata.addFacet( facet );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
+ MetadataFacet facet = new TestMetadataFacet(TEST_FACET_ID, "baz", additionalProps);
+ metadata.addFacet(facet);
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
- Collection<ArtifactMetadata> artifacts =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
- metadata = artifacts.iterator().next();
+ assertThat(artifacts).isNotNull().isNotEmpty().hasSize(1);
+ metadata = artifacts.iterator().next();
- Collection<String> ids = metadata.getFacetIds();
- assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
+ Collection<String> ids = metadata.getFacetIds();
+ assertThat(ids).isNotNull().isNotEmpty().hasSize(1).contains(TEST_FACET_ID);
- TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- Map<String, String> facetProperties = testFacet.toProperties();
+ TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
+ Map<String, String> facetProperties = testFacet.toProperties();
- assertEquals( "deleteValue", facetProperties.get( "deleteKey" ) );
+ assertEquals("deleteValue", facetProperties.get("deleteKey"));
- facetProperties.remove( "deleteKey" );
+ facetProperties.remove("deleteKey");
- TestMetadataFacet newTestFacet = new TestMetadataFacet( TEST_FACET_ID, testFacet.getValue(), facetProperties );
- metadata.addFacet( newTestFacet );
+ TestMetadataFacet newTestFacet = new TestMetadataFacet(TEST_FACET_ID, testFacet.getValue(), facetProperties);
+ metadata.addFacet(newTestFacet);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
- artifacts = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ artifacts = repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
- metadata = artifacts.iterator().next();
+ assertThat(artifacts).isNotNull().isNotEmpty().hasSize(1);
+ metadata = artifacts.iterator().next();
- ids = metadata.getFacetIds();
- assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
+ ids = metadata.getFacetIds();
+ assertThat(ids).isNotNull().isNotEmpty().hasSize(1).contains(TEST_FACET_ID);
- testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
+ testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
- Map<String, String> props = testFacet.toProperties();
- assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
+ Map<String, String> props = testFacet.toProperties();
+ assertThat(props).isNotNull().doesNotContainKey("deleteKey");
+ }
}
@Test
public void testUpdateArtifactMetadataWithExistingFacets()
- throws Exception
- {
- ArtifactMetadata metadata = createArtifact();
- MetadataFacet facet = new TestMetadataFacet( "baz" );
- metadata.addFacet( facet );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
-
- metadata = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ).iterator().next();
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
-
- metadata = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
-
- metadata = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ).iterator().next();
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
- TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- assertEquals( "baz", testFacet.getValue() );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ArtifactMetadata metadata = createArtifact();
+ MetadataFacet facet = new TestMetadataFacet("baz");
+ metadata.addFacet(facet);
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
+
+ metadata = repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION).iterator().next();
+ assertEquals(Collections.singleton(TEST_FACET_ID), metadata.getFacetIds());
+
+ metadata = createArtifact();
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
+
+ metadata = repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION).iterator().next();
+ assertEquals(Collections.singleton(TEST_FACET_ID), metadata.getFacetIds());
+ TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet(TEST_FACET_ID);
+ assertEquals("baz", testFacet.getValue());
+ }
}
@Test
public void testUpdateArtifactMetadataWithNoExistingFacets()
- throws Exception
- {
- ArtifactMetadata metadata = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata metadata = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
+
+ metadata = repository.getArtifacts( session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION).iterator().next();
+ assertEquals(Collections.<String>emptyList(), new ArrayList<String>(metadata.getFacetIds()));
- metadata = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ).iterator().next();
- assertEquals( Collections.<String>emptyList(), new ArrayList<String>( metadata.getFacetIds() ) );
+ metadata = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata);
- metadata = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
+ metadata = repository.getArtifacts( session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION).iterator().next();
+ assertEquals(Collections.<String>emptyList(), new ArrayList<String>(metadata.getFacetIds()));
- metadata = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ).iterator().next();
- assertEquals( Collections.<String>emptyList(), new ArrayList<String>( metadata.getFacetIds() ) );
+ }
}
@Test
public void testGetMetadataFacet()
- throws Exception
- {
- repository.addMetadataFacet( , TEST_REPO_ID, new TestMetadataFacet( TEST_VALUE ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.addMetadataFacet( session, TEST_REPO_ID, new TestMetadataFacet(TEST_VALUE));
- TestMetadataFacet test =
- (TestMetadataFacet) repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME );
+ TestMetadataFacet test =
+ (TestMetadataFacet) repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME);
- assertEquals( new TestMetadataFacet( TEST_VALUE ), test );
+ assertEquals(new TestMetadataFacet(TEST_VALUE), test);
+
+ }
}
@Test
public void testGetMetadataFacetWhenEmpty()
- throws Exception
- {
- assertNull( repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ assertNull(repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME));
+
+ }
}
@Test
public void testGetMetadataFacetWhenUnknownName()
- throws Exception
- {
- repository.addMetadataFacet( , TEST_REPO_ID, new TestMetadataFacet( TEST_VALUE ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.addMetadataFacet( session, TEST_REPO_ID, new TestMetadataFacet(TEST_VALUE));
+
+ assertNull(repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, UNKNOWN));
- assertNull( repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, UNKNOWN ) );
+ }
}
@Test
public void testGetMetadataFacetWhenDefaultValue()
- throws Exception
- {
- repository.addMetadataFacet( , TEST_REPO_ID, new TestMetadataFacet( null ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.addMetadataFacet( session, TEST_REPO_ID, new TestMetadataFacet(null));
- MetadataFacet metadataFacet = repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME );
+ MetadataFacet metadataFacet = repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME);
- assertEquals( new TestMetadataFacet( TEST_METADATA_VALUE ), metadataFacet );
+ assertEquals(new TestMetadataFacet(TEST_METADATA_VALUE), metadataFacet);
+
+ }
}
@Test
public void testGetMetadataFacetWhenUnknownFacetId()
- throws Exception
- {
- assertNull( repository.getMetadataFacet( , TEST_REPO_ID, UNKNOWN, TEST_NAME ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ assertNull(repository.getMetadataFacet( session, TEST_REPO_ID, UNKNOWN, TEST_NAME));
+
+ }
}
@Test
public void testGetMetadataFacets()
- throws Exception
- {
- repository.addMetadataFacet( , TEST_REPO_ID, new TestMetadataFacet( TEST_VALUE ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.addMetadataFacet( session, TEST_REPO_ID, new TestMetadataFacet(TEST_VALUE));
+
+ assertEquals(Collections.singletonList(TEST_NAME),
+ repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID));
- assertEquals( Collections.singletonList( TEST_NAME ),
- repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID ) );
+ }
}
@Test
public void testGetMetadataFacetsWhenEmpty()
- throws Exception
- {
+ throws Exception {
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertTrue( facets.isEmpty() );
+ try (RepositorySession session = sessionFactory.createSession()) {
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertTrue(facets.isEmpty());
+
+ }
}
@Test
public void testRemoveFacets()
- throws Exception
- {
- repository.addMetadataFacet( , TEST_REPO_ID, new TestMetadataFacet( TEST_VALUE ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.addMetadataFacet( session, TEST_REPO_ID, new TestMetadataFacet(TEST_VALUE));
+
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertFalse(facets.isEmpty());
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertFalse( facets.isEmpty() );
+ repository.removeMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
- repository.removeMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
+ facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertTrue(facets.isEmpty());
- facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertTrue( facets.isEmpty() );
+ }
}
@Test
public void testRemoveFacetsWhenEmpty()
- throws Exception
- {
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertTrue( facets.isEmpty() );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertTrue(facets.isEmpty());
+
+ repository.removeMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
- repository.removeMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
+ facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertTrue(facets.isEmpty());
- facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertTrue( facets.isEmpty() );
+ }
}
@Test
public void testRemoveFacetsWhenUnknown()
- throws Exception
- {
- // testing no exception
- repository.removeMetadataFacets( , TEST_REPO_ID, UNKNOWN );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+// testing no exception
+ repository.removeMetadataFacets( session, TEST_REPO_ID, UNKNOWN);
+
+ }
}
@Test
public void testRemoveFacetWhenUnknown()
- throws Exception
- {
- // testing no exception
- repository.removeMetadataFacet( , TEST_REPO_ID, UNKNOWN, TEST_NAME );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+// testing no exception
+ repository.removeMetadataFacet( session, TEST_REPO_ID, UNKNOWN, TEST_NAME);
+
+ }
}
@Test
public void testRemoveFacet()
- throws Exception
- {
- TestMetadataFacet metadataFacet = new TestMetadataFacet( TEST_VALUE );
- repository.addMetadataFacet( , TEST_REPO_ID, metadataFacet );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ TestMetadataFacet metadataFacet = new TestMetadataFacet(TEST_VALUE);
+ repository.addMetadataFacet( session, TEST_REPO_ID, metadataFacet);
- assertEquals( metadataFacet, repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) );
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertFalse( facets.isEmpty() );
+ assertEquals(metadataFacet, repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME));
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertFalse(facets.isEmpty());
- repository.removeMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME );
+ repository.removeMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME);
- assertNull( repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) );
- facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertTrue( facets.isEmpty() );
+ assertNull(repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME));
+ facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertTrue(facets.isEmpty());
+
+ }
}
@Test
public void testRemoveFacetWhenEmpty()
- throws Exception
- {
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertThat( facets ).isNotNull().isEmpty();
- assertThat( repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) ).isNull();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertThat(facets).isNotNull().isEmpty();
+ assertThat(repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME)).isNull();
+
+ repository.removeMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME);
- repository.removeMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME );
+ facets = repository.getMetadataFacets( session, TEST_REPO_ID, TEST_FACET_ID);
+ assertThat(facets).isNotNull().isEmpty();
+ assertThat(repository.getMetadataFacet( session, TEST_REPO_ID, TEST_FACET_ID, TEST_NAME)).isNull();
- facets = repository.getMetadataFacets( , TEST_REPO_ID, TEST_FACET_ID );
- assertThat( facets ).isNotNull().isEmpty();
- assertThat( repository.getMetadataFacet( , TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) ).isNull();
+ }
}
@Test
public void hasMetadataFacetStart()
- throws Exception
- {
- assertFalse( repository.hasMetadataFacet( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ assertFalse(repository.hasMetadataFacet( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName()));
+
+ }
}
@Test
public void hasMetadataFacet()
- throws Exception
- {
+ throws Exception {
- assertFalse( repository.hasMetadataFacet( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() ) );
+ try (RepositorySession session = sessionFactory.createSession()) {
+ assertFalse(repository.hasMetadataFacet( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName()));
- Calendar cal = Calendar.getInstance();
+ Calendar cal = Calendar.getInstance();
- repository.addMetadataFacet( , TEST_REPO_ID, new KindOfRepositoryStatistics( "first", cal.getTime() ) );
+ repository.addMetadataFacet( session, TEST_REPO_ID, new KindOfRepositoryStatistics("first", cal.getTime()));
- assertTrue( repository.hasMetadataFacet( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() ) );
+ assertTrue(repository.hasMetadataFacet( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName()));
- cal.add( Calendar.MINUTE, 2 );
+ cal.add(Calendar.MINUTE, 2);
- repository.addMetadataFacet( , TEST_REPO_ID, new KindOfRepositoryStatistics( "second", cal.getTime() ) );
+ repository.addMetadataFacet( session, TEST_REPO_ID, new KindOfRepositoryStatistics("second", cal.getTime()));
- cal.add( Calendar.MINUTE, 2 );
+ cal.add(Calendar.MINUTE, 2);
- repository.addMetadataFacet( , TEST_REPO_ID, new KindOfRepositoryStatistics( "third", cal.getTime() ) );
+ repository.addMetadataFacet( session, TEST_REPO_ID, new KindOfRepositoryStatistics("third", cal.getTime()));
- List<String> facets = repository.getMetadataFacets( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() );
+ List<String> facets = repository.getMetadataFacets( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName());
- assertThat( facets ).isNotNull().isNotEmpty().hasSize( 3 );
+ assertThat(facets).isNotNull().isNotEmpty().hasSize(3);
- assertTrue( repository.hasMetadataFacet( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() ) );
+ assertTrue(repository.hasMetadataFacet( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName()));
- repository.removeMetadataFacets( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() );
+ repository.removeMetadataFacets( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName());
- assertFalse( repository.hasMetadataFacet( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() ) );
+ assertFalse(repository.hasMetadataFacet( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName()));
- facets = repository.getMetadataFacets( , TEST_REPO_ID, KindOfRepositoryStatistics.class.getName() );
+ facets = repository.getMetadataFacets( session, TEST_REPO_ID, KindOfRepositoryStatistics.class.getName());
- assertThat( facets ).isNotNull().isEmpty();
+ assertThat(facets).isNotNull().isEmpty();
+
+ }
}
@Test
public void testGetArtifacts()
- throws Exception
- {
- ArtifactMetadata artifact1 = createArtifact();
- ArtifactMetadata artifact2 = createArtifact( "pom" );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact1 = createArtifact();
+ ArtifactMetadata artifact2 = createArtifact("pom");
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1);
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2);
+
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ ArrayList<ArtifactMetadata> actual = new ArrayList<>(artifacts);
+ Collections.sort(actual, (o1, o2) -> o1.getId().compareTo(o2.getId()));
+ assertEquals(Arrays.asList(artifact1, artifact2), actual);
- Collection<ArtifactMetadata> artifacts =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- ArrayList<ArtifactMetadata> actual = new ArrayList<>( artifacts );
- Collections.sort( actual,( o1, o2 ) -> o1.getId().compareTo( o2.getId() ) );
- assertEquals( Arrays.asList( artifact1, artifact2 ), actual );
+ }
}
@Test
public void testGetArtifactVersions()
- throws Exception
- {
- ArtifactMetadata artifact1 = createArtifact();
- String version1 = "1.0-20091212.012345-1";
- artifact1.setId( artifact1.getProject() + "-" + version1 + ".jar" );
- artifact1.setVersion( version1 );
- ArtifactMetadata artifact2 = createArtifact();
- String version2 = "1.0-20091212.123456-2";
- artifact2.setId( artifact2.getProject() + "-" + version2 + ".jar" );
- artifact2.setVersion( version2 );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact1 = createArtifact();
+ String version1 = "1.0-20091212.012345-1";
+ artifact1.setId(artifact1.getProject() + "-" + version1 + ".jar");
+ artifact1.setVersion(version1);
+ ArtifactMetadata artifact2 = createArtifact();
+ String version2 = "1.0-20091212.123456-2";
+ artifact2.setId(artifact2.getProject() + "-" + version2 + ".jar");
+ artifact2.setVersion(version2);
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1);
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2);
+
+ Collection<String> versions =
+ repository.getArtifactVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+
+ assertThat(versions).isNotNull().isNotEmpty().contains(version1, version2);
- Collection<String> versions =
- repository.getArtifactVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
-
- assertThat( versions ).isNotNull().isNotEmpty().contains( version1, version2 );
+ }
}
@Test
public void testGetArtifactVersionsMultipleArtifactsSingleVersion()
- throws Exception
- {
- ArtifactMetadata artifact1 = createArtifact();
- artifact1.setId( TEST_PROJECT + "-" + TEST_PROJECT_VERSION + ".jar" );
- ArtifactMetadata artifact2 = createArtifact();
- artifact2.setId( TEST_PROJECT + "-" + TEST_PROJECT_VERSION + "-sources.jar" );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact1 = createArtifact();
+ artifact1.setId(TEST_PROJECT + "-" + TEST_PROJECT_VERSION + ".jar");
+ ArtifactMetadata artifact2 = createArtifact();
+ artifact2.setId(TEST_PROJECT + "-" + TEST_PROJECT_VERSION + "-sources.jar");
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1);
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2);
- Collection<String> versions =
- repository.getArtifactVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ Collection<String> versions =
+ repository.getArtifactVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1 ).containsExactly( TEST_PROJECT_VERSION );
+ assertThat(versions).isNotNull().isNotEmpty().hasSize(1).containsExactly(TEST_PROJECT_VERSION);
+
+ }
}
@Test
public void testGetArtifactsByDateRangeOpen()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, null, null);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, null, null );
+ assertEquals(Collections.singletonList(artifact), artifacts);
- assertEquals( Collections.singletonList( artifact ), artifacts );
+ }
}
@Test
public void testGetArtifactsByDateRangeSparseNamespace()
- throws Exception
- {
- String namespace = "org.apache.archiva";
- ArtifactMetadata artifact = createArtifact();
- artifact.setNamespace( namespace );
- repository.updateArtifact( , TEST_REPO_ID, namespace, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ String namespace = "org.apache.archiva";
+ ArtifactMetadata artifact = createArtifact();
+ artifact.setNamespace(namespace);
+ repository.updateArtifact( session, TEST_REPO_ID, namespace, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, null, null);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, null, null );
+ tryAssert(() -> assertEquals(Collections.singletonList(artifact), artifacts));
- tryAssert(()->assertEquals( Collections.singletonList( artifact ), artifacts ));
+ }
}
@Test
public void testGetArtifactsByDateRangeLowerBound()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
- Date date = new Date( artifact.getWhenGathered().getTime() - 10000 );
+ Date date = new Date(artifact.getWhenGathered().getTime() - 10000);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, date, null );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, date, null);
- assertEquals( Collections.singletonList( artifact ), artifacts );
+ assertEquals(Collections.singletonList(artifact), artifacts);
+
+ }
}
@Test
public void testGetArtifactsByDateRangeLowerBoundOutOfRange()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+
+ Date date = new Date(artifact.getWhenGathered().getTime() + 10000);
- Date date = new Date( artifact.getWhenGathered().getTime() + 10000 );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, date, null);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, date, null );
+ assertThat(artifacts).isNotNull().isEmpty();
- assertThat( artifacts ).isNotNull().isEmpty();
+ }
}
@Test
public void testGetArtifactsByDateRangeLowerAndUpperBound()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
- Date lower = new Date( artifact.getWhenGathered().getTime() - 10000 );
- Date upper = new Date( artifact.getWhenGathered().getTime() + 10000 );
+ Date lower = new Date(artifact.getWhenGathered().getTime() - 10000);
+ Date upper = new Date(artifact.getWhenGathered().getTime() + 10000);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, lower, upper );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, lower, upper);
- assertEquals( Collections.singletonList( artifact ), artifacts );
+ assertEquals(Collections.singletonList(artifact), artifacts);
+
+ }
}
@Test
public void testGetArtifactsByDateRangeUpperBound()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
- Date upper = new Date( artifact.getWhenGathered().getTime() + 10000 );
+ Date upper = new Date(artifact.getWhenGathered().getTime() + 10000);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, null, upper );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, null, upper);
- assertEquals( Collections.singletonList( artifact ), artifacts );
+ assertEquals(Collections.singletonList(artifact), artifacts);
+
+ }
}
@Test
public void testGetArtifactsByDateRangeUpperBoundOutOfRange()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ Date upper = new Date(artifact.getWhenGathered().getTime() - 10000);
- Date upper = new Date( artifact.getWhenGathered().getTime() - 10000 );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( session, TEST_REPO_ID, null, upper);
- List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( , TEST_REPO_ID, null, upper );
+ assertThat(artifacts).isNotNull().isEmpty();
- assertThat( artifacts ).isNotNull().isEmpty();
+ }
}
@Test
public void testGetArtifactsByRepoId()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
-
- tryAssert(()-> {
- List<ArtifactMetadata> artifacts = repository.getArtifacts( , TEST_REPO_ID );
- assertEquals(Collections.singletonList(artifact), artifacts);
- });
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ tryAssert(() -> {
+ List<ArtifactMetadata> artifacts = repository.getArtifacts(session, TEST_REPO_ID);
+ assertEquals(Collections.singletonList(artifact), artifacts);
+ }
+ );
+ }
}
@Test
public void testGetArtifactsByRepoIdMultipleCopies()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+
+ ArtifactMetadata secondArtifact = createArtifact();
+ secondArtifact.setRepositoryId(OTHER_REPO_ID);
+ repository.updateArtifact( session, OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact);
+ session.save();
- ArtifactMetadata secondArtifact = createArtifact();
- secondArtifact.setRepositoryId( OTHER_REPO_ID );
- repository.updateArtifact( , OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact );
- repository.save();
+ // test it restricts to the appropriate repository
+ tryAssert(() -> assertEquals(Collections.singletonList(artifact), repository.getArtifacts( session, TEST_REPO_ID)));
+ tryAssert(() -> assertEquals(Collections.singletonList(secondArtifact), repository.getArtifacts( session, OTHER_REPO_ID)));
- // test it restricts to the appropriate repository
- tryAssert(() -> assertEquals( Collections.singletonList( artifact ), repository.getArtifacts( , TEST_REPO_ID ) ));
- tryAssert(() -> assertEquals( Collections.singletonList( secondArtifact ), repository.getArtifacts( , OTHER_REPO_ID ) ));
+ }
}
@Test
public void testGetArtifactsByDateRangeMultipleCopies()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+
+ ArtifactMetadata secondArtifact = createArtifact();
+ secondArtifact.setRepositoryId(OTHER_REPO_ID);
+ repository.updateArtifact( session, OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact);
+ session.save();
- ArtifactMetadata secondArtifact = createArtifact();
- secondArtifact.setRepositoryId( OTHER_REPO_ID );
- repository.updateArtifact( , OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact );
- repository.save();
+ // test it restricts to the appropriate repository
+ assertEquals(Collections.singletonList(artifact),
+ repository.getArtifactsByDateRange( session, TEST_REPO_ID, null, null));
+ assertEquals(Collections.singletonList(secondArtifact),
+ repository.getArtifactsByDateRange( session, OTHER_REPO_ID, null, null));
- // test it restricts to the appropriate repository
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( , TEST_REPO_ID, null, null ) );
- assertEquals( Collections.singletonList( secondArtifact ),
- repository.getArtifactsByDateRange( , OTHER_REPO_ID, null, null ) );
+ }
}
@Test
public void testGetArtifactsByChecksumMultipleCopies()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
-
- ArtifactMetadata secondArtifact = createArtifact();
- secondArtifact.setRepositoryId( OTHER_REPO_ID );
- repository.updateArtifact( , OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+
+ ArtifactMetadata secondArtifact = createArtifact();
+ secondArtifact.setRepositoryId(OTHER_REPO_ID);
+ repository.updateArtifact( session, OTHER_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact);
+ session.save();
+
+ // test it restricts to the appropriate repository
+ assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_SHA1)));
+ assertEquals(Collections.singletonList(secondArtifact), new ArrayList<>(
+ repository.getArtifactsByChecksum( session, OTHER_REPO_ID, TEST_SHA1)));
+ assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_MD5)));
+ assertEquals(Collections.singletonList(secondArtifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, OTHER_REPO_ID, TEST_MD5)));
- // test it restricts to the appropriate repository
- assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_SHA1 ) ) );
- assertEquals( Collections.singletonList( secondArtifact ), new ArrayList<>(
- repository.getArtifactsByChecksum( , OTHER_REPO_ID, TEST_SHA1 ) ) );
- assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_MD5 ) ) );
- assertEquals( Collections.singletonList( secondArtifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , OTHER_REPO_ID, TEST_MD5 ) ) );
+ }
}
@Test
public void testGetNamespacesWithSparseDepth()
- throws Exception
- {
- repository.updateNamespace( , TEST_REPO_ID, "org.apache.maven.shared" );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ repository.updateNamespace( session, TEST_REPO_ID, "org.apache.maven.shared");
+
+ Collection<String> namespaces = repository.getRootNamespaces( session, TEST_REPO_ID);
- Collection<String> namespaces = repository.getRootNamespaces( , TEST_REPO_ID );
+ assertThat(namespaces).isNotNull().isNotEmpty().hasSize(1).contains("org");
- assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "org" );
+ namespaces = repository.getNamespaces( session, TEST_REPO_ID, "org");
+ assertThat(namespaces).isNotNull().isNotEmpty().hasSize(1).contains("apache");
- namespaces = repository.getNamespaces( , TEST_REPO_ID, "org" );
- assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "apache" );
+ namespaces = repository.getNamespaces( session, TEST_REPO_ID, "org.apache");
+ assertThat(namespaces).isNotNull().isNotEmpty().hasSize(1).contains("maven");
- namespaces = repository.getNamespaces( , TEST_REPO_ID, "org.apache" );
- assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "maven" );
+ namespaces = repository.getNamespaces( session, TEST_REPO_ID, "org.apache.maven");
+ assertThat(namespaces).isNotNull().isNotEmpty().hasSize(1).contains("shared");
- namespaces = repository.getNamespaces( , TEST_REPO_ID, "org.apache.maven" );
- assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "shared" );
+ }
}
@Test
public void testGetNamespacesWithProjectsPresent()
- throws Exception
- {
- String namespace = "org.apache.maven.shared";
- repository.updateNamespace( , TEST_REPO_ID, namespace );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ String namespace = "org.apache.maven.shared";
+ repository.updateNamespace( session, TEST_REPO_ID, namespace);
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
+ repository.updateProjectVersion( session, TEST_REPO_ID, namespace, TEST_PROJECT, metadata);
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
- repository.updateProjectVersion( , TEST_REPO_ID, namespace, TEST_PROJECT, metadata );
+ Collection<String> namespaces = repository.getNamespaces( session, TEST_REPO_ID, namespace);
- Collection<String> namespaces = repository.getNamespaces( , TEST_REPO_ID, namespace );
+ assertThat(namespaces).isNotNull().isEmpty();
- assertThat( namespaces ).isNotNull().isEmpty();
+ }
}
@Test
public void testGetProjectsWithOtherNamespacesPresent()
- throws Exception
- {
- ProjectMetadata projectMetadata = new ProjectMetadata();
- projectMetadata.setId( TEST_PROJECT );
- projectMetadata.setNamespace( "org.apache.maven" );
- repository.updateProject( , TEST_REPO_ID, projectMetadata );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ProjectMetadata projectMetadata = new ProjectMetadata();
+ projectMetadata.setId(TEST_PROJECT);
+ projectMetadata.setNamespace("org.apache.maven");
+ repository.updateProject( session, TEST_REPO_ID, projectMetadata);
- repository.updateNamespace( , TEST_REPO_ID, "org.apache.maven.shared" );
+ repository.updateNamespace( session, TEST_REPO_ID, "org.apache.maven.shared");
- Collection<String> projects = repository.getProjects( , TEST_REPO_ID, "org.apache.maven" );
+ Collection<String> projects = repository.getProjects( session, TEST_REPO_ID, "org.apache.maven");
- assertThat( projects ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_PROJECT );
+ assertThat(projects).isNotNull().isNotEmpty().hasSize(1).contains(TEST_PROJECT);
+
+ }
}
@Test
public void testGetProjectVersionsWithOtherNamespacesPresent()
- throws Exception
- {
- // an unusual case but technically possible where a project namespace matches another project's name
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+// an unusual case but technically possible where a project namespace matches another project's name
+
+ ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
+ versionMetadata.setId(TEST_PROJECT_VERSION);
+ repository.updateProjectVersion( session, TEST_REPO_ID, "org.apache.maven", TEST_PROJECT, versionMetadata);
- ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
- versionMetadata.setId( TEST_PROJECT_VERSION );
- repository.updateProjectVersion( , TEST_REPO_ID, "org.apache.maven", TEST_PROJECT, versionMetadata );
+ repository.updateProjectVersion( session, TEST_REPO_ID, "org.apache.maven." + TEST_PROJECT,
+ "other-project", versionMetadata);
- repository.updateProjectVersion( , TEST_REPO_ID, "org.apache.maven." + TEST_PROJECT,
- "other-project", versionMetadata );
+ Collection<String> versions =
+ repository.getProjectVersions( session, TEST_REPO_ID, "org.apache.maven." + TEST_PROJECT, "other-project");
+ assertThat(versions).isNotNull().isNotEmpty().contains(TEST_PROJECT_VERSION);
- Collection<String> versions =
- repository.getProjectVersions( , TEST_REPO_ID, "org.apache.maven." + TEST_PROJECT, "other-project" );
- assertThat( versions ).isNotNull().isNotEmpty().contains( TEST_PROJECT_VERSION );
+ versions = repository.getProjectVersions( session, TEST_REPO_ID, "org.apache.maven", TEST_PROJECT);
- versions = repository.getProjectVersions( , TEST_REPO_ID, "org.apache.maven", TEST_PROJECT );
+ assertThat(versions).isNotNull().isNotEmpty().contains(TEST_PROJECT_VERSION);
- assertThat( versions ).isNotNull().isNotEmpty().contains( TEST_PROJECT_VERSION );
+ }
}
@Test
public void testGetArtifactsByChecksumSingleResultMd5()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
- assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_MD5 ) ) );
+ assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_MD5)));
+
+ }
}
@Test
public void testGetArtifactsByChecksumSingleResultSha1()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_SHA1)));
- assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_SHA1 ) ) );
+ }
}
@Test
public void testGetArtifactsByChecksumDeepNamespace()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- String namespace = "multi.level.ns";
- artifact.setNamespace( namespace );
- repository.updateArtifact( , TEST_REPO_ID, namespace, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- repository.save();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ String namespace = "multi.level.ns";
+ artifact.setNamespace(namespace);
+ repository.updateArtifact( session, TEST_REPO_ID, namespace, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ session.save();
+
+ tryAssert(() -> assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_SHA1))));
+ tryAssert(() -> assertEquals(Collections.singletonList(artifact),
+ new ArrayList<>(repository.getArtifactsByChecksum( session, TEST_REPO_ID, TEST_MD5))));
- tryAssert(()->assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_SHA1 ) ) ));
- tryAssert(()->assertEquals( Collections.singletonList( artifact ),
- new ArrayList<>( repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_MD5 ) ) ) );
+ }
}
@Test
public void testGetArtifactsByChecksumMultipleResult()
- throws Exception
- {
- ArtifactMetadata artifact1 = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
-
- String newProjectId = "another-project";
- ArtifactMetadata artifact2 = createArtifact();
- artifact2.setProject( newProjectId );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, newProjectId, TEST_PROJECT_VERSION, artifact2 );
- repository.save();
-
- tryAssert(()-> {
- List<ArtifactMetadata> artifacts =
- new ArrayList<>(repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_SHA1 ));
- Collections.sort(artifacts, new ArtifactMetadataComparator());
- assertEquals(Arrays.asList(artifact2, artifact1), artifacts);
- });
-
- tryAssert(() -> {
- ArrayList<ArtifactMetadata> artifacts = new ArrayList<>(repository.getArtifactsByChecksum( , TEST_REPO_ID, TEST_MD5 ));
- Collections.sort(artifacts, new ArtifactMetadataComparator());
- assertEquals(Arrays.asList(artifact2, artifact1), artifacts);
- });
+ throws Exception {
+
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact1 = createArtifact();
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1);
+
+ String newProjectId = "another-project";
+ ArtifactMetadata artifact2 = createArtifact();
+ artifact2.setProject(newProjectId);
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, newProjectId, TEST_PROJECT_VERSION, artifact2);
+ session.save();
+
+ tryAssert(() -> {
+ List<ArtifactMetadata> artifacts =
+ new ArrayList<>(repository.getArtifactsByChecksum(session, TEST_REPO_ID, TEST_SHA1));
+ Collections.sort(artifacts, new ArtifactMetadataComparator());
+ assertEquals(Arrays.asList(artifact2, artifact1), artifacts);
+ });
+
+ tryAssert(() -> {
+ ArrayList<ArtifactMetadata> artifacts = new ArrayList<>(repository.getArtifactsByChecksum(session, TEST_REPO_ID, TEST_MD5));
+ Collections.sort(artifacts, new ArtifactMetadataComparator());
+ assertEquals(Arrays.asList(artifact2, artifact1), artifacts);
+ });
+ }
}
@Test
public void testGetArtifactsByChecksumNoResult()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- Collection<ArtifactMetadata> artifactsByChecksum =
- repository.getArtifactsByChecksum( , TEST_REPO_ID, "not checksum" );
- assertThat( artifactsByChecksum ).isNotNull().isEmpty();
+ Collection<ArtifactMetadata> artifactsByChecksum =
+ repository.getArtifactsByChecksum( session, TEST_REPO_ID, "not checksum");
+ assertThat(artifactsByChecksum).isNotNull().isEmpty();
+
+ }
}
@Test
public void testGetArtifactsByProjectVersionMetadata()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet( 10 );
- Collection<ArtifactMetadata> artifactsByMetadata =
- repository.getArtifactsByProjectVersionMetadata( , TEST_METADATA_KEY, TEST_METADATA_VALUE, TEST_REPO_ID );
- assertThat( artifactsByMetadata ).hasSize( 1 );
- ArtifactMetadata artifactMetadata = artifactsByMetadata.iterator().next();
- assertThat( artifactMetadata.getId() ).isEqualTo( "projectId-1.0.jar" );
- assertThat( artifactMetadata.getSha1() ).isEqualTo( TEST_SHA1 );
- assertThat( artifactMetadata.getRepositoryId() ).isEqualTo( TEST_REPO_ID );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet( session,10);
+ Collection<ArtifactMetadata> artifactsByMetadata =
+ repository.getArtifactsByProjectVersionMetadata( session, TEST_METADATA_KEY, TEST_METADATA_VALUE, TEST_REPO_ID);
+ assertThat(artifactsByMetadata).hasSize(1);
+ ArtifactMetadata artifactMetadata = artifactsByMetadata.iterator().next();
+ assertThat(artifactMetadata.getId()).isEqualTo("projectId-1.0.jar");
+ assertThat(artifactMetadata.getSha1()).isEqualTo(TEST_SHA1);
+ assertThat(artifactMetadata.getRepositoryId()).isEqualTo(TEST_REPO_ID);
+
+ }
}
@Test
public void testGetArtifactsByProjectVersionMetadataNoRepository()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- Collection<ArtifactMetadata> artifactsByMetadata =
- repository.getArtifactsByProjectVersionMetadata( , TEST_METADATA_KEY, TEST_METADATA_VALUE, null );
- assertThat( artifactsByMetadata ).hasSize( 1 );
- assertThat( artifactsByMetadata.iterator().next().getRepositoryId() ).isNotNull().isNotEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ Collection<ArtifactMetadata> artifactsByMetadata =
+ repository.getArtifactsByProjectVersionMetadata( session, TEST_METADATA_KEY, TEST_METADATA_VALUE, null);
+ assertThat(artifactsByMetadata).hasSize(1);
+ assertThat(artifactsByMetadata.iterator().next().getRepositoryId()).isNotNull().isNotEmpty();
+
+ }
}
@Test
public void testGetArtifactsByProjectVersionMetadataAllRepositories()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- Collection<ArtifactMetadata> artifactsByMetadata =
- repository.getArtifactsByProjectVersionMetadata( , TEST_METADATA_KEY, TEST_METADATA_VALUE, null );
- assertThat( artifactsByMetadata ).hasSize( 1 );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ Collection<ArtifactMetadata> artifactsByMetadata =
+ repository.getArtifactsByProjectVersionMetadata( session, TEST_METADATA_KEY, TEST_METADATA_VALUE, null);
+ assertThat(artifactsByMetadata).hasSize(1);
+
+ }
}
@Test
public void testGetArtifactsByMetadataAllRepositories()
- throws Exception
- {
- createArtifactWithMavenArtifactFacet();
- tryAssert(()-> {
- Collection<ArtifactMetadata> artifactsByMetadata =
- repository.getArtifactsByMetadata( , "foo", TEST_METADATA_VALUE, null );
- assertThat(artifactsByMetadata).hasSize(1);
- ArtifactMetadata artifactMetadata = artifactsByMetadata.iterator().next();
- assertThat(artifactMetadata.getId()).isEqualTo("projectId-1.0.jar");
- assertThat(artifactMetadata.getSha1()).isEqualTo(TEST_SHA1);
- assertThat(artifactMetadata.getRepositoryId()).isEqualTo(TEST_REPO_ID);
- MetadataFacet facet = artifactMetadata.getFacet(TEST_FACET_ID);
- assertThat(facet).isNotNull();
- assertThat(facet.toProperties()).isEqualTo(Collections.singletonMap("foo", TEST_METADATA_VALUE));
- });
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithMavenArtifactFacet(session);
+ tryAssert(() -> {
+ Collection<ArtifactMetadata> artifactsByMetadata =
+ repository.getArtifactsByMetadata(session, "foo", TEST_METADATA_VALUE, null);
+ assertThat(artifactsByMetadata).hasSize(1);
+ ArtifactMetadata artifactMetadata = artifactsByMetadata.iterator().next();
+ assertThat(artifactMetadata.getId()).isEqualTo("projectId-1.0.jar");
+ assertThat(artifactMetadata.getSha1()).isEqualTo(TEST_SHA1);
+ assertThat(artifactMetadata.getRepositoryId()).isEqualTo(TEST_REPO_ID);
+ MetadataFacet facet = artifactMetadata.getFacet(TEST_FACET_ID);
+ assertThat(facet).isNotNull();
+ assertThat(facet.toProperties()).isEqualTo(Collections.singletonMap("foo", TEST_METADATA_VALUE));
+ });
+ }
}
@Test
public void testGetArtifactsByPropertySingleResult()
- throws Exception
- {
- createArtifactWithData();
- // only works on JCR implementation
- // Collection<ArtifactMetadata> artifactsByProperty = repository.getArtifactsByProperty( "org.name", TEST_ORGANIZATION.getName(), TEST_REPO_ID );
- Collection<ArtifactMetadata> artifactsByProperty = repository.getArtifactsByProperty( , "url", TEST_URL, TEST_REPO_ID );
- assertThat( artifactsByProperty ).hasSize( 1 );
- ArtifactMetadata artifactMetadata = artifactsByProperty.iterator().next();
- assertThat( artifactMetadata.getId() ).isEqualTo( "projectId-1.0.jar" );
- assertThat( artifactMetadata.getSha1() ).isEqualTo( TEST_SHA1 );
- assertThat( artifactMetadata.getRepositoryId() ).isEqualTo( TEST_REPO_ID );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithData(session);
+ // only works on JCR implementation
+ // Collection<ArtifactMetadata> artifactsByProperty = repository.getArtifactsByProperty( "org.name", TEST_ORGANIZATION.getName(), TEST_REPO_ID );
+ Collection<ArtifactMetadata> artifactsByProperty = repository.getArtifactsByProperty( session, "url", TEST_URL, TEST_REPO_ID);
+ assertThat(artifactsByProperty).hasSize(1);
+ ArtifactMetadata artifactMetadata = artifactsByProperty.iterator().next();
+ assertThat(artifactMetadata.getId()).isEqualTo("projectId-1.0.jar");
+ assertThat(artifactMetadata.getSha1()).isEqualTo(TEST_SHA1);
+ assertThat(artifactMetadata.getRepositoryId()).isEqualTo(TEST_REPO_ID);
+
+ }
}
@Test
public void testDeleteRepository()
- throws Exception
- {
- repository.updateNamespace( , TEST_REPO_ID, TEST_NAMESPACE );
-
- ProjectMetadata project1 = new ProjectMetadata();
- project1.setNamespace( TEST_NAMESPACE );
- project1.setId( "project1" );
- repository.updateProject( , TEST_REPO_ID, project1 );
- ProjectMetadata project2 = new ProjectMetadata();
- project2.setNamespace( TEST_NAMESPACE );
- project2.setId( "project2" );
- repository.updateProject( , TEST_REPO_ID, project2 );
-
- ArtifactMetadata artifact1 = createArtifact();
- artifact1.setProject( "project1" );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, "project1", TEST_PROJECT_VERSION, artifact1 );
- ArtifactMetadata artifact2 = createArtifact();
- artifact2.setProject( "project2" );
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, "project2", TEST_PROJECT_VERSION, artifact2 );
- repository.save();
-
- List<ArtifactMetadata> expected = Arrays.asList( artifact1, artifact2 );
- Collections.sort( expected, new ArtifactMetadataComparator() );
-
-
- tryAssert(()-> {
- List<ArtifactMetadata> actual =
- new ArrayList<>( repository.getArtifactsByDateRange( , TEST_REPO_ID, null, null ) );
- Collections.sort( actual, new ArtifactMetadataComparator() );
- assertEquals(expected, actual);
- });
-
- repository.removeRepository( , TEST_REPO_ID );
-
- assertTrue( repository.getArtifacts( , TEST_REPO_ID ).isEmpty() );
- assertTrue( repository.getRootNamespaces( , TEST_REPO_ID ).isEmpty() );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ repository.updateNamespace(session, TEST_REPO_ID, TEST_NAMESPACE);
+
+ ProjectMetadata project1 = new ProjectMetadata();
+ project1.setNamespace(TEST_NAMESPACE);
+ project1.setId("project1");
+ repository.updateProject(session, TEST_REPO_ID, project1);
+ ProjectMetadata project2 = new ProjectMetadata();
+ project2.setNamespace(TEST_NAMESPACE);
+ project2.setId("project2");
+ repository.updateProject(session, TEST_REPO_ID, project2);
+
+ ArtifactMetadata artifact1 = createArtifact();
+ artifact1.setProject("project1");
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, "project1", TEST_PROJECT_VERSION, artifact1);
+ ArtifactMetadata artifact2 = createArtifact();
+ artifact2.setProject("project2");
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, "project2", TEST_PROJECT_VERSION, artifact2);
+ session.save();
+
+ List<ArtifactMetadata> expected = Arrays.asList(artifact1, artifact2);
+ Collections.sort(expected, new ArtifactMetadataComparator());
+
+
+ tryAssert(() -> {
+ List<ArtifactMetadata> actual =
+ new ArrayList<>(repository.getArtifactsByDateRange(session, TEST_REPO_ID, null, null));
+ Collections.sort(actual, new ArtifactMetadataComparator());
+ assertEquals(expected, actual);
+ });
+
+ repository.removeRepository(session, TEST_REPO_ID);
+
+ assertTrue(repository.getArtifacts(session, TEST_REPO_ID).isEmpty());
+ assertTrue(repository.getRootNamespaces(session, TEST_REPO_ID).isEmpty());
+ }
}
@Test
public void testDeleteArtifact()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- artifact.addFacet( new TestMetadataFacet( "value" ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet(new TestMetadataFacet("value"));
+
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- assertThat( repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ) ).containsExactly( artifact );
+ assertThat(repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION)).containsExactly(artifact);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION_2_0, artifact );
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION_2_0, artifact);
- Collection<String> versions = repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ Collection<String> versions = repository.getProjectVersions(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- log.info( "versions {}", versions );
+ log.info("versions {}", versions);
- assertThat( versions ).isNotNull().isNotEmpty().hasSize( 2 ).contains( "1.0", "2.0" );
+ assertThat(versions).isNotNull().isNotEmpty().hasSize(2).contains("1.0", "2.0");
- repository.removeArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact.getId() );
+ repository.removeArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact.getId());
- versions = repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ versions = repository.getProjectVersions(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- log.info( "versions {}", versions );
+ log.info("versions {}", versions);
- assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "2.0" );
+ assertThat(versions).isNotNull().isNotEmpty().hasSize(1).contains("2.0");
- assertThat( repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION ) ).isNotNull().isEmpty();
+ assertThat(repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION)).isNotNull().isEmpty();
- assertThat( repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE,
- TEST_PROJECT, TEST_PROJECT_VERSION_2_0 ) ).isNotEmpty().hasSize( 1 );
+ assertThat(repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE,
+ TEST_PROJECT, TEST_PROJECT_VERSION_2_0)).isNotEmpty().hasSize(1);
+ }
}
@Test
public void deleteArtifact()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- artifact.addFacet( new TestMetadataFacet( "value" ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet(new TestMetadataFacet("value"));
+
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- Collection<ArtifactMetadata> artifacts =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ assertEquals(Collections.singletonList(artifact), new ArrayList<>(artifacts));
- assertEquals( Collections.singletonList( artifact ), new ArrayList<>( artifacts ) );
+ repository.removeArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact.getId());
- repository.removeArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact.getId() );
+ artifacts = repository.getArtifacts( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- artifacts = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ assertThat(artifacts).isNotNull().isEmpty();
- assertThat( artifacts ).isNotNull().isEmpty();
+ }
}
@Test
public void deleteVersion()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- artifact.addFacet( new TestMetadataFacet( "value" ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet(new TestMetadataFacet("value"));
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- Collection<String> versions = repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ Collection<String> versions = repository.getProjectVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat(versions).isNotNull().isNotEmpty().hasSize(1);
- repository.removeProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ repository.removeProjectVersion( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- versions = repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ versions = repository.getProjectVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- assertThat( versions ).isNotNull().isEmpty();
+ assertThat(versions).isNotNull().isEmpty();
+
+ }
}
@Test
public void deleteProject()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- artifact.addFacet( new TestMetadataFacet( "value" ) );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet(new TestMetadataFacet("value"));
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ repository.updateArtifact( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
- assertEquals( 1, repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT ).size() );
+ assertEquals(1, repository.getProjectVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT).size());
- repository.removeProject( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ repository.removeProject( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- Collection<String> versions = repository.getProjectVersions( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ Collection<String> versions = repository.getProjectVersions( session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT);
- assertThat( versions ).isNotNull().isEmpty();
+ assertThat(versions).isNotNull().isEmpty();
+
+ }
}
@Test
public void deleteSnapshotVersion()
- throws Exception
- {
- ArtifactMetadata artifactOne = createArtifact();
- artifactOne.setVersion( "2.0-20120618.214127-1" );
- artifactOne.setProjectVersion( "2.0-SNAPSHOT" );
- artifactOne.addFacet( new TestMetadataFacet( "value" ) );
- artifactOne.setId( TEST_PROJECT + "-" + "2.0-20120618.214127-1" + "." + "jar" );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ArtifactMetadata artifactOne = createArtifact();
+ artifactOne.setVersion("2.0-20120618.214127-1");
+ artifactOne.setProjectVersion("2.0-SNAPSHOT");
+ artifactOne.addFacet(new TestMetadataFacet("value"));
+ artifactOne.setId(TEST_PROJECT + "-" + "2.0-20120618.214127-1" + "." + "jar");
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactOne );
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactOne);
- ArtifactMetadata artifactTwo = createArtifact();
- artifactTwo.setVersion( "2.0-20120618.214135-2" );
- artifactTwo.setProjectVersion( "2.0-SNAPSHOT" );
- artifactTwo.addFacet( new TestMetadataFacet( "value" ) );
- artifactTwo.setId( TEST_PROJECT + "-" + "2.0-20120618.214135-2" + "." + "jar" );
+ ArtifactMetadata artifactTwo = createArtifact();
+ artifactTwo.setVersion("2.0-20120618.214135-2");
+ artifactTwo.setProjectVersion("2.0-SNAPSHOT");
+ artifactTwo.addFacet(new TestMetadataFacet("value"));
+ artifactTwo.setId(TEST_PROJECT + "-" + "2.0-20120618.214135-2" + "." + "jar");
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactTwo );
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactTwo);
- Collection<ArtifactMetadata> artifactMetadatas =
- repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+ Collection<ArtifactMetadata> artifactMetadatas =
+ repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT");
- assertThat( artifactMetadatas ).isNotNull().isNotEmpty().hasSize( 2 );
+ assertThat(artifactMetadatas).isNotNull().isNotEmpty().hasSize(2);
- log.info( "artifactMetadatas: {}", artifactMetadatas );
+ log.info("artifactMetadatas: {}", artifactMetadatas);
- repository.removeArtifact( , artifactOne, "2.0-SNAPSHOT" );
+ repository.removeArtifact(session, artifactOne, "2.0-SNAPSHOT");
- artifactMetadatas = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+ artifactMetadatas = repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT");
- assertThat( artifactMetadatas ).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat(artifactMetadatas).isNotNull().isNotEmpty().hasSize(1);
- repository.removeArtifact( , artifactTwo, "2.0-SNAPSHOT" );
+ repository.removeArtifact(session, artifactTwo, "2.0-SNAPSHOT");
- artifactMetadatas = repository.getArtifacts( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+ artifactMetadatas = repository.getArtifacts(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT");
- assertThat( artifactMetadatas ).isNotNull().isEmpty();
+ assertThat(artifactMetadatas).isNotNull().isEmpty();
+ }
}
@Test
public void testgetProjectReferences()
- throws Exception
- {
- ProjectVersionMetadata metadata = new ProjectVersionMetadata();
- metadata.setId( TEST_PROJECT_VERSION );
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+ metadata.setId(TEST_PROJECT_VERSION);
- metadata.setName( "project name" );
- metadata.setDescription( "project description" );
- metadata.setUrl( "the url" );
+ metadata.setName("project name");
+ metadata.setDescription("project description");
+ metadata.setUrl("the url");
- Dependency d = new Dependency();
- d.setArtifactId( "artifactId" );
- d.setClassifier( "classifier" );
- d.setGroupId( "groupId" );
- d.setScope( "scope" );
- d.setSystemPath( "system path" );
- d.setType( "type" );
- d.setVersion( "version" );
- d.setOptional( true );
- metadata.addDependency( d );
+ Dependency d = new Dependency();
+ d.setArtifactId("artifactId");
+ d.setClassifier("classifier");
+ d.setGroupId("groupId");
+ d.setScope("scope");
+ d.setSystemPath("system path");
+ d.setType("type");
+ d.setVersion("version");
+ d.setOptional(true);
+ metadata.addDependency(d);
- d = new Dependency();
- d.setArtifactId( "artifactId1" );
- d.setClassifier( "classifier" );
- d.setGroupId( "groupId" );
- d.setScope( "scope" );
- d.setSystemPath( "system path" );
- d.setType( "type" );
- d.setVersion( "version1" );
- d.setOptional( true );
- metadata.addDependency( d );
+ d = new Dependency();
+ d.setArtifactId("artifactId1");
+ d.setClassifier("classifier");
+ d.setGroupId("groupId");
+ d.setScope("scope");
+ d.setSystemPath("system path");
+ d.setType("type");
+ d.setVersion("version1");
+ d.setOptional(true);
+ metadata.addDependency(d);
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
- repository.save();
+ session.save();
- metadata = repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ metadata = repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
- Collection<ProjectVersionReference> references =
- repository.getProjectReferences( , TEST_REPO_ID, d.getGroupId(), d.getArtifactId(), d.getVersion() );
+ Collection<ProjectVersionReference> references =
+ repository.getProjectReferences(session, TEST_REPO_ID, d.getGroupId(), d.getArtifactId(), d.getVersion());
- log.info( "references: {}", references );
+ log.info("references: {}", references);
- assertThat( references ).isNotNull().hasSize( 1 ).contains(
- new ProjectVersionReference( ProjectVersionReference.ReferenceType.DEPENDENCY, TEST_PROJECT, TEST_NAMESPACE,
- TEST_PROJECT_VERSION ) );
+ assertThat(references).isNotNull().hasSize(1).contains(
+ new ProjectVersionReference(ProjectVersionReference.ReferenceType.DEPENDENCY, TEST_PROJECT, TEST_NAMESPACE,
+ TEST_PROJECT_VERSION));
+ }
}
@Test
public void testSearchArtifactsByKey()
- throws Exception
- {
- createArtifactWithData();
- Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, "url", TEST_URL, false );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithData(session);
+ session.refreshAndDiscard();
+ Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, "url", TEST_URL, false);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+
+ }
}
@Test
public void testSearchArtifactsByKeyExact()
- throws Exception
- {
- createArtifactWithData();
- Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, "url", TEST_URL, true );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
- artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, "org.name", "pache", true );
- assertThat( artifactsByProperty ).isNotNull().isEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithData(session);
+ Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, "url", TEST_URL, true);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+ artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, "org.name", "pache", true);
+ assertThat(artifactsByProperty).isNotNull().isEmpty();
+
+ }
}
@Test
public void testSearchArtifactsByFacetKey()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, TEST_METADATA_KEY, TEST_METADATA_VALUE, false );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ }
+ // Thread.currentThread().sleep(5000);
+ try (RepositorySession session = sessionFactory.createSession()) {
+ session.refresh();
+ System.out.println(repository.getRootNamespaces(session, TEST_REPO_ID));
+
+ Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, TEST_METADATA_KEY, TEST_METADATA_VALUE, false);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+
+ }
}
@Test
public void testSearchArtifactsByFacetKeyAllRepos()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- tryAssert(()-> {
- Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( , null, TEST_METADATA_KEY, TEST_METADATA_VALUE, false );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
- });
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+
+ createArtifactWithGenericMetadataFacet(session);
+ tryAssert(() -> {
+ Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts(session, null, TEST_METADATA_KEY, TEST_METADATA_VALUE, false);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+ });
+ }
}
@Test
public void testSearchArtifactsFullText()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- // only works in JCR
- // Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( TEST_URL, TEST_REPO_ID, false );
- Collection<ArtifactMetadata> artifactsByProperty =
- repository.searchArtifacts( , TEST_REPO_ID, TEST_METADATA_VALUE, false );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ // only works in JCR
+ // Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( TEST_URL, TEST_REPO_ID, false );
+ Collection<ArtifactMetadata> artifactsByProperty =
+ repository.searchArtifacts( session, TEST_REPO_ID, TEST_METADATA_VALUE, false);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+
+ }
}
@Test
public void testSearchArtifactsFullTextExact()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- // only works in JCR
- // Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( TEST_URL, TEST_REPO_ID, true );
- Collection<ArtifactMetadata> artifactsByProperty =
- repository.searchArtifacts( , TEST_REPO_ID, TEST_METADATA_VALUE, true );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
- artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, TEST_METADATA_VALUE.substring( 2 ), true );
- assertThat( artifactsByProperty ).isNotNull().isEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ // only works in JCR
+ // Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( TEST_URL, TEST_REPO_ID, true );
+ Collection<ArtifactMetadata> artifactsByProperty =
+ repository.searchArtifacts( session, TEST_REPO_ID, TEST_METADATA_VALUE, true);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+ artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, TEST_METADATA_VALUE.substring(2), true);
+ assertThat(artifactsByProperty).isNotNull().isEmpty();
+
+ }
}
@Test
public void testSearchArtifactsFullTextByFacet()
- throws Exception
- {
- createArtifactWithGenericMetadataFacet();
- Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( , TEST_REPO_ID, TEST_METADATA_VALUE, false );
- assertThat( artifactsByProperty ).isNotNull().isNotEmpty();
+ throws Exception {
+ try (RepositorySession session = sessionFactory.createSession()) {
+ createArtifactWithGenericMetadataFacet(session);
+ Collection<ArtifactMetadata> artifactsByProperty = repository.searchArtifacts( session, TEST_REPO_ID, TEST_METADATA_VALUE, false);
+ assertThat(artifactsByProperty).isNotNull().isNotEmpty();
+
+ }
}
- private static ProjectMetadata createProject()
- {
- return createProject( TEST_NAMESPACE );
+ private static ProjectMetadata createProject() {
+ return createProject(TEST_NAMESPACE);
}
- private static ProjectMetadata createProject( String ns )
- {
+ private static ProjectMetadata createProject(String ns) {
ProjectMetadata project = new ProjectMetadata();
- project.setId( TEST_PROJECT );
- project.setNamespace( ns );
+ project.setId(TEST_PROJECT);
+ project.setNamespace(ns);
return project;
}
- private void createArtifactWithGenericMetadataFacet()
- throws MetadataRepositoryException, MetadataResolutionException
- {
- createArtifactWithGenericMetadataFacet( 1 );
+ private void createArtifactWithGenericMetadataFacet(RepositorySession session)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
+ createArtifactWithGenericMetadataFacet( session,1);
}
- private void createArtifactWithGenericMetadataFacet( int artifacts )
- throws MetadataRepositoryException, MetadataResolutionException
- {
+ private void createArtifactWithGenericMetadataFacet(RepositorySession session, int artifacts)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
MetadataFacet metadataFacet = new GenericMetadataFacet();
Map<String, String> properties = new HashMap<>();
- properties.put( TEST_METADATA_KEY, TEST_METADATA_VALUE );
- metadataFacet.fromProperties( properties );
- createArtifactWithFacet( artifacts, null, metadataFacet );
+ properties.put(TEST_METADATA_KEY, TEST_METADATA_VALUE);
+ metadataFacet.fromProperties(properties);
+ createArtifactWithFacet(session, artifacts, null, metadataFacet);
}
- private void createArtifactWithMavenArtifactFacet()
- throws MetadataRepositoryException, MetadataResolutionException
- {
- createArtifactWithMavenArtifactFacet( 1 );
+ private void createArtifactWithMavenArtifactFacet(RepositorySession session)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
+ createArtifactWithMavenArtifactFacet(session, 1);
}
- private void createArtifactWithMavenArtifactFacet( int artifacts )
- throws MetadataRepositoryException, MetadataResolutionException
- {
- TestMetadataFacet facet = new TestMetadataFacet( TEST_METADATA_VALUE );
- createArtifactWithFacet( artifacts, facet, null );
+ private void createArtifactWithMavenArtifactFacet(RepositorySession session, int artifacts)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
+ TestMetadataFacet facet = new TestMetadataFacet(TEST_METADATA_VALUE);
+ createArtifactWithFacet(session, artifacts, facet, null);
}
- private void createArtifactWithFacet( int artifacts, MetadataFacet artifactFacet,
- MetadataFacet projectVersionMetadataFacet )
- throws MetadataRepositoryException, MetadataResolutionException
- {
- for ( int i = 0; i < artifacts; i++ )
- {
- ArtifactMetadata artifact = createArtifact();
- if ( artifactFacet != null )
- {
- artifact.addFacet( artifactFacet );
+ private void createArtifactWithFacet(RepositorySession session, int artifacts, MetadataFacet artifactFacet,
+ MetadataFacet projectVersionMetadataFacet)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
+ for (int i = 0; i < artifacts; i++) {
+ ArtifactMetadata artifact = createArtifact();
+ if (artifactFacet != null) {
+ artifact.addFacet(artifactFacet);
+ }
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
}
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- }
- if ( projectVersionMetadataFacet != null )
- {
- ProjectVersionMetadata metadata =
- repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- metadata.addFacet( projectVersionMetadataFacet );
- metadata.setOrganization( TEST_ORGANIZATION );
- metadata.setUrl( TEST_URL );
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
- }
- repository.save();
+ if (projectVersionMetadataFacet != null) {
+ ProjectVersionMetadata metadata =
+ repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ metadata.addFacet(projectVersionMetadataFacet);
+ metadata.setOrganization(TEST_ORGANIZATION);
+ metadata.setUrl(TEST_URL);
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+ }
+ session.save();
}
- private void createArtifactWithData()
- throws MetadataRepositoryException, MetadataResolutionException
- {
- ArtifactMetadata artifact = createArtifact();
- repository.updateArtifact( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- ProjectVersionMetadata metadata =
- repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
- metadata.setOrganization( TEST_ORGANIZATION );
- metadata.setUrl( TEST_URL );
+ private void createArtifactWithData(RepositorySession session)
+ throws MetadataRepositoryException, MetadataResolutionException, MetadataSessionException {
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact);
+ ProjectVersionMetadata metadata =
+ repository.getProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION);
+ metadata.setOrganization(TEST_ORGANIZATION);
+ metadata.setUrl(TEST_URL);
- repository.updateProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
- repository.save();
+ repository.updateProjectVersion(session, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata);
+ session.save();
}
- private static ArtifactMetadata createArtifact()
- {
- return createArtifact( "jar" );
+ private static ArtifactMetadata createArtifact() {
+ return createArtifact("jar");
}
- private static ArtifactMetadata createArtifact( String type )
- {
+ private static ArtifactMetadata createArtifact(String type) {
ArtifactMetadata artifact = new ArtifactMetadata();
- artifact.setId( TEST_PROJECT + "-" + TEST_PROJECT_VERSION + "." + type );
- artifact.setWhenGathered( new Date() );
- artifact.setNamespace( TEST_NAMESPACE );
- artifact.setProject( TEST_PROJECT );
- artifact.setRepositoryId( TEST_REPO_ID );
- artifact.setFileLastModified( System.currentTimeMillis() );
- artifact.setVersion( TEST_PROJECT_VERSION );
- artifact.setProjectVersion( TEST_PROJECT_VERSION );
- artifact.setMd5( TEST_MD5 );
- artifact.setSha1( TEST_SHA1 );
+ artifact.setId(TEST_PROJECT + "-" + TEST_PROJECT_VERSION + "." + type);
+ artifact.setWhenGathered(new Date());
+ artifact.setNamespace(TEST_NAMESPACE);
+ artifact.setProject(TEST_PROJECT);
+ artifact.setRepositoryId(TEST_REPO_ID);
+ artifact.setFileLastModified(System.currentTimeMillis());
+ artifact.setVersion(TEST_PROJECT_VERSION);
+ artifact.setProjectVersion(TEST_PROJECT_VERSION);
+ artifact.setMd5(TEST_MD5);
+ artifact.setSha1(TEST_SHA1);
return artifact;
}
private static class ArtifactMetadataComparator
- implements Comparator<ArtifactMetadata>
- {
+ implements Comparator<ArtifactMetadata> {
@Override
- public final int compare( ArtifactMetadata a, ArtifactMetadata b )
- {
- return a.getProject().compareTo( b.getProject() );
+ public final int compare(ArtifactMetadata a, ArtifactMetadata b) {
+ return a.getProject().compareTo(b.getProject());
}
}
private static class KindOfRepositoryStatistics
- implements MetadataFacet
- {
+ implements MetadataFacet {
private String value;
private Date date;
static final String SCAN_TIMESTAMP_FORMAT = "yyyy/MM/dd/HHmmss.SSS";
- private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" );
+ private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone("UTC");
- private KindOfRepositoryStatistics( String value, Date date )
- {
+ private KindOfRepositoryStatistics(String value, Date date) {
this.value = value;
this.date = date;
}
@Override
- public String getName()
- {
- return createNameFormat().format( date );
+ public String getName() {
+ return createNameFormat().format(date);
}
- private static SimpleDateFormat createNameFormat()
- {
- SimpleDateFormat fmt = new SimpleDateFormat( SCAN_TIMESTAMP_FORMAT );
- fmt.setTimeZone( UTC_TIME_ZONE );
+ private static SimpleDateFormat createNameFormat() {
+ SimpleDateFormat fmt = new SimpleDateFormat(SCAN_TIMESTAMP_FORMAT);
+ fmt.setTimeZone(UTC_TIME_ZONE);
return fmt;
}
@Override
- public String getFacetId()
- {
+ public String getFacetId() {
return KindOfRepositoryStatistics.class.getName();
}
@Override
- public Map<String, String> toProperties()
- {
+ public Map<String, String> toProperties() {
return Collections.emptyMap();
}
@Override
- public void fromProperties( Map<String, String> properties )
- {
+ public void fromProperties(Map<String, String> properties) {
// no op
}
}
private static class TestMetadataFacet
- implements MetadataFacet
- {
+ implements MetadataFacet {
private String testFacetId;
private Map<String, String> additionalProps;
private String value;
- private TestMetadataFacet( String value )
- {
+ private TestMetadataFacet(String value) {
this.value = value;
testFacetId = TEST_FACET_ID;
}
- private TestMetadataFacet( String facetId, String value )
- {
+ private TestMetadataFacet(String facetId, String value) {
this.value = value;
testFacetId = facetId;
}
- private TestMetadataFacet( String facetId, String value, Map<String, String> additionalProps )
- {
- this( facetId, value );
+ private TestMetadataFacet(String facetId, String value, Map<String, String> additionalProps) {
+ this(facetId, value);
this.additionalProps = additionalProps;
}
@Override
- public String getFacetId()
- {
+ public String getFacetId() {
return testFacetId;
}
@Override
- public String getName()
- {
+ public String getName() {
return TEST_NAME;
}
@Override
- public Map<String, String> toProperties()
- {
- if ( value != null )
- {
- if ( additionalProps == null )
- {
- return Collections.singletonMap( "foo", value );
- }
- else
- {
+ public Map<String, String> toProperties() {
+ if (value != null) {
+ if (additionalProps == null) {
+ return Collections.singletonMap("foo", value);
+ } else {
Map<String, String> props = new HashMap<>();
- props.put( "foo", value );
+ props.put("foo", value);
- for ( String key : additionalProps.keySet() )
- {
- props.put( key, additionalProps.get( key ) );
+ for (String key : additionalProps.keySet()) {
+ props.put(key, additionalProps.get(key));
}
return props;
}
- }
- else
- {
+ } else {
return Collections.emptyMap();
}
}
@Override
- public void fromProperties( Map<String, String> properties )
- {
- String value = properties.get( "foo" );
- if ( value != null )
- {
+ public void fromProperties(Map<String, String> properties) {
+ String value = properties.get("foo");
+ if (value != null) {
this.value = value;
}
- properties.remove( "foo" );
+ properties.remove("foo");
- if ( additionalProps == null )
- {
+ if (additionalProps == null) {
additionalProps = new HashMap<>();
}
- for ( String key : properties.keySet() )
- {
- additionalProps.put( key, properties.get( key ) );
+ for (String key : properties.keySet()) {
+ additionalProps.put(key, properties.get(key));
}
}
- public String getValue()
- {
+ public String getValue() {
return value;
}
@Override
- public String toString()
- {
+ public String toString() {
return "TestMetadataFacet{" + "value='" + value + '\'' + '}';
}
@Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if ( o == null || getClass() != o.getClass() )
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
TestMetadataFacet that = (TestMetadataFacet) o;
- if ( value != null ? !value.equals( that.value ) : that.value != null )
- {
+ if (value != null ? !value.equals(that.value) : that.value != null) {
return false;
}
@@ -1900,8 +1955,7 @@ public abstract class AbstractMetadataRepositoryTest
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return value != null ? value.hashCode() : 0;
}
}
diff --git a/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java b/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java
index 1723322..7cc7528 100644
--- a/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java
+++ b/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java
@@ -58,9 +58,9 @@ public class RepositoryWalkingStatisticsProvider implements RepositoryStatistics
{
try
{
- for ( String ns : metadataRepository.getRootNamespaces( , repositoryId ) )
+ for ( String ns : metadataRepository.getRootNamespaces( repositorySession, repositoryId ) )
{
- walkRepository( metadataRepository, repositoryStatistics, repositoryId, ns );
+ walkRepository( repositorySession, metadataRepository, repositoryStatistics, repositoryId, ns );
}
}
catch ( MetadataResolutionException e )
@@ -69,16 +69,16 @@ public class RepositoryWalkingStatisticsProvider implements RepositoryStatistics
}
}
- private void walkRepository( MetadataRepository metadataRepository, RepositoryStatistics stats, String repositoryId,
+ private void walkRepository( RepositorySession repositorySession, MetadataRepository metadataRepository, RepositoryStatistics stats, String repositoryId,
String ns )
throws MetadataResolutionException
{
- for ( String namespace : metadataRepository.getNamespaces( , repositoryId, ns ) )
+ for ( String namespace : metadataRepository.getNamespaces( repositorySession , repositoryId, ns ) )
{
- walkRepository( metadataRepository, stats, repositoryId, ns + "." + namespace );
+ walkRepository( repositorySession, metadataRepository, stats, repositoryId, ns + "." + namespace );
}
- Collection<String> projects = metadataRepository.getProjects( , repositoryId, ns );
+ Collection<String> projects = metadataRepository.getProjects( repositorySession , repositoryId, ns );
if ( !projects.isEmpty() )
{
stats.setTotalGroupCount( stats.getTotalGroupCount() + 1 );
@@ -86,9 +86,9 @@ public class RepositoryWalkingStatisticsProvider implements RepositoryStatistics
for ( String project : projects )
{
- for ( String version : metadataRepository.getProjectVersions( , repositoryId, ns, project ) )
+ for ( String version : metadataRepository.getProjectVersions( repositorySession , repositoryId, ns, project ) )
{
- for ( ArtifactMetadata artifact : metadataRepository.getArtifacts( , repositoryId, ns,
+ for ( ArtifactMetadata artifact : metadataRepository.getArtifacts( repositorySession , repositoryId, ns,
project, version ) )
{
stats.setTotalArtifactCount( stats.getTotalArtifactCount() + 1 );
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
index cff05aa..6cf3358 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
@@ -22,10 +22,13 @@ package org.apache.archiva.audit;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -49,43 +52,46 @@ public class DefaultAuditManager
private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" );
+ @Inject
+ RepositorySessionFactory repositorySessionFactory;
+
@Override
public List<AuditEvent> getMostRecentAuditEvents( MetadataRepository metadataRepository,
List<String> repositoryIds )
throws MetadataRepositoryException
{
- // TODO: consider a more efficient implementation that directly gets the last ten from the content repository
- List<AuditRecord> records = new ArrayList<>();
- for ( String repositoryId : repositoryIds )
- {
- List<String> names = metadataRepository.getMetadataFacets( , repositoryId, AuditEvent.FACET_ID );
- for ( String name : names )
- {
- records.add( new AuditRecord( repositoryId, name ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ // TODO: consider a more efficient implementation that directly gets the last ten from the content repository
+ List<AuditRecord> records = new ArrayList<>();
+ for (String repositoryId : repositoryIds) {
+ List<String> names = metadataRepository.getMetadataFacets(session, repositoryId, AuditEvent.FACET_ID);
+ for (String name : names) {
+ records.add(new AuditRecord(repositoryId, name));
+ }
}
+ Collections.sort(records);
+ records = records.subList(0, records.size() < NUM_RECENT_EVENTS ? records.size() : NUM_RECENT_EVENTS);
+
+ List<AuditEvent> events = new ArrayList<>(records.size());
+ for (AuditRecord record : records) {
+ AuditEvent auditEvent = (AuditEvent) metadataRepository.getMetadataFacet(session,
+ record.repositoryId,
+ AuditEvent.FACET_ID, record.name);
+ events.add(auditEvent);
+ }
+ return events;
}
- Collections.sort( records );
- records = records.subList( 0, records.size() < NUM_RECENT_EVENTS ? records.size() : NUM_RECENT_EVENTS );
-
- List<AuditEvent> events = new ArrayList<>( records.size() );
- for ( AuditRecord record : records )
- {
- AuditEvent auditEvent = (AuditEvent) metadataRepository.getMetadataFacet( ,
- record.repositoryId,
- AuditEvent.FACET_ID, record.name );
- events.add( auditEvent );
- }
- return events;
}
@Override
public void addAuditEvent( MetadataRepository repository, AuditEvent event )
throws MetadataRepositoryException
{
- // ignore those with no repository - they will still be logged to the textual audit log
- if ( event.getRepositoryId() != null )
- {
- repository.addMetadataFacet( , event.getRepositoryId(), event );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ // ignore those with no repository - they will still be logged to the textual audit log
+ if (event.getRepositoryId() != null) {
+ repository.addMetadataFacet(session, event.getRepositoryId(), event);
+ }
}
}
@@ -93,7 +99,9 @@ public class DefaultAuditManager
public void deleteAuditEvents( MetadataRepository metadataRepository, String repositoryId )
throws MetadataRepositoryException
{
- metadataRepository.removeMetadataFacets( , repositoryId, AuditEvent.FACET_ID );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ metadataRepository.removeMetadataFacets(session, repositoryId, AuditEvent.FACET_ID);
+ }
}
@Override
@@ -110,44 +118,37 @@ public class DefaultAuditManager
Date endTime )
throws MetadataRepositoryException
{
- List<AuditEvent> results = new ArrayList<>();
- for ( String repositoryId : repositoryIds )
- {
- List<String> list = metadataRepository.getMetadataFacets( , repositoryId, AuditEvent.FACET_ID );
- for ( String name : list )
- {
- try
- {
- Date date = createNameFormat().parse( name );
- if ( ( startTime == null || !date.before( startTime ) ) && ( endTime == null || !date.after(
- endTime ) ) )
- {
- AuditEvent event = (AuditEvent) metadataRepository.getMetadataFacet( ,
- repositoryId,
- AuditEvent.FACET_ID, name );
-
- if ( resource == null || event.getResource().startsWith( resource ) )
- {
- results.add( event );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ List<AuditEvent> results = new ArrayList<>();
+ for (String repositoryId : repositoryIds) {
+ List<String> list = metadataRepository.getMetadataFacets(session, repositoryId, AuditEvent.FACET_ID);
+ for (String name : list) {
+ try {
+ Date date = createNameFormat().parse(name);
+ if ((startTime == null || !date.before(startTime)) && (endTime == null || !date.after(
+ endTime))) {
+ AuditEvent event = (AuditEvent) metadataRepository.getMetadataFacet(session,
+ repositoryId,
+ AuditEvent.FACET_ID, name);
+
+ if (resource == null || event.getResource().startsWith(resource)) {
+ results.add(event);
+ }
}
+ } catch (ParseException e) {
+ log.error("Invalid audit event found in the metadata repository: {}", e.getMessage());
+ // continue and ignore this one
}
}
- catch ( ParseException e )
- {
- log.error( "Invalid audit event found in the metadata repository: {}", e.getMessage() );
- // continue and ignore this one
- }
}
+ Collections.sort(results, new Comparator<AuditEvent>() {
+ @Override
+ public int compare(AuditEvent o1, AuditEvent o2) {
+ return o2.getTimestamp().compareTo(o1.getTimestamp());
+ }
+ });
+ return results;
}
- Collections.sort( results, new Comparator<AuditEvent>()
- {
- @Override
- public int compare( AuditEvent o1, AuditEvent o2 )
- {
- return o2.getTimestamp().compareTo( o1.getTimestamp() );
- }
- } );
- return results;
}
private static SimpleDateFormat createNameFormat()
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
index ea535fd..5e17456 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
@@ -77,14 +77,14 @@ public class MetadataAuditListener
{
log.warn( "Unable to write audit event to repository: {}", e.getMessage(), e );
}
- finally
- {
- repositorySession.close();
- }
catch ( org.apache.archiva.metadata.repository.MetadataSessionException e )
{
e.printStackTrace( );
}
+ finally
+ {
+ repositorySession.close();
+ }
}
}
}
diff --git a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
index da40c68..eaf2d8a 100644
--- a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
+++ b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
@@ -23,6 +23,9 @@ import junit.framework.TestCase;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.repository.Repository;
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -52,6 +55,8 @@ public class AuditManagerTest
private MetadataRepository metadataRepository;
+ private RepositorySessionFactory repositorySessionFactory;
+
private static final String AUDIT_EVENT_BASE = "2010/01/18/123456.";
private static final String TEST_REPO_ID = "test-repo";
@@ -67,6 +72,7 @@ public class AuditManagerTest
private static final SimpleDateFormat TIMESTAMP_FORMAT = createTimestampFormat();
private static final DecimalFormat MILLIS_FORMAT = new DecimalFormat( "000" );
+ private IMocksControl factoryControl;
private static SimpleDateFormat createTimestampFormat()
{
@@ -87,6 +93,9 @@ public class AuditManagerTest
metadataRepositoryControl = EasyMock.createControl();
metadataRepository = metadataRepositoryControl.createMock( MetadataRepository.class );
+ factoryControl = EasyMock.createControl();
+ repositorySessionFactory = factoryControl.createMock(RepositorySessionFactory.class);
+
ManagedRepositoryConfiguration repository = new ManagedRepositoryConfiguration();
repository.setId( TEST_REPO_ID );
repository.setLocation( "" );
@@ -104,14 +113,15 @@ public class AuditManagerTest
expectedEvents.add( event );
}
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- getEventNames( expectedEvents ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ getEventNames(expectedEvents));
- for ( AuditEvent event : expectedEvents.subList( 1, expectedEvents.size() ) )
- {
- EasyMock.expect(
- metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, event.getName() ) ).andReturn(
- event );
+ for (AuditEvent event : expectedEvents.subList(1, expectedEvents.size())) {
+ EasyMock.expect(
+ metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, event.getName())).andReturn(
+ event);
+ }
}
metadataRepositoryControl.replay();
@@ -141,13 +151,14 @@ public class AuditManagerTest
expectedEvents.add( createEvent( AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) ) );
}
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- getEventNames( expectedEvents ) );
- for ( AuditEvent event : expectedEvents )
- {
- EasyMock.expect(
- metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, event.getName() ) ).andReturn(
- event );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ getEventNames(expectedEvents));
+ for (AuditEvent event : expectedEvents) {
+ EasyMock.expect(
+ metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, event.getName())).andReturn(
+ event);
+ }
}
metadataRepositoryControl.replay();
@@ -184,15 +195,16 @@ public class AuditManagerTest
eventNames.get( repositoryId ).add( event.getName() );
}
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- eventNames.get( TEST_REPO_ID ) );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID_2, AuditEvent.FACET_ID ) ).andReturn(
- eventNames.get( TEST_REPO_ID_2 ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ eventNames.get(TEST_REPO_ID));
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID_2, AuditEvent.FACET_ID)).andReturn(
+ eventNames.get(TEST_REPO_ID_2));
- for ( AuditEvent event : events.subList( 1, events.size() ) )
- {
- EasyMock.expect( metadataRepository.getMetadataFacet( , event.getRepositoryId(),
- AuditEvent.FACET_ID, event.getName() ) ).andReturn( event );
+ for (AuditEvent event : events.subList(1, events.size())) {
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, event.getRepositoryId(),
+ AuditEvent.FACET_ID, event.getName())).andReturn(event);
+ }
}
metadataRepositoryControl.replay();
@@ -218,8 +230,10 @@ public class AuditManagerTest
{
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Collections.<String>emptyList() );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Collections.<String>emptyList());
+ }
metadataRepositoryControl.replay();
assertTrue( auditManager.getMostRecentAuditEvents( metadataRepository,
@@ -235,7 +249,9 @@ public class AuditManagerTest
{
AuditEvent event = createEvent( new Date() );
- metadataRepository.addMetadataFacet( , TEST_REPO_ID, event );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ metadataRepository.addMetadataFacet(session, TEST_REPO_ID, event);
+ }
metadataRepositoryControl.replay();
@@ -265,7 +281,9 @@ public class AuditManagerTest
throws Exception
{
- metadataRepository.removeMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ metadataRepository.removeMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID);
+ }
metadataRepositoryControl.replay();
@@ -286,12 +304,14 @@ public class AuditManagerTest
AuditEvent expectedEvent = createEvent( expectedTimestamp );
AuditEvent event3 = createEvent( new Date( current.getTime() - 1000 ) );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( event1.getName(), expectedEvent.getName(), event3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(event1.getName(), expectedEvent.getName(), event3.getName()));
- // only match the middle one
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent.getName() ) ).andReturn( expectedEvent );
+ // only match the middle one
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent.getName())).andReturn(expectedEvent);
+ }
metadataRepositoryControl.replay();
@@ -318,13 +338,15 @@ public class AuditManagerTest
Date ts3 = new Date( current.getTime() - 1000 );
AuditEvent expectedEvent3 = createEvent( ts3 );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( event1.getName(), expectedEvent2.getName(), expectedEvent3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(event1.getName(), expectedEvent2.getName(), expectedEvent3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent2.getName() ) ).andReturn( expectedEvent2 );
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent3.getName() ) ).andReturn( expectedEvent3 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent2.getName())).andReturn(expectedEvent2);
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent3.getName())).andReturn(expectedEvent3);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -350,15 +372,16 @@ public class AuditManagerTest
AuditEvent expectedEvent2 = createEvent( expectedTimestamp );
AuditEvent event3 = createEvent( new Date( current.getTime() - 1000 ) );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( expectedEvent1.getName(), expectedEvent2.getName(), event3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(expectedEvent1.getName(), expectedEvent2.getName(), event3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent1.getName() ) ).andReturn( expectedEvent1 );
-
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent2.getName() ) ).andReturn( expectedEvent2 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent1.getName())).andReturn(expectedEvent1);
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent2.getName())).andReturn(expectedEvent2);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -386,17 +409,19 @@ public class AuditManagerTest
Date ts3 = new Date( current.getTime() - 1000 );
AuditEvent expectedEvent3 = createEvent( ts3 );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent1.getName() ) ).andReturn( expectedEvent1 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent1.getName())).andReturn(expectedEvent1);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent2.getName() ) ).andReturn( expectedEvent2 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent2.getName())).andReturn(expectedEvent2);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent3.getName() ) ).andReturn( expectedEvent3 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent3.getName())).andReturn(expectedEvent3);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -426,18 +451,20 @@ public class AuditManagerTest
AuditEvent expectedEvent3 = createEvent( ts3 );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent1.getName() ) ).andReturn( expectedEvent1 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent1.getName())).andReturn(expectedEvent1);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent2.getName() ) ).andReturn( expectedEvent2 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent2.getName())).andReturn(expectedEvent2);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- AuditEvent.FACET_ID, expectedEvent3.getName() ) ).andReturn( expectedEvent3 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ AuditEvent.FACET_ID, expectedEvent3.getName())).andReturn(expectedEvent3);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -464,16 +491,18 @@ public class AuditManagerTest
AuditEvent expectedEvent3 = createEvent( new Date( current.getTime() - 1000 ) );
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) ).andReturn(
- Arrays.asList( expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName() ) );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID)).andReturn(
+ Arrays.asList(expectedEvent1.getName(), expectedEvent2.getName(), expectedEvent3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent1.getName() ) ).andReturn( expectedEvent1 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent1.getName())).andReturn(expectedEvent1);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent2.getName() ) ).andReturn( expectedEvent2 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent2.getName())).andReturn(expectedEvent2);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent3.getName() ) ).andReturn( expectedEvent3 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent3.getName())).andReturn(expectedEvent3);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -499,23 +528,23 @@ public class AuditManagerTest
Date ts3 = new Date( current.getTime() - 1000 );
AuditEvent expectedEvent3 = createEvent( ts3 );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID))
+ .andReturn(Arrays.asList(expectedEvent1.getName(), expectedEvent3.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) )
- .andReturn( Arrays.asList( expectedEvent1.getName(), expectedEvent3.getName() ) );
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID_2, AuditEvent.FACET_ID))
+ .andReturn(Arrays.asList(expectedEvent2.getName()));
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID_2, AuditEvent.FACET_ID ) )
- .andReturn( Arrays.asList( expectedEvent2.getName() ) );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent1.getName()))
+ .andReturn(expectedEvent1);
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent1.getName() ) )
- .andReturn( expectedEvent1 );
-
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID_2, AuditEvent.FACET_ID, expectedEvent2.getName() ) )
- .andReturn( expectedEvent2 );
-
- EasyMock.expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent3.getName() ) )
- .andReturn( expectedEvent3 );
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID_2, AuditEvent.FACET_ID, expectedEvent2.getName()))
+ .andReturn(expectedEvent2);
+ EasyMock.expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID, AuditEvent.FACET_ID, expectedEvent3.getName()))
+ .andReturn(expectedEvent3);
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
@@ -542,9 +571,10 @@ public class AuditManagerTest
String name2 = createEvent( expectedTimestamp ).getName();
String name3 = createEvent( new Date( current.getTime() - 1000 ) ).getName();
- EasyMock.expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, AuditEvent.FACET_ID ) )
- .andReturn( Arrays.asList( name1, name2, name3 ) );
-
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ EasyMock.expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, AuditEvent.FACET_ID))
+ .andReturn(Arrays.asList(name1, name2, name3));
+ }
metadataRepositoryControl.replay();
List<AuditEvent> events =
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
index f9d32b2..edb7115 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
@@ -87,10 +87,10 @@ public class CassandraMetadataRepositoryTest
.withId( TEST_PROJECT_VERSION ) //
.build();
- this.cmr.removeProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+ this.cmr.removeProjectVersion( null, TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
assertThat(
- repository.getProjectVersion( , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ).isNull();
+ repository.getProjectVersion( null , TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ).isNull();
assertThat( cmr.getMailingLists( key ) ).isNotNull().isEmpty();
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
index 28d7f24..09e7fcd 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
@@ -85,13 +85,12 @@ public class RepositoriesNamespaceTest
try
{
- cmr.updateNamespace( , "release", "org" );
+ cmr.updateNamespace( null , "release", "org" );
r = cmr.getRepository( "release" );
assertThat( r ).isNotNull();
- assertThat( cmr.getRepositories() ).isNotEmpty().hasSize( 1 );
assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize( 1 );
n = cmr.getNamespace( "release", "org" );
@@ -99,14 +98,14 @@ public class RepositoriesNamespaceTest
assertThat( n ).isNotNull();
assertThat( n.getRepository() ).isNotNull();
- cmr.updateNamespace( , "release", "org.apache" );
+ cmr.updateNamespace( null, "release", "org.apache" );
r = cmr.getRepository( "release" );
assertThat( r ).isNotNull();
assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize( 2 );
- cmr.removeNamespace( , "release", "org.apache" );
+ cmr.removeNamespace(null , "release", "org.apache" );
assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize( 1 );
assertThat( cmr.getNamespaces( "release" ) ).containsExactly( "org" );
@@ -114,16 +113,16 @@ public class RepositoriesNamespaceTest
projectMetadata.setId( "theproject" );
projectMetadata.setNamespace( "org" );
- cmr.updateProject( , "release", projectMetadata );
+ cmr.updateProject(null , "release", projectMetadata );
- assertThat( cmr.getProjects( , "release", "org" ) ).isNotEmpty().hasSize( 1 ).containsExactly(
+ assertThat( cmr.getProjects(null , "release", "org" ) ).isNotEmpty().hasSize( 1 ).containsExactly(
"theproject" );
- cmr.removeProject( , "release", "org", "theproject" );
+ cmr.removeProject(null , "release", "org", "theproject" );
- assertThat( cmr.getProjects( , "release", "org" ) ).isEmpty();
+ assertThat( cmr.getProjects(null , "release", "org" ) ).isEmpty();
- cmr.removeRepository( , "release" );
+ cmr.removeRepository(null , "release" );
r = cmr.getRepository( "release" );
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index a6ac55f..47c4861 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -1458,7 +1458,7 @@ public class JcrMetadataRepository
public List<ArtifactMetadata> searchArtifacts( RepositorySession session, String repositoryId, String text, boolean exact )
throws MetadataRepositoryException
{
- return searchArtifacts( null, repositoryId, text, exact );
+ return searchArtifacts( session, repositoryId, null, text, exact );
}
@Override
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
index 7549229..5e0e8dd 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
@@ -20,12 +20,7 @@ package org.apache.archiva.metadata.repository.jcr;
*/
import org.apache.archiva.metadata.model.MetadataFacetFactory;
-import org.apache.archiva.metadata.repository.AbstractRepositorySessionFactory;
-import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.MetadataResolver;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.apache.archiva.metadata.repository.RepositorySessionFactoryBean;
+import org.apache.archiva.metadata.repository.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.StopWatch;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -95,7 +90,7 @@ public class JcrRepositorySessionFactory extends AbstractRepositorySessionFactor
return this.metadataResolver;
}
- public void initialize()
+ protected void initialize()
{
// skip initialisation if not jcr
@@ -107,7 +102,9 @@ public class JcrRepositorySessionFactory extends AbstractRepositorySessionFactor
StopWatch stopWatch = new StopWatch();
stopWatch.start();
- metadataFacetFactories = applicationContext.getBeansOfType( MetadataFacetFactory.class );
+ if (applicationContext!=null) {
+ metadataFacetFactories = applicationContext.getBeansOfType(MetadataFacetFactory.class);
+ }
// olamy with spring the "id" is now "metadataFacetFactory#hint"
// whereas was only hint with plexus so let remove metadataFacetFactory#
Map<String, MetadataFacetFactory> cleanedMetadataFacetFactories =
@@ -115,8 +112,13 @@ public class JcrRepositorySessionFactory extends AbstractRepositorySessionFactor
for ( Map.Entry<String, MetadataFacetFactory> entry : metadataFacetFactories.entrySet() )
{
- cleanedMetadataFacetFactories.put( StringUtils.substringAfterLast( entry.getKey(), "#" ),
- entry.getValue() );
+ if (entry.getKey().contains("#")) {
+ cleanedMetadataFacetFactories.put( StringUtils.substringAfterLast( entry.getKey(), "#" ),
+ entry.getValue() );
+
+ } else {
+ cleanedMetadataFacetFactories.put(entry.getKey(), entry.getValue());
+ }
}
metadataFacetFactories = cleanedMetadataFacetFactories;
@@ -159,4 +161,17 @@ public class JcrRepositorySessionFactory extends AbstractRepositorySessionFactor
{
super.close();
}
+
+ public void setMetadataResolver(MetadataResolver metadataResolver) {
+ this.metadataResolver = metadataResolver;
+ }
+
+ public JcrMetadataRepository getMetadataRepository() {
+ return jcrMetadataRepository;
+ }
+
+ public void setMetadataFacetFactories(Map<String, MetadataFacetFactory> metadataFacetFactories) {
+ this.metadataFacetFactories = metadataFacetFactories;
+ }
+
}
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrSession.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrSession.java
index 3878619..4b4c455 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrSession.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrSession.java
@@ -67,6 +67,9 @@ public class JcrSession extends RepositorySession implements AutoCloseable
@Override
protected boolean isDirty( )
{
+ if (super.isDirty()) {
+ return true;
+ }
try
{
return jcrSession.hasPendingChanges( );
@@ -105,4 +108,22 @@ public class JcrSession extends RepositorySession implements AutoCloseable
throw new MetadataSessionException( e.getMessage( ), e );
}
}
+
+ @Override
+ public void refresh() throws MetadataSessionException {
+ try {
+ jcrSession.refresh(true);
+ } catch (RepositoryException e) {
+ throw new MetadataSessionException(e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void refreshAndDiscard() throws MetadataSessionException {
+ try {
+ jcrSession.refresh(false);
+ } catch (RepositoryException e) {
+ throw new MetadataSessionException(e.getMessage(), e);
+ }
+ }
}
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
index 1e823b4..d2f0b11 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
@@ -21,12 +21,10 @@ package org.apache.archiva.metadata.repository.jcr;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
-import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
@@ -35,6 +33,8 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.DocumentQueue;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LocalIndexObserver;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndexFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
+import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.name.Namespaces;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
@@ -43,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
+import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -61,6 +62,9 @@ import java.util.concurrent.Executors;
import static org.apache.archiva.metadata.repository.jcr.RepositoryFactory.StoreType.IN_MEMORY_TYPE;
import static org.apache.archiva.metadata.repository.jcr.RepositoryFactory.StoreType.SEGMENT_FILE_TYPE;
+import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
+import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
+import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_TYPES;
/**
@@ -117,10 +121,18 @@ public class RepositoryFactory
@Override
public void initialize( @Nonnull NodeBuilder root )
{
- log.info( "Creating index " );
+ NodeBuilder namespaces;
+ if (!root.hasChildNode(NamespaceConstants.REP_NAMESPACES)) {
+ namespaces = Namespaces.createStandardMappings(root);
+ Namespaces.buildIndexNode(namespaces); // index node for faster lookup
+ } else {
+ namespaces = root.getChildNode(NamespaceConstants.REP_NAMESPACES);
+ }
+ Namespaces.addCustomMapping(namespaces, "http://archiva.apache.org/jcr/", "archiva");
+ log.info( "Creating index " );
NodeBuilder lucene = IndexUtils.getOrCreateOakIndex( root ).child( "lucene" );
- lucene.setProperty( JcrConstants.JCR_PRIMARYTYPE, "oak:QueryIndexDefinition", Type.NAME );
+ lucene.setProperty( JCR_PRIMARYTYPE, "oak:QueryIndexDefinition", NAME );
lucene.setProperty( "compatVersion", 2 );
lucene.setProperty( "type", "lucene" );
@@ -129,68 +141,74 @@ public class RepositoryFactory
// lucene.setProperty("refresh",true);
lucene.setProperty( "async", ImmutableSet.of( "async", "sync" ), Type.STRINGS );
NodeBuilder rules = lucene.child( "indexRules" ).
- setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME );
rules.setProperty( ":childOrder", ImmutableSet.of( "archiva:projectVersion", //
"archiva:artifact", //
"archiva:facet", //
"archiva:namespace", //
"archiva:project" ), //
Type.STRINGS );
- NodeBuilder allProps = rules.child( "archiva:projectVersion" ) //
+ NodeBuilder allProps = rules.child( "archiva:projectVersion" )
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME)//
.child( "properties" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, "nt:unstructured", Type.NAME ) //
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME ) //
.setProperty( ":childOrder", ImmutableSet.of( "allProps" ), Type.STRINGS ) //
.setProperty( "indexNodeName", true ) //
.child( "allProps" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME );
allProps.setProperty( "name", ".*" );
allProps.setProperty( "isRegexp", true );
allProps.setProperty( "nodeScopeIndex", true );
allProps.setProperty( "index", true );
allProps.setProperty( "analyzed", true );
// allProps.setProperty("propertyIndex",true);
- allProps = rules.child( "archiva:artifact" ) //
- .child( "properties" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, "nt:unstructured", Type.NAME ) //
- .setProperty( ":childOrder", ImmutableSet.of( "allProps" ), Type.STRINGS ) //
- .setProperty( "indexNodeName", true ).child( "allProps" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ allProps = rules.child("archiva:artifact") //
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME)
+ .child("properties") //
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME) //
+ .setProperty(":childOrder", ImmutableSet.of("allProps"), Type.STRINGS) //
+ .setProperty("indexNodeName", true)
+ .child("allProps")
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME);
allProps.setProperty( "name", ".*" );
allProps.setProperty( "isRegexp", true );
allProps.setProperty( "nodeScopeIndex", true );
allProps.setProperty( "index", true );
allProps.setProperty( "analyzed", true );
allProps = rules.child( "archiva:facet" ) //
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME)
.child( "properties" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, "nt:unstructured", Type.NAME ) //
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME ) //
.setProperty( ":childOrder", ImmutableSet.of( "allProps" ), Type.STRINGS ) //
.setProperty( "indexNodeName", true ) //
.child( "allProps" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME );
allProps.setProperty( "name", ".*" );
allProps.setProperty( "isRegexp", true );
allProps.setProperty( "nodeScopeIndex", true );
allProps.setProperty( "index", true );
allProps.setProperty( "analyzed", true );
allProps = rules.child( "archiva:namespace" ) //
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME)
.child( "properties" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, "nt:unstructured", Type.NAME ) //
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME ) //
.setProperty( ":childOrder", ImmutableSet.of( "allProps" ), Type.STRINGS ) //
.setProperty( "indexNodeName", true ) //
.child( "allProps" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME );
allProps.setProperty( "name", ".*" );
allProps.setProperty( "isRegexp", true );
allProps.setProperty( "nodeScopeIndex", true );
allProps.setProperty( "index", true );
allProps.setProperty( "analyzed", true );
allProps = rules.child( "archiva:project" ) //
+ .setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME)
.child( "properties" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, "nt:unstructured", Type.NAME ) //
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME ) //
.setProperty( ":childOrder", ImmutableSet.of( "allProps" ), Type.STRINGS ) //
.setProperty( "indexNodeName", true ) //
.child( "allProps" ) //
- .setProperty( JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME );
+ .setProperty( JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME );
allProps.setProperty( "name", ".*" );
allProps.setProperty( "isRegexp", true );
allProps.setProperty( "nodeScopeIndex", true );
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
index 9082a1f..bb7b74a 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
@@ -21,6 +21,8 @@ package org.apache.archiva.metadata.repository.jcr;
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
+import org.apache.archiva.metadata.repository.DefaultMetadataResolver;
+import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.junit.After;
import org.junit.Before;
@@ -40,7 +42,6 @@ import java.util.Map;
public class JcrMetadataRepositoryTest
extends AbstractMetadataRepositoryTest
{
- private JcrMetadataRepository jcrMetadataRepository;
@Inject
private ApplicationContext applicationContext;
@@ -70,26 +71,34 @@ public class JcrMetadataRepositoryTest
Map<String, MetadataFacetFactory> factories = createTestMetadataFacetFactories();
- // TODO: probably don't need to use Spring for this
- jcrMetadataRepository = new JcrMetadataRepository( factories, jcrRepository );
+// // TODO: probably don't need to use Spring for this
+// jcrMetadataRepository = new JcrMetadataRepository( factories, jcrRepository );
+//
+// try
+// {
+// Session session = jcrMetadataRepository.login();
+//
+// // set up namespaces, etc.
+// JcrMetadataRepository.initializeNodeTypes( session );
+//
+// // removing content is faster than deleting and re-copying the files from target/jcr
+// session.getRootNode().getNode( "repositories" ).remove();
+// session.save();
+// }
+// catch ( RepositoryException e )
+// {
+// // ignore
+// }
+
+ // this.repository = jcrMetadataRepository;
+ JcrRepositorySessionFactory jcrSessionFactory = new JcrRepositorySessionFactory();
+ jcrSessionFactory.setMetadataResolver(new DefaultMetadataResolver());
+ jcrSessionFactory.setMetadataFacetFactories(factories);
+
+ jcrSessionFactory.open();
+ this.sessionFactory = jcrSessionFactory;
+ this.repository = jcrSessionFactory.getMetadataRepository();
- try
- {
- Session session = jcrMetadataRepository.getJcrSession();
-
- // set up namespaces, etc.
- JcrMetadataRepository.initializeNodeTypes( session );
-
- // removing content is faster than deleting and re-copying the files from target/jcr
- session.getRootNode().getNode( "repositories" ).remove();
- session.save();
- }
- catch ( RepositoryException e )
- {
- // ignore
- }
-
- this.repository = jcrMetadataRepository;
}
@@ -98,7 +107,8 @@ public class JcrMetadataRepositoryTest
public void tearDown()
throws Exception
{
- jcrMetadataRepository.close();
+ repository.close();
+ sessionFactory.close();
super.tearDown();
}
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
index 55fb96b..e123284 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
@@ -22,8 +22,10 @@ package org.apache.archiva.metadata.repository.stats;
import junit.framework.TestCase;
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
+import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.jcr.JcrMetadataRepository;
+import org.apache.archiva.metadata.repository.jcr.JcrRepositorySessionFactory;
import org.apache.archiva.metadata.repository.jcr.RepositoryFactory;
import org.apache.archiva.metadata.repository.stats.model.DefaultRepositoryStatistics;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
@@ -68,6 +70,8 @@ public class JcrRepositoryStatisticsGatheringTest
private static final String TEST_REPO = "test-repo";
JcrMetadataRepository repository;
+ JcrRepositorySessionFactory sessionFactory;
+
@Inject
private RepositorySessionFactory repositorySessionFactory;
@@ -75,7 +79,7 @@ public class JcrRepositoryStatisticsGatheringTest
@Inject
private ApplicationContext applicationContext;
- Session session;
+ Session jcrSession;
private static Repository jcrRepository;
@@ -108,17 +112,17 @@ public class JcrRepositoryStatisticsGatheringTest
// TODO: probably don't need to use Spring for this
JcrMetadataRepository jcrMetadataRepository = new JcrMetadataRepository( factories, jcrRepository );
- session = jcrMetadataRepository.getJcrSession();
+ jcrSession = jcrMetadataRepository.login();
try
{
- session = jcrMetadataRepository.getJcrSession();
+ jcrSession = jcrMetadataRepository.login();
// set up namespaces, etc.
- JcrMetadataRepository.initializeNodeTypes( session );
+ JcrMetadataRepository.initializeNodeTypes(jcrSession);
// removing content is faster than deleting and re-copying the files from target/jcr
- session.getRootNode().getNode( "repositories" ).remove();
+ jcrSession.getRootNode().getNode( "repositories" ).remove();
}
catch ( RepositoryException e )
{
@@ -126,6 +130,7 @@ public class JcrRepositoryStatisticsGatheringTest
}
this.repository = jcrMetadataRepository;
+ this.sessionFactory = new JcrRepositorySessionFactory();
}
private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String type )
@@ -152,73 +157,74 @@ public class JcrRepositoryStatisticsGatheringTest
public void testJcrStatisticsQuery()
throws Exception
{
- Calendar cal = Calendar.getInstance();
- Date endTime = cal.getTime();
- cal.add( Calendar.HOUR, -1 );
- Date startTime = cal.getTime();
-
- loadContentIntoRepo( TEST_REPO );
- loadContentIntoRepo( "another-repo" );
-
- DefaultRepositoryStatistics testedStatistics = new DefaultRepositoryStatistics();
- testedStatistics.setNewFileCount( NEW_FILE_COUNT );
- testedStatistics.setTotalFileCount( TOTAL_FILE_COUNT );
- testedStatistics.setScanStartTime( startTime );
- testedStatistics.setScanEndTime( endTime );
-
- repository.populateStatistics( , repository, TEST_REPO, testedStatistics );
-
- DefaultRepositoryStatistics expectedStatistics = new DefaultRepositoryStatistics();
- expectedStatistics.setNewFileCount( NEW_FILE_COUNT );
- expectedStatistics.setTotalFileCount( TOTAL_FILE_COUNT );
- expectedStatistics.setScanEndTime( endTime );
- expectedStatistics.setScanStartTime( startTime );
- expectedStatistics.setTotalArtifactFileSize( 95954585 );
- expectedStatistics.setTotalArtifactCount( 269 );
- expectedStatistics.setTotalGroupCount( 1 );
- expectedStatistics.setTotalProjectCount( 43 );
- expectedStatistics.setTotalCountForType( "zip", 1 );
- expectedStatistics.setTotalCountForType( "gz", 1 ); // FIXME: should be tar.gz
- expectedStatistics.setTotalCountForType( "java-source", 10 );
- expectedStatistics.setTotalCountForType( "jar", 108 );
- expectedStatistics.setTotalCountForType( "xml", 3 );
- expectedStatistics.setTotalCountForType( "war", 2 );
- expectedStatistics.setTotalCountForType( "pom", 144 );
- expectedStatistics.setRepositoryId( TEST_REPO );
-
- logger.info("getTotalCountForType: {}", testedStatistics.getTotalCountForType() );
-
- assertEquals( NEW_FILE_COUNT, testedStatistics.getNewFileCount() );
- assertEquals( TOTAL_FILE_COUNT, testedStatistics.getTotalFileCount() );
- assertEquals( endTime, testedStatistics.getScanEndTime() );
- assertEquals( startTime, testedStatistics.getScanStartTime() );
- assertEquals( 95954585, testedStatistics.getTotalArtifactFileSize() );
- assertEquals( 269, testedStatistics.getTotalArtifactCount() );
- assertEquals( 1, testedStatistics.getTotalGroupCount() );
- assertEquals( 43, testedStatistics.getTotalProjectCount() );
- assertEquals( 1, testedStatistics.getTotalCountForType( "zip" ) );
- assertEquals( 1, testedStatistics.getTotalCountForType( "gz" ) );
- assertEquals( 10, testedStatistics.getTotalCountForType( "java-source" ) );
- assertEquals( 108, testedStatistics.getTotalCountForType( "jar" ) );
- assertEquals( 3, testedStatistics.getTotalCountForType( "xml" ) );
- assertEquals( 2, testedStatistics.getTotalCountForType( "war" ) );
- assertEquals( 144, testedStatistics.getTotalCountForType( "pom" ) );
- assertEquals( 10, testedStatistics.getTotalCountForType( "java-source" ) );
-
+ try(RepositorySession repSession = sessionFactory.createSession()) {
+ Calendar cal = Calendar.getInstance();
+ Date endTime = cal.getTime();
+ cal.add(Calendar.HOUR, -1);
+ Date startTime = cal.getTime();
+
+ loadContentIntoRepo(TEST_REPO);
+ loadContentIntoRepo("another-repo");
+
+ DefaultRepositoryStatistics testedStatistics = new DefaultRepositoryStatistics();
+ testedStatistics.setNewFileCount(NEW_FILE_COUNT);
+ testedStatistics.setTotalFileCount(TOTAL_FILE_COUNT);
+ testedStatistics.setScanStartTime(startTime);
+ testedStatistics.setScanEndTime(endTime);
+
+ repository.populateStatistics(repSession, repository, TEST_REPO, testedStatistics);
+
+ DefaultRepositoryStatistics expectedStatistics = new DefaultRepositoryStatistics();
+ expectedStatistics.setNewFileCount(NEW_FILE_COUNT);
+ expectedStatistics.setTotalFileCount(TOTAL_FILE_COUNT);
+ expectedStatistics.setScanEndTime(endTime);
+ expectedStatistics.setScanStartTime(startTime);
+ expectedStatistics.setTotalArtifactFileSize(95954585);
+ expectedStatistics.setTotalArtifactCount(269);
+ expectedStatistics.setTotalGroupCount(1);
+ expectedStatistics.setTotalProjectCount(43);
+ expectedStatistics.setTotalCountForType("zip", 1);
+ expectedStatistics.setTotalCountForType("gz", 1); // FIXME: should be tar.gz
+ expectedStatistics.setTotalCountForType("java-source", 10);
+ expectedStatistics.setTotalCountForType("jar", 108);
+ expectedStatistics.setTotalCountForType("xml", 3);
+ expectedStatistics.setTotalCountForType("war", 2);
+ expectedStatistics.setTotalCountForType("pom", 144);
+ expectedStatistics.setRepositoryId(TEST_REPO);
+
+ logger.info("getTotalCountForType: {}", testedStatistics.getTotalCountForType());
+
+ assertEquals(NEW_FILE_COUNT, testedStatistics.getNewFileCount());
+ assertEquals(TOTAL_FILE_COUNT, testedStatistics.getTotalFileCount());
+ assertEquals(endTime, testedStatistics.getScanEndTime());
+ assertEquals(startTime, testedStatistics.getScanStartTime());
+ assertEquals(95954585, testedStatistics.getTotalArtifactFileSize());
+ assertEquals(269, testedStatistics.getTotalArtifactCount());
+ assertEquals(1, testedStatistics.getTotalGroupCount());
+ assertEquals(43, testedStatistics.getTotalProjectCount());
+ assertEquals(1, testedStatistics.getTotalCountForType("zip"));
+ assertEquals(1, testedStatistics.getTotalCountForType("gz"));
+ assertEquals(10, testedStatistics.getTotalCountForType("java-source"));
+ assertEquals(108, testedStatistics.getTotalCountForType("jar"));
+ assertEquals(3, testedStatistics.getTotalCountForType("xml"));
+ assertEquals(2, testedStatistics.getTotalCountForType("war"));
+ assertEquals(144, testedStatistics.getTotalCountForType("pom"));
+ assertEquals(10, testedStatistics.getTotalCountForType("java-source"));
+ }
}
private void loadContentIntoRepo( String repoId )
throws RepositoryException, IOException
{
- Node n = JcrUtils.getOrAddNode( session.getRootNode(), "repositories" );
+ Node n = JcrUtils.getOrAddNode( jcrSession.getRootNode(), "repositories" );
n = JcrUtils.getOrAddNode( n, repoId );
n = JcrUtils.getOrAddNode( n, "content" );
n = JcrUtils.getOrAddNode( n, "org" );
n = JcrUtils.getOrAddNode( n, "apache" );
GZIPInputStream inputStream = new GZIPInputStream( getClass().getResourceAsStream( "/artifacts.xml.gz" ) );
- session.importXML( n.getPath(), inputStream, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW );
- session.save();
+ jcrSession.importXML( n.getPath(), inputStream, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW );
+ jcrSession.save();
}
}
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
index 7f4b0cd..a2eb7ab 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
@@ -30,6 +30,7 @@
</appenders>
<loggers>
<logger name="org.apache.jackrabbit" level="info"/>
+ <logger name="org.apache.jackrabbit.oak" level="debug"/>
<root level="info" includeLocation="true">
<appender-ref ref="console"/>
</root>
diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
index 64b067b..d5c34b7 100644
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
@@ -24,12 +24,15 @@ import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataException;
import org.apache.archiva.repository.events.RepositoryListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
+
/**
* Process repository management events and respond appropriately.
*
@@ -40,6 +43,9 @@ public class RepositoryProblemEventListener
{
private Logger log = LoggerFactory.getLogger( RepositoryProblemEventListener.class );
+ @Inject
+ private RepositorySessionFactory repositorySessionFactory;
+
// FIXME: move to session
@Override
public void deleteArtifact( MetadataRepository metadataRepository, String repositoryId, String namespace,
@@ -47,9 +53,9 @@ public class RepositoryProblemEventListener
{
String name = RepositoryProblemFacet.createName( namespace, project, version, id );
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
- metadataRepository.removeMetadataFacet( , repositoryId, RepositoryProblemFacet.FACET_ID, name );
+ metadataRepository.removeMetadataFacet(session , repositoryId, RepositoryProblemFacet.FACET_ID, name );
}
catch ( MetadataRepositoryException e )
{
@@ -67,7 +73,7 @@ public class RepositoryProblemEventListener
try
{
MetadataRepository metadataRepository = session.getRepository();
- metadataRepository.removeMetadataFacet( , repoId, RepositoryProblemFacet.FACET_ID, name );
+ metadataRepository.removeMetadataFacet(session , repoId, RepositoryProblemFacet.FACET_ID, name );
session.markDirty();
}
catch ( MetadataRepositoryException e )
@@ -91,7 +97,7 @@ public class RepositoryProblemEventListener
try
{
- session.getRepository().addMetadataFacet( , repoId, problem );
+ session.getRepository().addMetadataFacet(session , repoId, problem );
session.markDirty();
}
catch ( MetadataRepositoryException e )
diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index dca503e..09d0e33 100644
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -97,6 +97,7 @@ public class DuplicateArtifactsConsumer
@Named ( value = "repositoryPathTranslator#maven2" )
private RepositoryPathTranslator pathTranslator;
+
private RepositorySession repositorySession;
@Override
@@ -172,7 +173,7 @@ public class DuplicateArtifactsConsumer
Collection<ArtifactMetadata> results;
try
{
- results = metadataRepository.getArtifactsByChecksum( , repoId, checksumSha1 );
+ results = metadataRepository.getArtifactsByChecksum(repositorySession , repoId, checksumSha1 );
}
catch ( MetadataRepositoryException e )
{
@@ -224,7 +225,7 @@ public class DuplicateArtifactsConsumer
try
{
- metadataRepository.addMetadataFacet( , repoId, problem );
+ metadataRepository.addMetadataFacet(repositorySession , repoId, problem );
}
catch ( MetadataRepositoryException e )
{
diff --git a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
index 1dc1739..2e4acf9 100644
--- a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
+++ b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
@@ -85,6 +85,7 @@ public class DuplicateArtifactsConsumerTest
@Inject
ApplicationContext applicationContext;
+ RepositorySessionFactory repositorySessionFactory;
@Before
@Override
@@ -99,6 +100,7 @@ public class DuplicateArtifactsConsumerTest
config.setLocation( Paths.get( "target/test-repository" ).toAbsolutePath().toUri() );
metadataRepository = mock( MetadataRepository.class );
+ repositorySessionFactory = mock(RepositorySessionFactory.class);
RepositorySession session = mock( RepositorySession.class );
when( session.getRepository() ).thenReturn( metadataRepository );
@@ -114,14 +116,15 @@ public class DuplicateArtifactsConsumerTest
public void testConsumerArtifactNotDuplicated()
throws Exception
{
- when( metadataRepository.getArtifactsByChecksum( , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
+ RepositorySession session = repositorySessionFactory.createSession();
+ when( metadataRepository.getArtifactsByChecksum(session , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
Arrays.asList( TEST_METADATA ) );
consumer.beginScan( config, new Date() );
consumer.processFile( TEST_FILE );
consumer.completeScan();
- verify( metadataRepository, never() ).addMetadataFacet( , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
+ verify( metadataRepository, never() ).addMetadataFacet(session , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
}
// TODO: Doesn't currently work
@@ -142,7 +145,8 @@ public class DuplicateArtifactsConsumerTest
public void testConsumerArtifactDuplicated()
throws Exception
{
- when( metadataRepository.getArtifactsByChecksum( , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
+ RepositorySession session = repositorySessionFactory.createSession();
+ when( metadataRepository.getArtifactsByChecksum(session , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
Arrays.asList( TEST_METADATA, createMetadata( "1.0" ) ) );
consumer.beginScan( config, new Date() );
@@ -150,7 +154,7 @@ public class DuplicateArtifactsConsumerTest
consumer.completeScan();
ArgumentCaptor<RepositoryProblemFacet> argument = ArgumentCaptor.forClass( RepositoryProblemFacet.class );
- verify( metadataRepository ).addMetadataFacet( , eq( TEST_REPO ), argument.capture() );
+ verify( metadataRepository ).addMetadataFacet(session , eq( TEST_REPO ), argument.capture() );
RepositoryProblemFacet problem = argument.getValue();
assertProblem( problem );
}
@@ -159,7 +163,8 @@ public class DuplicateArtifactsConsumerTest
public void testConsumerArtifactDuplicatedButSelfNotInMetadataRepository()
throws Exception
{
- when( metadataRepository.getArtifactsByChecksum( , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
+ RepositorySession session = repositorySessionFactory.createSession();
+ when( metadataRepository.getArtifactsByChecksum(session , TEST_REPO, TEST_CHECKSUM ) ).thenReturn(
Arrays.asList( createMetadata( "1.0" ) ) );
consumer.beginScan( config, new Date() );
@@ -167,7 +172,7 @@ public class DuplicateArtifactsConsumerTest
consumer.completeScan();
ArgumentCaptor<RepositoryProblemFacet> argument = ArgumentCaptor.forClass( RepositoryProblemFacet.class );
- verify( metadataRepository ).addMetadataFacet( , eq( TEST_REPO ), argument.capture() );
+ verify( metadataRepository ).addMetadataFacet(session , eq( TEST_REPO ), argument.capture() );
RepositoryProblemFacet problem = argument.getValue();
assertProblem( problem );
}
@@ -190,8 +195,8 @@ public class DuplicateArtifactsConsumerTest
{
consumer.completeScan();
}
-
- verify( metadataRepository, never() ).addMetadataFacet( , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
+ RepositorySession session = repositorySessionFactory.createSession();
+ verify( metadataRepository, never() ).addMetadataFacet(session , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
}
@Test
@@ -202,15 +207,16 @@ public class DuplicateArtifactsConsumerTest
// No exception unnecessarily for something we can't report on
consumer.processFile( "com/example/invalid-artifact.txt" );
consumer.completeScan();
-
- verify( metadataRepository, never() ).addMetadataFacet( , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
+ RepositorySession session = repositorySessionFactory.createSession();
+ verify( metadataRepository, never() ).addMetadataFacet(session , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
}
@Test
public void testConsumerArtifactNotAnArtifactPathResults()
throws Exception
{
- when( metadataRepository.getArtifactsByChecksum( , eq( TEST_REPO ), anyString() ) ).thenReturn(
+ RepositorySession session = repositorySessionFactory.createSession();
+ when( metadataRepository.getArtifactsByChecksum(session , eq( TEST_REPO ), anyString() ) ).thenReturn(
Arrays.asList( TEST_METADATA, createMetadata( "1.0" ) ) );
// override, this feels a little overspecified though
@@ -222,7 +228,7 @@ public class DuplicateArtifactsConsumerTest
consumer.processFile( "com/example/invalid-artifact.txt" );
consumer.completeScan();
- verify( metadataRepository, never() ).addMetadataFacet( , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
+ verify( metadataRepository, never() ).addMetadataFacet(session , eq( TEST_REPO ), Matchers.<MetadataFacet>anyObject() );
}
private static void assertProblem( RepositoryProblemFacet problem )
diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
index 698d887..0bc82e0 100644
--- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
+++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
@@ -21,6 +21,8 @@ package org.apache.archiva.metadata.repository.stats;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.model.DefaultRepositoryStatistics;
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatistics;
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager;
@@ -31,6 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -52,11 +55,16 @@ public class DefaultRepositoryStatisticsManager
private RepositoryWalkingStatisticsProvider walkingProvider = new RepositoryWalkingStatisticsProvider();
+ @Inject
+ RepositorySessionFactory repositorySessionFactory;
+
@Override
public boolean hasStatistics( MetadataRepository metadataRepository, String repositoryId )
throws MetadataRepositoryException
{
- return metadataRepository.hasMetadataFacet( , repositoryId, DefaultRepositoryStatistics.FACET_ID );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ return metadataRepository.hasMetadataFacet(session, repositoryId, DefaultRepositoryStatistics.FACET_ID);
+ }
}
@Override
@@ -65,26 +73,24 @@ public class DefaultRepositoryStatisticsManager
{
StopWatch stopWatch = new StopWatch();
stopWatch.start();
- // TODO: consider a more efficient implementation that directly gets the last one from the content repository
- List<String> scans = metadataRepository.getMetadataFacets( , repositoryId, DefaultRepositoryStatistics.FACET_ID );
- if ( scans == null )
- {
- return null;
- }
- Collections.sort( scans );
- if ( !scans.isEmpty() )
- {
- String name = scans.get( scans.size() - 1 );
- RepositoryStatistics repositoryStatistics =
- RepositoryStatistics.class.cast( metadataRepository.getMetadataFacet( , repositoryId,
- RepositoryStatistics.FACET_ID, name ));
- stopWatch.stop();
- log.debug( "time to find last RepositoryStatistics: {} ms", stopWatch.getTime() );
- return repositoryStatistics;
- }
- else
- {
- return null;
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ // TODO: consider a more efficient implementation that directly gets the last one from the content repository
+ List<String> scans = metadataRepository.getMetadataFacets(session, repositoryId, DefaultRepositoryStatistics.FACET_ID);
+ if (scans == null) {
+ return null;
+ }
+ Collections.sort(scans);
+ if (!scans.isEmpty()) {
+ String name = scans.get(scans.size() - 1);
+ RepositoryStatistics repositoryStatistics =
+ RepositoryStatistics.class.cast(metadataRepository.getMetadataFacet(session, repositoryId,
+ RepositoryStatistics.FACET_ID, name));
+ stopWatch.stop();
+ log.debug("time to find last RepositoryStatistics: {} ms", stopWatch.getTime());
+ return repositoryStatistics;
+ } else {
+ return null;
+ }
}
}
@@ -93,42 +99,43 @@ public class DefaultRepositoryStatisticsManager
Date endTime, long totalFiles, long newFiles )
throws MetadataRepositoryException
{
- DefaultRepositoryStatistics repositoryStatistics = new DefaultRepositoryStatistics();
- repositoryStatistics.setRepositoryId( repositoryId );
- repositoryStatistics.setScanStartTime( startTime );
- repositoryStatistics.setScanEndTime( endTime );
- repositoryStatistics.setTotalFileCount( totalFiles );
- repositoryStatistics.setNewFileCount( newFiles );
-
- // TODO
- // In the future, instead of being tied to a scan we might want to record information in the fly based on
- // events that are occurring. Even without these totals we could query much of the information on demand based
- // on information from the metadata content repository. In the mean time, we lock information in at scan time.
- // Note that if new types are later discoverable due to a code change or new plugin, historical stats will not
- // be updated and the repository will need to be rescanned.
-
- long startGather = System.currentTimeMillis();
-
- if ( metadataRepository instanceof RepositoryStatisticsProvider)
- {
- ((RepositoryStatisticsProvider)metadataRepository).populateStatistics( ,
- metadataRepository, repositoryId, repositoryStatistics );
- }
- else
- {
- walkingProvider.populateStatistics( , metadataRepository, repositoryId, repositoryStatistics );
- }
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ DefaultRepositoryStatistics repositoryStatistics = new DefaultRepositoryStatistics();
+ repositoryStatistics.setRepositoryId(repositoryId);
+ repositoryStatistics.setScanStartTime(startTime);
+ repositoryStatistics.setScanEndTime(endTime);
+ repositoryStatistics.setTotalFileCount(totalFiles);
+ repositoryStatistics.setNewFileCount(newFiles);
+
+ // TODO
+ // In the future, instead of being tied to a scan we might want to record information in the fly based on
+ // events that are occurring. Even without these totals we could query much of the information on demand based
+ // on information from the metadata content repository. In the mean time, we lock information in at scan time.
+ // Note that if new types are later discoverable due to a code change or new plugin, historical stats will not
+ // be updated and the repository will need to be rescanned.
+
+ long startGather = System.currentTimeMillis();
+
+ if (metadataRepository instanceof RepositoryStatisticsProvider) {
+ ((RepositoryStatisticsProvider) metadataRepository).populateStatistics(session,
+ metadataRepository, repositoryId, repositoryStatistics);
+ } else {
+ walkingProvider.populateStatistics(session, metadataRepository, repositoryId, repositoryStatistics);
+ }
- log.info( "Gathering statistics executed in {} ms", ( System.currentTimeMillis() - startGather ) );
+ log.info("Gathering statistics executed in {} ms", (System.currentTimeMillis() - startGather));
- metadataRepository.addMetadataFacet( , repositoryId, repositoryStatistics );
+ metadataRepository.addMetadataFacet(session, repositoryId, repositoryStatistics);
+ }
}
@Override
public void deleteStatistics( MetadataRepository metadataRepository, String repositoryId )
throws MetadataRepositoryException
{
- metadataRepository.removeMetadataFacets( , repositoryId, DefaultRepositoryStatistics.FACET_ID );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ metadataRepository.removeMetadataFacets(session, repositoryId, DefaultRepositoryStatistics.FACET_ID);
+ }
}
@Override
@@ -136,31 +143,28 @@ public class DefaultRepositoryStatisticsManager
Date startTime, Date endTime )
throws MetadataRepositoryException
{
- List<RepositoryStatistics> results = new ArrayList<>();
- List<String> list = metadataRepository.getMetadataFacets( , repositoryId, DefaultRepositoryStatistics.FACET_ID );
- Collections.sort( list, Collections.reverseOrder() );
- for ( String name : list )
- {
- try
- {
- Date date = createNameFormat().parse( name );
- if ( ( startTime == null || !date.before( startTime ) ) && ( endTime == null || !date.after(
- endTime ) ) )
- {
- RepositoryStatistics stats =
- (RepositoryStatistics) metadataRepository.getMetadataFacet( ,
- repositoryId,
- DefaultRepositoryStatistics.FACET_ID, name );
- results.add( stats );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ List<RepositoryStatistics> results = new ArrayList<>();
+ List<String> list = metadataRepository.getMetadataFacets(session, repositoryId, DefaultRepositoryStatistics.FACET_ID);
+ Collections.sort(list, Collections.reverseOrder());
+ for (String name : list) {
+ try {
+ Date date = createNameFormat().parse(name);
+ if ((startTime == null || !date.before(startTime)) && (endTime == null || !date.after(
+ endTime))) {
+ RepositoryStatistics stats =
+ (RepositoryStatistics) metadataRepository.getMetadataFacet(session,
+ repositoryId,
+ DefaultRepositoryStatistics.FACET_ID, name);
+ results.add(stats);
+ }
+ } catch (ParseException e) {
+ log.error("Invalid scan result found in the metadata repository: {}", e.getMessage());
+ // continue and ignore this one
}
}
- catch ( ParseException e )
- {
- log.error( "Invalid scan result found in the metadata repository: {}", e.getMessage() );
- // continue and ignore this one
- }
+ return results;
}
- return results;
}
private static SimpleDateFormat createNameFormat()
diff --git a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
index dfa185b..0c31249 100644
--- a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
+++ b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
@@ -23,6 +23,8 @@ import junit.framework.TestCase;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.model.DefaultRepositoryStatistics;
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatistics;
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
@@ -64,6 +66,9 @@ public class RepositoryStatisticsManagerTest
private static final SimpleDateFormat TIMESTAMP_FORMAT = createTimestampFormat();
+ private RepositorySessionFactory repositorySessionFactory;
+ private IMocksControl factoryControl;
+
private static SimpleDateFormat createTimestampFormat()
{
SimpleDateFormat fmt = new SimpleDateFormat( DefaultRepositoryStatistics.SCAN_TIMESTAMP_FORMAT );
@@ -82,6 +87,9 @@ public class RepositoryStatisticsManagerTest
metadataRepositoryControl = createControl();
metadataRepository = metadataRepositoryControl.createMock( MetadataRepository.class );
+
+ factoryControl = createControl();
+ repositorySessionFactory = factoryControl.createMock(RepositorySessionFactory.class);
}
@Test
@@ -103,12 +111,13 @@ public class RepositoryStatisticsManagerTest
stats.setTotalFileCount( 56229 );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
- Arrays.asList( FIRST_TEST_SCAN, SECOND_TEST_SCAN ) );
-
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
- DefaultRepositoryStatistics.FACET_ID, SECOND_TEST_SCAN ) ).andReturn( stats );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ expect(metadataRepository.getMetadataFacets(session, TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID)).andReturn(
+ Arrays.asList(FIRST_TEST_SCAN, SECOND_TEST_SCAN));
+ expect(metadataRepository.getMetadataFacet(session, TEST_REPO_ID,
+ DefaultRepositoryStatistics.FACET_ID, SECOND_TEST_SCAN)).andReturn(stats);
+ }
metadataRepositoryControl.replay();
stats = repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
@@ -131,7 +140,8 @@ public class RepositoryStatisticsManagerTest
throws Exception
{
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
+ RepositorySession session = repositorySessionFactory.createSession();
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
Collections.<String>emptyList() );
metadataRepositoryControl.replay();
@@ -151,13 +161,15 @@ public class RepositoryStatisticsManagerTest
RepositoryStatistics stats = createTestStats( startTime, current );
walkRepository( 1 );
+ RepositorySession session = repositorySessionFactory.createSession();
- metadataRepository.addMetadataFacet( , TEST_REPO_ID, stats );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
+ metadataRepository.addMetadataFacet(session , TEST_REPO_ID, stats );
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
Arrays.asList( stats.getName() ) );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID,
DefaultRepositoryStatistics.FACET_ID, stats.getName() ) ).andReturn( stats );
metadataRepositoryControl.replay();
@@ -189,21 +201,23 @@ public class RepositoryStatisticsManagerTest
Date startTime1 = new Date( current.getTime() - 12345 );
DefaultRepositoryStatistics stats1 = createTestStats( startTime1, new Date( current.getTime() - 6000 ) );
- metadataRepository.addMetadataFacet( , TEST_REPO_ID, stats1 );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ metadataRepository.addMetadataFacet(session , TEST_REPO_ID, stats1 );
Date startTime2 = new Date( current.getTime() - 3000 );
DefaultRepositoryStatistics stats2 = createTestStats( startTime2, current );
- metadataRepository.addMetadataFacet( , TEST_REPO_ID, stats2 );
+ metadataRepository.addMetadataFacet(session , TEST_REPO_ID, stats2 );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
Arrays.asList( stats1.getName(), stats2.getName() ) );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID,
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID,
DefaultRepositoryStatistics.FACET_ID, stats2.getName() ) ).andReturn( stats2 );
- metadataRepository.removeMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID );
+ metadataRepository.removeMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
Collections.<String>emptyList() );
metadataRepositoryControl.replay();
@@ -226,10 +240,11 @@ public class RepositoryStatisticsManagerTest
public void testDeleteStatsWhenEmpty()
throws Exception
{
+ RepositorySession session = repositorySessionFactory.createSession();
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn(
Collections.<String>emptyList() ).times( 2 );
- metadataRepository.removeMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID );
+ metadataRepository.removeMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID );
metadataRepositoryControl.replay();
@@ -256,12 +271,14 @@ public class RepositoryStatisticsManagerTest
ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
// only match the middle one
String key = keys.get( 1 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
@@ -299,16 +316,19 @@ public class RepositoryStatisticsManagerTest
List<String> keys = new ArrayList<>( statsCreated.keySet() );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
String key = keys.get( 1 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session, TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
key = keys.get( 2 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
@@ -346,15 +366,17 @@ public class RepositoryStatisticsManagerTest
List<String> keys = new ArrayList<>( statsCreated.keySet() );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
String key = keys.get( 0 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
key = keys.get( 1 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
metadataRepositoryControl.replay();
@@ -392,19 +414,21 @@ public class RepositoryStatisticsManagerTest
ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
String key = keys.get( 0 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
key = keys.get( 1 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
key = keys.get( 2 );
- expect( metadataRepository.getMetadataFacet( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
+ expect( metadataRepository.getMetadataFacet(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID, key ) ).andReturn(
statsCreated.get( key ) );
metadataRepositoryControl.replay();
@@ -442,7 +466,9 @@ public class RepositoryStatisticsManagerTest
ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() );
- expect( metadataRepository.getMetadataFacets( , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
+ RepositorySession session = repositorySessionFactory.createSession();
+
+ expect( metadataRepository.getMetadataFacets(session , TEST_REPO_ID, DefaultRepositoryStatistics.FACET_ID ) ).andReturn( keys );
metadataRepositoryControl.replay();
@@ -466,8 +492,10 @@ public class RepositoryStatisticsManagerTest
private void addStats( Date startTime, Date endTime )
throws Exception
{
+ RepositorySession session = repositorySessionFactory.createSession();
+
DefaultRepositoryStatistics stats = createTestStats( startTime, endTime );
- metadataRepository.addMetadataFacet( , TEST_REPO_ID, stats );
+ metadataRepository.addMetadataFacet(session , TEST_REPO_ID, stats );
statsCreated.put( stats.getName(), stats );
}
@@ -509,107 +537,111 @@ public class RepositoryStatisticsManagerTest
private void walkRepository( int count )
throws Exception
{
+ RepositorySession session = repositorySessionFactory.createSession();
+
for ( int i = 0; i < count; i++ )
{
- expect( metadataRepository.getRootNamespaces( , TEST_REPO_ID ) ).andReturn( Arrays.asList( "com", "org" ) );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "com" ) ).andReturn( Arrays.<String>asList() );
+ expect( metadataRepository.getRootNamespaces(session , TEST_REPO_ID ) ).andReturn( Arrays.asList( "com", "org" ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "com" ) ).andReturn( Arrays.asList( "example" ) );
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "com" ) ).andReturn( Arrays.<String>asList() );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "com.example" ) ).andReturn(
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "com" ) ).andReturn( Arrays.asList( "example" ) );
+
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "com.example" ) ).andReturn(
Arrays.<String>asList() );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "com.example" ) ).andReturn(
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "com.example" ) ).andReturn(
Arrays.asList( "example-project" ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO_ID, "com.example", "example-project" ) ).andReturn(
+ expect( metadataRepository.getProjectVersions(session , TEST_REPO_ID, "com.example", "example-project" ) ).andReturn(
Arrays.asList( "1.0", "1.1" ) );
expect(
- metadataRepository.getArtifacts( , TEST_REPO_ID, "com.example", "example-project", "1.0" ) ).andReturn(
+ metadataRepository.getArtifacts(session , TEST_REPO_ID, "com.example", "example-project", "1.0" ) ).andReturn(
Arrays.asList( createArtifact( "com.example", "example-project", "1.0", "jar" ),
createArtifact( "com.example", "example-project", "1.0", "pom" ) ) );
expect(
- metadataRepository.getArtifacts( , TEST_REPO_ID, "com.example", "example-project", "1.1" ) ).andReturn(
+ metadataRepository.getArtifacts(session , TEST_REPO_ID, "com.example", "example-project", "1.1" ) ).andReturn(
Arrays.asList( createArtifact( "com.example", "example-project", "1.1", "jar" ),
createArtifact( "com.example", "example-project", "1.1", "pom" ) ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org" ) ).andReturn( Arrays.asList( "apache", "codehaus" ) );
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org" ) ).andReturn( Arrays.asList( "apache", "codehaus" ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org.apache" ) ).andReturn( Arrays.asList( "archiva", "maven" ) );
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org.apache" ) ).andReturn( Arrays.asList( "archiva", "maven" ) );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org.apache" ) ).andReturn( Arrays.<String>asList() );
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org.apache" ) ).andReturn( Arrays.<String>asList() );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org.apache.archiva" ) ).andReturn( Arrays.<String>asList() );
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org.apache.archiva" ) ).andReturn( Arrays.<String>asList() );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org.apache.archiva" ) ).andReturn( Arrays.asList( "metadata-repository-api", "metadata-model" ) );
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org.apache.archiva" ) ).andReturn( Arrays.asList( "metadata-repository-api", "metadata-model" ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api" ) )
+ expect( metadataRepository.getProjectVersions(session , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api" ) )
.andReturn( Arrays.asList( "1.3-SNAPSHOT", "1.3" ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT" ) )
.andReturn( Arrays.asList( createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT", "jar" ),
createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT",
"pom" ) ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api", "1.3" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api", "1.3" ) )
.andReturn( Arrays.asList( createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3", "jar" ),
createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3", "pom" ) ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO_ID, "org.apache.archiva", "metadata-model" ) )
+ expect( metadataRepository.getProjectVersions(session , TEST_REPO_ID, "org.apache.archiva", "metadata-model" ) )
.andReturn( Arrays.asList( "1.3-SNAPSHOT", "1.3" ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT" ) )
.andReturn( Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT", "jar" ),
createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT", "pom" ) ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3" ) )
.andReturn( Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3", "jar" ),
createArtifact( "org.apache.archiva", "metadata-model", "1.3", "pom" ) ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org.apache.maven" ) ).andReturn( Arrays.<String>asList() );
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org.apache.maven" ) ).andReturn( Arrays.<String>asList() );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org.apache.maven" ) )
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org.apache.maven" ) )
.andReturn( Arrays.asList( "maven-model" ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO_ID, "org.apache.maven", "maven-model" ) )
+ expect( metadataRepository.getProjectVersions(session , TEST_REPO_ID, "org.apache.maven", "maven-model" ) )
.andReturn( Arrays.asList( "2.2.1" ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.apache.maven", "maven-model", "2.2.1" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.apache.maven", "maven-model", "2.2.1" ) )
.andReturn( Arrays.asList( createArtifact( "org.apache.archiva", "maven-model", "2.2.1", "jar" ),
createArtifact( "org.apache.archiva", "maven-model", "2.2.1", "pom" ) ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org.codehaus" ) ).andReturn( Arrays.asList( "plexus" ) );
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org.codehaus" ) ).andReturn( Arrays.asList( "plexus" ) );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org" ) ).andReturn( Arrays.<String>asList( ) );
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org" ) ).andReturn( Arrays.<String>asList( ) );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org.codehaus" ) )
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org.codehaus" ) )
.andReturn( Arrays.<String>asList( ) );
- expect( metadataRepository.getNamespaces( , TEST_REPO_ID, "org.codehaus.plexus" ) )
+ expect( metadataRepository.getNamespaces(session , TEST_REPO_ID, "org.codehaus.plexus" ) )
.andReturn( Arrays.<String>asList( ) );
- expect( metadataRepository.getProjects( , TEST_REPO_ID, "org.codehaus.plexus" ) )
+ expect( metadataRepository.getProjects(session , TEST_REPO_ID, "org.codehaus.plexus" ) )
.andReturn( Arrays.asList( "plexus-spring" ) );
- expect( metadataRepository.getProjectVersions( , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring" ) )
+ expect( metadataRepository.getProjectVersions(session, TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring" ) )
.andReturn( Arrays.asList( "1.0", "1.1", "1.2" ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.0" ) )
+
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.0" ) )
.andReturn( Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.0", "jar" ),
createArtifact( "org.codehaus.plexus", "plexus-spring", "1.0", "pom" ) ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.1" ) )
+ expect( metadataRepository.getArtifacts(session, TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.1" ) )
.andReturn( Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.1", "jar" ),
createArtifact( "org.codehaus.plexus", "plexus-spring", "1.1", "pom" ) ) );
- expect( metadataRepository.getArtifacts( , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.2" ) )
+ expect( metadataRepository.getArtifacts(session , TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.2" ) )
.andReturn( Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.2", "jar" ),
createArtifact( "org.codehaus.plexus", "plexus-spring", "1.2", "pom" ) ) );
}
diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index 19c5333..eab7ea9 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -30,6 +30,8 @@ import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.filter.Filter;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.repository.RepositoryException;
@@ -83,6 +85,9 @@ public class Maven2RepositoryMerger
private static final String METADATA_FILENAME = "maven-metadata.xml";
@Inject
+ private RepositorySessionFactory repositorySessionFactory;
+
+ @Inject
public Maven2RepositoryMerger(
@Named (value = "archivaConfiguration#default") ArchivaConfiguration archivaConfiguration,
@Named (value = "repositoryPathTranslator#maven2") RepositoryPathTranslator repositoryPathTranslator )
@@ -101,9 +106,9 @@ public class Maven2RepositoryMerger
throws RepositoryMergerException
{
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
- List<ArtifactMetadata> artifactsInSourceRepo = metadataRepository.getArtifacts( , sourceRepoId );
+ List<ArtifactMetadata> artifactsInSourceRepo = metadataRepository.getArtifacts(session , sourceRepoId );
for ( ArtifactMetadata artifactMetadata : artifactsInSourceRepo )
{
artifactMetadata.setRepositoryId( targetRepoId );
@@ -130,9 +135,9 @@ public class Maven2RepositoryMerger
Filter<ArtifactMetadata> filter )
throws RepositoryMergerException
{
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
- List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( , sourceRepoId );
+ List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts(session , sourceRepoId );
for ( ArtifactMetadata metadata : sourceArtifacts )
{
if ( filter.accept( metadata ) )
@@ -396,12 +401,12 @@ public class Maven2RepositoryMerger
String targetRepo )
throws RepositoryMergerException
{
- try
+ try(RepositorySession session = repositorySessionFactory.createSession())
{
TreeSet<ArtifactMetadata> targetArtifacts = new TreeSet<>(META_COMPARATOR);
- targetArtifacts.addAll(metadataRepository.getArtifacts( , targetRepo ));
+ targetArtifacts.addAll(metadataRepository.getArtifacts(session , targetRepo ));
TreeSet<ArtifactMetadata> sourceArtifacts = new TreeSet<>(META_COMPARATOR);
- sourceArtifacts.addAll(metadataRepository.getArtifacts( , sourceRepo ));
+ sourceArtifacts.addAll(metadataRepository.getArtifacts(session , sourceRepo ));
sourceArtifacts.retainAll(targetArtifacts);
return new ArrayList<>(sourceArtifacts);
diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
index facc184..7405b64 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
@@ -26,6 +26,8 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.Before;
import org.junit.Test;
@@ -58,6 +60,8 @@ public class Maven2RepositoryMergerTest
private MetadataRepository metadataRepository;
+ private RepositorySessionFactory repositorySessionFactory;
+
@Before
@Override
public void setUp()
@@ -66,6 +70,7 @@ public class Maven2RepositoryMergerTest
super.setUp();
MockitoAnnotations.initMocks( this );
metadataRepository = mock( MetadataRepository.class );
+ repositorySessionFactory = mock(RepositorySessionFactory.class);
}
private List<ArtifactMetadata> getArtifacts()
@@ -120,9 +125,11 @@ public class Maven2RepositoryMergerTest
c.addManagedRepository( targetRepo );
configuration.save( c );
- when( metadataRepository.getArtifacts( , TEST_REPO_ID ) ).thenReturn( getArtifacts() );
- repositoryMerger.merge( metadataRepository, TEST_REPO_ID, "target-rep" );
- verify( metadataRepository ).getArtifacts( , TEST_REPO_ID );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ when(metadataRepository.getArtifacts(session, TEST_REPO_ID)).thenReturn(getArtifacts());
+ repositoryMerger.merge(metadataRepository, TEST_REPO_ID, "target-rep");
+ verify(metadataRepository).getArtifacts(session, TEST_REPO_ID);
+ }
assertTrue( Files.exists(mergedArtifact) );
assertTrue( Files.exists(mavenMetadata) );
assertTrue( Files.exists(pom) );
@@ -169,12 +176,14 @@ public class Maven2RepositoryMergerTest
"/target/test-repository/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.jar" );
targetRepoFile.toFile().setReadOnly();
- when( metadataRepository.getArtifacts( , sourceRepoId ) ).thenReturn( sourceRepoArtifactsList );
- when( metadataRepository.getArtifacts( , TEST_REPO_ID ) ).thenReturn( targetRepoArtifactsList );
+ try(RepositorySession session = repositorySessionFactory.createSession()) {
+ when(metadataRepository.getArtifacts(session, sourceRepoId)).thenReturn(sourceRepoArtifactsList);
+ when(metadataRepository.getArtifacts(session, TEST_REPO_ID)).thenReturn(targetRepoArtifactsList);
- assertEquals( 1, repositoryMerger.getConflictingArtifacts( metadataRepository, sourceRepoId,
- TEST_REPO_ID ).size() );
- verify( metadataRepository ).getArtifacts( , TEST_REPO_ID );
+ assertEquals(1, repositoryMerger.getConflictingArtifacts(metadataRepository, sourceRepoId,
+ TEST_REPO_ID).size());
+ verify(metadataRepository).getArtifacts(session, TEST_REPO_ID);
+ }
}
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f4dd558..66f30a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<lucene.version>4.10.4</lucene.version>
- <jcr-oak.version>1.7.11</jcr-oak.version>
+ <jcr-oak.version>1.14.0</jcr-oak.version>
<jackrabbit.version>2.15.4</jackrabbit.version>
<felix.scr.version>1.12.0</felix.scr.version>
<metrics-core.version>3.1.0</metrics-core.version>
@@ -357,6 +357,7 @@
<artifactId>jackrabbit-webdav</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>