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 a4da85cf8e8fa4538b6a8e93380d3c03182bb9e0
Author: Marius Petria <[email protected]>
AuthorDate: Fri May 25 09:47:47 2018 +0300

    Fix build after previous reverts
---
 .../packaging/impl/InMemoryDistributionPackageBuilder.java     |  2 +-
 .../packaging/impl/FileDistributionPackageBuilderTest.java     |  4 ----
 .../packaging/impl/InMemoryDistributionPackageBuilderTest.java | 10 ----------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
 
b/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
index 72b733c..3870c2a 100644
--- 
a/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
+++ 
b/src/main/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilder.java
@@ -60,7 +60,7 @@ public class InMemoryDistributionPackageBuilder extends 
AbstractDistributionPack
                                               @Nonnull 
DistributionContentSerializer serializer,
                                               @Nullable String[] nodeFilters,
                                               @Nullable String[] 
propertyFilters) {
-        super(type, serializer.getContentType(), 
serializer.isDeletionSupported());
+        super(type);
         this.serializer = serializer;
         this.nodeFilters = VltUtils.parseFilters(nodeFilters);
         this.propertyFilters = VltUtils.parseFilters(propertyFilters);
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 33fc0c2..ea6072c 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
@@ -62,10 +62,6 @@ public class FileDistributionPackageBuilderTest {
             }
         }
 
-        @Override public String getContentType() {
-            return "text/plain";
-        }
-
         @Override public void importFromStream(ResourceResolver 
resourceResolver, InputStream inputStream) throws DistributionException {
             throw new DistributionException("unsupported");
         }
diff --git 
a/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
 
b/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
index 8d385f0..f20dc66 100644
--- 
a/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
+++ 
b/src/test/java/org/apache/sling/distribution/packaging/impl/InMemoryDistributionPackageBuilderTest.java
@@ -71,19 +71,9 @@ public class InMemoryDistributionPackageBuilderTest {
         }
 
         @Override
-        public String getContentType() {
-            return "text/plain";
-        }
-
-        @Override
         public boolean isRequestFiltering() {
             return false;
         }
-
-        @Override
-        public boolean isDeletionSupported() {
-            return false;
-        }
     }
 
 }
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to