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
The following commit(s) were added to refs/heads/master by this push:
new c7e070a Removing Nullable annotation and fix dependency errors
c7e070a is described below
commit c7e070a97c1f92b1d0bc527e12d07b3bcee04dbf
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Feb 2 16:31:30 2020 +0100
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.
---
.../archiva-maven/archiva-maven-repository/pom.xml | 6 ++++++
.../archiva-maven/archiva-maven-scheduler/pom.xml | 5 +++++
.../archiva-scheduler-repository/pom.xml | 5 +++++
.../metadata/repository/MetadataRepository.java | 18 +++++++-----------
.../cassandra/CassandraMetadataRepository.java | 2 --
.../repository/file/FileMetadataRepository.java | 2 --
.../metadata/repository/jcr/JcrMetadataRepository.java | 2 --
7 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 94d7e7f..8fb5a38 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -152,6 +152,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>
<scope>test</scope>
diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
index 9254ede..b24adb4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
@@ -62,6 +62,11 @@
</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>
<scope>provided</scope>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 46a01e4..a312519 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -88,6 +88,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>
<scope>test</scope>
diff --git
a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
index c63420a..abaed59 100644
---
a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
+++
b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
@@ -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;
/**
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
index 8fbdd0e..d350c67 100644
---
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
+++
b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
@@ -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
{
diff --git
a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index a344064..00e68c1 100644
---
a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++
b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -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 {
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index d803d48..2e09bbf 100644
---
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++
b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -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 {
