Author: olamy
Date: Tue Oct 23 14:02:33 2012
New Revision: 1401298
URL: http://svn.apache.org/viewvc?rev=1401298&view=rev
Log:
use a better naming convention
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java?rev=1401298&r1=1401297&r2=1401298&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java
Tue Oct 23 14:02:33 2012
@@ -26,7 +26,7 @@ import org.apache.archiva.metadata.repos
*/
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;
}
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1401298&r1=1401297&r2=1401298&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Tue Oct 23 14:02:33 2012
@@ -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 );
