You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2018/01/30 09:50:13 UTC

[sling-org-apache-sling-repoinit-parser] branch master updated: Add back some constructors for optional extra arguments and make OperationVisitor ProviderType (which it should be) - that will make SLING-7226 and SLING-7227 more backword compatible.

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git


The following commit(s) were added to refs/heads/master by this push:
     new 69acb05  Add back some constructors for optional extra arguments and make OperationVisitor ProviderType (which it should be) - that will make SLING-7226 and SLING-7227 more backword compatible.
69acb05 is described below

commit 69acb053e544c7cf5bf4d1e78fbd6bb036acece2
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Jan 30 10:50:06 2018 +0100

    Add back some constructors for optional extra arguments and make OperationVisitor ProviderType (which it should be) - that will make SLING-7226 and SLING-7227 more backword compatible.
---
 .../sling/repoinit/parser/operations/CreateServiceUser.java    |  4 ++++
 .../apache/sling/repoinit/parser/operations/CreateUser.java    | 10 ++++++++++
 .../sling/repoinit/parser/operations/OperationVisitor.java     |  3 +++
 .../apache/sling/repoinit/parser/operations/package-info.java  |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
index c1e4e11..01e5906 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
@@ -20,6 +20,10 @@ package org.apache.sling.repoinit.parser.operations;
 public class CreateServiceUser extends ServiceUserOperation {
     private final String path;
 
+    public CreateServiceUser(String username) {
+        this(username, null);
+    }
+
     public CreateServiceUser(String username, String path) {
         super(username);
         this.path = path;
diff --git a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
index c27039a..7f454ab 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
@@ -28,6 +28,16 @@ public class CreateUser extends Operation {
      * @param passwordEncoding optional encoding for the supplied password
      * @param password optional password
      */
+    public CreateUser(String username, String passwordEncoding, String password) {
+        this(username, passwordEncoding, password, null);
+    }
+
+    /** Operation that creates a user.
+     * @param username the name of the user to create
+     * @param passwordEncoding optional encoding for the supplied password
+     * @param password optional password
+     * @param path optional path
+     */
     public CreateUser(String username, String passwordEncoding, String password, String path) {
         this.username = username;
         this.passwordEncoding = passwordEncoding;
diff --git a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
index 8488b2c..f84eefb 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
@@ -17,6 +17,9 @@
 
 package org.apache.sling.repoinit.parser.operations;
 
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
 public interface OperationVisitor {
     void visitCreateUser(CreateUser u);
     void visitDeleteUser(DeleteUser u);
diff --git a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
index 1db1f72..6b7e0d7 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
@@ -15,6 +15,6 @@
  * limitations under the License.
  ******************************************************************************/
 
-@org.osgi.annotation.versioning.Version("5.0.0")
+@org.osgi.annotation.versioning.Version("4.1.0")
 package org.apache.sling.repoinit.parser.operations;
 

-- 
To stop receiving notification emails like this one, please contact
pauls@apache.org.