Author: tommaso Date: Thu Apr 30 07:34:37 2015 New Revision: 1676913 URL: http://svn.apache.org/r1676913 Log: SLING-4682 - added missing jsr305 annotations to DistributionQueue and AbstractDistributionPackageBuilder, minor fixes
Modified: 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/queue/DistributionQueue.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java 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=1676913&r1=1676912&r2=1676913&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 Thu Apr 30 07:34:37 2015 @@ -20,7 +20,6 @@ package org.apache.sling.distribution.packaging.impl; -import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.SharedDistributionPackage; import org.slf4j.Logger; @@ -40,13 +39,11 @@ public class DistributionPackageUtils { public static void releaseOrDelete(DistributionPackage distributionPackage, String queueName) { if (distributionPackage instanceof SharedDistributionPackage) { - if (distributionPackage instanceof SharedDistributionPackage) { - if (queueName != null) { - ((SharedDistributionPackage) distributionPackage).release(queueName); - log.debug("package {} released from queue {}", distributionPackage.getId(), queueName); - } else { - log.error("package {} cannot be released from null queue", distributionPackage.getId()); - } + if (queueName != null) { + ((SharedDistributionPackage) distributionPackage).release(queueName); + log.debug("package {} released from queue {}", distributionPackage.getId(), queueName); + } else { + log.error("package {} cannot be released from null queue", distributionPackage.getId()); } } else { distributionPackage.delete(); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java Thu Apr 30 07:34:37 2015 @@ -91,6 +91,7 @@ public interface DistributionQueue { * @return the item, or {@code null} if the item with the given id * doesn't exist */ + @CheckForNull DistributionQueueItem getItem(@Nonnull String packageId); /** @@ -100,6 +101,7 @@ public interface DistributionQueue { * @return the removed item, or {@code null} if the item with the given id * doesn't exist */ + @CheckForNull DistributionQueueItem remove(@Nonnull String packageId); @@ -119,5 +121,6 @@ public interface DistributionQueue { * returns the state of the queue * @return the queue state */ + @Nonnull DistributionQueueState getState(); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java Thu Apr 30 07:34:37 2015 @@ -206,6 +206,7 @@ public class JobHandlingDistributionQueu return item; } + @Nonnull public DistributionQueueState getState() { if (!isActive) { return DistributionQueueState.PAUSED; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java Thu Apr 30 07:34:37 2015 @@ -18,6 +18,7 @@ */ package org.apache.sling.distribution.queue.impl.simple; +import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.util.Calendar; import java.util.Map; @@ -88,6 +89,7 @@ public class SimpleDistributionQueue imp } } + @CheckForNull public DistributionQueueItem getHead() { DistributionQueueItem element = queue.peek(); if (element != null) { @@ -107,6 +109,7 @@ public class SimpleDistributionQueue imp return queue.size(); } + @Nonnull public DistributionQueueState getState() { return DistributionQueueUtils.calculateState(this); } @@ -117,6 +120,7 @@ public class SimpleDistributionQueue imp return queue; } + @CheckForNull public DistributionQueueItem getItem(@Nonnull String id) { DistributionQueueItem toRemove = null; for (DistributionQueueItem item : queue) { @@ -129,6 +133,7 @@ public class SimpleDistributionQueue imp } + @CheckForNull public DistributionQueueItem remove(@Nonnull String id) { DistributionQueueItem toRemove =getItem(id); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java Thu Apr 30 07:34:37 2015 @@ -49,7 +49,6 @@ public abstract class AbstractDistributi this.type = type; } - public String getType() { return type; } @@ -79,12 +78,11 @@ public abstract class AbstractDistributi @CheckForNull public DistributionPackage readPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageReadingException { - DistributionPackage distributionPackage = null; + if (!stream.markSupported()) { stream = new BufferedInputStream(stream); } - distributionPackage = SimpleDistributionPackage.fromStream(stream, type); - + DistributionPackage distributionPackage = SimpleDistributionPackage.fromStream(stream, type); stream.mark(-1); @@ -116,7 +114,7 @@ public abstract class AbstractDistributi return installed; } - private boolean installDeletePackage(ResourceResolver resourceResolver, DistributionPackage distributionPackage) throws DistributionPackageReadingException { + private boolean installDeletePackage(@Nonnull ResourceResolver resourceResolver, @CheckForNull DistributionPackage distributionPackage) throws DistributionPackageReadingException { Session session = null; try { if (distributionPackage != null) { @@ -138,6 +136,7 @@ public abstract class AbstractDistributi return false; } + @CheckForNull public DistributionPackage getPackage(@Nonnull ResourceResolver resourceResolver, @Nonnull String id) { DistributionPackage distributionPackage = SimpleDistributionPackage.fromIdString(id, type); @@ -168,17 +167,19 @@ public abstract class AbstractDistributi } } - protected abstract DistributionPackage createPackageForAdd(ResourceResolver resourceResolver, DistributionRequest request) + @CheckForNull + protected abstract DistributionPackage createPackageForAdd(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionPackageBuildingException; - - protected abstract DistributionPackage readPackageInternal(ResourceResolver resourceResolver, InputStream stream) + @CheckForNull + protected abstract DistributionPackage readPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageReadingException; - protected abstract boolean installPackageInternal(ResourceResolver resourceResolver, DistributionPackage distributionPackage) + protected abstract boolean installPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException; - protected abstract DistributionPackage getPackageInternal(ResourceResolver resourceResolver, String id); + @CheckForNull + protected abstract DistributionPackage getPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull String id); } Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/ResourceSharedDistributionPackage.java Thu Apr 30 07:34:37 2015 @@ -73,7 +73,7 @@ public class ResourceSharedDistributionP deleteHolderResource(holderName); Resource holderRoot = getHolderRootResource(); - if (!holderRoot.hasChildren()) { + if (holderRoot != null && !holderRoot.hasChildren()) { delete(); } } catch (PersistenceException e) { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilder.java Thu Apr 30 07:34:37 2015 @@ -18,6 +18,7 @@ */ package org.apache.sling.distribution.serialization.impl.vlt; +import javax.annotation.Nonnull; import javax.jcr.Session; import java.io.File; import java.io.FileOutputStream; @@ -62,6 +63,7 @@ public class FileVaultDistributionPackag private ImportMode importMode; private AccessControlHandling aclHandling; + private final String[] packageRoots; public FileVaultDistributionPackageBuilder(String type, Packaging packaging, ImportMode importMode, AccessControlHandling aclHandling, String[] packageRoots) { @@ -73,7 +75,7 @@ public class FileVaultDistributionPackag } @Override - protected DistributionPackage createPackageForAdd(ResourceResolver resourceResolver, DistributionRequest request) + protected DistributionPackage createPackageForAdd(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionPackageBuildingException { Session session = null; try { @@ -97,7 +99,7 @@ public class FileVaultDistributionPackag } @Override - protected DistributionPackage readPackageInternal(ResourceResolver resourceResolver, final InputStream stream) + protected DistributionPackage readPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull final InputStream stream) throws DistributionPackageReadingException { log.debug("reading a stream"); DistributionPackage pkg = null; @@ -123,7 +125,7 @@ public class FileVaultDistributionPackag @Override - protected DistributionPackage getPackageInternal(ResourceResolver resourceResolver, String id) { + protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull String id) { DistributionPackage distributionPackage = null; try { File file = new File(id); @@ -139,7 +141,7 @@ public class FileVaultDistributionPackag @Override - public boolean installPackageInternal(ResourceResolver resourceResolver, DistributionPackage distributionPackage) throws DistributionPackageReadingException { + public boolean installPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException { log.debug("reading a distribution package stream"); Session session = null; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/JcrVaultDistributionPackageBuilder.java Thu Apr 30 07:34:37 2015 @@ -23,6 +23,7 @@ import java.io.File; import java.io.InputStream; import java.util.UUID; +import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -75,7 +76,7 @@ public class JcrVaultDistributionPackage } @Override - protected DistributionPackage createPackageForAdd(ResourceResolver resourceResolver, DistributionRequest request) throws DistributionPackageBuildingException { + protected DistributionPackage createPackageForAdd(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest request) throws DistributionPackageBuildingException { Session session = null; try { session = getSession(resourceResolver); @@ -103,7 +104,7 @@ public class JcrVaultDistributionPackage } @Override - protected DistributionPackage readPackageInternal(ResourceResolver resourceResolver, InputStream stream) throws DistributionPackageReadingException { + protected DistributionPackage readPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull InputStream stream) throws DistributionPackageReadingException { Session session = null; try { session = getSession(resourceResolver); @@ -120,7 +121,7 @@ public class JcrVaultDistributionPackage } @Override - protected boolean installPackageInternal(ResourceResolver resourceResolver, DistributionPackage distributionPackage) throws DistributionPackageReadingException { + protected boolean installPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionPackage distributionPackage) throws DistributionPackageReadingException { Session session = null; try { session = getSession(resourceResolver); @@ -143,7 +144,7 @@ public class JcrVaultDistributionPackage } @Override - protected DistributionPackage getPackageInternal(ResourceResolver resourceResolver, String id) { + protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull String id) { Session session = null; try { session = getSession(resourceResolver); Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java?rev=1676913&r1=1676912&r2=1676913&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java Thu Apr 30 07:34:37 2015 @@ -77,7 +77,7 @@ public class FileVaultDistributionPackag FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder("filevlt", packaging, null, null, null); - DistributionRequest request = new SimpleDistributionRequest(DistributionRequestType.ADD, new String[]{"/"}); + DistributionRequest request = new SimpleDistributionRequest(DistributionRequestType.ADD, "/"); DistributionPackage distributionPackage = fileVaultdistributionPackageBuilder.createPackageForAdd(resourceResolver, request); assertNotNull(distributionPackage); }