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 2014/11/08 16:30:32 UTC
svn commit: r1637573 - in /sling/trunk/contrib/extensions/distribution:
api/src/main/java/org/apache/sling/distribution/communication/
api/src/main/java/org/apache/sling/distribution/trigger/
core/src/main/java/org/apache/sling/distribution/agent/impl/...
Author: tommaso
Date: Sat Nov 8 15:30:30 2014
New Revision: 1637573
URL: http://svn.apache.org/r1637573
Log:
SLING-3553 - varius minor fixes (final modifiers, visibility issues, etc.)
Modified:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/trigger/DistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/AdvancedRemoteDistributionPackageImporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDistributionStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategy.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTask.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionConstants.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiConfigurationResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiPropertiesResourceProviderFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractModifyingResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/AbstractReadableResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableValueMap.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimplePathInfo.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleReadableResource.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandler.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactoryTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/SettingsUtilsTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java Sat Nov 8 15:30:30 2014
@@ -45,7 +45,7 @@ public class DistributionRequest {
/**
* get the time this distribution request was created
*
- * @return a <code>long</code> representing the distribution request creation time e.g. as returend by {@code System#currentTimeMillis}
+ * @return a <code>long</code> representing the distribution request creation time e.g. as returned by {@code System#currentTimeMillis}
*/
public long getTime() {
return time;
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/communication/DistributionResponse.java Sat Nov 8 15:30:30 2014
@@ -24,7 +24,7 @@ package org.apache.sling.distribution.co
public class DistributionResponse {
private final String status;
- private boolean successful;
+ private final boolean successful;
public DistributionResponse(String status, boolean successful) {
this.status = status;
Modified: sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/trigger/DistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/trigger/DistributionTrigger.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/trigger/DistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/trigger/DistributionTrigger.java Sat Nov 8 15:30:30 2014
@@ -45,7 +45,7 @@ public interface DistributionTrigger ext
* unregister the given handler, if existing
*
* @param requestHandler handler to unregister
- * @throws DistributionTriggerException if unregistration fails
+ * @throws DistributionTriggerException if any error happen
*/
void unregister(@Nonnull DistributionRequestHandler requestHandler) throws DistributionTriggerException;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Sat Nov 8 15:30:30 2014
@@ -157,7 +157,7 @@ public class SimpleDistributionAgent imp
}
- public boolean isPassive() {
+ boolean isPassive() {
return passive;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactory.java Sat Nov 8 15:30:30 2014
@@ -141,7 +141,7 @@ public class DefaultDistributionComponen
return null;
}
- public DistributionAgent createAgent(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionAgent createAgent(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), DistributionComponentFactory.AGENT_SIMPLE);
@@ -198,7 +198,7 @@ public class DefaultDistributionComponen
}
- public DistributionPackageExporter createExporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionPackageExporter createExporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
@@ -235,7 +235,7 @@ public class DefaultDistributionComponen
return null;
}
- public DistributionPackageImporter createImporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionPackageImporter createImporter(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
@@ -259,7 +259,7 @@ public class DefaultDistributionComponen
return null;
}
- public DistributionQueueProvider createQueueProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionQueueProvider createQueueProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
if (COMPONENT_TYPE_SERVICE.equals(factory)) {
@@ -279,7 +279,7 @@ public class DefaultDistributionComponen
return null;
}
- public DistributionQueueDistributionStrategy createDistributionStrategy(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionQueueDistributionStrategy createDistributionStrategy(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
if (COMPONENT_TYPE_SERVICE.equals(factory)) {
@@ -298,7 +298,7 @@ public class DefaultDistributionComponen
return null;
}
- public TransportAuthenticationProvider createTransportAuthenticationProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ TransportAuthenticationProvider createTransportAuthenticationProvider(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
if (COMPONENT_TYPE_SERVICE.equals(factory)) {
@@ -314,7 +314,7 @@ public class DefaultDistributionComponen
return null;
}
- public DistributionPackageBuilder createBuilder(Map<String, Object> properties) {
+ DistributionPackageBuilder createBuilder(Map<String, Object> properties) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
if (PACKAGE_BUILDER_FILEVLT.equals(factory)) {
@@ -331,7 +331,7 @@ public class DefaultDistributionComponen
}
- protected DistributionTrigger createTrigger(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
+ DistributionTrigger createTrigger(Map<String, Object> properties, DistributionComponentProvider componentProvider) {
String factory = PropertiesUtil.toString(properties.get(COMPONENT_TYPE), COMPONENT_TYPE_SERVICE);
if (COMPONENT_TYPE_SERVICE.equals(factory)) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java Sat Nov 8 15:30:30 2014
@@ -63,12 +63,12 @@ public class DefaultDistributionComponen
private final Logger log = LoggerFactory.getLogger(getClass());
- Map<String, DistributionAgent> distributionAgentMap = new ConcurrentHashMap<String, DistributionAgent>();
- Map<String, DistributionQueueProvider> distributionQueueProviderMap = new ConcurrentHashMap<String, DistributionQueueProvider>();
- Map<String, DistributionQueueDistributionStrategy> distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String, DistributionQueueDistributionStrategy>();
- Map<String, TransportAuthenticationProvider> transportAuthenticationProviderMap = new ConcurrentHashMap<String, TransportAuthenticationProvider>();
- Map<String, DistributionPackageImporter> distributionPackageImporterMap = new ConcurrentHashMap<String, DistributionPackageImporter>();
- Map<String, DistributionPackageExporter> distributionPackageExporterMap = new ConcurrentHashMap<String, DistributionPackageExporter>();
+ private Map<String, DistributionAgent> distributionAgentMap = new ConcurrentHashMap<String, DistributionAgent>();
+ private Map<String, DistributionQueueProvider> distributionQueueProviderMap = new ConcurrentHashMap<String, DistributionQueueProvider>();
+ private Map<String, DistributionQueueDistributionStrategy> distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String, DistributionQueueDistributionStrategy>();
+ private Map<String, TransportAuthenticationProvider> transportAuthenticationProviderMap = new ConcurrentHashMap<String, TransportAuthenticationProvider>();
+ private Map<String, DistributionPackageImporter> distributionPackageImporterMap = new ConcurrentHashMap<String, DistributionPackageImporter>();
+ private Map<String, DistributionPackageExporter> distributionPackageExporterMap = new ConcurrentHashMap<String, DistributionPackageExporter>();
private BundleContext bundleContext;
public <ComponentType extends DistributionComponent> ComponentType getComponent(@Nonnull Class<ComponentType> type,
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java Sat Nov 8 15:30:30 2014
@@ -44,8 +44,8 @@ public class SettingsUtils {
* trigger[0]/propertyKey=propertyValue
* trigger[0]/propertyKey=propertyValue
*
- * @param lines
- * @return
+ * @param lines the property lines
+ * @return a {@link Map} of the property names -> property values
*/
public static Map<String, Object> parseLines(String[] lines) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -70,7 +70,7 @@ public class SettingsUtils {
return result;
}
- public static Map<String, List<String>> toLinesMap(String[] lines) {
+ private static Map<String, List<String>> toLinesMap(String[] lines) {
Map<String, List<String>> result = new HashMap<String, List<String>>();
@@ -102,7 +102,7 @@ public class SettingsUtils {
return result;
}
- public static Map<String, Object> collapseMap(Map<String, Object> valueMap) {
+ private static Map<String, Object> collapseMap(Map<String, Object> valueMap) {
Map<String, Object> result = new HashMap<String, Object>();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java Sat Nov 8 15:30:30 2014
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
public class AgentDistributionPackageExporter implements DistributionPackageExporter {
private final Logger log = LoggerFactory.getLogger(getClass());
- public static final String QUEUE_NAME = "queue";
+ private static final String QUEUE_NAME = "queue";
private DistributionAgent agent;
private final DistributionPackageBuilder packageBuilder;
@@ -48,7 +48,7 @@ public class AgentDistributionPackageExp
this (PropertiesUtil.toString(config.get(QUEUE_NAME), ""), agent, packageBuilder);
}
- public AgentDistributionPackageExporter(String queueName, DistributionAgent agent, DistributionPackageBuilder packageBuilder) {
+ private AgentDistributionPackageExporter(String queueName, DistributionAgent agent, DistributionPackageBuilder packageBuilder) {
if (agent == null || packageBuilder == null) {
throw new IllegalArgumentException("Agent and package builder are required");
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java Sat Nov 8 15:30:30 2014
@@ -71,7 +71,7 @@ public class AgentDistributionPackageExp
@Reference
DistributionComponentFactory distributionComponentFactory;
- DistributionPackageExporter packageExporter;
+ private DistributionPackageExporter packageExporter;
@Activate
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java Sat Nov 8 15:30:30 2014
@@ -36,7 +36,7 @@ import org.apache.sling.distribution.ser
*/
public class LocalDistributionPackageExporter implements DistributionPackageExporter {
- private DistributionPackageBuilder packageBuilder;
+ private final DistributionPackageBuilder packageBuilder;
public LocalDistributionPackageExporter(DistributionPackageBuilder packageBuilder) {
this.packageBuilder = packageBuilder;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java Sat Nov 8 15:30:30 2014
@@ -66,7 +66,7 @@ public class LocalDistributionPackageExp
@Reference
DistributionComponentFactory distributionComponentFactory;
- DistributionPackageExporter exporter;
+ private DistributionPackageExporter exporter;
@Activate
public void activate(Map<String, Object> config) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java Sat Nov 8 15:30:30 2014
@@ -40,12 +40,9 @@ import org.apache.sling.distribution.tra
*/
public class RemoteDistributionPackageExporter implements DistributionPackageExporter {
-
private final DistributionPackageBuilder packageBuilder;
- DistributionTransportHandler transportHandler;
-
-
+ private DistributionTransportHandler transportHandler;
public RemoteDistributionPackageExporter(DistributionPackageBuilder packageBuilder,
TransportAuthenticationProvider transportAuthenticationProvider,
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java Sat Nov 8 15:30:30 2014
@@ -94,9 +94,9 @@ public class RemoteDistributionPackageEx
public static final String PACKAGE_BUILDER = DistributionComponentFactory.COMPONENT_PACKAGE_BUILDER;
@Reference
- DistributionComponentFactory distributionComponentFactory;
+ private DistributionComponentFactory distributionComponentFactory;
- DistributionPackageExporter exporter;
+ private DistributionPackageExporter exporter;
@Activate
protected void activate(Map<String, Object> config) throws Exception {
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -96,7 +96,7 @@ public class AdvancedRemoteDistributionP
@Reference
private DistributionEventFactory distributionEventFactory;
- DistributionTransportHandler transportHandler;
+ private DistributionTransportHandler transportHandler;
@Activate
protected void activate(Map<String, ?> config) throws Exception {
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -65,7 +65,7 @@ public class LocalDistributionPackageImp
@Reference
private DistributionComponentFactory componentFactory;
- DistributionPackageImporter importer;
+ private DistributionPackageImporter importer;
@Activate
public void activate(Map<String, Object> config) {
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -89,7 +89,7 @@ public class RemoteDistributionPackageIm
DistributionComponentFactory distributionComponentFactory;
@Activate
- protected void activate(BundleContext context, Map<String, Object> config) throws Exception {
+ protected void activate(Map<String, Object> config) {
Map<String, Object> properties = new HashMap<String, Object>();
properties.putAll(config);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDistributionStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDistributionStrategy.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDistributionStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/ErrorAwareQueueDistributionStrategy.java Sat Nov 8 15:30:30 2014
@@ -90,7 +90,7 @@ public class ErrorAwareQueueDistribution
@Nonnull
public List<String> getQueueNames() {
- return Arrays.asList(new String[] { ERROR_QUEUE_NAME, DEFAULT_QUEUE_NAME });
+ return Arrays.asList(ERROR_QUEUE_NAME, DEFAULT_QUEUE_NAME);
}
private void checkAndRemoveStuckItems(DistributionQueueProvider queueProvider) throws DistributionQueueException {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategy.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategy.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategy.java Sat Nov 8 15:30:30 2014
@@ -47,7 +47,7 @@ public class SingleQueueDistributionStra
@Nonnull
public List<String> getQueueNames() {
- return Arrays.asList(new String[] { DEFAULT_QUEUE_NAME });
+ return Arrays.asList(DEFAULT_QUEUE_NAME);
}
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
/**
* {@link JobConsumer}Â for {@link org.apache.sling.distribution.agent.DistributionAgent}s using {@link JobHandlingDistributionQueue}
*/
-public class DistributionAgentJobConsumer implements JobConsumer {
+class DistributionAgentJobConsumer implements JobConsumer {
private final Logger log = LoggerFactory.getLogger(getClass());
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -51,7 +51,7 @@ public class JobHandlingDistributionQueu
private final JobManager jobManager;
- protected JobHandlingDistributionQueue(String name, String topic, JobManager jobManager) {
+ JobHandlingDistributionQueue(String name, String topic, JobManager jobManager) {
this.name = name;
this.topic = topic;
this.jobManager = jobManager;
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* a simple scheduled {@link SimpleDistributionQueue}s processor
*/
-public class ScheduledDistributionQueueProcessorTask implements Runnable {
+class ScheduledDistributionQueueProcessorTask implements Runnable {
private final Logger log = LoggerFactory.getLogger(getClass());
private final SimpleDistributionQueueProvider queueProvider;
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -73,7 +73,7 @@ public class SimpleDistributionQueueProv
}
- protected Collection<DistributionQueue> getQueues() {
+ Collection<DistributionQueue> getQueues() {
return queueMap.values();
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionConstants.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionConstants.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/DistributionConstants.java Sat Nov 8 15:30:30 2014
@@ -23,9 +23,9 @@ package org.apache.sling.distribution.re
*/
public class DistributionConstants {
- public static final String SUFFIX_RESOURCE_LIST = "/list";
- public static final String SUFFIX_AGENT_QUEUE = "/queue";
- public static final String SUFFIX_AGENT_QUEUE_EVENT = "/queue/event";
+ private static final String SUFFIX_RESOURCE_LIST = "/list";
+ private static final String SUFFIX_AGENT_QUEUE = "/queue";
+ private static final String SUFFIX_AGENT_QUEUE_EVENT = "/queue/event";
public static final String AGENT_RESOURCE_TYPE = "sling/distribution/service/agent";
public static final String AGENT_QUEUE_RESOURCE_TYPE = AGENT_RESOURCE_TYPE + SUFFIX_AGENT_QUEUE;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiConfigurationResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiConfigurationResourceProvider.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiConfigurationResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiConfigurationResourceProvider.java Sat Nov 8 15:30:30 2014
@@ -101,7 +101,7 @@ public class OsgiConfigurationResourcePr
}
}
} catch (IOException e) {
- throw new PersistenceException("Resources cannot be commited", e);
+ throw new PersistenceException("Resources cannot be committed", e);
}
}
@@ -193,7 +193,7 @@ public class OsgiConfigurationResourcePr
}
- public static <K, V> Map<K, V> fromDictionary(Dictionary<K, V> dictionary) {
+ private static <K, V> Map<K, V> fromDictionary(Dictionary<K, V> dictionary) {
if (dictionary == null) {
return null;
}
@@ -206,7 +206,7 @@ public class OsgiConfigurationResourcePr
return map;
}
- public static <K, V> Dictionary<K, V> toDictionary(Map<K, V> map) {
+ private static <K, V> Dictionary<K, V> toDictionary(Map<K, V> map) {
if (map == null) {
return null;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiPropertiesResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiPropertiesResourceProviderFactory.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiPropertiesResourceProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiPropertiesResourceProviderFactory.java Sat Nov 8 15:30:30 2014
@@ -95,7 +95,7 @@ public class OsgiPropertiesResourceProvi
public final static String DEFAULT_PROVIDER_TYPE = "osgiService";
/**
* The providerType can be osgiService or osgiConfig.
- * A provider of type osgiService will allow read only access to osgi service properties of a particuar interface.
+ * A provider of type osgiService will allow read only access to osgi service properties of a specific interface.
* The resource can be adapted to the underlying service instance.
* <p/>
* A provider of type osgiConfig will allow CRUD access to osgi configurations registered for a particular factory. *
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -36,8 +36,8 @@ public abstract class AbstractModifyingR
private final Map<String, Map<String, Object>> changedResources = new HashMap<String, Map<String, Object>>();
private final Set<String> deletedResources = new HashSet<String>();
- public AbstractModifyingResourceProvider(String resourceRoot,
- Map<String, String> additionalResourceProperties) {
+ protected AbstractModifyingResourceProvider(String resourceRoot,
+ Map<String, String> additionalResourceProperties) {
super(resourceRoot, additionalResourceProperties);
}
@@ -143,7 +143,7 @@ public abstract class AbstractModifyingR
}
@Override
- public Map<String, Object> getMainResourceProperties(String resourceName) {
+ protected 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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -40,8 +40,8 @@ public abstract class AbstractReadableRe
private final String resourceRoot;
private final Map<String, Map<String, String>> additionalResourcePropertiesMap = new HashMap<String, Map<String, String>>();
- public AbstractReadableResourceProvider(String resourceRoot,
- Map<String, String> additionalResourceProperties) {
+ protected AbstractReadableResourceProvider(String resourceRoot,
+ Map<String, String> additionalResourceProperties) {
this.resourceRoot = resourceRoot;
@@ -127,7 +127,7 @@ public abstract class AbstractReadableRe
return resource;
}
- protected Map<String, Object> getMainResourceProperties(String resourceName) {
+ Map<String, Object> getMainResourceProperties(String resourceName) {
return getResourceProperties(resourceName);
}
@@ -140,7 +140,7 @@ public abstract class AbstractReadableRe
* @param properties the properties to bind
* @return
*/
- protected Map<String, Object> bindMainResourceProperties(Map<String, Object> properties) {
+ Map<String, Object> bindMainResourceProperties(Map<String, Object> properties) {
Map<String, Object> result = new HashMap<String, Object>();
Map<String, String> resourcePropertyTemplates = additionalResourcePropertiesMap.get(MAIN_RESOURCE_PREFIX);
@@ -173,7 +173,7 @@ public abstract class AbstractReadableRe
* @param properties the properties to unbind
* @return
*/
- protected Map<String, Object> unbindMainResourceProperties(Map<String, Object> properties) {
+ Map<String, Object> unbindMainResourceProperties(Map<String, Object> properties) {
Map<String, Object> result = new HashMap<String, Object>();
Map<String, String> resourcePropertyTemplates = additionalResourcePropertiesMap.get(MAIN_RESOURCE_PREFIX);
@@ -193,18 +193,18 @@ public abstract class AbstractReadableRe
return fixMap(result);
}
- protected Resource buildMainResource(ResourceResolver resourceResolver,
- SimplePathInfo pathInfo,
- Map<String, Object> properties,
- Object... adapters) {
+ Resource buildMainResource(ResourceResolver resourceResolver,
+ SimplePathInfo pathInfo,
+ Map<String, Object> properties,
+ Object... adapters) {
return new SimpleReadableResource(resourceResolver, pathInfo.getResourcePath(), properties, adapters);
}
- protected SimplePathInfo extractPathInfo(String path) {
+ SimplePathInfo extractPathInfo(String path) {
return SimplePathInfo.parsePathInfo(resourceRoot, path);
}
- protected boolean hasPermission(ResourceResolver resourceResolver, String resourcePath, String permission) {
+ boolean hasPermission(ResourceResolver resourceResolver, String resourcePath, String permission) {
boolean hasPermission = false;
Session session = resourceResolver.adaptTo(Session.class);
@@ -221,7 +221,7 @@ public abstract class AbstractReadableRe
}
- static <K, V> Map<String, Object> fixMap(Map<K, V> map) {
+ private static <K, V> Map<String, Object> fixMap(Map<K, V> map) {
Map<String, Object> result = new HashMap<String, Object>();
for (Map.Entry<K, V> entry : map.entrySet()) {
K key = entry.getKey();
@@ -255,7 +255,7 @@ public abstract class AbstractReadableRe
return result;
}
- static <T> boolean isAcceptedType(Class<T> clazz) {
+ private static <T> boolean isAcceptedType(Class<T> clazz) {
return clazz.isPrimitive() || clazz == String.class || clazz.isArray();
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableValueMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableValueMap.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableValueMap.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableValueMap.java Sat Nov 8 15:30:30 2014
@@ -29,7 +29,7 @@ import org.apache.sling.api.wrappers.Mod
/**
* ValueMap that signals to the underlying resource provider the its values are changed.
*/
-public class SimpleModifiableValueMap extends ModifiableValueMapDecorator
+class SimpleModifiableValueMap extends ModifiableValueMapDecorator
implements ModifiableValueMap {
private final ResourceResolver resourceResolver;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimplePathInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimplePathInfo.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimplePathInfo.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimplePathInfo.java Sat Nov 8 15:30:30 2014
@@ -29,14 +29,14 @@ package org.apache.sling.distribution.re
*/
public class SimplePathInfo {
- final String resourcePathInfo;
+ private final String resourcePathInfo;
// resourcePath = resourceRoot + "/" + mainResourceName + "/" + childResourceName
private final String resourceRoot;
private final String mainResourceName;
private final String childResourceName;
- public SimplePathInfo(String resourcePathInfo, String resourceRoot, String resourceName, String childResourceName) {
+ private SimplePathInfo(String resourcePathInfo, String resourceRoot, String resourceName, String childResourceName) {
this.resourcePathInfo = resourcePathInfo;
this.resourceRoot = resourceRoot;
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -32,7 +32,7 @@ import org.apache.sling.api.wrappers.Val
/**
* Read only resource that can adapt to one of the object provided as parameter.
*/
-public class SimpleReadableResource extends AbstractResource {
+class SimpleReadableResource extends AbstractResource {
private final ResourceResolver resourceResolver;
private final String resourcePath;
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -53,7 +53,7 @@ public abstract class AbstractDistributi
private final DistributionEventFactory distributionEventFactory;
- public AbstractDistributionPackageBuilder(String type, DistributionEventFactory distributionEventFactory) {
+ protected AbstractDistributionPackageBuilder(String type, DistributionEventFactory distributionEventFactory) {
this.type = type;
this.distributionEventFactory = distributionEventFactory;
}
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -50,7 +50,7 @@ public class ResourceSharedDistributionP
}
public void acquire(@Nonnull String holderName) {
- if (holderName == null || holderName.length() == 0) {
+ if (holderName.length() == 0) {
throw new IllegalArgumentException("holder name cannot be null or empty");
}
@@ -63,7 +63,7 @@ public class ResourceSharedDistributionP
public void release(@Nonnull String holderName) {
- if (holderName == null || holderName.length() == 0) {
+ if (holderName.length() == 0) {
throw new IllegalArgumentException("holder name cannot be null or empty");
}
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -40,12 +40,12 @@ import org.apache.sling.distribution.ser
public class ResourceSharedDistributionPackageBuilder implements DistributionPackageBuilder {
- private String PN_ORIGINAL_ID = "original.package.id";
- private String PN_ORIGINAL_ACTION = "original.package.action";
- private String PN_ORIGINAL_PATHS = "original.package.paths";
+ private final String PN_ORIGINAL_ID = "original.package.id";
+ private final String PN_ORIGINAL_ACTION = "original.package.action";
+ private final String PN_ORIGINAL_PATHS = "original.package.paths";
- private String PACKAGE_NAME_PREFIX = "distrpackage";
- private String sharedPackagesRoot = "/var/sling/distribution/";
+ private final String PACKAGE_NAME_PREFIX = "distrpackage";
+ private final String sharedPackagesRoot = "/var/sling/distribution/";
private final DistributionPackageBuilder distributionPackageBuilder;
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
/**
* a {@link org.apache.sling.distribution.serialization.DistributionPackageBuilder}Â based on Apache Jackrabbit FileVault.
* <p/>
- * Each {@link org.apache.sling.distribution.packaging.DistributionPackage}Â created by <code>FileVaultdistributionPackageBuilder</code> is
+ * Each {@link org.apache.sling.distribution.packaging.DistributionPackage}Â created by {@link FileVaultDistributionPackageBuilder} is
* backed by a {@link org.apache.jackrabbit.vault.packaging.VaultPackage}.Â
*/
public class FileVaultDistributionPackageBuilder extends AbstractDistributionPackageBuilder implements
@@ -56,7 +56,7 @@ public class FileVaultDistributionPackag
private static final String VERSION = "0.0.1";
- public static String PACKAGING_TYPE = "vlt";
+ public static final String PACKAGING_TYPE = "vlt";
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java Sat Nov 8 15:30:30 2014
@@ -71,7 +71,7 @@ public class DistributionPackageImporter
log.error("Error during distribution import: {}", e.getMessage(), e);
} finally {
long end = System.currentTimeMillis();
- log.info("Processed package import request in {} ms: : {}", new Object[]{end - start, success});
+ log.info("Processed package import request in {} ms", end - start);
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandler.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandler.java Sat Nov 8 15:30:30 2014
@@ -36,7 +36,7 @@ public class MultipleEndpointDistributio
private final List<DistributionTransportHandler> transportHelpers;
private final TransportEndpointStrategyType endpointStrategyType;
- private int lastSuccessfulEnpointId = 0;
+ private int lastSuccessfulEndpointId = 0;
public MultipleEndpointDistributionTransportHandler(List<DistributionTransportHandler> transportHelpers,
TransportEndpointStrategyType endpointStrategyType) {
@@ -48,7 +48,7 @@ public class MultipleEndpointDistributio
int offset = 0;
if (endpointStrategyType.equals(TransportEndpointStrategyType.One)) {
- offset = lastSuccessfulEnpointId;
+ offset = lastSuccessfulEndpointId;
}
int length = transportHelpers.size();
@@ -64,7 +64,7 @@ public class MultipleEndpointDistributio
result.addAll(transportHelper.retrievePackages(resourceResolver, distributionRequest));
}
- lastSuccessfulEnpointId = currentId;
+ lastSuccessfulEndpointId = currentId;
if (endpointStrategyType.equals(TransportEndpointStrategyType.One))
break;
}
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -49,11 +49,11 @@ public abstract class AbstractJcrEventTr
private final String path;
private final String serviceUser;
- protected final SlingRepository repository;
+ private final SlingRepository repository;
private Session cachedSession;
- public AbstractJcrEventTrigger(SlingRepository repository, String path, String serviceUser) {
+ AbstractJcrEventTrigger(SlingRepository repository, String path, String serviceUser) {
this.repository = repository;
this.path = path;
this.serviceUser = serviceUser;
@@ -125,7 +125,7 @@ public abstract class AbstractJcrEventTr
*
* @return a <code>int</code> as generated by e.g. <code>Event.NODE_ADDED | Event.NODE_MOVED</code>
*/
- protected int getEventTypes() {
+ int getEventTypes() {
return Event.NODE_ADDED | Event.NODE_MOVED | Event.NODE_REMOVED | Event.PROPERTY_CHANGED |
Event.PROPERTY_ADDED | Event.PROPERTY_REMOVED;
}
@@ -136,7 +136,7 @@ public abstract class AbstractJcrEventTr
* @return a {@link javax.jcr.Session}
* @throws RepositoryException
*/
- protected Session getSession() throws RepositoryException {
+ Session getSession() throws RepositoryException {
return cachedSession != null ? cachedSession : (cachedSession = repository.loginService(serviceUser, null));
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java Sat Nov 8 15:30:30 2014
@@ -124,7 +124,7 @@ public class PersistingJcrEventDistribut
public void enable() {
log.info("enabling persisting jcr event listener");
- Session session = null;
+ Session session;
try {
session = getSession();
if (!session.nodeExists(nuggetsPath)) {
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=1637573&r1=1637572&r2=1637573&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 Sat Nov 8 15:30:30 2014
@@ -65,7 +65,7 @@ public class RemoteEventDistributionTrig
private Scheduler scheduler;
- private Map<String, Future<HttpResponse>> requests = new ConcurrentHashMap<String, Future<HttpResponse>>();
+ private final Map<String, Future<HttpResponse>> requests = new ConcurrentHashMap<String, Future<HttpResponse>>();
public RemoteEventDistributionTrigger(String endpoint, TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authenticationProvider, Scheduler scheduler) {
if (endpoint == null) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java Sat Nov 8 15:30:30 2014
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
public class SimpleDistributionAgentTest {
@Test
- public void testdistributionWithFailingDistributionStrategy() throws Exception {
+ public void testDistributionWithFailingDistributionStrategy() throws Exception {
String name = "sample-agent";
DistributionPackageImporter packageImporter = mock(DistributionPackageImporter.class);
DistributionPackageExporter packageExporter = mock(DistributionPackageExporter.class);
@@ -82,7 +82,7 @@ public class SimpleDistributionAgentTest
}
@Test
- public void testdistributionWithWorkingDistributionStrategy() throws Exception {
+ public void testDistributionWithWorkingDistributionStrategy() throws Exception {
String name = "sample-agent";
DistributionPackageImporter packageImporter = mock(DistributionPackageImporter.class);
DistributionPackageExporter packageExporter = mock(DistributionPackageExporter.class);
@@ -113,7 +113,7 @@ public class SimpleDistributionAgentTest
}
@Test
- public void testdistribution() throws Exception {
+ public void testDistribution() throws Exception {
String name = "sample-agent";
DistributionPackageImporter packageImporter = mock(DistributionPackageImporter.class);
DistributionPackageExporter packageExporter = mock(DistributionPackageExporter.class);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactoryTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactoryTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentFactoryTest.java Sat Nov 8 15:30:30 2014
@@ -51,10 +51,8 @@ public class DefaultDistributionComponen
DistributionAgent agent = mock(DistributionAgent.class);
when(provider.getComponent(DistributionAgent.class, name)).thenReturn(agent);
try {
- DistributionAgent component = defaultdistributionComponentFactory.createComponent(DistributionAgent.class, properties, provider);
-
+ defaultdistributionComponentFactory.createComponent(DistributionAgent.class, properties, provider);
fail("agents cannot be referenced by service name using the factory");
-
}
catch (IllegalArgumentException e) {
// expect to fail
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/SettingsUtilsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/SettingsUtilsTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/SettingsUtilsTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/component/impl/SettingsUtilsTest.java Sat Nov 8 15:30:30 2014
@@ -6,6 +6,7 @@ import java.util.Map;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class SettingsUtilsTest {
@@ -53,7 +54,7 @@ public class SettingsUtilsTest {
assertTrue(result.get("trigger") instanceof List);
List<Map> triggersList = (List<Map>) result.get("trigger");
- assertTrue(triggersList.get(0) instanceof Map);
+ assertNotNull(triggersList.get(0));
Map trigger0Map = triggersList.get(0);
assertEquals("propertyValue1", trigger0Map.get("propertyKey1"));
assertEquals("propertyValue2", trigger0Map.get("propertyKey2"));
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java Sat Nov 8 15:30:30 2014
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.when;
public class DistributionQueueHealthCheckTest {
@Test
- public void testWithNodistributionQueueProvider() throws Exception {
+ public void testWithNoDistributionQueueProvider() throws Exception {
DistributionQueueHealthCheck distributionQueueHealthCheck = new DistributionQueueHealthCheck();
distributionQueueHealthCheck.activate(Collections.<String, Object>emptyMap());
Result result = distributionQueueHealthCheck.execute();
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java Sat Nov 8 15:30:30 2014
@@ -58,7 +58,6 @@ public class JobHandlingDistributionQueu
BundleContext context = mock(BundleContext.class);
JobHandlingDistributionQueueProvider jobHandlingdistributionQueueProvider = new JobHandlingDistributionQueueProvider("dummy-agent",
jobManager, context);
- String agentName = "dummy-agent";
DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
jobHandlingdistributionQueueProvider.enableQueueProcessing(queueProcessor);
}
@@ -72,7 +71,6 @@ public class JobHandlingDistributionQueu
BundleContext context = mock(BundleContext.class);
JobHandlingDistributionQueueProvider jobHandlingdistributionQueueProvider = new JobHandlingDistributionQueueProvider("dummy-agent",
jobManager, context);
- String agentName = "dummy-agent";
jobHandlingdistributionQueueProvider.disableQueueProcessing();
}
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java Sat Nov 8 15:30:30 2014
@@ -51,7 +51,6 @@ public class RemoteEventDistributionTrig
@Test
public void testUnregister() throws Exception {
String endpoint = "";
- String handlerId = "handler-id-1";
TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authProvider = mock(TransportAuthenticationProvider.class);
when(authProvider.canAuthenticate(CredentialsProvider.class)).thenReturn(true);
Scheduler scheduler = mock(Scheduler.class);
Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java?rev=1637573&r1=1637572&r2=1637573&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java Sat Nov 8 15:30:30 2014
@@ -110,10 +110,10 @@ public class DistributionUtils {
public static void distribute(SlingInstance slingInstance, String agentName, DistributionActionType action, String... paths) throws IOException {
String agentResource = agentUrl(agentName);
- executedistributionRequest(slingInstance, 202, agentResource, action, paths);
+ executeDistributionRequest(slingInstance, 202, agentResource, action, paths);
}
- public static String executedistributionRequest(SlingInstance slingInstance, int status, String resource, DistributionActionType action, String... paths) throws IOException {
+ public static String executeDistributionRequest(SlingInstance slingInstance, int status, String resource, DistributionActionType action, String... paths) throws IOException {
List<String> args = new ArrayList<String>();
args.add(DistributionParameter.ACTION.toString());
@@ -132,7 +132,7 @@ public class DistributionUtils {
public static String doExport(SlingInstance slingInstance, String exporterName, DistributionActionType action, String... paths) throws IOException {
String agentResource = exporterUrl(exporterName);
- return executedistributionRequest(slingInstance, 200, agentResource, action, paths);
+ return executeDistributionRequest(slingInstance, 200, agentResource, action, paths);
}
public static String doImport(SlingInstance slingInstance, String importerName, byte[] bytes) throws IOException {