Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a better naming convention 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1401298 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-23 14:02:33 +00:00
parent 01b9012562
commit 1d46b329d2
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java
View File

@ -26,7 +26,7 @@ import org.apache.archiva.metadata.repository.filter.Filter;
*/
public class ReadMetadataRequest
{
private String repoId;
private String repositoryId;
private String namespace;
@ -41,34 +41,34 @@ public class ReadMetadataRequest
// no op
}
public ReadMetadataRequest( String repoId, String namespace, String projectId, String projectVersion )
public ReadMetadataRequest( String repositoryId, String namespace, String projectId, String projectVersion )
{
this.repoId = repoId;
this.repositoryId = repositoryId;
this.namespace = namespace;
this.projectId = projectId;
this.projectVersion = projectVersion;
}
public ReadMetadataRequest( String repoId, String namespace, String projectId, String projectVersion,
public ReadMetadataRequest( String repositoryId, String namespace, String projectId, String projectVersion,
Filter<String> filter )
{
this( repoId, namespace, projectId, projectVersion );
this( repositoryId, namespace, projectId, projectVersion );
this.filter = filter;
}
public String getRepoId()
public String getRepositoryId()
{
return repoId;
return repositoryId;
}
public void setRepoId( String repoId )
public void setRepositoryId( String repositoryId )
{
this.repoId = repoId;
this.repositoryId = repositoryId;
}
public ReadMetadataRequest repoId( String repoId )
{
this.repoId = repoId;
this.repositoryId = repoId;
return this;
}

12
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
View File

@ -154,7 +154,7 @@ public class Maven2RepositoryStorage
try
{
ManagedRepository managedRepository =
managedRepositoryAdmin.getManagedRepository( readMetadataRequest.getRepoId() );
managedRepositoryAdmin.getManagedRepository( readMetadataRequest.getRepositoryId() );
String artifactVersion = readMetadataRequest.getProjectVersion();
if ( VersionUtil.isSnapshot(
@ -220,7 +220,7 @@ public class Maven2RepositoryStorage
Map<String, NetworkProxy> networkProxies = new HashMap<String, NetworkProxy>();
Map<String, List<ProxyConnector>> proxyConnectorsMap = proxyConnectorAdmin.getProxyConnectorAsMap();
List<ProxyConnector> proxyConnectors = proxyConnectorsMap.get( readMetadataRequest.getRepoId() );
List<ProxyConnector> proxyConnectors = proxyConnectorsMap.get( readMetadataRequest.getRepositoryId() );
if ( proxyConnectors != null )
{
for ( ProxyConnector proxyConnector : proxyConnectors )
@ -293,8 +293,8 @@ public class Maven2RepositoryStorage
? problem.getMessage()
: problem.getException().getMessage() );
RepositoryProblemFacet repoProblemFacet = new RepositoryProblemFacet();
repoProblemFacet.setRepositoryId( readMetadataRequest.getRepoId() );
repoProblemFacet.setId( readMetadataRequest.getRepoId() );
repoProblemFacet.setRepositoryId( readMetadataRequest.getRepositoryId() );
repoProblemFacet.setId( readMetadataRequest.getRepositoryId() );
repoProblemFacet.setMessage( errMsg );
repoProblemFacet.setProblem( errMsg );
repoProblemFacet.setProject( readMetadataRequest.getProjectId() );
@ -571,7 +571,7 @@ public class Maven2RepositoryStorage
public Collection<ArtifactMetadata> readArtifactsMetadata( ReadMetadataRequest readMetadataRequest )
throws RepositoryStorageRuntimeException
{
File dir = pathTranslator.toFile( getRepositoryBasedir( readMetadataRequest.getRepoId() ),
File dir = pathTranslator.toFile( getRepositoryBasedir( readMetadataRequest.getRepositoryId() ),
readMetadataRequest.getNamespace(), readMetadataRequest.getProjectId(),
readMetadataRequest.getProjectVersion() );
@ -584,7 +584,7 @@ public class Maven2RepositoryStorage
for ( File file : files )
{
ArtifactMetadata metadata =
getArtifactFromFile( readMetadataRequest.getRepoId(), readMetadataRequest.getNamespace(),
getArtifactFromFile( readMetadataRequest.getRepositoryId(), readMetadataRequest.getNamespace(),
readMetadataRequest.getProjectId(), readMetadataRequest.getProjectVersion(),
file );
artifacts.add( metadata );