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 e978e2b Updating content item interfaces
e978e2b is described below
commit e978e2bf2111063b9f8461e91ccbd811d4887c62
Author: Martin Stockhammer <[email protected]>
AuthorDate: Wed Feb 12 21:12:09 2020 +0100
Updating content item interfaces
---
.../org/apache/archiva/repository/content/Project.java | 18 ++++++++++++------
.../repository/content/base/ArchivaVersion.java | 2 +-
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Project.java
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Project.java
index 2ad2c88..f7a840a 100644
---
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Project.java
+++
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Project.java
@@ -19,11 +19,8 @@ package org.apache.archiva.repository.content;
* under the License.
*/
-import org.apache.archiva.repository.RepositoryContent;
-import org.apache.archiva.repository.UnsupportedConversionException;
-import org.apache.archiva.repository.UnsupportedRepositoryTypeException;
-
-import java.util.Map;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.storage.StorageAsset;
/**
*
@@ -60,6 +57,15 @@ public interface Project extends ContentItem
* The repository this project is part of.
* @return the repository content
*/
- RepositoryContent getRepository();
+ ManagedRepositoryContent getRepository();
+
+ /**
+ * Returns the asset that corresponds to this project.
+ * It depends of the implementation, if the asset provides additional
information about the
+ * project or not.
+ *
+ * @return the repository asset that represents this project
+ */
+ StorageAsset getAsset();
}
diff --git
a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/base/ArchivaVersion.java
b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/base/ArchivaVersion.java
index 194f071..66fd529 100644
---
a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/base/ArchivaVersion.java
+++
b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/base/ArchivaVersion.java
@@ -95,7 +95,7 @@ public class ArchivaVersion extends ArchivaContentItem
implements Version
public ArchivaVersion build() {
if (this.version.asset == null) {
- this.version.project.getRepository( ).getRepository(
).getAsset( "" );
+ this.version.project.getRepository(
).getRepository().getAsset( "" );
}
return this.version;
}