[sling-org-apache-sling-installer-core] branch master updated: SLING-10538 : Support merging of configurations

[cz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git


The following commit(s) were added to refs/heads/master by this push:
     new f7a5e5f  SLING-10538 : Support merging of configurations
f7a5e5f is described below

commit f7a5e5ff41d34dedeeb71a6d7f6b1e473a26e762
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 24 09:15:58 2021 +0200

    SLING-10538 : Support merging of configurations
---
 .../sling/installer/api/tasks/TaskResourceGroup.java       | 14 ++++++++++++++
 .../org/apache/sling/installer/api/tasks/package-info.java |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
index 9c8f6c0..6701021 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.installer.api.tasks;
 
+import java.util.Iterator;
+
 import org.jetbrains.annotations.Nullable;
 
 import org.osgi.annotation.versioning.ProviderType;
@@ -34,6 +36,7 @@ public interface TaskResourceGroup {
      * Return the first resource if it either needs to be installed or uninstalled.
      * @return The task resource.
      */
+    @Nullable
     TaskResource getActiveResource();
 
     /**
@@ -42,9 +45,20 @@ public interface TaskResourceGroup {
      * @return The next task resource or {@code null}.
      * @since 1.1
      */
+    @Nullable
     TaskResource getNextActiveResource();
 
     /**
+     * Return an iterator over all active resources in this group if there is more than just
+     * one active resourcew. The iterator does not allow to modify the group.
+     * @return An iterator for all active resources in this group or {code null} if there
+     *         is no or just one active resource.
+     * @since 1.6
+     */
+    @Nullable
+    Iterator<TaskResource> getActiveResourceIterator();
+
+    /**
      * Set the finish state for the active resource.
      * If this resource has been uninstalled, check the next in the list if it needs to
      * be reactivated.
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
index dfdb91e..252a768 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-@org.osgi.annotation.versioning.Version("1.5.0")
+@org.osgi.annotation.versioning.Version("1.6.0")
 package org.apache.sling.installer.api.tasks;