use a better naming convention

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1401299 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 13 insertions, 13 deletions

diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
index 9d04f4ef8..fc2488bbe 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
@@ -178,7 +178,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
                                     "target/test-repository/com/example/test/test-artifact-module-a" );
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "test-artifact-module-a" ).projectVersion( "1.0" );
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
 
@@ -230,7 +230,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
                                     "target/test-repository/com/example/test/test-artifact-module-a" );
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "test-artifact-module-a" ).projectVersion( "1.0" );
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
         assertEquals( "1.0", metadata.getId() );
@@ -257,7 +257,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
                                     "target/test-repository/com/example/test/test-artifact-module-a" );
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "missing-parent" ).projectVersion( "1.1" );
 
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
@@ -331,7 +331,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
                                     "target/test-repositorys/com/example/test/test-snapshot-artifact-module-a" );
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_SNAP_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_SNAP_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "test-snapshot-artifact-module-a" ).projectVersion( "1.1-SNAPSHOT" );
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
 
@@ -374,7 +374,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest
                                     "target/test-repository/com/example/test/test-artifact-module-b" );
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "test-artifact-module-b" ).projectVersion( "1.0" );
 
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java
index a0965fcc4..495c15c55 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java
@@ -97,7 +97,7 @@ public class Maven2RepositoryMetadataResolverManagedReleaseTest
         // skygo IMHO must fail because TEST_REPO_ID ( is snap ,no release) and we seek for a snapshot
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
                 "maven-archiver" ).projectVersion( "2.4.1" );
 
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
@@ -109,7 +109,7 @@ public class Maven2RepositoryMetadataResolverManagedReleaseTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "missing-metadata" ).projectVersion( "1.0-SNAPSHOT" );
         storage.readProjectVersionMetadata( readMetadataRequest );
     }
@@ -120,7 +120,7 @@ public class Maven2RepositoryMetadataResolverManagedReleaseTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectVersion(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectVersion(
                 "malformed-metadata" ).projectVersion( "1.0-SNAPSHOT" );
         storage.readProjectVersionMetadata( readMetadataRequest );
     }
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
index 77d547353..f24ba9cbf 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
@@ -94,7 +94,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest
         // skygo IMHO must fail because TEST_REPO_ID ( is snap ,no release) and we seek for a snapshot
 
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
                 "maven-archiver" ).projectVersion( "2.4.1" );
 
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
@@ -106,7 +106,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "mislocated-pom" ).projectVersion( "1.0" );
         storage.readProjectVersionMetadata( readMetadataRequest );
 
@@ -126,7 +126,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "invalid-pom" ).projectVersion( "1.0" );
         storage.readProjectVersionMetadata( readMetadataRequest );
     }
@@ -137,7 +137,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "com.example.test" ).projectId(
                 "missing-pom" ).projectVersion( "1.0" );
         storage.readProjectVersionMetadata( readMetadataRequest );
     }
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
index 65d15906d..e173e3e4c 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
@@ -147,7 +147,7 @@ public class Maven2RepositoryMetadataResolverTest
         throws Exception
     {
         ReadMetadataRequest readMetadataRequest =
-            new ReadMetadataRequest().repoId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
+            new ReadMetadataRequest().repositoryId( TEST_REPO_ID ).namespace( "org.apache.maven" ).projectId(
                 "maven-archiver" ).projectVersion( "2.4.1" );
         ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest );
         MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID );