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 2016/07/28 14:27:26 UTC
svn commit: r1754418 - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/agent/impl/
main/java/org/apache/sling/distribution/component/impl/
main/java/org/apache/sling/distribution/log/impl/ main/java/org...
Author: tommaso
Date: Thu Jul 28 14:27:26 2016
New Revision: 1754418
URL: http://svn.apache.org/viewvc?rev=1754418&view=rev
Log:
SLING-5913 - applied patch from Simone Tripodi for code cleanup
Added:
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java (with props)
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.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/DefaultDistributionConfigurationManager.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.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/log/impl/DefaultDistributionLog.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionConfigurationResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/DistributionServiceResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.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/SimpleModifiableResource.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/DefaultDistributionPackageBuilderProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.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/servlet/DistributionTriggerServlet.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/ServletJsonUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistedJcrEventDistributionTrigger.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java Thu Jul 28 14:27:26 2016
@@ -56,7 +56,6 @@ abstract class AbstractDistributionAgent
private ServiceRegistration componentReg;
- private Map<String, Object> savedConfig;
private String agentName;
private final List<DistributionTrigger> triggers = new CopyOnWriteArrayList<DistributionTrigger>();
private boolean triggersEnabled = false;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java Thu Jul 28 14:27:26 2016
@@ -80,7 +80,6 @@ import org.slf4j.LoggerFactory;
bind = "bindDistributionTrigger", unbind = "unbindDistributionTrigger")
@Property(name = "webconsole.configurationFactory.nameHint", value = "Agent name: {name}")
public class ForwardDistributionAgentFactory extends AbstractDistributionAgentFactory {
- private final Logger log = LoggerFactory.getLogger(getClass());
@Property(label = "Name", description = "The name of the agent.")
public static final String NAME = DistributionComponentConstants.PN_NAME;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java Thu Jul 28 14:27:26 2016
@@ -37,6 +37,7 @@ import org.apache.sling.distribution.com
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
+import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
@@ -44,14 +45,11 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.trigger.DistributionTrigger;
import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An OSGi service factory for "queuing agents" that queue resources from the local instance (and can be eventually
@@ -71,7 +69,6 @@ import org.slf4j.LoggerFactory;
bind = "bindDistributionTrigger", unbind = "unbindDistributionTrigger")
@Property(name="webconsole.configurationFactory.nameHint", value="Agent name: {name}")
public class QueueDistributionAgentFactory extends AbstractDistributionAgentFactory {
- private final Logger log = LoggerFactory.getLogger(getClass());
@Property(label = "Name", description = "The name of the agent.")
public static final String NAME = DistributionComponentConstants.PN_NAME;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java Thu Jul 28 14:27:26 2016
@@ -47,8 +47,6 @@ import org.apache.sling.event.jobs.JobMa
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An OSGi service factory for {@link org.apache.sling.distribution.agent.DistributionAgent}s which references already existing OSGi services.
@@ -65,8 +63,6 @@ import org.slf4j.LoggerFactory;
bind = "bindDistributionTrigger", unbind = "unbindDistributionTrigger")
@Property(name="webconsole.configurationFactory.nameHint", value="Agent name: {name}")
public class SimpleDistributionAgentFactory extends AbstractDistributionAgentFactory {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
@Property(label = "Name", description = "The name of the agent.")
public static final String NAME = DistributionComponentConstants.PN_NAME;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java Thu Jul 28 14:27:26 2016
@@ -41,6 +41,7 @@ import org.apache.sling.distribution.com
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
+import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
@@ -50,15 +51,12 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.MultipleQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.trigger.DistributionTrigger;
import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An OSGi service factory for "synchronizing agents" that synchronize (pull and push) resources between remote instances.
@@ -77,7 +75,6 @@ import org.slf4j.LoggerFactory;
bind = "bindDistributionTrigger", unbind = "unbindDistributionTrigger")
@Property(name="webconsole.configurationFactory.nameHint", value="Agent name: {name}")
public class SyncDistributionAgentFactory extends AbstractDistributionAgentFactory {
- private final Logger log = LoggerFactory.getLogger(getClass());
@Property(label = "Name", description = "The name of the agent.")
public static final String NAME = DistributionComponentConstants.PN_NAME;
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -32,15 +32,12 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link DistributionComponentProvider} OSGi service.
@@ -61,8 +58,6 @@ public class DefaultDistributionComponen
private static final String NAME = DistributionComponentConstants.PN_NAME;
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private final Map<String, DistributionComponent<DistributionAgent>> distributionAgentMap = new ConcurrentHashMap<String, DistributionComponent<DistributionAgent>>();
private final Map<String, DistributionComponent<DistributionQueueProvider>> distributionQueueProviderMap = new ConcurrentHashMap<String, DistributionComponent<DistributionQueueProvider>>();
private final Map<String, DistributionComponent<DistributionQueueDispatchingStrategy>> distributionQueueDistributionStrategyMap = new ConcurrentHashMap<String, DistributionComponent<DistributionQueueDispatchingStrategy>>();
@@ -71,36 +66,35 @@ public class DefaultDistributionComponen
private final Map<String, DistributionComponent<DistributionPackageExporter>> distributionPackageExporterMap = new ConcurrentHashMap<String, DistributionComponent<DistributionPackageExporter>>();
private final Map<String, DistributionComponent<DistributionPackageBuilder>> distributionPackageBuilderMap = new ConcurrentHashMap<String, DistributionComponent<DistributionPackageBuilder>>();
- private BundleContext bundleContext;
-
-
- public DistributionComponent getComponent(DistributionComponentKind kind, String componentName) {
- Map<String, DistributionComponent> componentMap = getComponentMap(kind.asClass());
+ public DistributionComponent<?> getComponent(DistributionComponentKind kind, String componentName) {
+ Map<String, DistributionComponent<?>> componentMap = getComponentMap(kind.asClass());
return componentMap.get(componentName);
}
- public List<DistributionComponent> getComponents(DistributionComponentKind kind) {
- Map<String, DistributionComponent> componentMap = getComponentMap(kind.asClass());
+ public List<DistributionComponent<?>> getComponents(DistributionComponentKind kind) {
+ Map<String, DistributionComponent<?>> componentMap = getComponentMap(kind.asClass());
- List<DistributionComponent> componentList = new ArrayList<DistributionComponent>();
+ List<DistributionComponent<?>> componentList = new ArrayList<DistributionComponent<?>>();
componentList.addAll(componentMap.values());
return componentList;
}
public <ComponentType> ComponentType getService(Class<ComponentType> type, String componentName) {
- Map<String, DistributionComponent<ComponentType>> componentMap = getComponentMap(type);
- DistributionComponent<ComponentType> component = componentMap.get(componentName);
+ Map<String, DistributionComponent<?>> componentMap = getComponentMap(type);
+ DistributionComponent<?> component = componentMap.get(componentName);
if (component == null) {
return null;
}
- return component.getService();
+ // safe cast driven by the input type?
+ return type.cast(component.getService());
}
- private <ComponentType> Map<String, DistributionComponent<ComponentType>> getComponentMap(Class<ComponentType> type) {
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private Map<String, DistributionComponent<?>> getComponentMap(Class<?> type) {
if (type.isAssignableFrom(DistributionAgent.class)) {
return (Map) distributionAgentMap;
} else if (type.isAssignableFrom(DistributionPackageExporter.class)) {
@@ -120,6 +114,8 @@ public class DefaultDistributionComponen
return null;
}
+ // TODO are these methods still needed?!?
+
private void bindDistributionQueueProvider(DistributionQueueProvider distributionQueueProvider, Map<String, Object> config) {
put(DistributionQueueProvider.class, distributionQueueProvider, config);
@@ -196,7 +192,7 @@ public class DefaultDistributionComponen
}
private <ComponentType> void put(Class<ComponentType> typeClass, ComponentType service, Map<String, Object> config) {
- Map<String, DistributionComponent<ComponentType>> componentMap = getComponentMap(typeClass);
+ Map<String, DistributionComponent<?>> componentMap = getComponentMap(typeClass);
String name = PropertiesUtil.toString(config.get(NAME), null);
DistributionComponentKind kind = DistributionComponentKind.fromClass(typeClass);
@@ -208,7 +204,7 @@ public class DefaultDistributionComponen
private <ComponentType> void remove(Class<ComponentType> typeClass, ComponentType service, Map<String, Object> config) {
- Map<String, DistributionComponent<ComponentType>> componentMap = getComponentMap(typeClass);
+ Map<String, DistributionComponent<?>> componentMap = getComponentMap(typeClass);
String name = PropertiesUtil.toString(config.get(NAME), null);
if (name != null) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionConfigurationManager.java Thu Jul 28 14:27:26 2016
@@ -33,8 +33,6 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.osgi.service.cm.ConfigurationAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link org.apache.sling.distribution.component.impl.DistributionConfigurationManager} implementation based on OSGI configs.
@@ -45,8 +43,6 @@ import org.slf4j.LoggerFactory;
@Service(DistributionConfigurationManager.class)
public class DefaultDistributionConfigurationManager implements DistributionConfigurationManager {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
@Property(label = "Resource Config Enabled", description = "If storing config in resource tree is enabled.", boolValue = false)
public static final String CONFIG_ENABLED = "resource.config.enabled";
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java Thu Jul 28 14:27:26 2016
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.sling.distribution.agent.DistributionAgent;
import org.apache.sling.distribution.agent.impl.DistributionRequestAuthorizationStrategy;
@@ -32,6 +33,7 @@ import org.apache.sling.distribution.age
import org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory;
import org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory;
import org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory;
+import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory;
@@ -41,7 +43,6 @@ import org.apache.sling.distribution.pac
import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider;
@@ -55,77 +56,102 @@ import org.apache.sling.distribution.tri
/**
* Enum that represents the main distribution component kinds that can be configured for distribution.
*/
+@SuppressWarnings( "serial" )
public enum DistributionComponentKind {
- AGENT("agent"),
- IMPORTER("importer"),
- EXPORTER("exporter"),
- QUEUE_PROVIDER("queueProvider"),
- QUEUE_STRATEGY("queueStrategy"),
- TRANSPORT_SECRET_PROVIDER("transportSecretProvider"),
- PACKAGE_BUILDER("packageBuilder"),
- REQUEST_AUTHORIZATION("requestAuthorization"),
- TRIGGER("trigger");
-
-
- private static final Map<DistributionComponentKind, Class> classMap = new HashMap<DistributionComponentKind, Class>();
- private static final Map<DistributionComponentKind, Map<String, Class>> factoryMap = new HashMap<DistributionComponentKind, Map<String, Class>>();
-
- static {
- registerKind(AGENT, DistributionAgent.class);
- registerKind(IMPORTER, DistributionPackageImporter.class);
- registerKind(EXPORTER, DistributionPackageExporter.class);
- registerKind(QUEUE_PROVIDER, DistributionQueueProvider.class);
- registerKind(QUEUE_STRATEGY, DistributionQueueDispatchingStrategy.class);
- registerKind(TRANSPORT_SECRET_PROVIDER, DistributionTransportSecretProvider.class);
- registerKind(REQUEST_AUTHORIZATION, DistributionRequestAuthorizationStrategy.class);
- registerKind(PACKAGE_BUILDER, DistributionPackageBuilder.class);
- registerKind(TRIGGER, DistributionTrigger.class);
-
-
- // register "core" factories kind, type -> ComponentFactoryClass
- registerFactory(DistributionComponentKind.AGENT, "simple", SimpleDistributionAgentFactory.class);
- registerFactory(DistributionComponentKind.AGENT, "sync", SyncDistributionAgentFactory.class);
- registerFactory(DistributionComponentKind.AGENT, "forward", ForwardDistributionAgentFactory.class);
- registerFactory(DistributionComponentKind.AGENT, "reverse", ReverseDistributionAgentFactory.class);
- registerFactory(DistributionComponentKind.AGENT, "queue", QueueDistributionAgentFactory.class);
-
- registerFactory(DistributionComponentKind.EXPORTER, "local", LocalDistributionPackageExporterFactory.class);
- registerFactory(DistributionComponentKind.EXPORTER, "remote", RemoteDistributionPackageExporterFactory.class);
- registerFactory(DistributionComponentKind.EXPORTER, "agent", AgentDistributionPackageExporterFactory.class);
-
- registerFactory(DistributionComponentKind.IMPORTER, "local", LocalDistributionPackageImporterFactory.class);
- registerFactory(DistributionComponentKind.IMPORTER, "remote", RemoteDistributionPackageImporterFactory.class);
-
- registerFactory(DistributionComponentKind.PACKAGE_BUILDER, "filevlt", VaultDistributionPackageBuilderFactory.class);
- registerFactory(DistributionComponentKind.PACKAGE_BUILDER, "jcrvlt", VaultDistributionPackageBuilderFactory.class);
-
- registerFactory(DistributionComponentKind.REQUEST_AUTHORIZATION, "privilege", PrivilegeDistributionRequestAuthorizationStrategy.class);
-
- registerFactory(DistributionComponentKind.TRANSPORT_SECRET_PROVIDER, "user", UserCredentialsDistributionTransportSecretProvider.class);
-
- registerFactory(DistributionComponentKind.TRIGGER, "resourceEvent", ResourceEventDistributionTriggerFactory.class);
- registerFactory(DistributionComponentKind.TRIGGER, "scheduledEvent", ScheduledDistributionTriggerFactory.class);
- registerFactory(DistributionComponentKind.TRIGGER, "distributionEvent", DistributionEventDistributeDistributionTriggerFactory.class);
- registerFactory(DistributionComponentKind.TRIGGER, "persistedJcrEvent", PersistedJcrEventDistributionTriggerFactory.class);
- registerFactory(DistributionComponentKind.TRIGGER, "jcrEvent", JcrEventDistributionTriggerFactory.class);
+ AGENT("agent", DistributionAgent.class, new HashMap<String, Class<?>>() {
+ {
+ put("simple", SimpleDistributionAgentFactory.class);
+ put("sync", SyncDistributionAgentFactory.class);
+ put("forward", ForwardDistributionAgentFactory.class);
+ put("reverse", ReverseDistributionAgentFactory.class);
+ put("queue", QueueDistributionAgentFactory.class);
+ }
+ }),
+ IMPORTER("importer", DistributionPackageImporter.class, new HashMap<String, Class<?>>() {
+ {
+ put("local", LocalDistributionPackageImporterFactory.class);
+ put("remote", RemoteDistributionPackageImporterFactory.class);
+ }
+ }),
- }
+ EXPORTER("exporter", DistributionPackageExporter.class, new HashMap<String, Class<?>>() {
+ {
+ put("local", LocalDistributionPackageExporterFactory.class);
+ put("remote", RemoteDistributionPackageExporterFactory.class);
+ put("agent", AgentDistributionPackageExporterFactory.class);
+ }
+ }),
+
+ QUEUE_PROVIDER("queueProvider", DistributionQueueProvider.class, new HashMap<String, Class<?>>() {
+ {
+ put("simple", SimpleDistributionAgentFactory.class);
+ put("sync", SyncDistributionAgentFactory.class);
+ put("forward", ForwardDistributionAgentFactory.class);
+ put("reverse", ReverseDistributionAgentFactory.class);
+ put("queue", QueueDistributionAgentFactory.class);
+ }
+ }),
+
+ QUEUE_STRATEGY("queueStrategy", DistributionQueueDispatchingStrategy.class, new HashMap<String, Class<?>>() {
+ {
+ put("simple", SimpleDistributionAgentFactory.class);
+ put("sync", SyncDistributionAgentFactory.class);
+ put("forward", ForwardDistributionAgentFactory.class);
+ put("reverse", ReverseDistributionAgentFactory.class);
+ put("queue", QueueDistributionAgentFactory.class);
+ }
+ }),
+
+ TRANSPORT_SECRET_PROVIDER("transportSecretProvider", DistributionTransportSecretProvider.class, new HashMap<String, Class<?>>() {
+ {
+ put("user", UserCredentialsDistributionTransportSecretProvider.class);
+ }
+ }),
+
+ PACKAGE_BUILDER("packageBuilder", DistributionPackageBuilder.class, new HashMap<String, Class<?>>() {
+ {
+ put("filevlt", VaultDistributionPackageBuilderFactory.class);
+ put("jcrvlt", VaultDistributionPackageBuilderFactory.class);
+ }
+ }),
+
+ REQUEST_AUTHORIZATION("requestAuthorization", DistributionRequestAuthorizationStrategy.class, new HashMap<String, Class<?>>() {
+ {
+ put("privilege", PrivilegeDistributionRequestAuthorizationStrategy.class);
+ }
+ }),
+
+ TRIGGER("trigger", DistributionTrigger.class, new HashMap<String, Class<?>>() {
+ {
+ put("resourceEvent", ResourceEventDistributionTriggerFactory.class);
+ put("scheduledEvent", ScheduledDistributionTriggerFactory.class);
+ put("distributionEvent", DistributionEventDistributeDistributionTriggerFactory.class);
+ put("persistedJcrEvent", PersistedJcrEventDistributionTriggerFactory.class);
+ put("jcrEvent", JcrEventDistributionTriggerFactory.class);
+ }
+ });
private final String name;
- DistributionComponentKind(String name) {
+ private final Class<?> type;
+
+ private final Map<String, Class<?>> factoryMap;
+
+ DistributionComponentKind(String name, Class<?> type, Map<String, Class<?>> factoryMap) {
this.name = name;
+ this.type = type;
+ this.factoryMap = factoryMap;
}
- public Class asClass() {
- return classMap.get(this);
+ public Class<?> asClass() {
+ return type;
}
- public static DistributionComponentKind fromClass(Class type) {
- for (DistributionComponentKind kind : classMap.keySet()) {
- Class kindClass = classMap.get(kind);
+ public static DistributionComponentKind fromClass(Class<?> type) {
+ for (DistributionComponentKind kind : values()) {
+ Class<?> kindClass = kind.asClass();
if (kindClass.equals(type)) {
return kind;
@@ -136,7 +162,7 @@ public enum DistributionComponentKind {
}
public static DistributionComponentKind fromName(String name) {
- for (DistributionComponentKind kind : classMap.keySet()) {
+ for (DistributionComponentKind kind : values()) {
if (kind.getName().equals(name)) {
return kind;
@@ -150,48 +176,32 @@ public enum DistributionComponentKind {
return name;
}
- private static void registerKind(DistributionComponentKind kind, Class kindClass) {
- classMap.put(kind, kindClass);
- }
-
- private static void registerFactory(DistributionComponentKind kind, String type, Class factoryClass) {
-
- if (!factoryMap.containsKey(kind)) {
- factoryMap.put(kind, new HashMap<String, Class>());
- }
-
- Map<String, Class> kindMap = factoryMap.get(kind);
-
- kindMap.put(type, factoryClass);
- }
-
public String getFactory(String type) {
- Class factory = factoryMap.get(this).get(type);
- return factory.getName();
+ Class<?> factory = factoryMap.get(type);
+ if (factory != null) {
+ return factory.getName();
+ }
+ return null;
}
public List<String> getFactories() {
List<String> result = new ArrayList<String>();
- for (Class factory : factoryMap.get(this).values()) {
+ for (Class<?> factory : factoryMap.values()) {
result.add(factory.getName());
}
-
return result;
-
}
public String getType(String factory) {
- for (String type : factoryMap.get(this).keySet()) {
- Class factoryClass = factoryMap.get(this).get(type);
+ for (Entry<String, Class<?>> factoryEntry : factoryMap.entrySet()) {
+ String type = factoryEntry.getKey();
+ Class<?> factoryClass = factoryEntry.getValue();
if (factoryClass.getName().equals(factory)) {
return type;
}
}
-
return null;
-
}
-
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentProvider.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentProvider.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentProvider.java Thu Jul 28 14:27:26 2016
@@ -26,9 +26,10 @@ import java.util.List;
* A provider that allows access to registered distribution services.
*/
public interface DistributionComponentProvider {
- DistributionComponent getComponent(DistributionComponentKind kind, String componentName);
- List<DistributionComponent> getComponents(DistributionComponentKind kind);
+ DistributionComponent<?> getComponent(DistributionComponentKind kind, String componentName);
+
+ List<DistributionComponent<?>> getComponents(DistributionComponentKind kind);
<ComponentType> ComponentType getService(Class<ComponentType> type, String componentName);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/OsgiConfigurationManager.java Thu Jul 28 14:27:26 2016
@@ -19,26 +19,26 @@
package org.apache.sling.distribution.component.impl;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.resources.impl.OsgiUtils;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Dictionary;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.apache.sling.distribution.resources.impl.OsgiUtils;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Manager implementation which represents the distribution configurations as OSGI configuration.
*/
@@ -62,7 +62,8 @@ public class OsgiConfigurationManager im
for (Configuration configuration : configurations) {
- Dictionary propertiesDict = configuration.getProperties();
+ @SuppressWarnings( "unchecked" )
+ Dictionary<String, Object> propertiesDict = configuration.getProperties();
Map<String, Object> properties = OsgiUtils.fromDictionary(propertiesDict);
properties = filterBeforeRead(properties);
@@ -89,7 +90,8 @@ public class OsgiConfigurationManager im
Configuration configuration = configurations.get(0);
if (configuration != null) {
- Dictionary properties = configuration.getProperties();
+ @SuppressWarnings( "unchecked" )
+ Dictionary<String, Object> properties = configuration.getProperties();
Map<String, Object> result = OsgiUtils.fromDictionary(properties);
String factoryPid = PropertiesUtil.toString(result.get(ConfigurationAdmin.SERVICE_FACTORYPID), null);
@@ -128,7 +130,7 @@ public class OsgiConfigurationManager im
deleteOsgiConfigs(configs);
properties.put(DistributionComponentConstants.PN_NAME, componentName);
- Configuration configuration = saveOsgiConfig(factoryPid, componentName, properties);
+ saveOsgiConfig(factoryPid, componentName, properties);
}
}
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -110,6 +110,7 @@ public class SettingsUtils {
return result;
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
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/log/impl/DefaultDistributionLog.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java Thu Jul 28 14:27:26 2016
@@ -44,7 +44,7 @@ public class DefaultDistributionLog impl
private final Logger logger;
private final LogLevel logLevel;
- public DefaultDistributionLog(DistributionComponentKind kind, String name, Class clazz, LogLevel logLevel) {
+ public DefaultDistributionLog(DistributionComponentKind kind, String name, Class<?> clazz, LogLevel logLevel) {
this.kind = kind;
this.name = name;
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -35,8 +35,6 @@ import org.apache.sling.distribution.com
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.resources.impl.common.AbstractModifyingResourceProvider;
import org.apache.sling.distribution.resources.impl.common.SimplePathInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link ResourceProvider} for Osgi configurations for a specific configuration factory.
@@ -45,8 +43,6 @@ import org.slf4j.LoggerFactory;
*/
public class DistributionConfigurationResourceProvider extends AbstractModifyingResourceProvider implements ResourceProvider, ModifyingResourceProvider {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private static final String SETTINGS_RESOURCE_TYPE = DistributionResourceTypes.DEFAULT_SETTING_RESOURCE_TYPE;
private final DistributionConfigurationManager configurationManager;
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -62,7 +62,7 @@ public class DistributionServiceResource
} else if (pathInfo.isMain()) {
return getResourceProperties(resolver, pathInfo.getMainResourceName());
} else if (pathInfo.isChild()) {
- DistributionComponent component = componentProvider.getComponent(kind, pathInfo.getMainResourceName());
+ DistributionComponent<?> component = componentProvider.getComponent(kind, pathInfo.getMainResourceName());
if (component != null) {
return getChildResourceProperties(component, pathInfo.getChildResourceName());
@@ -76,7 +76,7 @@ public class DistributionServiceResource
@Override
protected Iterable<String> getInternalResourceChildren(ResourceResolver resolver, SimplePathInfo pathInfo) {
if (pathInfo.isMain()) {
- DistributionComponent component = componentProvider.getComponent(kind, pathInfo.getMainResourceName());
+ DistributionComponent<?> component = componentProvider.getComponent(kind, pathInfo.getMainResourceName());
if (component != null) {
return getChildResourceChildren(component, pathInfo.getChildResourceName());
@@ -88,7 +88,7 @@ public class DistributionServiceResource
private Map<String, Object> getResourceProperties(ResourceResolver resolver, String resourceName) {
- DistributionComponent component = componentProvider.getComponent(kind, resourceName);
+ DistributionComponent<?> component = componentProvider.getComponent(kind, resourceName);
if (component != null) {
Map<String, Object> properties = new HashMap<String, Object>();
@@ -106,10 +106,10 @@ public class DistributionServiceResource
private Map<String, Object> getResourceRootProperties() {
- List<DistributionComponent> componentList = componentProvider.getComponents(kind);
+ List<DistributionComponent<?>> componentList = componentProvider.getComponents(kind);
List<String> nameList = new ArrayList<String>();
- for (DistributionComponent component : componentList) {
+ for (DistributionComponent<?> component : componentList) {
nameList.add(component.getName());
}
@@ -151,11 +151,11 @@ public class DistributionServiceResource
return SERVICES_RESOURCE_TYPE;
}
- Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) {
+ Map<String, Object> getChildResourceProperties(DistributionComponent<?> component, String childResourceName) {
return null;
}
- 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/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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -66,7 +66,7 @@ public class ExtendedDistributionService
@Override
- protected Map<String, Object> getChildResourceProperties(DistributionComponent component, String childResourceName) {
+ protected Map<String, Object> getChildResourceProperties(DistributionComponent<?> component, String childResourceName) {
DistributionComponentKind kind = component.getKind();
if (kind.equals(DistributionComponentKind.AGENT)) {
DistributionAgent agent = (DistributionAgent) component.getService();
@@ -97,7 +97,7 @@ public class ExtendedDistributionService
}
@Override
- protected Iterable<String> getChildResourceChildren(DistributionComponent component, String childResourceName) {
+ protected Iterable<String> getChildResourceChildren(DistributionComponent<?> component, String childResourceName) {
DistributionComponentKind kind = component.getKind();
if (kind.equals(DistributionComponentKind.AGENT)) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/OsgiUtils.java Thu Jul 28 14:27:26 2016
@@ -140,7 +140,7 @@ public class OsgiUtils {
continue;
}
- Class valueClass = entry.getValue().getClass();
+ Class<?> valueClass = entry.getValue().getClass();
Object value = entry.getValue();
if (valueClass.isArray()) {
valueClass = valueClass.getComponentType();
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -119,6 +119,7 @@ public abstract class AbstractReadableRe
}
+ @SuppressWarnings( "unchecked" )
public Iterator<Resource> listChildren(Resource parent) {
String path = parent.getPath();
ResourceResolver resourceResolver = parent.getResourceResolver();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableResource.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableResource.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/resources/impl/common/SimpleModifiableResource.java Thu Jul 28 14:27:26 2016
@@ -42,10 +42,10 @@ public class SimpleModifiableResource ex
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
if (type == ValueMap.class || type == Map.class) {
- return (AdapterType) new SimpleModifiableValueMap(getResourceResolver(), resourceProvider, this);
+ return type.cast(new SimpleModifiableValueMap(getResourceResolver(), resourceProvider, this));
} else if (type == ModifiableValueMap.class) {
- return (AdapterType) new SimpleModifiableValueMap(getResourceResolver(), resourceProvider, this);
+ return type.cast(new SimpleModifiableValueMap(getResourceResolver(), resourceProvider, this));
}
return super.adaptTo(type);
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -89,7 +89,7 @@ class SimpleReadableResource extends Abs
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
if (type == ValueMap.class || type == Map.class) {
- return (AdapterType) new ValueMapDecorator(getProperties());
+ return type.cast(new ValueMapDecorator(getProperties()));
} else {
if (adapters != null) {
for (Object adapter : adapters) {
@@ -102,7 +102,7 @@ class SimpleReadableResource extends Abs
return convertArray(type, adapterArray);
}
} else if (type.isAssignableFrom(adapter.getClass())) {
- return (AdapterType) adapter;
+ return type.cast(adapter);
}
}
}
@@ -119,7 +119,7 @@ class SimpleReadableResource extends Abs
}
result[i] = array[i];
}
-
+ // TODO is this correct? result = ArrayType[], not ArrayType
return (ArrayType) result;
}
}
\ No newline at end of file
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -38,18 +38,18 @@ public class DefaultDistributionPackageB
DistributionComponentProvider componentProvider;
public DistributionPackageBuilder getPackageBuilder(String type) {
- List<DistributionComponent> componentList = componentProvider.getComponents(DistributionComponentKind.PACKAGE_BUILDER);
+ List<DistributionComponent<?>> componentList = componentProvider.getComponents(DistributionComponentKind.PACKAGE_BUILDER);
return filterPackageBuildersByType(componentList, type);
}
- private static DistributionPackageBuilder filterPackageBuildersByType(List<DistributionComponent> componentList, String type) {
+ private static DistributionPackageBuilder filterPackageBuildersByType(List<DistributionComponent<?>> componentList, String type) {
if (type == null) {
return null;
}
- for (DistributionComponent component : componentList) {
+ for (DistributionComponent<?> component : componentList) {
Object service = component.getService();
if (service instanceof DistributionPackageBuilder) {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java Thu Jul 28 14:27:26 2016
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
/**
* Servlet to ask {@link org.apache.sling.distribution.agent.DistributionAgent}s to distribute (via HTTP POST).
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.LOG_RESOURCE_TYPE, methods = "GET", extensions = "txt")
public class DistributionAgentLogServlet extends SlingAllMethodsServlet {
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
/**
* Servlet to retrieve a {@link org.apache.sling.distribution.queue.DistributionQueue} status.
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.AGENT_QUEUE_RESOURCE_TYPE, methods = {"POST"})
public class DistributionAgentQueueServlet extends SlingAllMethodsServlet {
@@ -56,7 +57,6 @@ public class DistributionAgentQueueServl
@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
- @SuppressWarnings("unchecked")
String operation = request.getParameter("operation");
DistributionQueue queue = request.getResource().adaptTo(DistributionQueue.class);
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java Thu Jul 28 14:27:26 2016
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
/**
* Servlet to ask {@link org.apache.sling.distribution.agent.DistributionAgent}s to distribute (via HTTP POST).
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.AGENT_RESOURCE_TYPE, methods = "POST")
public class DistributionAgentServlet extends SlingAllMethodsServlet {
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
/**
* Servlet to handle fetching of distribution content.
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.EXPORTER_RESOURCE_TYPE, methods = "POST")
public class DistributionPackageExporterServlet extends SlingAllMethodsServlet {
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
/**
* Servlet to handle reception of distribution content.
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.IMPORTER_RESOURCE_TYPE, methods = "POST")
public class DistributionPackageImporterServlet extends SlingAllMethodsServlet {
@@ -59,7 +60,7 @@ public class DistributionPackageImporter
if (request.getParameter("forceError") != null) {
throw new Exception("manually forced error");
}
-
+
DistributionPackageInfo distributionPackageInfo = distributionPackageImporter.importStream(resourceResolver, stream);
long end = System.currentTimeMillis();
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java?rev=1754418&r1=1754417&r2=1754418&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionTriggerServlet.java Thu Jul 28 14:27:26 2016
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
/**
* Triggers Server Sent Events servlet
*/
+@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.TRIGGER_RESOURCE_TYPE, extensions = "event", methods = "GET")
public class DistributionTriggerServlet extends SlingAllMethodsServlet {
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -58,6 +58,9 @@ class ServletJsonUtils {
case ACCEPTED:
response.setStatus(202);
break;
+ default:
+ // TODO
+ break;
}
response.getWriter().append(json.toString());
}
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -29,13 +29,9 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request;
import org.apache.http.client.utils.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class HttpTransportUtils {
- private static final Logger log = LoggerFactory.getLogger(HttpTransportUtils.class);
-
public static InputStream fetchNextPackage(Executor executor, URI distributionURI) throws URISyntaxException, IOException {
URI fetchUri = getFetchUri(distributionURI);
Request fetchReq = Request.Post(fetchUri).useExpectContinue();
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -32,8 +32,6 @@ import org.apache.sling.commons.osgi.Pro
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.transport.DistributionTransportSecret;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Component(metatype = true,
label = "Apache Sling Distribution Transport Credentials - User Credentials based DistributionTransportSecretProvider",
@@ -57,8 +55,6 @@ public class UserCredentialsDistribution
@Property(label = "Password", description = "The clear text password to perform authentication. Warning: storing clear text passwords is not safe.")
private final static String PASSWORD = "password";
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private String username;
private String password;
@@ -70,10 +66,6 @@ public class UserCredentialsDistribution
public DistributionTransportSecret getSecret(URI uri) {
return new DistributionTransportSecret() {
- public String asToken() {
- return null;
- }
-
public Map<String, String> asCredentialsMap() {
Map<String, String> map = new HashMap<String, String>();
map.put(USERNAME, username);
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=1754418&r1=1754417&r2=1754418&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 Thu Jul 28 14:27:26 2016
@@ -81,9 +81,10 @@ public class PersistedJcrEventDistributi
createdNode.setProperty("userData", event.getUserData());
createdNode.setProperty("userID", event.getUserID());
+ @SuppressWarnings({ "unchecked", "rawtypes" })
Set<Map.Entry> set = event.getInfo().entrySet();
Collection<String> values = new ArrayList<String>();
- for (Map.Entry entry : set) {
+ for (@SuppressWarnings("rawtypes") Map.Entry entry : set) {
values.add(String.valueOf(entry.getKey()) + ":" + String.valueOf(entry.getValue()));
}
createdNode.setProperty("info", values.toArray(new String[values.size()]));
Added: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java?rev=1754418&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java (added)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java Thu Jul 28 14:27:26 2016
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.distribution.util.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Random;
+
+import org.junit.Test;
+
+public class FileBackedMemoryOutputStreamTest {
+
+ @Test
+ public void justKeepDataInMemory() throws IOException {
+ FileBackedMemoryOutputStream output = new FileBackedMemoryOutputStream(10,
+ new File("/tmp"),
+ "FileBackedMemoryOutputStreamTest.justKeepDataInMemory",
+ ".tmp");
+ byte[] data = newDataArray(2);
+
+ output.write(data);
+ output.close();
+
+ assertEquals(2, output.size());
+ assertNull(output.getFile());
+ }
+
+ @Test
+ public void backedToFile() throws IOException {
+ FileBackedMemoryOutputStream output = new FileBackedMemoryOutputStream(2,
+ new File("/tmp"),
+ "FileBackedMemoryOutputStreamTest.backedToFile",
+ ".tmp");
+ byte[] data = newDataArray(100);
+
+ output.write(data);
+ output.close();
+
+ assertEquals(100, output.size());
+ assertNotNull(output.getFile());
+ assertTrue(output.getFile().exists());
+
+ output.clean();
+ assertFalse(output.getFile().exists());
+ }
+
+ private byte[] newDataArray(int size) {
+ byte[] data = new byte[size];
+ byte b = (byte) (new Random().nextInt() & 0xff);
+ Arrays.fill(data, b);
+ return data;
+ }
+
+}
Propchange: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java
------------------------------------------------------------------------------
svn:eol-style = native