You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2018/05/25 07:10:13 UTC
[sling-org-apache-sling-distribution-core] branch master updated
(16d8bea -> a4da85c)
This is an automated email from the ASF dual-hosted git repository.
mpetria pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.
from 16d8bea Merge pull request #8 from mpetria/issue/SLING-7555-3
new 3b959a7 Revert "Merge pull request #4 from Buuhuu/feature/SLING-7360"
new 4a8b9ac Revert "Merge pull request #2 from Buuhuu/feature/SLING-7357"
new a4da85c Fix build after previous reverts
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../impl/ForwardDistributionAgentFactory.java | 5 +----
.../impl/MonitoringDistributionPackageBuilder.java | 5 -----
.../packaging/DistributionPackageBuilder.java | 6 ------
.../impl/AbstractDistributionPackageBuilder.java | 24 +++-------------------
.../impl/FileDistributionPackageBuilder.java | 2 +-
.../impl/InMemoryDistributionPackageBuilder.java | 2 +-
.../impl/ResourceDistributionPackageBuilder.java | 2 +-
.../DistributionContentSerializer.java | 12 -----------
.../impl/DistributionPackageBuilderFactory.java | 4 ----
.../impl/vlt/FileVaultContentSerializer.java | 9 --------
.../VaultDistributionPackageBuilderFactory.java | 4 ----
.../distribution/serialization/package-info.java | 2 +-
.../transport/impl/HttpConfiguration.java | 20 ++----------------
.../impl/SimpleHttpDistributionTransport.java | 4 ----
.../impl/FileDistributionPackageBuilderTest.java | 8 --------
.../InMemoryDistributionPackageBuilderTest.java | 10 ---------
16 files changed, 10 insertions(+), 109 deletions(-)
--
To stop receiving notification emails like this one, please contact
mpetria@apache.org.
[sling-org-apache-sling-distribution-core] 01/03: Revert "Merge
pull request #4 from Buuhuu/feature/SLING-7360"
Posted by mp...@apache.org.
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 <mp...@adobe.com>
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
mpetria@apache.org.
[sling-org-apache-sling-distribution-core] 02/03: Revert "Merge
pull request #2 from Buuhuu/feature/SLING-7357"
Posted by mp...@apache.org.
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 4a8b9ace5859f9f79ee674a8887010e092746e84
Author: Marius Petria <mp...@adobe.com>
AuthorDate: Fri May 25 09:44:34 2018 +0300
Revert "Merge pull request #2 from Buuhuu/feature/SLING-7357"
This reverts commit 959ea056d5cd0b58245ba4e7d66a0bf3d6c4baae, reversing
changes made to 36c7bf864e90438859cee40ed12d26d1daf62477.
---
.../agent/impl/ForwardDistributionAgentFactory.java | 5 +----
.../impl/MonitoringDistributionPackageBuilder.java | 5 -----
.../packaging/DistributionPackageBuilder.java | 6 ------
.../impl/AbstractDistributionPackageBuilder.java | 8 +-------
.../impl/FileDistributionPackageBuilder.java | 2 +-
.../impl/ResourceDistributionPackageBuilder.java | 2 +-
.../serialization/DistributionContentSerializer.java | 6 ------
.../impl/DistributionPackageBuilderFactory.java | 4 ----
.../impl/vlt/FileVaultContentSerializer.java | 5 -----
.../vlt/VaultDistributionPackageBuilderFactory.java | 4 ----
.../distribution/serialization/package-info.java | 2 +-
.../transport/impl/HttpConfiguration.java | 20 ++------------------
.../impl/SimpleHttpDistributionTransport.java | 4 ----
13 files changed, 7 insertions(+), 66 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index 757fb83..5473ed7 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -34,7 +34,6 @@ import org.apache.felix.scr.annotations.PropertyOption;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.http.HttpHeaders;
import org.apache.jackrabbit.vault.packaging.Packaging;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
@@ -247,10 +246,8 @@ public class ForwardDistributionAgentFactory extends AbstractDistributionAgentFa
Map<String, String> priorityQueues = PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
- Map<String, String> headers = new HashMap<String, String>(1);
- headers.put(HttpHeaders.CONTENT_TYPE, packageBuilder.getContentType());
Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
- HttpConfiguration httpConfiguration = new HttpConfiguration(timeout, headers);
+ HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
DistributionPackageExporter packageExporter = new LocalDistributionPackageExporter(packageBuilder);
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
index d6e22c5..32066c9 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
@@ -59,11 +59,6 @@ public final class MonitoringDistributionPackageBuilder implements DistributionP
return wrapped.getType();
}
- @Override
- public String getContentType() {
- return wrapped.getContentType();
- }
-
@Nonnull
@Override
public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionException {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
index d6c65b4..6713072 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilder.java
@@ -40,12 +40,6 @@ public interface DistributionPackageBuilder {
String getType();
/**
- * returns the content type of packages created and consumed by the package builder.
- * @return the content type of the package
- */
- String getContentType();
-
- /**
* creates a {@link DistributionPackage} for a specific {@link org.apache.sling.distribution.DistributionRequest}
*
* @param resourceResolver the resource resolver used to access the resources to be packaged
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 0a32868..37e28ca 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
@@ -50,21 +50,15 @@ public abstract class AbstractDistributionPackageBuilder implements Distribution
private final Logger log = LoggerFactory.getLogger(getClass());
private final String type;
- private final String contentType;
- AbstractDistributionPackageBuilder(String type, String contentType) {
+ AbstractDistributionPackageBuilder(String type) {
this.type = type;
- this.contentType = contentType;
}
public String getType() {
return type;
}
- public String getContentType() {
- return this.contentType;
- }
-
@Nonnull
public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request)
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 8e8e264..66fd0b3 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());
+ super(type);
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 04a4cfb..70a5186 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());
+ super(type);
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 ab1735d..60f1fa6 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java
@@ -56,12 +56,6 @@ public interface DistributionContentSerializer {
String getName();
/**
- * retrieve the mime type of the exported content of this content serializer
- * @implNote the default implementation returns application/octet-stream.
- */
- String getContentType();
-
- /**
* whether or not this {@link DistributionContentSerializer} can build package filters for including / excluding
* certain resources / attributes directly from a {@link org.apache.sling.distribution.DistributionRequest}
* @return {@code true} if it can build filters from a request, {@code false} otherwise
diff --git a/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java b/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java
index 00401e5..40bd3ab 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java
@@ -237,10 +237,6 @@ public class DistributionPackageBuilderFactory implements DistributionPackageBui
return packageBuilder.getType();
}
- public String getContentType() {
- return contentSerializer.getContentType();
- }
-
@Nonnull
public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionException {
return packageBuilder.createPackage(resourceResolver, request);
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 9b09665..5547185 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
@@ -197,11 +197,6 @@ public class FileVaultContentSerializer implements DistributionContentSerializer
}
@Override
- public String getContentType() {
- return "application/octet-stream";
- }
-
- @Override
public boolean isRequestFiltering() {
return true;
}
diff --git a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
index f6dc523..220d987 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
@@ -294,10 +294,6 @@ public class VaultDistributionPackageBuilderFactory implements DistributionPacka
return packageBuilder.getType();
}
- public String getContentType() {
- return packageBuilder.getContentType();
- }
-
@Nonnull
public DistributionPackage createPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionException {
return packageBuilder.createPackage(resourceResolver, request);
diff --git a/src/main/java/org/apache/sling/distribution/serialization/package-info.java b/src/main/java/org/apache/sling/distribution/serialization/package-info.java
index 2b90d5f..8759b0e 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/package-info.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("0.1.0")
package org.apache.sling.distribution.serialization;
import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java b/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
index a460053..8f48d4a 100644
--- a/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
+++ b/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.distribution.transport.impl;
-import java.util.Collections;
-import java.util.Map;
-
/**
* HTTP related configuration for {@link SimpleHttpDistributionTransport}
*/
@@ -28,24 +25,15 @@ public class HttpConfiguration {
private final Integer connectTimeout;
private final Integer socketTimeout;
- private final Map<String, String> headers;
public HttpConfiguration(Integer timeout) {
- this(timeout, timeout);
+ this.socketTimeout = timeout;
+ this.connectTimeout = timeout;
}
public HttpConfiguration(Integer connectTimeout, Integer socketTimeout) {
- this(connectTimeout, socketTimeout, Collections.<String, String>emptyMap());
- }
-
- public HttpConfiguration(Integer timeout, Map<String, String> headers) {
- this(timeout, timeout, headers);
- }
-
- public HttpConfiguration(Integer connectTimeout, Integer socketTimeout, Map<String, String> headers) {
this.connectTimeout = connectTimeout;
this.socketTimeout = socketTimeout;
- this.headers = headers;
}
public Integer getConnectTimeout() {
@@ -55,8 +43,4 @@ public class HttpConfiguration {
public Integer getSocketTimeout() {
return socketTimeout;
}
-
- public Map<String, String> getHeaders() {
- return headers;
- }
}
diff --git a/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java b/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
index 5d243cb..86e33e2 100644
--- a/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
+++ b/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
@@ -137,10 +137,6 @@ public class SimpleHttpDistributionTransport implements DistributionTransport {
}
}
- for (Map.Entry<String, String> header : httpConfiguration.getHeaders().entrySet()) {
- req.addHeader(header.getKey(), header.getValue());
- }
-
InputStream inputStream = null;
try {
inputStream = DistributionPackageUtils.createStreamWithHeader(distributionPackage);
--
To stop receiving notification emails like this one, please contact
mpetria@apache.org.
[sling-org-apache-sling-distribution-core] 03/03: Fix build after
previous reverts
Posted by mp...@apache.org.
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 <mp...@adobe.com>
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
mpetria@apache.org.