aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2021-07-11 19:00:54 +0200
committerMartin Stockhammer <martin_s@apache.org>2021-07-11 19:00:54 +0200
commitf7e0eea716b5a65fa1e848ffbdcc960a18d31222 (patch)
tree887b274087a37693517bac165f4217da5b9d7ca9
parent678d0c98ea47b0a2fb866556ad2255f5bb30a01e (diff)
downloadarchiva-f7e0eea716b5a65fa1e848ffbdcc960a18d31222.tar.gz
archiva-f7e0eea716b5a65fa1e848ffbdcc960a18d31222.zip
Renaming method of repository handler
-rw-r--r--archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java2
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java10
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java2
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java2
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java2
5 files changed, 9 insertions, 9 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java
index 058fd6543..9ecc323c4 100644
--- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java
@@ -219,7 +219,7 @@ public interface RepositoryHandler<R extends Repository, C>
* @param id the repository identifier
* @return <code>true</code>, if it is registered, otherwise <code>false</code>
*/
- boolean has( String id );
+ boolean hasRepository( String id );
/**
* Initializes the handler. This method must be called before using the repository handler.
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
index 34a4f956c..8eef5b2af 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
@@ -565,7 +565,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa
log.debug( "Remote repo" );
return remoteRepositories.get( repoId );
}
- else if ( groupHandler.has( repoId ) )
+ else if ( groupHandler.hasRepository( repoId ) )
{
return groupHandler.get( repoId );
}
@@ -639,7 +639,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa
@Override
public boolean hasRepository( String repoId )
{
- return this.managedRepositories.containsKey( repoId ) || this.remoteRepositories.containsKey( repoId ) || groupHandler.has( repoId );
+ return this.managedRepositories.containsKey( repoId ) || this.remoteRepositories.containsKey( repoId ) || groupHandler.hasRepository( repoId );
}
@Override
@@ -657,7 +657,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa
@Override
public boolean hasRepositoryGroup( String groupId )
{
- return groupHandler.has( groupId );
+ return groupHandler.hasRepository( groupId );
}
protected void saveConfiguration( Configuration configuration ) throws IndeterminateConfigurationException, RegistryException
@@ -1293,7 +1293,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa
return;
}
final String id = repositoryGroup.getId( );
- if ( groupHandler.has( id ) )
+ if ( groupHandler.hasRepository( id ) )
{
rwLock.writeLock( ).lock( );
try
@@ -1315,7 +1315,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa
return;
}
final String id = repositoryGroup.getId( );
- if ( groupHandler.has( id ) )
+ if ( groupHandler.hasRepository( id ) )
{
rwLock.writeLock( ).lock( );
try
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java
index 40365765c..c97a59e1e 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java
@@ -606,7 +606,7 @@ public class RepositoryGroupHandler
return this.validator.applyForUpdate( repository );
}
@Override
- public boolean has( String id )
+ public boolean hasRepository( String id )
{
return repositoryGroups.containsKey( id );
}
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java
index 6cfb228ec..fee66b828 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java
@@ -221,7 +221,7 @@ implements RepositoryHandler<ManagedRepository, ManagedRepositoryConfiguration>
}
@Override
- public boolean has( String id )
+ public boolean hasRepository( String id )
{
return false;
}
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java
index 09c1c1d8b..07992dad3 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java
@@ -81,7 +81,7 @@ class RepositoryGroupHandlerTest
}
@Test
- void initialize( )
+ void activateRepository( )
{
}