From: Olivier Lamy Date: Thu, 20 Dec 2012 15:34:51 +0000 (+0000) Subject: review/comment/delete some FIXME X-Git-Tag: archiva-1.4-M4~442 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9682660dbcff0ef77676b25fbbea80e5f6bdf361;p=archiva.git review/comment/delete some FIXME git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1424533 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java index 4228fae70..e2a9d5caa 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java @@ -81,7 +81,6 @@ public abstract class AbstractRepositoryPurge { File artifactFile = repository.toFile( reference ); - // FIXME: looks incomplete, might not delete related metadata? for ( RepositoryListener listener : listeners ) { listener.deleteArtifact( metadataRepository, repository.getId(), reference.getGroupId(), diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java index 05fa0c465..b3104fe3e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java @@ -114,7 +114,7 @@ public class DefaultProxyConnectorAdmin } - // FIXME take of proxyConnectorRules ! + // FIXME take care of proxyConnectorRules ! public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -134,7 +134,7 @@ public class DefaultProxyConnectorAdmin return Boolean.TRUE; } - // FIXME take of proxyConnectorRules ! + // FIXME care take of proxyConnectorRules ! public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index a9638b60f..82a68037e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -1022,7 +1022,6 @@ public class DefaultBrowseService if ( CollectionUtils.isEmpty( selectedRepos ) ) { - // FIXME 403 ??? return Collections.emptyList(); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index c9d05c99e..012b32c2a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -400,8 +400,6 @@ public class DefaultRepositoriesService String filename = artifactPath.substring( lastIndex + 1 ); - // FIXME some dupe with uploadaction - boolean fixChecksums = !( archivaAdministration.getKnownContentConsumers().contains( "create-missing-checksums" ) ); @@ -471,8 +469,6 @@ public class DefaultRepositoriesService return true; } - //FIXME some duplicate with UploadAction - private void queueRepositoryTask( String repositoryId, File localFile ) { RepositoryTask task = new RepositoryTask(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java index cb135a999..b258cf954 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java @@ -188,7 +188,10 @@ public class DefaultSystemStatusService private List mapConsumerScanningStatistics( RepositoryScannerInstance instance ) { DecimalFormat decimalFormat = new DecimalFormat( "###.##" ); - // FIXME take care of NPE here !!! + if ( instance.getConsumerCounts() == null ) + { + return Collections.emptyList(); + } List ret = new ArrayList( instance.getConsumerCounts().size() ); for ( Map.Entry entry : instance.getConsumerCounts().entrySet() ) diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index 803809afb..bdd3783bc 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -96,7 +96,6 @@ import java.util.Map; * Maven 2 repository format storage implementation. This class currently takes parameters to indicate the repository to * deal with rather than being instantiated per-repository. * FIXME: instantiate one per repository and allocate permanently from a factory (which can be obtained within the session). - * TODO: finish Maven 1 implementation to prove this API *

* The session is passed in as an argument to obtain any necessary resources, rather than the class being instantiated * within the session in the context of a single managed repository's resolution needs.