Skip to content
Permalink
Browse files
code cleanup
  • Loading branch information
effrafax committed Dec 24, 2021
1 parent c818808 commit 78413e37c4ea50778a5448f5e50071e1039457c4
Showing 1 changed file with 18 additions and 19 deletions.
@@ -92,9 +92,9 @@ public class DefaultMavenManagedRepositoryService implements MavenManagedReposit
QUERY_HELPER.addNullsafeFieldComparator( "name", ManagedRepository::getName );
}

private ManagedRepositoryAdmin managedRepositoryAdmin;
private RepositoryRegistry repositoryRegistry;
private SecuritySystem securitySystem;
private final ManagedRepositoryAdmin managedRepositoryAdmin;
private final RepositoryRegistry repositoryRegistry;
private final SecuritySystem securitySystem;

public DefaultMavenManagedRepositoryService( SecuritySystem securitySystem,
RepositoryRegistry repositoryRegistry,
@@ -133,7 +133,7 @@ public PagedResult<MavenManagedRepository> getManagedRepositories( final String
final Comparator<ManagedRepository> comparator = QUERY_HELPER.getComparator( orderBy, order );
int totalCount = Math.toIntExact( repos.stream( ).filter( queryFilter ).count( ) );
return PagedResult.of( totalCount, offset, limit, repos.stream( ).filter( queryFilter ).sorted( comparator )
.map(mr -> MavenManagedRepository.of(mr)).skip( offset ).limit( limit ).collect( Collectors.toList( ) ) );
.map( MavenManagedRepository::of ).skip( offset ).limit( limit ).collect( Collectors.toList( ) ) );
}
catch (ArithmeticException e) {
log.error( "Invalid number of repositories detected." );
@@ -157,21 +157,20 @@ public MavenManagedRepository getManagedRepository( String repositoryId ) throws
@Override
public Response deleteManagedRepository( String repositoryId, Boolean deleteContent ) throws ArchivaRestServiceException
{
ManagedRepository repo = repositoryRegistry.getManagedRepository( repositoryId );
if (repo==null) {
throw new ArchivaRestServiceException( ErrorMessage.of( ErrorKeys.REPOSITORY_NOT_FOUND, repositoryId ), 404 );
}
if (repo.getType()!=RepositoryType.MAVEN) {
throw new ArchivaRestServiceException( ErrorMessage.of( ErrorKeys.REPOSITORY_WRONG_TYPE, repositoryId, repo.getType().name() ), 404 );
}
try
MavenManagedRepository repo = getManagedRepository( repositoryId );
if (repo != null)
{
managedRepositoryAdmin.deleteManagedRepository( repositoryId, getAuditInformation( ), deleteContent );
return Response.ok( ).build( );
}
catch ( RepositoryAdminException e )
{
throw new ArchivaRestServiceException( ErrorMessage.of( ErrorKeys.REPOSITORY_DELETE_FAILED, e.getMessage( ) ) );
try
{
managedRepositoryAdmin.deleteManagedRepository( repositoryId, getAuditInformation( ), deleteContent );
return Response.ok( ).build( );
}
catch ( RepositoryAdminException e )
{
throw new ArchivaRestServiceException( ErrorMessage.of( ErrorKeys.REPOSITORY_DELETE_FAILED, e.getMessage( ) ) );
}
} else {
throw new ArchivaRestServiceException( ErrorMessage.of( ErrorKeys.REPOSITORY_NOT_FOUND, repositoryId ), 404 );
}
}

@@ -306,7 +305,7 @@ public Response copyArtifact( String srcRepositoryId, String dstRepositoryId,
}

private void checkAuthority(final String userName, final String srcRepositoryId, final String dstRepositoryId ) throws ArchivaRestServiceException {
User user = null;
User user;
try
{
user = securitySystem.getUserManager().findUser( userName );

0 comments on commit 78413e3

Please sign in to comment.