This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit f7e0eea716b5a65fa1e848ffbdcc960a18d31222 Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Jul 11 19:00:54 2021 +0200 Renaming method of repository handler --- .../java/org/apache/archiva/repository/RepositoryHandler.java | 2 +- .../archiva/repository/base/ArchivaRepositoryRegistry.java | 10 +++++----- .../archiva/repository/base/group/RepositoryGroupHandler.java | 2 +- .../repository/base/managed/ManagedRepositoryHandler.java | 2 +- .../repository/base/group/RepositoryGroupHandlerTest.java | 2 +- 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 058fd65..9ecc323 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 34a4f95..8eef5b2 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 4036576..c97a59e 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 6cfb228..fee66b8 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 09c1c1d..07992da 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( ) { }
