You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/09/09 15:15:40 UTC
svn commit: r1702000 - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/queue/impl/
test/java/org/apache/sling/distribution/packaging/impl/importer/
test/java/org/apache/sling/distribution/transport/impl/
Author: tommaso
Date: Wed Sep 9 13:15:40 2015
New Revision: 1702000
URL: http://svn.apache.org/r1702000
Log:
SLING-5008 - fixed prioritPath dispatching strategy init and tests wrongly assuming package.getInfo could be null
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java?rev=1702000&r1=1701999&r2=1702000&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityPathQueueDispatchingStrategy.java Wed Sep 9 13:15:40 2015
@@ -19,6 +19,7 @@
package org.apache.sling.distribution.queue.impl;
import javax.annotation.Nonnull;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -46,10 +47,10 @@ public class PriorityPathQueueDispatchin
private final List<String> priorityPaths;
public PriorityPathQueueDispatchingStrategy(String[] priorityPaths) {
- List<String> paths = Arrays.asList(priorityPaths);
+ List<String> paths = new ArrayList<String>(priorityPaths.length + 1);
paths.add(DEFAULT_QUEUE_NAME);
+ paths.addAll(Arrays.asList(priorityPaths));
this.priorityPaths = Collections.unmodifiableList(paths);
-
}
private DistributionQueue getQueue(DistributionQueueItem queueItem, DistributionQueueProvider queueProvider)
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java?rev=1702000&r1=1701999&r2=1702000&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java Wed Sep 9 13:15:40 2015
@@ -21,6 +21,7 @@ package org.apache.sling.distribution.pa
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.TransportEndpointStrategyType;
import org.junit.Test;
@@ -28,7 +29,9 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
+import static org.mockito.Matchers.endsWith;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Testcase for {@link RemoteDistributionPackageImporter}
@@ -44,6 +47,8 @@ public class RemoteDistributionPackageIm
distributionTransportSecretProvider, endpoints, strategy);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionPackageInfo info = new DistributionPackageInfo("/foo");
+ when(distributionPackage.getInfo()).thenReturn(info);
remotedistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java?rev=1702000&r1=1701999&r2=1702000&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java Wed Sep 9 13:15:40 2015
@@ -27,6 +27,7 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.SimpleDistributionRequest;
import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.transport.core.DistributionTransport;
import org.apache.sling.distribution.transport.DistributionTransportSecret;
import org.junit.Test;
@@ -48,6 +49,8 @@ public class MultipleEndpointDistributio
List<DistributionTransport> subHandlers = new ArrayList<DistributionTransport>();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionPackageInfo info = new DistributionPackageInfo("/foo");
+ when(distributionPackage.getInfo()).thenReturn(info);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
MultipleEndpointDistributionTransport multipleEndpointDistributionTransport = new MultipleEndpointDistributionTransport(subHandlers, strategy);
multipleEndpointDistributionTransport.deliverPackage(resourceResolver, distributionPackage);
@@ -76,6 +79,8 @@ public class MultipleEndpointDistributio
subHandlers.add(second);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionPackageInfo info = new DistributionPackageInfo("/foo");
+ when(distributionPackage.getInfo()).thenReturn(info);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
MultipleEndpointDistributionTransport multipleEndpointdistributionTransport = new MultipleEndpointDistributionTransport(subHandlers, strategy);
multipleEndpointdistributionTransport.deliverPackage(resourceResolver, distributionPackage);