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 14:09:21 UTC
svn commit: r1701984 [2/3] - in
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution:
agent/ agent/impl/ component/impl/ event/impl/ impl/ log/ log/impl/
packaging/ packaging/impl/ packaging/impl/exporter/ packa...
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java Wed Sep 9 12:09:19 2015
@@ -30,8 +30,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
+import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
@@ -39,8 +39,8 @@ import org.apache.sling.distribution.pac
import org.apache.sling.distribution.packaging.DistributionPackageImportException;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-import org.apache.sling.distribution.transport.core.DistributionTransport;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
+import org.apache.sling.distribution.transport.core.DistributionTransport;
import org.apache.sling.distribution.transport.impl.AdvancedHttpDistributionTransport;
import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
import org.apache.sling.distribution.transport.impl.MultipleEndpointDistributionTransport;
@@ -118,8 +118,6 @@ public class AdvancedRemoteDistributionP
String customBody = PropertiesUtil.toString(config.get(CUSTOM_BODY), "");
-
-
String importerName = PropertiesUtil.toString(config.get(NAME), null);
DefaultDistributionLog distributionLog = new DefaultDistributionLog(DistributionComponentKind.IMPORTER, importerName, RemoteDistributionPackageImporter.class, DefaultDistributionLog.LogLevel.ERROR);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java Wed Sep 9 12:09:19 2015
@@ -20,7 +20,6 @@ package org.apache.sling.distribution.pa
import javax.annotation.Nonnull;
import java.io.InputStream;
-import java.util.Arrays;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.packaging.DistributionPackage;
@@ -53,7 +52,6 @@ public class LocalDistributionPackageImp
this.packageBuilder = packageBuilder;
}
-
public void importPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageImportException {
try {
boolean success = packageBuilder.installPackage(resourceResolver, distributionPackage);
@@ -69,6 +67,7 @@ public class LocalDistributionPackageImp
}
}
+ @Nonnull
public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageImportException {
DistributionPackage distributionPackage = null;
try {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java Wed Sep 9 12:09:19 2015
@@ -30,8 +30,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
+import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.event.DistributionEventTopics;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.packaging.DistributionPackage;
@@ -86,13 +86,11 @@ public class LocalDistributionPackageImp
eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, distributionPackage.getInfo());
}
+ @Nonnull
public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageImportException {
DistributionPackageInfo distributionPackageInfo = importer.importStream(resourceResolver, stream);
-
- if (distributionPackageInfo != null) {
- eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, distributionPackageInfo);
- }
+ eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, distributionPackageInfo);
return distributionPackageInfo;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java Wed Sep 9 12:09:19 2015
@@ -29,14 +29,12 @@ import org.apache.sling.distribution.pac
import org.apache.sling.distribution.packaging.DistributionPackageImportException;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-import org.apache.sling.distribution.transport.core.DistributionTransport;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
+import org.apache.sling.distribution.transport.core.DistributionTransport;
import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
import org.apache.sling.distribution.transport.impl.MultipleEndpointDistributionTransport;
import org.apache.sling.distribution.transport.impl.SimpleHttpDistributionTransport;
import org.apache.sling.distribution.transport.impl.TransportEndpointStrategyType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Remote implementation of {@link org.apache.sling.distribution.packaging.DistributionPackageImporter}
@@ -45,21 +43,15 @@ public class RemoteDistributionPackageIm
private DistributionTransport transportHandler;
- private final DefaultDistributionLog log;
- private DistributionTransportSecretProvider distributionTransportSecretProvider;
public RemoteDistributionPackageImporter(DefaultDistributionLog log, DistributionTransportSecretProvider distributionTransportSecretProvider,
Map<String, String> endpointsMap,
TransportEndpointStrategyType transportEndpointStrategyType) {
- this.log = log;
- this.distributionTransportSecretProvider = distributionTransportSecretProvider;
-
if (distributionTransportSecretProvider == null) {
throw new IllegalArgumentException("distributionTransportSecretProvider is required");
}
-
Map<String, DistributionTransport> transportHandlers = new HashMap<String, DistributionTransport>();
for (Map.Entry<String, String> entry : endpointsMap.entrySet()) {
@@ -82,6 +74,7 @@ public class RemoteDistributionPackageIm
}
}
+ @Nonnull
public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageImportException {
throw new DistributionPackageImportException("not supported");
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java Wed Sep 9 12:09:19 2015
@@ -31,8 +31,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
+import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
@@ -107,7 +107,7 @@ public class RemoteDistributionPackageIm
DefaultDistributionLog distributionLog = new DefaultDistributionLog(DistributionComponentKind.IMPORTER, importerName, RemoteDistributionPackageImporter.class, DefaultDistributionLog.LogLevel.ERROR);
- importer = new RemoteDistributionPackageImporter(distributionLog, transportSecretProvider, endpoints, transportEndpointStrategyType);
+ importer = new RemoteDistributionPackageImporter(distributionLog, transportSecretProvider, endpoints, transportEndpointStrategyType);
}
@@ -115,6 +115,7 @@ public class RemoteDistributionPackageIm
importer.importPackage(resourceResolver, distributionPackage);
}
+ @Nonnull
public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageImportException {
return importer.importStream(resourceResolver, stream);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java Wed Sep 9 12:09:19 2015
@@ -18,13 +18,13 @@
*/
package org.apache.sling.distribution.packaging.impl.importer;
-import java.io.InputStream;
import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
+import java.io.InputStream;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java Wed Sep 9 12:09:19 2015
@@ -18,9 +18,9 @@
*/
package org.apache.sling.distribution.packaging.impl.importer;
+import javax.annotation.Nonnull;
import java.io.InputStream;
import java.util.Map;
-import javax.annotation.Nonnull;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -86,6 +86,7 @@ public class RepositoryDistributionPacka
}
+ @Nonnull
public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageImportException {
return importer.importStream(resourceResolver, stream);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java Wed Sep 9 12:09:19 2015
@@ -16,25 +16,35 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.distribution.queue;
+/**
+ * an entry in a {@link DistributionQueue}
+ */
public final class DistributionQueueEntry {
-
private final DistributionQueueItem item;
private final DistributionQueueItemStatus status;
public DistributionQueueEntry(DistributionQueueItem item, DistributionQueueItemStatus status) {
-
this.item = item;
this.status = status;
}
+ /**
+ * get the status for this entry
+ *
+ * @return a {@link DistributionQueueStatus}
+ */
public DistributionQueueItemStatus getStatus() {
return status;
}
+ /**
+ * get the queue item in this entry
+ *
+ * @return a {@link DistributionQueueItem}
+ */
public DistributionQueueItem getItem() {
return item;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java Wed Sep 9 12:09:19 2015
@@ -19,16 +19,13 @@
package org.apache.sling.distribution.queue;
import javax.annotation.Nonnull;
+import java.util.Map;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-
-import java.util.Map;
/**
* An item in a {@link DistributionQueue}
- * <p/>
* This is basically a proxy to {@link org.apache.sling.distribution.packaging.DistributionPackage} designed to avoid having
* to keep the package {@link org.apache.sling.distribution.packaging.DistributionPackage#createInputStream() stream} into
* the queues.
@@ -48,7 +45,6 @@ public class DistributionQueueItem exten
}
-
@Override
public String toString() {
return "DistributionQueueItem{" +
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java Wed Sep 9 12:09:19 2015
@@ -23,7 +23,6 @@ import java.util.Calendar;
/**
* the current status of a certain item in a {@link DistributionQueue}
*/
-
public class DistributionQueueItemStatus {
private final int attempts;
@@ -59,7 +58,7 @@ public class DistributionQueueItemStatus
@Override
public String toString() {
- return "{\"attempts\":\"" + attempts + "\",\"" + "\",\"" + "state\":\"" + state +
+ return "{\"attempts\":\"" + attempts + "\",\"" + "\",\"" + "state\":\"" + state +
"\",\"" + "queueName\":\"" + queueName + "\"}";
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java Wed Sep 9 12:09:19 2015
@@ -19,27 +19,40 @@
package org.apache.sling.distribution.queue;
-
+/**
+ * The status of a certain {@link DistributionQueue}
+ */
public final class DistributionQueueStatus {
final int itemsCount;
final DistributionQueueState queueState;
public DistributionQueueStatus(int itemsCount, DistributionQueueState queueState) {
-
this.itemsCount = itemsCount;
this.queueState = queueState;
}
+ /**
+ * get the no. of items in the queue
+ * @return the no. of items in the queue
+ */
public int getItemsCount() {
return itemsCount;
}
+ /**
+ * get the state associated with the status of this queue
+ * @return a {@link DistributionQueueItemState}
+ */
public DistributionQueueState getState() {
return queueState;
}
+ /**
+ * check if the queue is empty
+ * @return {@code true} if the queue is empty
+ */
public boolean isEmpty() {
return itemsCount == 0;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueUtils.java Wed Sep 9 12:09:19 2015
@@ -19,14 +19,21 @@
package org.apache.sling.distribution.queue.impl;
-
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.apache.sling.distribution.queue.DistributionQueueState;
+/**
+ * Utility methods for queues.
+ */
public class DistributionQueueUtils {
-
+ /**
+ * Calculate the {@link DistributionQueueState} of an item given its status.
+ * @param item a queue item
+ * @param status an item status
+ * @return a queue item state
+ */
public static DistributionQueueState calculateState(DistributionQueueItem item, DistributionQueueItemStatus status) {
if (item != null && status != null) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java Wed Sep 9 12:09:19 2015
@@ -19,6 +19,13 @@
package org.apache.sling.distribution.queue.impl;
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.DistributionQueue;
@@ -29,14 +36,6 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
/**
* The error strategy for delivering packages to queues. The strategy delivers the packages in a queue named error-queueName
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java Wed Sep 9 12:09:19 2015
@@ -18,6 +18,13 @@
*/
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;
+import java.util.UUID;
+
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.SharedDistributionPackage;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
@@ -30,12 +37,6 @@ import org.apache.sling.distribution.que
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
/**
* The default strategy for delivering packages to queues. Each package can be dispatched to multiple queues.
*/
@@ -43,17 +44,15 @@ public class MultipleQueueDispatchingStr
private final Logger log = LoggerFactory.getLogger(getClass());
- private final String[] queueNames;
+ private final List<String> queueNames;
public MultipleQueueDispatchingStrategy(String[] queueNames) {
-
- this.queueNames = queueNames;
+ this.queueNames = Collections.unmodifiableList(Arrays.asList(queueNames));
}
public Iterable<DistributionQueueItemStatus> add(@Nonnull DistributionPackage distributionPackage, @Nonnull DistributionQueueProvider queueProvider) throws DistributionQueueException {
-
- if (!(distributionPackage instanceof SharedDistributionPackage) && queueNames.length > 1) {
+ if (!(distributionPackage instanceof SharedDistributionPackage) && queueNames.size() > 1) {
throw new DistributionQueueException("distribution package must be a shared package to be added in multiple queues");
}
@@ -65,7 +64,7 @@ public class MultipleQueueDispatchingStr
DistributionPackageUtils.acquire(distributionPackage, tempQueueName);
try {
- for (String queueName: queueNames) {
+ for (String queueName : queueNames) {
DistributionQueue queue = queueProvider.getQueue(queueName);
DistributionQueueItemStatus status = new DistributionQueueItemStatus(DistributionQueueItemState.ERROR, queue.getName());
@@ -88,15 +87,11 @@ public class MultipleQueueDispatchingStr
@Nonnull
public List<String> getQueueNames() {
-
- return Arrays.asList(queueNames);
+ return queueNames;
}
-
private DistributionQueueItem getItem(DistributionPackage distributionPackage) {
- DistributionQueueItem distributionQueueItem = DistributionPackageUtils.toQueueItem(distributionPackage);
-
- return distributionQueueItem;
+ return DistributionPackageUtils.toQueueItem(distributionPackage);
}
}
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=1701984&r1=1701983&r2=1701984&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 12:09:19 2015
@@ -20,6 +20,7 @@ package org.apache.sling.distribution.qu
import javax.annotation.Nonnull;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.sling.distribution.packaging.DistributionPackage;
@@ -42,10 +43,12 @@ public class PriorityPathQueueDispatchin
private final Logger log = LoggerFactory.getLogger(getClass());
- private final String[] priorityPaths;
+ private final List<String> priorityPaths;
public PriorityPathQueueDispatchingStrategy(String[] priorityPaths) {
- this.priorityPaths = priorityPaths;
+ List<String> paths = Arrays.asList(priorityPaths);
+ paths.add(DEFAULT_QUEUE_NAME);
+ this.priorityPaths = Collections.unmodifiableList(paths);
}
@@ -84,25 +87,20 @@ public class PriorityPathQueueDispatchin
DistributionQueueItem queueItem = getItem(distributionPackage);
DistributionQueue queue = getQueue(queueItem, queueProvider);
if (queue.add(queueItem)) {
- return Arrays.asList(queue.getItem(queueItem.getId()).getStatus());
+ return Collections.singletonList(queue.getItem(queueItem.getId()).getStatus());
} else {
- return Arrays.asList(new DistributionQueueItemStatus(DistributionQueueItemState.ERROR, queue.getName()));
+ return Collections.singletonList(new DistributionQueueItemStatus(DistributionQueueItemState.ERROR, queue.getName()));
}
}
@Nonnull
public List<String> getQueueNames() {
- List<String> paths = Arrays.asList(priorityPaths);
- paths.add(DEFAULT_QUEUE_NAME);
-
- return paths;
+ return priorityPaths;
}
private DistributionQueueItem getItem(DistributionPackage distributionPackage) {
- DistributionQueueItem distributionQueueItem = DistributionPackageUtils.toQueueItem(distributionPackage);
-
- return distributionQueueItem;
+ return DistributionPackageUtils.toQueueItem(distributionPackage);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDispatchingStrategy.java Wed Sep 9 12:09:19 2015
@@ -25,7 +25,7 @@ package org.apache.sling.distribution.qu
public class SingleQueueDispatchingStrategy extends MultipleQueueDispatchingStrategy {
public SingleQueueDispatchingStrategy() {
- super(new String[] { DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME });
+ super(new String[]{DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME});
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java Wed Sep 9 12:09:19 2015
@@ -81,7 +81,6 @@ public class JobHandlingDistributionQueu
}
-
public DistributionQueueEntry getHead() {
Job firstJob = getFirstJob();
if (firstJob != null) {
@@ -140,7 +139,6 @@ public class JobHandlingDistributionQueu
@Nonnull
public List<DistributionQueueEntry> getItems(int skip, int limit) {
-
List<DistributionQueueEntry> items = new ArrayList<DistributionQueueEntry>();
Collection<Job> jobs = getJobs(skip, limit);
for (Job job : jobs) {
@@ -156,12 +154,10 @@ public class JobHandlingDistributionQueu
public DistributionQueueEntry getItem(@Nonnull String id) {
Job job = getJob(id);
-
if (job != null) {
DistributionQueueItem item = JobHandlingUtils.getItem(job);
DistributionQueueItemStatus status = JobHandlingUtils.getStatus(job);
-
return new DistributionQueueEntry(item, status);
}
@@ -187,6 +183,7 @@ public class JobHandlingDistributionQueu
@Override
+ @Nonnull
public DistributionQueueStatus getStatus() {
List<Job> jobs = getJobs(0, -1);
Job firstJob = jobs.size() > 0 ? jobs.get(0) : null;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java Wed Sep 9 12:09:19 2015
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
import org.apache.sling.distribution.queue.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueException;
@@ -68,7 +67,7 @@ public class JobHandlingDistributionQueu
@Nonnull
public DistributionQueue getQueue(@Nonnull String queueName) throws DistributionQueueException {
String topic = JobHandlingDistributionQueue.DISTRIBUTION_QUEUE_TOPIC + '/' + name + "/" + queueName;
- boolean isActive = jobConsumer != null && (processingQueueNames == null || processingQueueNames.contains(queueName));
+ boolean isActive = jobConsumer != null && (processingQueueNames == null || processingQueueNames.contains(queueName));
return new JobHandlingDistributionQueue(queueName, topic, jobManager, isActive);
}
@@ -93,14 +92,12 @@ public class JobHandlingDistributionQueu
processingQueueNames = new HashSet<String>(Arrays.asList(queueNames));
}
- jobProps.put(JobConsumer.PROPERTY_TOPICS, topicList.toArray(new String[0]));
+ jobProps.put(JobConsumer.PROPERTY_TOPICS, topicList.toArray(new String[topicList.size()]));
log.info("registering job consumer for agent {}", name);
log.info("qp: {}, jp: {}", queueProcessor, jobProps);
jobConsumer = context.registerService(JobConsumer.class.getName(), new DistributionAgentJobConsumer(queueProcessor), jobProps);
log.info("job consumer for agent {} registered", name);
-
-
}
public void disableQueueProcessing() {
@@ -111,8 +108,6 @@ public class JobHandlingDistributionQueu
}
processingQueueNames = null;
log.info("unregistering job consumer for agent {}", name);
-
}
-
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java Wed Sep 9 12:09:19 2015
@@ -35,7 +35,7 @@ public class JobHandlingUtils {
public static DistributionQueueItem getItem(final Job job) {
Map<String, Object> properties = new HashMap<String, Object>();
- for (String key: job.getPropertyNames()) {
+ for (String key : job.getPropertyNames()) {
if (key.startsWith(DISTRIBUTION_PACKAGE_PREFIX)) {
String infoKey = key.substring(DISTRIBUTION_PACKAGE_PREFIX.length());
properties.put(infoKey, job.getProperty(key));
@@ -51,7 +51,7 @@ public class JobHandlingUtils {
Map<String, Object> properties = new HashMap<String, Object>();
for (String key : queueItem.keySet()) {
- properties.put(DISTRIBUTION_PACKAGE_PREFIX + key, queueItem.get(key));
+ properties.put(DISTRIBUTION_PACKAGE_PREFIX + key, queueItem.get(key));
}
properties.put(ID, queueItem.getId());
@@ -83,7 +83,7 @@ public class JobHandlingUtils {
int attempts = job.getRetryCount();
DistributionQueueItemStatus status = new DistributionQueueItemStatus(job.getCreated(),
- attempts > 0 ? DistributionQueueItemState.ERROR: DistributionQueueItemState.QUEUED,
+ attempts > 0 ? DistributionQueueItemState.ERROR : DistributionQueueItemState.QUEUED,
attempts, queueName);
return status;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java Wed Sep 9 12:09:19 2015
@@ -20,7 +20,6 @@ package org.apache.sling.distribution.qu
import org.apache.sling.distribution.queue.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
-import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java Wed Sep 9 12:09:19 2015
@@ -143,8 +143,7 @@ public class SimpleDistributionQueue imp
log.info("item with id {} removed from the queue: {}", id, removed);
if (removed) {
return toRemove;
- }
- else {
+ } else {
return null;
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java Wed Sep 9 12:09:19 2015
@@ -40,13 +40,11 @@ public class SimpleDistributionQueueProv
private final Logger log = LoggerFactory.getLogger(getClass());
-
private final String name;
private final Scheduler scheduler;
private final Map<String, DistributionQueue> queueMap = new ConcurrentHashMap<String, DistributionQueue>();
-
public SimpleDistributionQueueProvider(Scheduler scheduler, String name) {
if (name == null || scheduler == null) {
throw new IllegalArgumentException("all arguments are required");
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionResourceTypes.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionResourceTypes.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionResourceTypes.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionResourceTypes.java Wed Sep 9 12:09:19 2015
@@ -26,7 +26,6 @@ public class DistributionResourceTypes {
public static final String DEFAULT_SETTING_RESOURCE_TYPE = "sling/distribution/setting";
public static final String DEFAULT_SERVICE_RESOURCE_TYPE = "sling/distribution/service";
-
public static final String AGENT_RESOURCE_TYPE = "sling/distribution/service/agent";
public static final String AGENT_LIST_RESOURCE_TYPE = "sling/distribution/service/agent/list";
public static final String AGENT_QUEUE_RESOURCE_TYPE = "sling/distribution/service/agent/queue";
@@ -43,7 +42,4 @@ public class DistributionResourceTypes {
public static final String TRIGGER_RESOURCE_TYPE = "sling/distribution/service/trigger";
public static final String TRIGGER_LIST_RESOURCE_TYPE = "sling/distribution/service/trigger/list";
-
-
-
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java Wed Sep 9 12:09:19 2015
@@ -49,7 +49,6 @@ public class DistributionConfigurationRe
private static final String SETTINGS_RESOURCE_TYPE = DistributionResourceTypes.DEFAULT_SETTING_RESOURCE_TYPE;
-
private final DistributionConfigurationManager configurationManager;
private final DistributionComponentKind kind;
@@ -58,7 +57,6 @@ public class DistributionConfigurationRe
super(resourceRoot);
this.configurationManager = configurationManager;
this.kind = DistributionComponentKind.fromName(kind);
-
}
@Override
@@ -85,8 +83,7 @@ public class DistributionConfigurationRe
protected Map<String, Object> getResourceProperties(SimplePathInfo pathInfo) {
if (pathInfo.isRoot()) {
return getResourceRootProperties();
- }
- else if (pathInfo.isMain()) {
+ } else if (pathInfo.isMain()) {
return getResourceProperties(pathInfo.getMainResourceName());
}
@@ -116,8 +113,6 @@ public class DistributionConfigurationRe
}
-
-
protected Map<String, Object> getResourceProperties(String resourceName) {
String componentName = getConfigName(resourceName);
@@ -139,8 +134,6 @@ public class DistributionConfigurationRe
}
-
-
private String getConfigName(String configName) {
return configName;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProviderFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProviderFactory.java Wed Sep 9 12:09:19 2015
@@ -19,6 +19,8 @@
package org.apache.sling.distribution.resources.impl;
+import java.util.Map;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -37,9 +39,9 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
-
-
+/**
+ * A {@link ResourceProviderFactory} for distribution configuration resources.
+ */
@Component(metatype = true,
label = "Apache Sling Distribution Resources - Configuration Resource Provider Factory",
description = "Distribution Configuration Resource Provider Factory",
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java Wed Sep 9 12:09:19 2015
@@ -27,9 +27,9 @@ import java.util.Map;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.distribution.component.impl.DistributionComponent;
+import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
-import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.resources.impl.common.AbstractReadableResourceProvider;
import org.apache.sling.distribution.resources.impl.common.SimplePathInfo;
@@ -39,14 +39,13 @@ import org.apache.sling.distribution.res
* The main resource contains a list of service properties and can be adapted to the underlying service.
* The accepted path is resourceRoot/{friendlyNameProperty}/childResourceName.
*/
-public class DistributionServiceResourceProvider extends AbstractReadableResourceProvider {
+public class DistributionServiceResourceProvider extends AbstractReadableResourceProvider {
private final DistributionComponentKind kind;
private final DistributionComponentProvider componentProvider;
private static final String SERVICES_RESOURCE_TYPE = DistributionResourceTypes.DEFAULT_SERVICE_RESOURCE_TYPE;
-
public DistributionServiceResourceProvider(String kind,
DistributionComponentProvider componentProvider,
String resourceRoot) {
@@ -55,14 +54,11 @@ public class DistributionServiceResource
this.componentProvider = componentProvider;
}
-
-
@Override
protected Map<String, Object> getResourceProperties(SimplePathInfo pathInfo) {
if (pathInfo.isRoot()) {
return getResourceRootProperties();
- }
- else if (pathInfo.isMain()) {
+ } else if (pathInfo.isMain()) {
return getResourceProperties(pathInfo.getMainResourceName());
} else if (pathInfo.isChild()) {
DistributionComponent component = componentProvider.getComponent(kind, pathInfo.getMainResourceName());
@@ -89,7 +85,6 @@ public class DistributionServiceResource
return null;
}
-
protected Map<String, Object> getResourceProperties(String resourceName) {
DistributionComponent component = componentProvider.getComponent(kind, resourceName);
@@ -127,7 +122,6 @@ public class DistributionServiceResource
}
-
String getResourceType(DistributionComponentKind kind) {
if (DistributionComponentKind.AGENT.equals(kind)) {
return DistributionResourceTypes.AGENT_RESOURCE_TYPE;
@@ -156,13 +150,10 @@ public class DistributionServiceResource
return SERVICES_RESOURCE_TYPE;
}
-
-
protected Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) {
return null;
}
-
protected Iterable<String> getChildResourceChildren(DistributionComponent component, String childResourceName) {
return null;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProviderFactory.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProviderFactory.java Wed Sep 9 12:09:19 2015
@@ -19,6 +19,7 @@
package org.apache.sling.distribution.resources.impl;
+import javax.servlet.http.HttpServletRequest;
import java.util.Iterator;
import java.util.Map;
@@ -34,15 +35,15 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
+import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
-
-
+/**
+ * A {@link org.apache.sling.api.resource.ResourceProviderFactory} for resources backing distribution services.
+ */
@Component(metatype = true,
label = "Apache Sling Distribution Resources - Service Resource Provider Factory",
description = "Distribution Service Resource Provider Factory",
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java Wed Sep 9 12:09:19 2015
@@ -19,6 +19,11 @@
package org.apache.sling.distribution.resources.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.sling.distribution.agent.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentException;
import org.apache.sling.distribution.agent.DistributionAgentState;
@@ -36,12 +41,6 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.resources.impl.common.SimplePathInfo;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Extended service resource provider exposes children resources like .../agents/agentName/queues/queueName/queueItem
*/
@@ -56,23 +55,22 @@ public class ExtendedDistributionService
public ExtendedDistributionServiceResourceProvider(String kind,
- DistributionComponentProvider componentProvider,
- String resourceRoot) {
+ DistributionComponentProvider componentProvider,
+ String resourceRoot) {
super(kind, componentProvider, resourceRoot);
}
@Override
- protected Map<String,Object> getChildResourceProperties(DistributionComponent component, String childResourceName) {
- DistributionComponentKind kind = component.getKind();
+ protected Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) {
+ DistributionComponentKind kind = component.getKind();
if (kind.equals(DistributionComponentKind.AGENT)) {
DistributionAgent agent = (DistributionAgent) component.getService();
if (agent != null && childResourceName != null) {
if (childResourceName.startsWith(QUEUES_PATH)) {
SimplePathInfo queuePathInfo = SimplePathInfo.parsePathInfo(QUEUES_PATH, childResourceName);
- Map<String, Object> result = getQueueProperties(agent, queuePathInfo);
- return result;
+ return getQueueProperties(agent, queuePathInfo);
} else if (childResourceName.startsWith(LOG_PATH)) {
Map<String, Object> result = new HashMap<String, Object>();
result.put(SLING_RESOURCE_TYPE, DistributionResourceTypes.LOG_RESOURCE_TYPE);
@@ -97,7 +95,7 @@ public class ExtendedDistributionService
@Override
protected Iterable<String> getChildResourceChildren(DistributionComponent component, String childResourceName) {
- DistributionComponentKind kind = component.getKind();
+ DistributionComponentKind kind = component.getKind();
if (kind.equals(DistributionComponentKind.AGENT)) {
DistributionAgent agent = (DistributionAgent) component.getService();
@@ -115,7 +113,7 @@ public class ExtendedDistributionService
return null;
}
- private Map<String,Object> getQueueProperties(DistributionAgent agent, SimplePathInfo queueInfo) {
+ private Map<String, Object> getQueueProperties(DistributionAgent agent, SimplePathInfo queueInfo) {
if (queueInfo.isRoot()) {
Map<String, Object> result = new HashMap<String, Object>();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java Wed Sep 9 12:09:19 2015
@@ -55,14 +55,12 @@ public class OsgiUtils {
if (entry.getValue() == null) {
result += safeString(entry.getValue());
- }
- else if (entry.getValue().getClass().isArray()) {
+ } else if (entry.getValue().getClass().isArray()) {
Object[] array = (Object[]) entry.getValue();
for (Object obj : array) {
result += safeString(obj) + ",";
}
- }
- else {
+ } else {
result += safeString(entry.getValue());
}
@@ -73,7 +71,7 @@ public class OsgiUtils {
}
private static String safeString(Object obj) {
- return obj == null? "null" : obj.toString();
+ return obj == null ? "null" : obj.toString();
}
@@ -81,7 +79,7 @@ public class OsgiUtils {
* Create a filter for selecting configs of a certain factory
*/
public static String getFilter(String configFactory, String propertyName, String propertyValue) {
- if (propertyName!= null && propertyValue != null) {
+ if (propertyName != null && propertyValue != null) {
return "(&(" + ConfigurationAdmin.SERVICE_FACTORYPID + "=" + OsgiUtils.escape(configFactory) + ")("
+ OsgiUtils.escape(propertyName) + "=" + OsgiUtils.escape(propertyValue) + "))";
} else if (configFactory != null) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java Wed Sep 9 12:09:19 2015
@@ -18,7 +18,6 @@
*/
package org.apache.sling.distribution.resources.impl.common;
-
import javax.jcr.Session;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,6 +29,9 @@ import org.apache.sling.api.resource.Per
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+/**
+ * a modifying {@link org.apache.sling.api.resource.ResourceProvider} for distribution.
+ */
public abstract class AbstractModifyingResourceProvider extends AbstractReadableResourceProvider
implements ModifyingResourceProvider {
@@ -56,14 +58,11 @@ public abstract class AbstractModifyingR
boolean added = addToChangedResources(resourceName, properties, true);
-
if (!added) {
throw new PersistenceException("Resource already exists at " + path, null, resourceName, null);
}
- Resource resource = buildMainResource(resolver, pathInfo, properties);
-
- return resource;
+ return buildMainResource(resolver, pathInfo, properties);
}
public void delete(ResourceResolver resolver, String requestPath) throws PersistenceException {
@@ -164,7 +163,6 @@ public abstract class AbstractModifyingR
}
-
protected abstract void save(ResourceResolver resourceResolver,
Map<String, Map<String, Object>> changedResources,
Set<String> deletedResources) throws PersistenceException;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java Wed Sep 9 12:09:19 2015
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.resources.impl.common;
-
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +33,9 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
+/**
+ * a readable {@link ResourceProvider} for distribution.
+ */
public abstract class AbstractReadableResourceProvider implements ResourceProvider {
protected static final String INTERNAL_ADAPTABLE = "internal:adaptable";
@@ -43,7 +45,6 @@ public abstract class AbstractReadableRe
protected static final String ITEMS = "items";
-
protected static final String SLING_RESOURCE_TYPE = "sling:resourceType";
protected final String resourceRoot;
@@ -95,8 +96,6 @@ public abstract class AbstractReadableRe
}
-
-
SimplePathInfo extractPathInfo(String path) {
return SimplePathInfo.parsePathInfo(resourceRoot, path);
}
@@ -164,7 +163,7 @@ public abstract class AbstractReadableRe
childResource = buildMainResource(resourceResolver, childPathInfo, childProperties);
} else {
- childResource = getResource(resourceResolver, path + "/" + childResourceName);
+ childResource = getResource(resourceResolver, path + "/" + childResourceName);
}
resourceList.add(childResource);
@@ -176,6 +175,7 @@ public abstract class AbstractReadableRe
protected abstract Map<String, Object> getResourceProperties(SimplePathInfo pathInfo);
+
protected abstract Iterable<String> getResourceChildren(SimplePathInfo pathInfo);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResource.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResource.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResource.java Wed Sep 9 12:09:19 2015
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.resources.impl.common;
-
import java.lang.reflect.Array;
import java.util.Map;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java Wed Sep 9 12:09:19 2015
@@ -110,7 +110,7 @@ public abstract class AbstractDistributi
} else if (DistributionRequestType.TEST.equals(actionType)) {
// do nothing for test packages
installed = true;
- } else if (DistributionRequestType.ADD.equals(actionType)) {
+ } else if (DistributionRequestType.ADD.equals(actionType)) {
installed = installPackageInternal(resourceResolver, distributionPackage);
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java Wed Sep 9 12:09:19 2015
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.distribution.serialization.impl;
-
+import java.util.List;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -30,8 +29,6 @@ import org.apache.sling.distribution.com
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import org.apache.sling.distribution.serialization.DistributionPackageBuilderProvider;
-import java.util.List;
-
@Component
@Service(DistributionPackageBuilderProvider.class)
public class DefaultDistributionPackageBuilderProvider implements DistributionPackageBuilderProvider {
@@ -41,12 +38,10 @@ public class DefaultDistributionPackageB
public DistributionPackageBuilder getPackageBuilder(String type) {
List<DistributionComponent> componentList = componentProvider.getComponents(DistributionComponentKind.PACKAGE_BUILDER);
- DistributionPackageBuilder packageBuilder = filterPackageBuildersByType(componentList, type);
- return packageBuilder;
+ return filterPackageBuildersByType(componentList, type);
}
-
private static DistributionPackageBuilder filterPackageBuildersByType(List<DistributionComponent> componentList, String type) {
if (type == null) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageWrapper.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageWrapper.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageWrapper.java Wed Sep 9 12:09:19 2015
@@ -20,17 +20,17 @@
package org.apache.sling.distribution.serialization.impl;
-import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-
import javax.annotation.Nonnull;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
+
/**
* Package wrapper meant to be extended and provide just simple overridden methods.
*/
-public class DistributionPackageWrapper implements DistributionPackage {
+public class DistributionPackageWrapper implements DistributionPackage {
protected final DistributionPackage distributionPackage;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java Wed Sep 9 12:09:19 2015
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
-import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -36,10 +35,9 @@ import org.slf4j.LoggerFactory;
public class ResourceSharedDistributionPackage implements SharedDistributionPackage {
private final Logger log = LoggerFactory.getLogger(getClass());
- protected static final String REFERENCE_ROOT_NODE = "refs";
+ protected static final String REFERENCE_ROOT_NODE = "refs";
private final Object lock;
-
private final ResourceResolver resourceResolver;
private final String packagePath;
private final DistributionPackage distributionPackage;
@@ -57,11 +55,11 @@ public class ResourceSharedDistributionP
if (holderName.length() == 0) {
throw new IllegalArgumentException("holder name cannot be null or empty");
}
-
+
try {
createHolderResource(holderName);
- log.debug("acquired package {} for holder {}", new Object[] { packagePath, holderName } );
+ log.debug("acquired package {} for holder {}", new Object[]{packagePath, holderName});
} catch (PersistenceException e) {
log.error("cannot acquire package", e);
@@ -83,14 +81,13 @@ public class ResourceSharedDistributionP
distributionPackage.delete();
}
- log.debug("released package {} from holder {} delete {}", new Object[] { packagePath, holderName, doPackageDelete } );
+ log.debug("released package {} from holder {} delete {}", new Object[]{packagePath, holderName, doPackageDelete});
} catch (PersistenceException e) {
log.error("cannot release package", e);
}
}
-
@Nonnull
public String getId() {
return packageName;
@@ -140,7 +137,7 @@ public class ResourceSharedDistributionP
}
- private Resource getHolderRootResource() {
+ private Resource getHolderRootResource() {
Resource resource = getProxyResource();
Resource holderRoot = resource.getChild(REFERENCE_ROOT_NODE);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java Wed Sep 9 12:09:19 2015
@@ -74,8 +74,7 @@ public class ResourceSharedDistributionP
try {
packageName = generateNameFromId(resourceResolver, distributionPackage);
- }
- catch (PersistenceException e) {
+ } catch (PersistenceException e) {
DistributionPackageUtils.deleteSafely(distributionPackage);
throw new DistributionPackageBuildingException(e);
}
@@ -97,8 +96,7 @@ public class ResourceSharedDistributionP
try {
packageName = generateNameFromId(resourceResolver, distributionPackage);
- }
- catch (PersistenceException e) {
+ } catch (PersistenceException e) {
DistributionPackageUtils.deleteSafely(distributionPackage);
throw new DistributionPackageReadingException(e);
}
@@ -128,7 +126,7 @@ public class ResourceSharedDistributionP
}
public boolean installPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException {
- if (! (distributionPackage instanceof ResourceSharedDistributionPackage)) {
+ if (!(distributionPackage instanceof ResourceSharedDistributionPackage)) {
return false;
}
@@ -139,9 +137,9 @@ public class ResourceSharedDistributionP
}
- private String generateNameFromId(ResourceResolver resourceResolver, DistributionPackage distributionPackage) throws PersistenceException {
+ private String generateNameFromId(ResourceResolver resourceResolver, DistributionPackage distributionPackage) throws PersistenceException {
- String name = PACKAGE_NAME_PREFIX + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID();
+ String name = PACKAGE_NAME_PREFIX + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID();
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(PN_ORIGINAL_ID, distributionPackage.getId());
@@ -165,7 +163,7 @@ public class ResourceSharedDistributionP
synchronized (repolock) {
resourceResolver.create(resource, ResourceSharedDistributionPackage.REFERENCE_ROOT_NODE,
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"sling:Folder"));
+ Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object) "sling:Folder"));
resourceResolver.commit();
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackage.java Wed Sep 9 12:09:19 2015
@@ -43,15 +43,10 @@ public class SimpleDistributionPackage e
private final static String DELIM = "|";
private final static String PATH_DELIM = ",";
- private final String[] paths;
-
- private final DistributionRequestType requestType;
-
-
public SimpleDistributionPackage(DistributionRequest request, String type) {
super(toIdString(request, type), type);
- this.paths = request.getPaths();
- this.requestType = request.getRequestType();
+ String[] paths = request.getPaths();
+ DistributionRequestType requestType = request.getRequestType();
this.getInfo().put(DistributionPackageInfo.PROPERTY_REQUEST_PATHS, paths);
this.getInfo().put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, requestType);
@@ -68,12 +63,10 @@ public class SimpleDistributionPackage e
String[] paths = request.getPaths();
- if (paths == null || paths.length == 0) {
- // do nothing
- } else {
+ if (paths != null && paths.length != 0) {
for (int i = 0; i < paths.length; i++) {
b.append(paths[i]);
- if (i < paths.length-1) {
+ if (i < paths.length - 1) {
b.append(PATH_DELIM);
}
}
@@ -89,10 +82,9 @@ public class SimpleDistributionPackage e
id = id.substring(PACKAGE_START.length());
-
String[] parts = id.split(Pattern.quote(DELIM));
- if (parts.length < 1 || parts.length > 2) {
+ if (parts.length < 1 || parts.length > 2) {
return null;
}
@@ -104,7 +96,7 @@ public class SimpleDistributionPackage e
SimpleDistributionPackage distributionPackage = null;
if (distributionRequestType != null) {
- String[] paths = pathsString == null ? null : pathsString.split(PATH_DELIM);
+ String[] paths = pathsString == null ? null : pathsString.split(PATH_DELIM);
DistributionRequest request = new SimpleDistributionRequest(distributionRequestType, paths);
distributionPackage = new SimpleDistributionPackage(request, type);
@@ -120,8 +112,6 @@ public class SimpleDistributionPackage e
}
-
-
public void close() {
// there's nothing to close
}
@@ -135,7 +125,7 @@ public class SimpleDistributionPackage e
return getId();
}
- public static SimpleDistributionPackage fromStream(InputStream stream, String type) {
+ public static SimpleDistributionPackage fromStream(InputStream stream, String type) {
try {
int size = SimpleDistributionPackage.PACKAGE_START.getBytes("UTF-8").length;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackage.java Wed Sep 9 12:09:19 2015
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.serialization.impl.vlt;
import javax.annotation.Nonnull;
-import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -55,7 +54,6 @@ public class FileVaultDistributionPackag
return new FileInputStream(pkg.getFile());
}
-
public void close() {
pkg.close();
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java Wed Sep 9 12:09:19 2015
@@ -21,20 +21,17 @@ package org.apache.sling.distribution.se
import javax.annotation.Nonnull;
import javax.jcr.Session;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.TreeMap;
import java.util.UUID;
-import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.ImportMode;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
import org.apache.jackrabbit.vault.packaging.ExportOptions;
-import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.Packaging;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.api.resource.ResourceResolver;
@@ -70,7 +67,6 @@ public class FileVaultDistributionPackag
private final File tempDirectory;
private final TreeMap<String, PathFilterSet> filters;
-
public FileVaultDistributionPackageBuilder(String type, Packaging packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] packageRoots, String[] filterRules, String tempFilesFolder) {
super(type);
this.packaging = packaging;
@@ -94,7 +90,7 @@ public class FileVaultDistributionPackag
session = getSession(resourceResolver);
String packageGroup = "sling/distribution";
- String packageName = getType() + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID();
+ String packageName = getType() + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID();
WorkspaceFilter filter = VltUtils.createFilter(request, filters);
ExportOptions opts = VltUtils.getExportOptions(filter, packageRoots, packageGroup, packageName, VERSION);
@@ -127,7 +123,6 @@ public class FileVaultDistributionPackag
}
}
-
@Override
protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull String id) {
DistributionPackage distributionPackage = null;
@@ -143,7 +138,6 @@ public class FileVaultDistributionPackag
return distributionPackage;
}
-
@Override
public boolean installPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException {
log.debug("reading a distribution package stream");
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java?rev=1701984&r1=1701983&r2=1701984&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackage.java Wed Sep 9 12:09:19 2015
@@ -18,13 +18,11 @@
*/
package org.apache.sling.distribution.serialization.impl.vlt;
-import java.io.IOException;
-import java.io.InputStream;
-
import javax.annotation.Nonnull;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import java.io.IOException;
+import java.io.InputStream;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.sling.distribution.DistributionRequestType;
@@ -33,6 +31,7 @@ import org.apache.sling.distribution.pac
import org.apache.sling.distribution.serialization.impl.AbstractDistributionPackage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* a JcrPackage based {@link org.apache.sling.distribution.packaging.DistributionPackage}
*/