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/11/29 15:21:05 UTC
svn commit: r1771915 - in
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution:
monitor/impl/ packaging/impl/ packaging/impl/exporter/
packaging/impl/importer/ trigger/impl/
Author: tommaso
Date: Tue Nov 29 15:21:05 2016
New Revision: 1771915
URL: http://svn.apache.org/viewvc?rev=1771915&view=rev
Log:
SLING-6339 - applied patch from Simone Tripodi for warnings cleanup
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.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/LocalDistributionPackageExporterFactory.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/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java?rev=1771915&r1=1771914&r2=1771915&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java Tue Nov 29 15:21:05 2016
@@ -86,7 +86,7 @@ public final class MonitoringDistributio
return wrapped.installPackage(resourceResolver, stream);
}
- private final void registerDistributionPackageMBean(long start, DistributionPackage distributionPackage) {
+ private void registerDistributionPackageMBean(long start, DistributionPackage distributionPackage) {
long processingTime = System.currentTimeMillis() - start;
DistributionPackageMBean mBean = new DistributionPackageMBeanImpl(distributionPackage,
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java?rev=1771915&r1=1771914&r2=1771915&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java Tue Nov 29 15:21:05 2016
@@ -18,21 +18,18 @@
*/
package org.apache.sling.distribution.packaging.impl;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java?rev=1771915&r1=1771914&r2=1771915&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java Tue Nov 29 15:21:05 2016
@@ -237,6 +237,7 @@ public class DistributionPackageUtils {
if (bytesRead > 0 && buffer[0] > 0 && META_START.equals(s)) {
ObjectInputStream stream = getSafeObjectInputStream(inputStream);
+ @SuppressWarnings("unchecked") // by design
HashMap<String, Object> map = (HashMap<String, Object>) stream.readObject();
info.putAll(map);
} else {
@@ -295,7 +296,7 @@ public class DistributionPackageUtils {
Node content = JcrUtils.getOrAddNode(file, Node.JCR_CONTENT, NodeType.NT_RESOURCE);
Binary binary = parent.getSession().getValueFactory().createBinary(stream);
content.setProperty(Property.JCR_DATA, binary);
- Node refs = JcrUtils.getOrAddNode(parent, "refs", NodeType.NT_UNSTRUCTURED);
+ JcrUtils.getOrAddNode(parent, "refs", NodeType.NT_UNSTRUCTURED);
}
@@ -346,23 +347,30 @@ public class DistributionPackageUtils {
}
synchronized (filelock) {
+ ObjectInputStream inputStream = null;
+ ObjectOutputStream outputStream = null;
try {
- HashSet<String> set = new HashSet<String>();
+ HashSet<String> set;
if (file.exists()) {
- ObjectInputStream inputStream = getSafeObjectInputStream(new FileInputStream(file));
- set = (HashSet<String>) inputStream.readObject();
- IOUtils.closeQuietly(inputStream);
+ inputStream = getSafeObjectInputStream(new FileInputStream(file));
+ @SuppressWarnings("unchecked") // type is known by sedign
+ HashSet<String> fromStreamSet = (HashSet<String>) inputStream.readObject();
+ set = fromStreamSet;
+ } else {
+ set = new HashSet<String>();
}
set.addAll(Arrays.asList(holderNames));
- ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(file));
+ outputStream = new ObjectOutputStream(new FileOutputStream(file));
outputStream.writeObject(set);
- IOUtils.closeQuietly(outputStream);
} catch (ClassNotFoundException e) {
log.error("Cannot release file", e);
+ } finally {
+ IOUtils.closeQuietly(inputStream);
+ IOUtils.closeQuietly(outputStream);
}
}
@@ -375,14 +383,19 @@ public class DistributionPackageUtils {
}
synchronized (filelock) {
+ ObjectInputStream inputStream = null;
+ ObjectOutputStream outputStream = null;
try {
- HashSet<String> set = new HashSet<String>();
+ HashSet<String> set;
if (file.exists()) {
- ObjectInputStream inputStream = getSafeObjectInputStream(new FileInputStream(file));
- set = (HashSet<String>) inputStream.readObject();
- IOUtils.closeQuietly(inputStream);
+ inputStream = getSafeObjectInputStream(new FileInputStream(file));
+ @SuppressWarnings("unchecked") //type is known by design
+ HashSet<String> fromStreamSet = (HashSet<String>) inputStream.readObject();
+ set = fromStreamSet;
+ } else {
+ set = new HashSet<String>();
}
set.removeAll(Arrays.asList(holderNames));
@@ -392,12 +405,14 @@ public class DistributionPackageUtils {
return true;
}
- ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(file));
+ outputStream = new ObjectOutputStream(new FileOutputStream(file));
outputStream.writeObject(set);
- IOUtils.closeQuietly(outputStream);
}
catch (ClassNotFoundException e) {
log.error("Cannot release file", e);
+ } finally {
+ IOUtils.closeQuietly(inputStream);
+ IOUtils.closeQuietly(outputStream);
}
}
return false;
@@ -405,7 +420,7 @@ public class DistributionPackageUtils {
private static ObjectInputStream getSafeObjectInputStream(InputStream inputStream) throws IOException {
- final Class[] acceptedClasses = new Class[] {
+ final Class<?>[] acceptedClasses = new Class<?>[] {
HashMap.class, HashSet.class,
String.class, String[].class,
Long.class,
@@ -419,7 +434,7 @@ public class DistributionPackageUtils {
@Override
protected Class<?> resolveClass(ObjectStreamClass osc) throws IOException, ClassNotFoundException {
String className = osc.getName();
- for (Class clazz : acceptedClasses) {
+ for (Class<?> clazz : acceptedClasses) {
if (clazz.getName().equals(className)) {
return super.resolveClass(osc);
}
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=1771915&r1=1771914&r2=1771915&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 Tue Nov 29 15:21:05 2016
@@ -92,10 +92,11 @@ public class AgentDistributionPackageExp
if (packageBuilder != null) {
distributionPackage = packageBuilder.getPackage(resourceResolver, queueItem.getPackageId());
- distributionPackage.getInfo().putAll(info);
-
- log.debug("item {} fetched from the queue", info);
if (distributionPackage != null) {
+ distributionPackage.getInfo().putAll(info);
+
+ log.debug("item {} fetched from the queue", info);
+
packageProcessor.process(new AgentDistributionPackage(distributionPackage, queue, entry.getId()));
} else {
log.warn("cannot get package {}", info);
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=1771915&r1=1771914&r2=1771915&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 Tue Nov 29 15:21:05 2016
@@ -18,9 +18,10 @@
*/
package org.apache.sling.distribution.packaging.impl.exporter;
-import javax.annotation.Nonnull;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -31,15 +32,13 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.agent.DistributionAgent;
-import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
-import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
+import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
/**
* OSGi configuration factory for {@link AgentDistributionPackageExporter}s
@@ -53,8 +52,6 @@ import org.slf4j.LoggerFactory;
@Property(name="webconsole.configurationFactory.nameHint", value="Exporter name: {name}")
public class AgentDistributionPackageExporterFactory implements DistributionPackageExporter {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
/**
* name of this exporter.
*/
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=1771915&r1=1771914&r2=1771915&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 Tue Nov 29 15:21:05 2016
@@ -18,9 +18,10 @@
*/
package org.apache.sling.distribution.packaging.impl.exporter;
-import javax.annotation.Nonnull;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -29,14 +30,12 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
/**
* OSGi configuration factory for {@link LocalDistributionPackageExporter}s.
@@ -50,8 +49,6 @@ import org.slf4j.LoggerFactory;
@Property(name="webconsole.configurationFactory.nameHint", value="Exporter name: {name}")
public class LocalDistributionPackageExporterFactory implements DistributionPackageExporter {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
/**
* name of this exporter.
*/
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=1771915&r1=1771914&r2=1771915&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 Tue Nov 29 15:21:05 2016
@@ -18,10 +18,11 @@
*/
package org.apache.sling.distribution.packaging.impl.importer;
-import javax.annotation.Nonnull;
import java.io.InputStream;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -30,17 +31,15 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
-import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* OSGi configuration factory for {@link RemoteDistributionPackageImporter}s.
@@ -54,9 +53,6 @@ import org.slf4j.LoggerFactory;
@Property(name="webconsole.configurationFactory.nameHint", value="Importer name: {name}")
public class RemoteDistributionPackageImporterFactory implements DistributionPackageImporter {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
-
/**
* name of this importer.
*/
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java?rev=1771915&r1=1771914&r2=1771915&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java Tue Nov 29 15:21:05 2016
@@ -18,10 +18,11 @@
*/
package org.apache.sling.distribution.packaging.impl.importer;
-import javax.annotation.Nonnull;
import java.io.InputStream;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -30,14 +31,12 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.jcr.api.SlingRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* OSGi configuration factory for {@link RepositoryDistributionPackageImporter}s.
@@ -51,8 +50,6 @@ import org.slf4j.LoggerFactory;
@Property(name="webconsole.configurationFactory.nameHint", value="Importer name: {name}")
public class RepositoryDistributionPackageImporterFactory implements DistributionPackageImporter {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
/**
* name of this component.
*/
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java?rev=1771915&r1=1771914&r2=1771915&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerFactory.java Tue Nov 29 15:21:05 2016
@@ -18,9 +18,10 @@
*/
package org.apache.sling.distribution.trigger.impl;
-import javax.annotation.Nonnull;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -31,13 +32,12 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.commons.scheduler.Scheduler;
+import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
-import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.apache.sling.distribution.trigger.DistributionTrigger;
import org.apache.sling.jcr.api.SlingRepository;
-import org.osgi.framework.BundleContext;
@Component(metatype = true,
label = "Apache Sling Distribution Trigger - Jcr Event Triggers Factory",