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 <[email protected]> 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 [email protected].
