trivial: fix javadoc
get rid of usage of PackagePropertiesImpl
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk@1872498 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
index c230ac9..ac1eae1 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
@@ -125,7 +125,6 @@
* @param dependencies The list of {@link MavenBasedPackageDependency} instances to convert.
* @throws IOException in case meta information could not be read from the project dependency or the
* dependency is not a content package.
- * @throws URISyntaxException
*/
public static void resolve(final MavenProject project, final Log log, final Collection<MavenBasedPackageDependency> dependencies) throws IOException {
for (MavenBasedPackageDependency dependency : dependencies) {
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
index 08dee46..0aa34b4 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
@@ -544,9 +544,8 @@
/** Checks if some files (optionally prefixed) below the given source directory are not listed in coveredFiles
*
* @param sourceDirectory the source directory
- * @param prefix the optional prefix to prepend to the relative file name before comparing with {@link coveredFiles}
+ * @param prefix the optional prefix to prepend to the relative file name before comparing with {@code coveredFileNames}
* @param coveredFileNames the covered file names (should have relative file names), might have OS specific separators
- * @param additionalExcludes the file name patterns to exclude from the source directory (in addition to the default excludes)
* @return the absolute file names in the source directory which are not already listed in {@code entryNames}. */
protected static Collection<File> getUncoveredFiles(final File sourceDirectory, Collection<String> excludes, String prefix,
Collection<String> coveredFileNames) {
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
index 036b0b0..a05d551 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
@@ -19,40 +19,31 @@
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
-import java.util.Properties;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.io.Archive;
+import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
-import org.apache.jackrabbit.vault.packaging.impl.PackagePropertiesImpl;
+import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.validation.spi.ValidationContext;
import org.apache.maven.plugin.logging.Log;
+import org.jetbrains.annotations.NotNull;
/**
* Implements a validation context based on a given {@link Archive}.
*/
-public class ArchiveValidationContextImpl extends PackagePropertiesImpl implements ValidationContext {
+public class ArchiveValidationContextImpl implements ValidationContext {
private final WorkspaceFilter filter;
- private final Properties properties;
+ private final PackageProperties properties;
private final Path archivePath;
private final Collection<PackageInfo> resolvedDependencies;
- /**
- *
- * @param archive
- * @param archivePath
- * @param configuration
- * @throws IOException
- */
public ArchiveValidationContextImpl(Archive archive, Path archivePath, DependencyResolver resolver, Log log) throws IOException {
this.archivePath = archivePath;
- properties = archive.getMetaInf().getProperties();
- if (properties == null) {
- throw new IllegalStateException("Archive '" + archivePath + "' does not contain a properties.xml.");
- }
+ properties = archive.getMetaInf().getPackageProperties();
this.filter = archive.getMetaInf().getFilter();
if (filter == null) {
throw new IllegalStateException("Archive '" + archivePath + "' does not contain a filter.xml.");
@@ -60,15 +51,9 @@
this.resolvedDependencies = resolver.resolve(getProperties().getDependencies(), getProperties().getDependenciesLocations(), log);
}
-
- @Override
- protected Properties getPropertiesMap() {
- return properties;
- }
-
@Override
public PackageProperties getProperties() {
- return this;
+ return properties;
}
@Override
@@ -91,4 +76,14 @@
return this.resolvedDependencies;
}
+ @Override
+ public @NotNull PackageId getId() {
+ return properties.getId();
+ }
+
+ @Override
+ public @NotNull PackageType getPackageType() {
+ return properties.getPackageType();
+ }
+
}
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
index 85dfbb4..d6676a6 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
@@ -24,7 +24,6 @@
import java.util.Collection;
import java.util.List;
-import org.apache.jackrabbit.filevault.maven.packaging.GenerateMetadataMojo;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
@@ -118,8 +117,7 @@
@Override
public PackageType getPackageType() {
- // TODO Auto-generated method stub
- return null;
+ return properties.getPackageType();
}
}
