Procházet zdrojové kódy

Removing Nullable annotation and fix dependency errors

Nullable annotation is not part of javax.annotation-api package. To avoid having the
additional dependency to findbugs ( no current updates ) I removed the Nullable
annotations until we find a better approach.
pull/56/head
Martin Stockhammer před 4 roky
rodič
revize
c7e070a97c

+ 6
- 0
archiva-modules/archiva-maven/archiva-maven-repository/pom.xml Zobrazit soubor

@@ -151,6 +151,12 @@


<!-- Test scope -->
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>

+ 5
- 0
archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml Zobrazit soubor

@@ -61,6 +61,11 @@
<artifactId>archiva-maven-proxy</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>

+ 5
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Zobrazit soubor

@@ -87,6 +87,11 @@


<!-- Test scope -->
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>

+ 7
- 11
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java Zobrazit soubor

@@ -26,8 +26,6 @@ import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.model.ProjectVersionReference;

import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.stream.Stream;
@@ -92,8 +90,6 @@ import java.util.stream.Stream;
* lazy loading for the retrieved objects. So the streaming methods may be faster and use less memory than the list based methods.
* But for some backends there is no difference.
*/
@SuppressWarnings( "NullableProblems" )
@ParametersAreNonnullByDefault
public interface MetadataRepository
{

@@ -289,7 +285,7 @@ public interface MetadataRepository
* uses default query parameters.
*/
List<ArtifactMetadata> getArtifactsByDateRange( RepositorySession session, String repositoryId,
@Nullable ZonedDateTime startTime, @Nullable ZonedDateTime endTime )
ZonedDateTime startTime, ZonedDateTime endTime )
throws MetadataRepositoryException;

/**
@@ -306,7 +302,7 @@ public interface MetadataRepository
* @since 3.0
*/
List<ArtifactMetadata> getArtifactsByDateRange( RepositorySession session, String repositoryId,
@Nullable ZonedDateTime startTime, @Nullable ZonedDateTime endTime,
ZonedDateTime startTime, ZonedDateTime endTime,
QueryParameter queryParameter )
throws MetadataRepositoryException;

@@ -325,7 +321,7 @@ public interface MetadataRepository
* @since 3.0
*/
Stream<ArtifactMetadata> getArtifactByDateRangeStream( RepositorySession session, String repositoryId,
@Nullable ZonedDateTime startTime, @Nullable ZonedDateTime endTime )
ZonedDateTime startTime, ZonedDateTime endTime )
throws MetadataRepositoryException;

/**
@@ -343,7 +339,7 @@ public interface MetadataRepository
* @since 3.0
*/
Stream<ArtifactMetadata> getArtifactByDateRangeStream( RepositorySession session, String repositoryId,
@Nullable ZonedDateTime startTime, @Nullable ZonedDateTime endTime,
ZonedDateTime startTime, ZonedDateTime endTime,
QueryParameter queryParameter )
throws MetadataRepositoryException;

@@ -371,7 +367,7 @@ public interface MetadataRepository
* @throws MetadataRepositoryException if the artifact retrieval fails.
*/
List<ArtifactMetadata> getArtifactsByProjectVersionFacet( RepositorySession session, String key, String value,
@Nullable String repositoryId )
String repositoryId )
throws MetadataRepositoryException;

/**
@@ -386,7 +382,7 @@ public interface MetadataRepository
* @return a list of artifact objects for each artifact that matches the search string
* @throws MetadataRepositoryException if the artifact retrieval fails.
*/
List<ArtifactMetadata> getArtifactsByAttribute( RepositorySession session, String key, String value, @Nullable String repositoryId )
List<ArtifactMetadata> getArtifactsByAttribute( RepositorySession session, String key, String value, String repositoryId )
throws MetadataRepositoryException;

/**
@@ -400,7 +396,7 @@ public interface MetadataRepository
* @return a list of artifacts or a empty list, if no artifact was found
* @throws MetadataRepositoryException if the artifact retrieval fails
*/
List<ArtifactMetadata> getArtifactsByProjectVersionAttribute( RepositorySession session, String key, String value, @Nullable String repositoryId )
List<ArtifactMetadata> getArtifactsByProjectVersionAttribute( RepositorySession session, String key, String value, String repositoryId )
throws MetadataRepositoryException;

/**

+ 0
- 2
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Zobrazit soubor

@@ -71,7 +71,6 @@ import org.modelmapper.ModelMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.ParametersAreNonnullByDefault;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.util.*;
@@ -89,7 +88,6 @@ import static org.apache.archiva.metadata.repository.cassandra.model.ColumnNames
* @author Olivier Lamy
* @since 2.0.0
*/
@ParametersAreNonnullByDefault
public class CassandraMetadataRepository
extends AbstractMetadataRepository implements MetadataRepository
{

+ 0
- 2
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Zobrazit soubor

@@ -46,7 +46,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.ParametersAreNonnullByDefault;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -82,7 +81,6 @@ import java.util.stream.Stream;
*
* Some retrieval methods may not be very efficient.
*/
@ParametersAreNonnullByDefault
public class FileMetadataRepository
extends AbstractMetadataRepository implements MetadataRepository {


+ 0
- 2
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java Zobrazit soubor

@@ -35,7 +35,6 @@ import org.apache.jackrabbit.commons.cnd.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.ParametersAreNonnullByDefault;
import javax.jcr.*;
import javax.jcr.query.*;
import java.io.IOException;
@@ -57,7 +56,6 @@ import static org.apache.archiva.metadata.repository.jcr.JcrConstants.*;
* TODO below: revise storage format for project version metadata
* TODO revise reference storage
*/
@ParametersAreNonnullByDefault
public class JcrMetadataRepository
extends AbstractMetadataRepository implements MetadataRepository, RepositoryStatisticsProvider {


Načítá se…
Zrušit
Uložit