Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-06 10:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix imports and minors warning sonar.

Browse Source 
remove a space in transactions name pom.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1456696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
skygo 2013-03-14 22:12:24 +00:00
parent 1af394618d
commit 40c462af88
34 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java
View File

@ -29,5 +29,5 @@ public interface ConfigurationListener
/**
* Generic event point to notify components that something has happend in the configuration.
*/
public void configurationEvent( ConfigurationEvent event );
void configurationEvent( ConfigurationEvent event );
}

6
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerMonitor.java
View File

@ -33,7 +33,7 @@ public interface ConsumerMonitor
* @param type the type of error.
* @param message the message about the error.
*/
public void consumerError( Consumer consumer, String type, String message );
void consumerError( Consumer consumer, String type, String message );
/**
* A consumer warning event.
@ -42,7 +42,7 @@ public interface ConsumerMonitor
* @param type the type of warning.
* @param message the message about the warning.
*/
public void consumerWarning( Consumer consumer, String type, String message );
void consumerWarning( Consumer consumer, String type, String message );
/**
* A consumer informational event.
@ -50,5 +50,5 @@ public interface ConsumerMonitor
* @param consumer the consumer that caused the informational message.
* @param message the message.
*/
public void consumerInfo( Consumer consumer, String message );
void consumerInfo( Consumer consumer, String message );
}

1
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
View File

@ -24,7 +24,6 @@
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang.time.StopWatch;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;

2
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
View File

@ -32,7 +32,7 @@ public interface IndexMerger
/**
* system property which contains the value in s for ttl of temporary index groups
*/
static final String TMP_GROUP_INDEX_SYS_KEY = "archiva.tmp.group.index.ttl";
String TMP_GROUP_INDEX_SYS_KEY = "archiva.tmp.group.index.ttl";
/**
* @param indexMergerRequest

2
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
View File

@ -39,7 +39,6 @@
import org.apache.maven.index.OSGI;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.apache.maven.index.expr.SourcedSearchExpression;
import org.apache.maven.index.expr.UserInputSearchExpression;
import org.slf4j.Logger;
@ -47,7 +46,6 @@
import org.springframework.stereotype.Service;
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;

2
archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
View File

@ -26,5 +26,5 @@
*/
public interface ArchivaArtifactPlatformDetails
{
public String getPlatform();
String getPlatform();
}

2
archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
View File

@ -26,5 +26,5 @@
*/
public interface CompoundKey
{
public String toString();
String toString();
}

1
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
View File

@ -26,7 +26,6 @@
import org.springframework.stereotype.Service;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.List;

2
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadErrorPolicy.java
View File

@ -43,7 +43,7 @@ public interface DownloadErrorPolicy
* @return whether to process the exception or not
* @throws PolicyConfigurationException if the policy is improperly configured
*/
public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception,
boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception,
Map<String, Exception> previousExceptions )
throws PolicyConfigurationException;
}

2
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadPolicy.java
View File

@ -40,6 +40,6 @@ public interface DownloadPolicy
*
* @throws PolicyViolationException if the policy has been violated.
*/
public void applyPolicy( String policySetting, Properties request, File localFile )
void applyPolicy( String policySetting, Properties request, File localFile )
throws PolicyViolationException, PolicyConfigurationException;
}

10
archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java
View File

@ -45,7 +45,7 @@ public interface RepositoryProxyConnectors
* @return the file that was obtained, or null if no content was obtained
* @throws ProxyDownloadException if there was a problem fetching the content from the target repositories.
*/
public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactReference artifact )
File fetchFromProxies( ManagedRepositoryContent repository, ArtifactReference artifact )
throws ProxyDownloadException;
/**
@ -59,7 +59,7 @@ public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactRefer
* @param logicalPath the metadata to fetch.
* @return the file that was obtained, or null if no content was obtained
*/
public File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath );
File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath );
/**
* Performs the fetch operation against the target repositories
@ -69,7 +69,7 @@ public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactRefer
* @param path the path of the resource to fetch
* @return the file that was obtained, or null if no content was obtained
*/
public File fetchFromProxies( ManagedRepositoryContent managedRepository, String path );
File fetchFromProxies( ManagedRepositoryContent managedRepository, String path );
/**
* Get the List of {@link ProxyConnector} objects of the source repository.
@ -77,7 +77,7 @@ public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactRefer
* @param repository the source repository to look for.
* @return the List of {@link ProxyConnector} objects.
*/
public List<ProxyConnector> getProxyConnectors( ManagedRepositoryContent repository );
List<ProxyConnector> getProxyConnectors( ManagedRepositoryContent repository );
/**
* Tests to see if the provided repository is a source repository for
@ -87,5 +87,5 @@ public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactRefer
* @return true if there are proxy connectors that use the provided
* repository as a source repository.
*/
public boolean hasProxies( ManagedRepositoryContent repository );
boolean hasProxies( ManagedRepositoryContent repository );
}

2
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

@ -76,8 +76,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MarkerFactory;
import org.slf4j.helpers.BasicMarker;
import org.slf4j.helpers.BasicMarkerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;

4
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryCommonValidator.java
View File

@ -31,9 +31,9 @@
public interface RepositoryCommonValidator
{
public static final String REPOSITORY_ID_VALID_EXPRESSION = "^[a-zA-Z0-9._-]+$";
String REPOSITORY_ID_VALID_EXPRESSION = "^[a-zA-Z0-9._-]+$";
public static final String REPOSITORY_NAME_VALID_EXPRESSION = "^([a-zA-Z0-9.)/_(-]|\\s)+$";
String REPOSITORY_NAME_VALID_EXPRESSION = "^([a-zA-Z0-9.)/_(-]|\\s)+$";
void basicValidation( AbstractRepository abstractRepository, boolean update )

1
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorAdmin.java
View File

@ -21,7 +21,6 @@
import org.apache.archiva.admin.model.AuditInformation;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ProxyConnector;
import org.apache.archiva.admin.model.beans.ProxyConnectorRule;
import java.util.List;
import java.util.Map;

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
View File

@ -33,9 +33,7 @@
import org.apache.archiva.configuration.UserInterfaceOptions;
import org.apache.archiva.configuration.WebappConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.maven.wagon.providers.http.HttpWagon;
import org.springframework.stereotype.Service;

1
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
View File

@ -36,7 +36,6 @@
import java.io.IOException;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
/**
* RepositoryMetadataWriter

5
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
View File

@ -22,7 +22,6 @@
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.springframework.scheduling.annotation.Async;
import java.util.List;
import java.util.Set;
@ -38,7 +37,7 @@ public interface RepositoryScanner
* The value to pass to {@link #scan(ManagedRepository, long)} to have the scan
* operate in a fresh fashion, with no check on changes based on timestamp.
*/
public static final long FRESH_SCAN = 0;
long FRESH_SCAN = 0;
/**
* <p>
@ -53,7 +52,7 @@ public interface RepositoryScanner
* These patterns are only valid for archiva-cli and archiva-converter use.
* </p>
*/
public static final String[] IGNORABLE_CONTENT =
static final String[] IGNORABLE_CONTENT =
{ "bin/**", "reports/**", ".index", ".reports/**", ".maven/**", "**/.svn/**", "**/*snapshot-version",
"*/website/**", "*/licences/**", "**/.htaccess", "**/*.html", "**/*.txt", "**/README*", "**/CHANGELOG*",
"**/KEYS*", ".indexer" };

2
archiva-modules/archiva-base/archiva-transaction/pom.xml
View File

@ -26,7 +26,7 @@
</parent>
<artifactId>archiva-transaction</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Transactions</name>
<name>Archiva Base :: Transactions</name>
<description>API for managing transaction.</description>
<dependencies>
<dependency>

1
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -28,7 +28,6 @@
import org.apache.archiva.redback.components.taskqueue.Task;
import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutionException;
import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.maven.index.ArtifactContext;

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
View File

@ -28,8 +28,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.time.StopWatch;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.updater.IndexUpdateRequest;
import org.apache.maven.index.updater.IndexUpdater;
import org.apache.maven.index.updater.ResourceFetcher;

1
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java
View File

@ -22,7 +22,6 @@
import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.updater.IndexUpdater;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorRuleService.java
View File

@ -25,7 +25,6 @@
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ReportRepositoriesService.java
View File

@ -46,7 +46,7 @@ public interface ReportRepositoriesService
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
public List<RepositoryStatistics> getStatisticsReport( @QueryParam( "repository" ) List<String> repositoriesId,
List<RepositoryStatistics> getStatisticsReport( @QueryParam( "repository" ) List<String> repositoriesId,
@QueryParam( "rowCount" ) int rowCount,
@QueryParam( "startDate" ) Date startDate,
@QueryParam( "endDate" ) Date endDate )
@ -56,7 +56,7 @@ public List<RepositoryStatistics> getStatisticsReport( @QueryParam( "repository"
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
public List<RepositoryProblemFacet> getHealthReport( @PathParam( "repository" ) String repository,
List<RepositoryProblemFacet> getHealthReport( @PathParam( "repository" ) String repository,
@QueryParam( "groupId" ) String groupId,
@PathParam( "rowCount" ) int rowCount )
throws ArchivaRestServiceException;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
View File

@ -35,7 +35,6 @@
import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.apache.archiva.redback.rest.services.RedbackRequestInformation;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
View File

@ -19,7 +19,6 @@
*/
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import javax.xml.bind.annotation.XmlRootElement;

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
View File

@ -62,8 +62,6 @@
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import java.io.File;
import java.io.IOException;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
View File

@ -22,7 +22,6 @@
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.RepositoryCommonValidator;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
View File

@ -22,7 +22,6 @@
import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import org.apache.archiva.admin.model.beans.LdapConfiguration;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
View File

@ -35,7 +35,6 @@
import org.springframework.stereotype.Service;
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.core.Response;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;

6
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
View File

@ -30,11 +30,11 @@
*/
public interface RssFeedProcessor
{
public static final String KEY_REPO_ID = "repoId";
String KEY_REPO_ID = "repoId";
public static final String KEY_GROUP_ID = "groupId";
String KEY_GROUP_ID = "groupId";
public static final String KEY_ARTIFACT_ID = "artifactId";
String KEY_ARTIFACT_ID = "artifactId";
SyndFeed process( Map<String, String> reqParams, MetadataRepository metadataRepository )
throws FeedException;

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/ApplicationRuntimeInfo.java
View File

@ -18,8 +18,6 @@
* under the License.
*/
import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Calendar;

1
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
View File

@ -31,7 +31,6 @@
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;

4
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/IndexWriter.java
View File

@ -26,7 +26,6 @@
import java.io.File;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -84,7 +83,8 @@ private void writeDocumentStart( PrintWriter writer )
writer.println( "<head>" );
writer.println( "<title>Collection: /" + logicalResource + "</title>" );
writer.println( "<style type=\"text/css\">" );
writer.println( "ul{list-style:none;}" ); //list-style-image: url("../images/folder.png");
writer.println( "ul{list-style:none;}" );
StringBuilder relative = new StringBuilder("../../");
if ( logicalResource.length() > 0 )
{

2
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
View File

@ -25,7 +25,7 @@
public interface RepositoryPathTranslator
{
static final char PATH_SEPARATOR = '/';
char PATH_SEPARATOR = '/';
String toPath( String namespace, String projectId, String projectVersion, String filename );