This is an automated email from the ASF dual-hosted git repository. mpetria pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit 3b959a72a555af2da29363a1e3cde2ae3b157fae Author: Marius Petria <[email protected]> AuthorDate: Fri May 25 09:44:10 2018 +0300 Revert "Merge pull request #4 from Buuhuu/feature/SLING-7360" --- .../impl/AbstractDistributionPackageBuilder.java | 18 +++--------------- .../packaging/impl/FileDistributionPackageBuilder.java | 2 +- .../impl/ResourceDistributionPackageBuilder.java | 2 +- .../serialization/DistributionContentSerializer.java | 6 ------ .../impl/vlt/FileVaultContentSerializer.java | 4 ---- .../impl/FileDistributionPackageBuilderTest.java | 4 ---- 6 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java index 373c9ec..0a32868 100644 --- a/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java +++ b/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java @@ -51,12 +51,10 @@ public abstract class AbstractDistributionPackageBuilder implements Distribution private final String type; private final String contentType; - private final boolean serializerSupportsDeletion; - AbstractDistributionPackageBuilder(String type, String contentType, boolean serializerSupportsDeletion) { + AbstractDistributionPackageBuilder(String type, String contentType) { this.type = type; this.contentType = contentType; - this.serializerSupportsDeletion = serializerSupportsDeletion; } public String getType() { @@ -77,11 +75,7 @@ public abstract class AbstractDistributionPackageBuilder implements Distribution if (DistributionRequestType.ADD.equals(request.getRequestType())) { distributionPackage = createPackageForAdd(resourceResolver, request); } else if (DistributionRequestType.DELETE.equals(request.getRequestType())) { - if (this.serializerSupportsDeletion) { - distributionPackage = createPackageForDelete(resourceResolver, request); - } else { - distributionPackage = new SimpleDistributionPackage(request, type); - } + distributionPackage = new SimpleDistributionPackage(request, type); } else if (DistributionRequestType.PULL.equals(request.getRequestType())) { distributionPackage = new SimpleDistributionPackage(request, type); } else if (DistributionRequestType.TEST.equals(request.getRequestType())) { @@ -251,18 +245,12 @@ public abstract class AbstractDistributionPackageBuilder implements Distribution } } + @CheckForNull protected abstract DistributionPackage createPackageForAdd(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionException; @CheckForNull - protected DistributionPackage createPackageForDelete(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) - throws DistributionException { - // normally this will work the same way as for add - return this.createPackageForAdd(resourceResolver, request); - } - - @CheckForNull protected abstract DistributionPackage readPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionException; diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java index 3e72aa3..8e8e264 100644 --- a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java +++ b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java @@ -66,7 +66,7 @@ public class FileDistributionPackageBuilder extends AbstractDistributionPackageB String tempFilesFolder, String digestAlgorithm, String[] nodeFilters, String[] propertyFilters) { - super(type, distributionContentSerializer.getContentType(), distributionContentSerializer.isDeletionSupported()); + super(type, distributionContentSerializer.getContentType()); this.distributionContentSerializer = distributionContentSerializer; this.nodeFilters = VltUtils.parseFilters(nodeFilters); this.propertyFilters = VltUtils.parseFilters(propertyFilters); diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java index 09556af..04a4cfb 100644 --- a/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java +++ b/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java @@ -77,7 +77,7 @@ public class ResourceDistributionPackageBuilder extends AbstractDistributionPack boolean useOffHeapMemory, String digestAlgorithm, String[] nodeFilters, String[] propertyFilters) { - super(type, distributionContentSerializer.getContentType(), distributionContentSerializer.isDeletionSupported()); + super(type, distributionContentSerializer.getContentType()); this.distributionContentSerializer = distributionContentSerializer; this.nodeFilters = VltUtils.parseFilters(nodeFilters); this.propertyFilters = VltUtils.parseFilters(propertyFilters); diff --git a/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java b/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java index b4094c3..ab1735d 100644 --- a/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java +++ b/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java @@ -67,10 +67,4 @@ public interface DistributionContentSerializer { * @return {@code true} if it can build filters from a request, {@code false} otherwise */ boolean isRequestFiltering(); - - /** - * whether or not this {@link DistributionContentSerializer} can build packages for deletion - * @retur {@code} true if it can build packages for deletion - */ - boolean isDeletionSupported(); } diff --git a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java index 4b0f94f..9b09665 100644 --- a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java +++ b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java @@ -205,8 +205,4 @@ public class FileVaultContentSerializer implements DistributionContentSerializer public boolean isRequestFiltering() { return true; } - - @Override public boolean isDeletionSupported() { - return false; - } } diff --git a/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java b/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java index 76a300f..33fc0c2 100644 --- a/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java +++ b/src/test/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilderTest.java @@ -77,9 +77,5 @@ public class FileDistributionPackageBuilderTest { @Override public boolean isRequestFiltering() { return true; } - - @Override public boolean isDeletionSupported() { - return false; - } } } -- To stop receiving notification emails like this one, please contact [email protected].
