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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -26,7 +26,6 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.PropertyOption; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.ResourceResolver; @@ -61,18 +60,19 @@ public class RemoteDistributionPackageIm * name of this importer. */ @Property(label = "Name", description = "The name of the importer.") - public static final String NAME = DistributionComponentConstants.PN_NAME; + private static final String NAME = DistributionComponentConstants.PN_NAME; /** * endpoints property */ @Property(cardinality = 100, label = "Endpoints", description = "The list of endpoints to which the packages will be imported.") - public static final String ENDPOINTS = "endpoints"; + private static final String ENDPOINTS = "endpoints"; @Property(name = "transportSecretProvider.target", label = "Transport Secret Provider", description = "The target reference for the DistributionTransportSecretProvider used to obtain the credentials used for accessing the remote endpoints, " + "e.g. use target=(name=...) to bind to services by name.") @Reference(name = "transportSecretProvider") + private DistributionTransportSecretProvider transportSecretProvider; private DistributionPackageImporter importer;
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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -99,6 +99,7 @@ public class RepositoryDistributionPacka } } + @Nonnull public DistributionPackageInfo importStream(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionException { throw new DistributionException("not supported"); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java Mon Jan 18 11:29:58 2016 @@ -35,5 +35,5 @@ public interface DistributionQueueProces * @param queueEntry the {@link org.apache.sling.distribution.queue.DistributionQueueEntry} to be processed * @return {@code true} if the item was successfully processed, {@code false} otherwise */ - public boolean process(@Nonnull String queueName, @Nonnull DistributionQueueEntry queueEntry); + boolean process(@Nonnull String queueName, @Nonnull DistributionQueueEntry queueEntry); } 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -23,9 +23,9 @@ package org.apache.sling.distribution.qu * The status of a certain {@link DistributionQueue} */ public final class DistributionQueueStatus { - final int itemsCount; + private final int itemsCount; - final DistributionQueueState queueState; + private final DistributionQueueState queueState; public DistributionQueueStatus(int itemsCount, DistributionQueueState queueState) { this.itemsCount = itemsCount; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java Mon Jan 18 11:29:58 2016 @@ -26,7 +26,7 @@ import org.apache.sling.distribution.que import javax.annotation.Nonnull; public abstract class DistributionQueueWrapper implements DistributionQueue { - protected final DistributionQueue wrappedQueue; + private final DistributionQueue wrappedQueue; public DistributionQueueWrapper(DistributionQueue wrappedQueue) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java Mon Jan 18 11:29:58 2016 @@ -36,14 +36,13 @@ public class PriorityQueueDispatchingStr private final Map<String, String> selectors; private final List<String> mainQueues; - private final Map<String, String> selectorQueues; private final List<String> allQueues = new ArrayList<String>(); public PriorityQueueDispatchingStrategy(Map<String, String> selectors, String[] queueNames) { this.selectors = selectors; this.mainQueues = Arrays.asList(queueNames); - this.selectorQueues = getMatchingQueues(null); + Map<String, String> selectorQueues = getMatchingQueues(null); this.allQueues.addAll(mainQueues); this.allQueues.addAll(selectorQueues.keySet()); } @@ -55,9 +54,10 @@ public class PriorityQueueDispatchingStr DistributionQueueDispatchingStrategy dispatchingStrategy = null; if (matchingQueues.size() > 0) { - dispatchingStrategy = new MultipleQueueDispatchingStrategy(matchingQueues.keySet().toArray(new String[0])); + java.util.Set<String> var = matchingQueues.keySet(); + dispatchingStrategy = new MultipleQueueDispatchingStrategy(var.toArray(new String[var.size()])); } else { - dispatchingStrategy = new MultipleQueueDispatchingStrategy(mainQueues.toArray(new String[0])); + dispatchingStrategy = new MultipleQueueDispatchingStrategy(mainQueues.toArray(new String[mainQueues.size()])); } return dispatchingStrategy.add(distributionPackage, queueProvider); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java Mon Jan 18 11:29:58 2016 @@ -43,12 +43,16 @@ class DistributionAgentJobConsumer imple log.debug("processing job {}", job.getId()); String queueName = JobHandlingUtils.getQueueName(job); DistributionQueueEntry entry = JobHandlingUtils.getEntry(job); - DistributionQueueItem item = entry.getItem(); - log.debug("processing item {} in queue {}", item.getId(), queueName); - boolean processingResult = queueProcessor.process(queueName, entry); - JobResult jobResult = processingResult ? JobResult.OK : JobResult.FAILED; - log.debug("item {} processed {}", item.getId(), jobResult); - return jobResult; + boolean processingResult = false; + if (entry != null) { + DistributionQueueItem item = entry.getItem(); + log.debug("processing item {} in queue {}", item.getId(), queueName); + processingResult = queueProcessor.process(queueName, entry); + log.debug("item {} processed {}", item.getId()); + } else { + log.warn("no entry for job {}", job.getId()); + } + return processingResult ? JobResult.OK : JobResult.FAILED; } } 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -18,6 +18,8 @@ */ package org.apache.sling.distribution.queue.impl.jobhandling; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -30,7 +32,7 @@ import org.apache.sling.event.jobs.Job; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JobHandlingUtils { +class JobHandlingUtils { private final static Logger log = LoggerFactory.getLogger(JobHandlingUtils.class); @@ -79,6 +81,7 @@ public class JobHandlingUtils { return properties; } + @Nonnull public static String getQueueName(Job job) { String topic = job.getTopic(); @@ -96,13 +99,12 @@ public class JobHandlingUtils { String queueName = getQueueName(job); int attempts = job.getRetryCount(); - DistributionQueueItemStatus status = new DistributionQueueItemStatus(job.getCreated(), + return new DistributionQueueItemStatus(job.getCreated(), attempts > 0 ? DistributionQueueItemState.ERROR : DistributionQueueItemState.QUEUED, attempts, queueName); - - return status; } + @CheckForNull public static DistributionQueueEntry getEntry(final Job job) { DistributionQueueItem item = getItem(job); DistributionQueueItemStatus itemStatus = getStatus(job); 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -103,12 +103,13 @@ public class SimpleDistributionQueue imp } @Nonnull - public DistributionQueueState getState() { + private DistributionQueueState getState() { DistributionQueueItem firstItem = queue.peek(); DistributionQueueItemStatus firstItemStatus = firstItem != null ? statusMap.get(firstItem) : null; return DistributionQueueUtils.calculateState(firstItem, firstItemStatus); } + @Nonnull @Override public DistributionQueueStatus getStatus() { return new DistributionQueueStatus(queue.size(), getState()); 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -95,7 +95,7 @@ public class DistributionConfigurationRe return null; } - protected Map<String, Object> getResourceRootProperties() { + private Map<String, Object> getResourceRootProperties() { List<DistributionConfiguration> configsList = configurationManager.getConfigs(kind); List<String> nameList = new ArrayList<String>(); @@ -113,7 +113,7 @@ public class DistributionConfigurationRe } - protected Map<String, Object> getResourceProperties(String resourceName) { + private Map<String, Object> getResourceProperties(String resourceName) { String componentName = getConfigName(resourceName); @@ -138,7 +138,7 @@ public class DistributionConfigurationRe return configName; } - String getResourceType(DistributionComponentKind kind) { + private String getResourceType(DistributionComponentKind kind) { return SETTINGS_RESOURCE_TYPE; } 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -58,9 +58,10 @@ public class DistributionConfigurationRe private final Logger log = LoggerFactory.getLogger(getClass()); @Property - public final static String KIND = DistributionComponentConstants.PN_KIND; + private final static String KIND = DistributionComponentConstants.PN_KIND; @Reference + private DistributionConfigurationManager configurationManager; private String resourceRoot; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -46,9 +46,9 @@ public class DistributionServiceResource private static final String SERVICES_RESOURCE_TYPE = DistributionResourceTypes.DEFAULT_SERVICE_RESOURCE_TYPE; - public DistributionServiceResourceProvider(String kind, - DistributionComponentProvider componentProvider, - String resourceRoot) { + DistributionServiceResourceProvider(String kind, + DistributionComponentProvider componentProvider, + String resourceRoot) { super(resourceRoot); this.kind = DistributionComponentKind.fromName(kind); this.componentProvider = componentProvider; @@ -85,7 +85,7 @@ public class DistributionServiceResource return null; } - protected Map<String, Object> getResourceProperties(String resourceName) { + private Map<String, Object> getResourceProperties(String resourceName) { DistributionComponent component = componentProvider.getComponent(kind, resourceName); @@ -103,7 +103,7 @@ public class DistributionServiceResource return null; } - protected Map<String, Object> getResourceRootProperties() { + private Map<String, Object> getResourceRootProperties() { List<DistributionComponent> componentList = componentProvider.getComponents(kind); @@ -122,7 +122,7 @@ public class DistributionServiceResource } - String getResourceType(DistributionComponentKind kind) { + private String getResourceType(DistributionComponentKind kind) { if (DistributionComponentKind.AGENT.equals(kind)) { return DistributionResourceTypes.AGENT_RESOURCE_TYPE; } else if (DistributionComponentKind.IMPORTER.equals(kind)) { @@ -136,7 +136,7 @@ public class DistributionServiceResource return SERVICES_RESOURCE_TYPE; } - String getRootResourceType(DistributionComponentKind kind) { + private String getRootResourceType(DistributionComponentKind kind) { if (DistributionComponentKind.AGENT.equals(kind)) { return DistributionResourceTypes.AGENT_LIST_RESOURCE_TYPE; } else if (DistributionComponentKind.IMPORTER.equals(kind)) { @@ -150,11 +150,11 @@ public class DistributionServiceResource return SERVICES_RESOURCE_TYPE; } - protected Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) { + Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) { return null; } - protected Iterable<String> getChildResourceChildren(DistributionComponent component, String childResourceName) { + 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -61,9 +61,10 @@ public class DistributionServiceResource @Property - public final static String KIND = DistributionComponentConstants.PN_KIND; + private final static String KIND = DistributionComponentConstants.PN_KIND; @Reference + private DistributionComponentProvider componentProvider; private ResourceProvider resourceProvider; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -151,7 +151,7 @@ public class ExtendedDistributionService propertiesMap.put(entry.getItem().getId(), getItemProperties(entry)); } - result.put(ITEMS, nameList.toArray(new String[0])); + result.put(ITEMS, nameList.toArray(new String[nameList.size()])); result.put(INTERNAL_ITEMS_PROPERTIES, propertiesMap); result.put(INTERNAL_ADAPTABLE, queue); } @@ -179,7 +179,7 @@ public class ExtendedDistributionService } - Map<String, Object> getItemProperties(DistributionQueueEntry entry) { + private Map<String, Object> getItemProperties(DistributionQueueEntry entry) { Map<String, Object> result = new HashMap<String, Object>(); 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -140,7 +140,7 @@ public abstract class AbstractModifyingR return true; } - protected Map<String, Object> getMainResourceProperties(String resourceName) { + private Map<String, Object> getMainResourceProperties(String resourceName) { if (deletedResources.contains(resourceName)) { return null; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -47,7 +47,7 @@ public abstract class AbstractReadableRe protected static final String SLING_RESOURCE_TYPE = "sling:resourceType"; - protected final String resourceRoot; + final String resourceRoot; protected AbstractReadableResourceProvider(String resourceRoot) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java Mon Jan 18 11:29:58 2016 @@ -20,7 +20,6 @@ package org.apache.sling.distribution.se import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import java.net.URI; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -40,23 +39,23 @@ public final class DistributionPackageIn /** * distribution package type */ - public static String PROPERTY_PACKAGE_TYPE = "package.type"; + public static final String PROPERTY_PACKAGE_TYPE = "package.type"; /** * distribution request paths */ - public static String PROPERTY_REQUEST_PATHS = "request.paths"; + public static final String PROPERTY_REQUEST_PATHS = "request.paths"; /** * distribution request deep paths */ - public static String PROPERTY_REQUEST_DEEP_PATHS = "request.deepPaths"; + public static final String PROPERTY_REQUEST_DEEP_PATHS = "request.deepPaths"; /** * distribution request type */ - public static String PROPERTY_REQUEST_TYPE = "request.type"; + public static final String PROPERTY_REQUEST_TYPE = "request.type"; /** 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -31,7 +31,6 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.common.DistributionException; import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; import org.apache.sling.distribution.serialization.DistributionPackageBuilder; import org.apache.sling.distribution.serialization.impl.vlt.VltUtils; import org.apache.sling.distribution.util.DistributionJcrUtils; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -34,6 +34,7 @@ import org.apache.sling.distribution.ser public class DefaultDistributionPackageBuilderProvider implements DistributionPackageBuilderProvider { @Reference + private DistributionComponentProvider componentProvider; public DistributionPackageBuilder getPackageBuilder(String type) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackage.java Mon Jan 18 11:29:58 2016 @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public class DefaultSharedDistributionPackage implements SharedDistributionPackage { private final Logger log = LoggerFactory.getLogger(getClass()); - protected static final String REFERENCE_ROOT_NODE = "refs"; + static final String REFERENCE_ROOT_NODE = "refs"; private final Object lock; private final ResourceResolver resourceResolver; @@ -136,8 +136,7 @@ public class DefaultSharedDistributionPa String holderPath = packagePath; resourceResolver.refresh(); - Resource resource = resourceResolver.getResource(holderPath); - return resource; + return resourceResolver.getResource(holderPath); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultSharedDistributionPackageBuilder.java Mon Jan 18 11:29:58 2016 @@ -191,8 +191,7 @@ public class DefaultSharedDistributionPa } private String getPathFromName(String name) { - String packagePath = sharedPackagesRoot + "/" + name; - return packagePath; + return sharedPackagesRoot + "/" + name; } private String retrieveIdFromName(ResourceResolver resourceResolver, String name) { 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -33,7 +33,7 @@ import org.apache.sling.distribution.ser public class DistributionPackageWrapper implements DistributionPackage { - protected final DistributionPackage wrappedPackage; + private final DistributionPackage wrappedPackage; protected DistributionPackageWrapper(DistributionPackage wrappedPackage) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/SharedDistributionPackage.java Mon Jan 18 11:29:58 2016 @@ -20,7 +20,6 @@ package org.apache.sling.distribution.se import javax.annotation.Nonnull; -import aQute.bnd.annotation.ConsumerType; import aQute.bnd.annotation.ProviderType; import org.apache.sling.distribution.serialization.DistributionPackage; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; */ public class SimpleDistributionPackage extends AbstractDistributionPackage implements DistributionPackage { - static Logger log = LoggerFactory.getLogger(SimpleDistributionPackage.class); + private static final Logger log = LoggerFactory.getLogger(SimpleDistributionPackage.class); private final static String PACKAGE_START = "DSTRPCK:"; private final static String DELIM = "|"; @@ -54,7 +54,7 @@ public class SimpleDistributionPackage e this.size = getId().toCharArray().length; } - public static String toIdString(DistributionRequest request, String type) { + private static String toIdString(DistributionRequest request, String type) { StringBuilder b = new StringBuilder(); 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; */ public class FileVaultDistributionPackage extends AbstractDistributionPackage implements DistributionPackage { - Logger log = LoggerFactory.getLogger(FileVaultDistributionPackage.class); + private final Logger log = LoggerFactory.getLogger(FileVaultDistributionPackage.class); private final VaultPackage pkg; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -28,7 +28,6 @@ import java.util.TreeMap; import java.util.UUID; 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; @@ -59,9 +58,9 @@ public class FileVaultDistributionPackag private final Packaging packaging; - private ImportMode importMode; + private final ImportMode importMode; - private AccessControlHandling aclHandling; + private final AccessControlHandling aclHandling; private final String[] packageRoots; private final File tempDirectory; 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=1725236&r1=1725235&r2=1725236&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 Mon Jan 18 11:29:58 2016 @@ -36,7 +36,8 @@ import org.slf4j.LoggerFactory; * a JcrPackage based {@link DistributionPackage} */ public class JcrVaultDistributionPackage extends AbstractDistributionPackage implements DistributionPackage { - private final Logger log = LoggerFactory.getLogger(getClass()); + + private static final Logger log = LoggerFactory.getLogger(JcrVaultDistributionPackage.class); private final JcrPackage jcrPackage; private final Session session; @@ -57,11 +58,11 @@ public class JcrVaultDistributionPackage } - public static String getIdFromPackage(JcrPackage jcrPackage) { + private static String getIdFromPackage(JcrPackage jcrPackage) { try { return jcrPackage.getPackage().getId().getName(); - } catch (RepositoryException e) { - } catch (IOException e) { + } catch (Exception e) { + log.warn("could not get package {}", jcrPackage, e); } return null; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java Mon Jan 18 11:29:58 2016 @@ -36,7 +36,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.commons.JcrUtils; 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; @@ -71,8 +70,8 @@ public class JcrVaultDistributionPackage private static final String PACKAGE_GROUP = "sling/distribution"; private final Packaging packaging; - private ImportMode importMode; - private AccessControlHandling aclHandling; + private final ImportMode importMode; + private final AccessControlHandling aclHandling; private final String[] packageRoots; private final String tempPackagesNode; private final File tempDirectory; @@ -190,8 +189,6 @@ public class JcrVaultDistributionPackage InputStream in = FileUtils.openInputStream(pack.getFile()); - - try { String packageName = packageId.getDownloadName(); if (packageRoot.hasNode(packageName)) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Mon Jan 18 11:29:58 2016 @@ -60,7 +60,7 @@ public class VaultDistributionPackageBui * name of this package builder. */ @Property(label = "Name", description = "The name of the package builder.") - public static final String NAME = DistributionComponentConstants.PN_NAME; + private static final String NAME = DistributionComponentConstants.PN_NAME; /** @@ -74,39 +74,39 @@ public class VaultDistributionPackageBui value = "file packages" )}, value = "jcrvlt", label = "type", description = "The type of this package builder") - public static final String TYPE = DistributionComponentConstants.PN_TYPE; + private static final String TYPE = DistributionComponentConstants.PN_TYPE; /** * import mode property for file vault package builder */ @Property(label = "Import Mode", description = "The vlt import mode for created packages.") - public static final String IMPORT_MODE = "importMode"; + private static final String IMPORT_MODE = "importMode"; /** * ACL handling property for file vault package builder */ @Property(label = "Acl Handling", description = "The vlt acl handling mode for created packages.") - public static final String ACL_HANDLING = "aclHandling"; + private static final String ACL_HANDLING = "aclHandling"; /** * Package roots */ @Property(label = "Package Roots", description = "The package roots to be used for created packages. (this is useful for assembling packages with an user that cannot read above the package root)") - public static final String PACKAGE_ROOTS = "package.roots"; + private static final String PACKAGE_ROOTS = "package.roots"; /** * Package filters */ @Property(label = "Package Filters", description = "The package path filters. Filter format: path|+include|-exclude", cardinality = 100) - public static final String PACKAGE_FILTERS = "package.filters"; + private static final String PACKAGE_FILTERS = "package.filters"; /** * Temp file folder */ @Property(label = "Temp Filesystem Folder", description = "The filesystem folder where the temporary files should be saved.") - public static final String TEMP_FS_FOLDER = "tempFsFolder"; + private static final String TEMP_FS_FOLDER = "tempFsFolder"; @Reference private Packaging packaging; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java Mon Jan 18 11:29:58 2016 @@ -38,9 +38,7 @@ import java.util.TreeMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.util.Text; import org.apache.jackrabbit.vault.fs.api.ImportMode; -import org.apache.jackrabbit.vault.fs.api.PathFilter; import org.apache.jackrabbit.vault.fs.api.PathFilterSet; import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter; import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf; @@ -65,7 +63,7 @@ import org.slf4j.LoggerFactory; */ public class VltUtils { - final static Logger log = LoggerFactory.getLogger(VltUtils.class); + private final static Logger log = LoggerFactory.getLogger(VltUtils.class); public static WorkspaceFilter createFilter(DistributionRequest distributionRequest, NavigableMap<String, List<String>> filters) { DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter(); @@ -105,7 +103,6 @@ public class VltUtils { filterSet.addInclude(new DefaultPathFilter(path)); } - List<String> patterns = new ArrayList<String>(); // add the most specific filter rules @@ -116,11 +113,7 @@ public class VltUtils { } } - String[] requestFilters = distributionRequest.getFilters(path); - - if (requestFilters != null) { - patterns.addAll(Arrays.asList(requestFilters)); - } + patterns.addAll(Arrays.asList(distributionRequest.getFilters(path))); for (String pattern : patterns) { PathFilterSet.Entry<DefaultPathFilter> entry = extractPathPattern(pattern); @@ -350,8 +343,6 @@ public class VltUtils { List<String> paths = new ArrayList<String>(); Map<String, String[]> filters = new HashMap<String, String[]>(); - - for (String path : request.getPaths()) { if (VltUtils.findParent(path, "rep:policy") != null) { if (DistributionRequestType.DELETE.equals(requestType)) { @@ -373,11 +364,10 @@ public class VltUtils { filters.put(path, request.getFilters(path)); } - return new SimpleDistributionRequest(requestType, paths.toArray(new String[0]), deepPaths, filters); + return new SimpleDistributionRequest(requestType, paths.toArray(new String[paths.size()]), deepPaths, filters); } - - public static PathFilterSet.Entry<DefaultPathFilter> extractPathPattern(String pattern) { + private static PathFilterSet.Entry<DefaultPathFilter> extractPathPattern(String pattern) { PathFilterSet.Entry<DefaultPathFilter> result = null; if (pattern.startsWith("+")) { result = new PathFilterSet.Entry<DefaultPathFilter>(new DefaultPathFilter(pattern.substring(1)), true); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java Mon Jan 18 11:29:58 2016 @@ -25,7 +25,6 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.sling.SlingServlet; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; -import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.servlets.SlingAllMethodsServlet; import org.apache.sling.distribution.agent.DistributionAgent; @@ -51,6 +50,7 @@ public class DistributionAgentQueueServl private final Logger log = LoggerFactory.getLogger(getClass()); @Reference + private DistributionPackageBuilderProvider packageBuilderProvider; @Override @@ -128,20 +128,20 @@ public class DistributionAgentQueueServl } } - protected void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, int limit) { + private void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, int limit) { for (DistributionQueueEntry item : queue.getItems(0, limit)) { deleteItem(resourceResolver, queue, item); } } - protected void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, String[] ids) { + private void deleteItems(ResourceResolver resourceResolver, DistributionQueue queue, String[] ids) { for (String id : ids) { DistributionQueueEntry entry = queue.getItem(id); deleteItem(resourceResolver, queue, entry); } } - protected void deleteItem(ResourceResolver resourceResolver, DistributionQueue queue, DistributionQueueEntry entry) { + private void deleteItem(ResourceResolver resourceResolver, DistributionQueue queue, DistributionQueueEntry entry) { DistributionQueueItem item = entry.getItem(); String id = item.getId(); queue.remove(id); @@ -150,7 +150,7 @@ public class DistributionAgentQueueServl DistributionPackageUtils.releaseOrDelete(distributionPackage, queue.getName()); } - DistributionPackage getPackage(ResourceResolver resourceResolver, DistributionQueueItem item) { + private DistributionPackage getPackage(ResourceResolver resourceResolver, DistributionQueueItem item) { DistributionPackageInfo info = DistributionPackageUtils.fromQueueItem(item); String type = info.getType(); @@ -159,9 +159,7 @@ public class DistributionAgentQueueServl if (packageBuilder != null) { try { - DistributionPackage distributionPackage = packageBuilder.getPackage(resourceResolver, item.getId()); - - return distributionPackage; + return packageBuilder.getPackage(resourceResolver, item.getId()); } catch (DistributionException e) { log.error("cannot get package", e); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java Mon Jan 18 11:29:58 2016 @@ -21,7 +21,6 @@ package org.apache.sling.distribution.se import javax.servlet.ServletException; import java.io.IOException; import java.io.InputStream; -import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.io.IOUtils; @@ -77,7 +76,7 @@ public class DistributionPackageExporter } } - protected void exportOnePackage(final SlingHttpServletRequest request, final SlingHttpServletResponse response, final boolean delete) + private void exportOnePackage(final SlingHttpServletRequest request, final SlingHttpServletResponse response, final boolean delete) throws ServletException, IOException { DistributionPackageExporter distributionPackageExporter = request @@ -140,7 +139,7 @@ public class DistributionPackageExporter } } - void deletePackage(final SlingHttpServletRequest request, final SlingHttpServletResponse response) throws DistributionException { + private void deletePackage(final SlingHttpServletRequest request, final SlingHttpServletResponse response) throws DistributionException { DistributionPackageExporter distributionPackageExporter = request .getResource() .adaptTo(DistributionPackageExporter.class); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java Mon Jan 18 11:29:58 2016 @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; /** * Utility class for writing json data to http responses. */ -public class ServletJsonUtils { +class ServletJsonUtils { private final static Logger log = LoggerFactory.getLogger(ServletJsonUtils.class); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultDistributionPackageProxy.java Mon Jan 18 11:29:58 2016 @@ -30,7 +30,7 @@ import java.net.URISyntaxException; public class DefaultDistributionPackageProxy implements DistributionPackageProxy { - static final Logger log = LoggerFactory.getLogger(DefaultDistributionPackageProxy.class); + private static final Logger log = LoggerFactory.getLogger(DefaultDistributionPackageProxy.class); private final DistributionPackage wrappedPackage; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java Mon Jan 18 11:29:58 2016 @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; public class HttpTransportUtils { - static final Logger log = LoggerFactory.getLogger(HttpTransportUtils.class); + private static final Logger log = LoggerFactory.getLogger(HttpTransportUtils.class); public final static String HEADER_DISTRIBUTION_ORIGINAL_ID = "X-Distribution-OriginalId"; @@ -76,14 +76,14 @@ public class HttpTransportUtils { return httpResponse.getStatusLine().getStatusCode() == 200; } - public static URI getFetchUri(URI uri) throws URISyntaxException { + private static URI getFetchUri(URI uri) throws URISyntaxException { URIBuilder uriBuilder = new URIBuilder(uri); uriBuilder.addParameter("operation", "fetch"); return uriBuilder.build(); } - public static URI getDeleteUri(URI uri, String id) throws URISyntaxException { + private static URI getDeleteUri(URI uri, String id) throws URISyntaxException { URIBuilder uriBuilder = new URIBuilder(uri); uriBuilder.addParameter("operation", "delete"); uriBuilder.addParameter("id", id); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Mon Jan 18 11:29:58 2016 @@ -19,6 +19,7 @@ package org.apache.sling.distribution.transport.impl; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.InputStream; import java.net.URI; import java.util.ArrayList; @@ -55,16 +56,15 @@ public class SimpleHttpDistributionTrans private static final String PASSWORD = "password"; private static final String EXECUTOR_CONTEXT_KEY_PREFIX = "ExecutorContextKey"; - /** * distribution package origin uri */ - public static String PACKAGE_INFO_PROPERTY_ORIGIN_URI = "internal.origin.uri"; + private static final String PACKAGE_INFO_PROPERTY_ORIGIN_URI = "internal.origin.uri"; - protected final DefaultDistributionLog log; + private final DefaultDistributionLog log; private final DistributionEndpoint distributionEndpoint; private final DistributionPackageBuilder packageBuilder; - protected final DistributionTransportSecretProvider secretProvider; + private final DistributionTransportSecretProvider secretProvider; private final String contextKeyExecutor; public SimpleHttpDistributionTransport(DefaultDistributionLog log, DistributionEndpoint distributionEndpoint, @@ -87,7 +87,6 @@ public class SimpleHttpDistributionTrans log.debug("skipping distribution of package {}Â to same origin {}", distributionPackage.getId(), hostAndPort); } else { - try { Executor executor = getExecutor(distributionContext); @@ -116,7 +115,7 @@ public class SimpleHttpDistributionTrans } - @Nonnull + @Nullable public DistributionPackageProxy retrievePackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest distributionRequest, @Nonnull DistributionTransportContext distributionContext) throws DistributionException { log.debug("pulling from {}", distributionEndpoint.getUri()); List<DistributionPackage> result = new ArrayList<DistributionPackage>(); @@ -127,7 +126,6 @@ public class SimpleHttpDistributionTrans // TODO : executor should be cached and reused - Executor executor = getExecutor(distributionContext); // Request req = Request.Post(distributionURI).useExpectContinue(); @@ -137,7 +135,6 @@ public class SimpleHttpDistributionTrans // continuously requests package streams as long as type header is received with the response (meaning there's a package of a certain type) final Map<String, String> headers = new HashMap<String, String>(); - InputStream inputStream = HttpTransportUtils.fetchNextPackage(executor, distributionURI, headers); if (inputStream == null) { @@ -145,19 +142,12 @@ public class SimpleHttpDistributionTrans } final DistributionPackage responsePackage = packageBuilder.readPackage(resourceResolver, inputStream); - if (responsePackage != null) { - responsePackage.getInfo().put(PACKAGE_INFO_PROPERTY_ORIGIN_URI, distributionURI); - log.debug("pulled package with info {}", responsePackage.getInfo()); + responsePackage.getInfo().put(PACKAGE_INFO_PROPERTY_ORIGIN_URI, distributionURI); + log.debug("pulled package with info {}", responsePackage.getInfo()); + String originalId = headers.get(HttpTransportUtils.HEADER_DISTRIBUTION_ORIGINAL_ID); - String originalId = headers.get(HttpTransportUtils.HEADER_DISTRIBUTION_ORIGINAL_ID); - - DistributionPackageProxy remotePackage = new DefaultDistributionPackageProxy(responsePackage, executor, distributionURI, originalId); - - return remotePackage; - } else { - log.warn("responsePackage is null"); - } + return new DefaultDistributionPackageProxy(responsePackage, executor, distributionURI, originalId); } catch (HttpHostConnectException e) { log.debug("could not connect to {} - skipping", distributionEndpoint.getUri()); } catch (Exception ex) { @@ -167,7 +157,7 @@ public class SimpleHttpDistributionTrans return null; } - protected Executor authenticate(DistributionTransportSecret secret, Executor executor) { + private Executor authenticate(DistributionTransportSecret secret, Executor executor) { Map<String, String> credentialsMap = secret.asCredentialsMap(); if (credentialsMap != null) { executor = executor.auth(new HttpHost(distributionEndpoint.getUri().getHost(), distributionEndpoint.getUri().getPort()), Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java Mon Jan 18 11:29:58 2016 @@ -51,10 +51,10 @@ public class UserCredentialsDistribution public static final String NAME = DistributionComponentConstants.PN_NAME; @Property(label = "User Name", description = "The name of the user used to perform remote actions.") - public final static String USERNAME = "username"; + private final static String USERNAME = "username"; @Property(label = "Password", description = "The clear text password to perform authentication. Warning: storing clear text passwords is not safe.") - public final static String PASSWORD = "password"; + private final static String PASSWORD = "password"; private final Logger log = LoggerFactory.getLogger(getClass()); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java Mon Jan 18 11:29:58 2016 @@ -198,7 +198,7 @@ public abstract class AbstractJcrEventTr * * @return a <code>int</code> as generated by e.g. <code>Event.NODE_ADDED | Event.NODE_REMOVED</code> */ - int getEventTypes() { + private int getEventTypes() { return Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_CHANGED | Event.PROPERTY_ADDED | Event.PROPERTY_REMOVED; } @@ -215,7 +215,7 @@ public abstract class AbstractJcrEventTr } - protected String getNodePathFromEvent(Event event) throws RepositoryException { + String getNodePathFromEvent(Event event) throws RepositoryException { String eventPath = event.getPath(); int type = event.getType(); @@ -231,7 +231,7 @@ public abstract class AbstractJcrEventTr } - boolean hasDeepPaths(DistributionRequest distributionRequest) { + private boolean hasDeepPaths(DistributionRequest distributionRequest) { if (!DistributionRequestType.ADD.equals(distributionRequest.getRequestType())) { return false; } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -50,10 +50,10 @@ public class DistributionEventDistribute * chain distribution path property */ @Property(label = "Path", description = "The path for which the distribution events will be forwarded.") - public static final String PATH = "path"; + private static final String PATH = "path"; - DistributionEventDistributeDistributionTrigger trigger; + private DistributionEventDistributeDistributionTrigger trigger; @Activate Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java Mon Jan 18 11:29:58 2016 @@ -78,7 +78,7 @@ public class JcrEventDistributionTrigger } - boolean isIgnoredPath(String path) { + private boolean isIgnoredPath(String path) { if (path == null) { return true; } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -56,22 +56,22 @@ public class JcrEventDistributionTrigger * jcr event trigger path property */ @Property(label = "Path", description = "The path for which changes are distributed.") - public static final String PATH = "path"; + private static final String PATH = "path"; /** * jcr event trigger path property */ @Property(cardinality = 100, label = "Ignored Paths Patterns", description = "The paths matching one of these patterns will be ignored.") - public static final String IGNORED_PATHS_PATTERNS = "ignoredPathsPatterns"; + private static final String IGNORED_PATHS_PATTERNS = "ignoredPathsPatterns"; /** * jcr event trigger service user property */ @Property(label = "Service Name", description = "The service used to listen for jcr events") - public static final String SERVICE_NAME = "serviceName"; + private static final String SERVICE_NAME = "serviceName"; - JcrEventDistributionTrigger trigger; + private JcrEventDistributionTrigger trigger; @Reference private SlingRepository repository; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTrigger.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTrigger.java Mon Jan 18 11:29:58 2016 @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.commons.scheduler.Scheduler; import org.apache.sling.distribution.DistributionRequest; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -57,22 +57,22 @@ public class PersistedJcrEventDistributi * jcr persisting event trigger path property */ @Property(label = "Path", description = "The path for which changes are listened and distributed as persisted nugget events.") - public static final String PATH = "path"; + private static final String PATH = "path"; /** * jcr persisting event trigger service user property */ @Property(label = "Service Name", description = "The service used to listen for jcr events") - public static final String SERVICE_NAME = "serviceName"; + private static final String SERVICE_NAME = "serviceName"; /** * jcr persisting event trigger nuggets path property */ @Property(value = PersistedJcrEventDistributionTrigger.DEFAULT_NUGGETS_PATH, label = "Nuggets Path", description = "The location where serialization of jcr events will be stored") - public static final String NUGGETS_PATH = "nuggetsPath"; + private static final String NUGGETS_PATH = "nuggetsPath"; - PersistedJcrEventDistributionTrigger trigger; + private PersistedJcrEventDistributionTrigger trigger; @Reference private SlingRepository repository; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java Mon Jan 18 11:29:58 2016 @@ -105,7 +105,7 @@ public class RemoteEventDistributionTrig scheduler.unschedule(getJobName(requestHandler)); } - String getJobName(DistributionRequestHandler requestHandler) { + private String getJobName(DistributionRequestHandler requestHandler) { return SCHEDULE_NAME + requestHandler.toString(); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -54,18 +54,19 @@ public class RemoteEventDistributionTrig * remote event endpoint property */ @Property(label = "Endpoint", description = "The endpoint from which the remote requests should be polled.") - public static final String ENDPOINT = "endpoint"; + private static final String ENDPOINT = "endpoint"; @Property(name = "transportSecretProvider.target") @Reference(name = "transportSecretProvider") + private DistributionTransportSecretProvider transportSecretProvider; @Reference private Scheduler scheduler; - RemoteEventDistributionTrigger trigger; + private RemoteEventDistributionTrigger trigger; @Activate Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -53,9 +53,9 @@ public class ResourceEventDistributionTr * resource event path property */ @Property(label = "Path", description = "The resource path for which changes are distributed") - public static final String PATH = "path"; + private static final String PATH = "path"; - ResourceEventDistributionTrigger trigger; + private ResourceEventDistributionTrigger trigger; @Reference private SlingRepository repository; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java Mon Jan 18 11:29:58 2016 @@ -55,7 +55,7 @@ public class ScheduledDistributionTrigge private final String serviceName; private final ResourceResolverFactory resourceResolverFactory; - private Set<String> registeredJobs = Collections.synchronizedSet(new HashSet<String>()); + private final Set<String> registeredJobs = Collections.synchronizedSet(new HashSet<String>()); public ScheduledDistributionTrigger(String distributionActionName, String path, int secondsInterval, String serviceName, Scheduler scheduler, ResourceResolverFactory resourceResolverFactory) { @@ -146,7 +146,7 @@ public class ScheduledDistributionTrigge } } - String getJobName(DistributionRequestHandler requestHandler) { + private String getJobName(DistributionRequestHandler requestHandler) { return SCHEDULE_NAME + requestHandler.toString(); } } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerFactory.java Mon Jan 18 11:29:58 2016 @@ -56,24 +56,24 @@ public class ScheduledDistributionTrigge * scheduled trigger action property */ @Property(label = "Distribution Type", description = "The type of the distribution request produced by this trigger.") - public static final String ACTION = "action"; + private static final String ACTION = "action"; /** * scheduled trigger path property */ @Property(label = "Distributed Path", description = "The path to be distributed periodically.") - public static final String PATH = "path"; + private static final String PATH = "path"; /** * scheduled trigger seconds property */ @Property(label = "Interval in Seconds", description = "The number of seconds between executions") - public static final String SECONDS = "seconds"; + private static final String SECONDS = "seconds"; @Property(label = "Service Name", description = "The name of the service used to trigger the distribution requests.") - public static final String SERVICE_NAME = "serviceName"; + private static final String SERVICE_NAME = "serviceName"; - ScheduledDistributionTrigger trigger; + private ScheduledDistributionTrigger trigger; @Reference private ResourceResolverFactory resolverFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java?rev=1725236&r1=1725235&r2=1725236&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java Mon Jan 18 11:29:58 2016 @@ -39,9 +39,7 @@ public class DistributionUtils { authInfo.put(ResourceResolverFactory.SUBSERVICE, serviceName); - ResourceResolver resourceResolver = resolverFactory.getServiceResourceResolver(authInfo); - - return resourceResolver; + return resolverFactory.getServiceResourceResolver(authInfo); } public static void safelyLogout(ResourceResolver resourceResolver) {
