Shorter scripts

Author: krystian-panek-vmltech

README.md

@@ -288,7 +288,7 @@ Logging is very descriptive allowing you to see what was done and what was skipp
 You can leverage the [repository service](https://github.com/wttech/acm/blob/main/core/src/main/java/dev/vml/es/acm/core/repo/Repo.java) (`repo`) to efficiently perform JCR operations such as reading, writing, and deleting nodes with concise, expressive code.
 The out-of-the-box AEM API often requires extensive boilerplate code and can behave unpredictably in certain scenarios. The [RepoResource](https://github.com/wttech/acm/blob/main/core/src/main/java/dev/vml/es/acm/core/repo/RepoResource.java) API streamlines these operations, making repository programming more enjoyable, concise, and reliable.
 
-The repo service abstracts away the complexity of managing dry-run and auto-commit behaviors—features that are often error-prone and cumbersome to implement manually—ensuring safe, predictable, and streamlined repository operations.
+The repo service abstracts away the complexity of managing dry-run and auto-commit behaviors—features that are often error-prone and cumbersome to implement manually — ensuring safe, predictable, and streamlined repository operations.
 
 ```groovy
 void describeRun() {
@@ -307,16 +307,14 @@ void doRun() {
         println "Creating a folder structure in the temporary directory of the repository."
         def dataFolder = repo.get("/tmp/acm/demo/data").ensureFolder()
         for (int i = 0; i < 5; i++) {
-            def child = dataFolder.child("child-\${i+1}")
-            child.save(["foo": "bar"])
+            def child = dataFolder.child("child-\${i+1}").save(["foo": "bar"])
             child.updateProperty("foo") { v -> v.toUpperCase() }
         }
         println "Folder '${dataFolder.path}' has now ${dataFolder.descendants().count()} descendant(s)."
 
         println "Creating a post in the temporary directory of the repository."
         def postFolder = repo.get("/tmp/acm/demo/posts").ensureFolder()
-        def post = postFolder.child("hello-world.yml")
-        post.saveFile("application/x-yaml") { output ->
+        def post = postFolder.child("hello-world.yml").saveFile("application/x-yaml") { output ->
             formatter.yml.write(output, [
                     title: "Hello World",
                     description: "This is a sample post.",

core/src/main/java/dev/vml/es/acm/core/repo/RepoResource.java

@@ -116,11 +116,12 @@ public RepoResource ensure(String resourceType) {
         return this;
     }
 
-    public Resource save(String key, Object value) {
-        return save(Collections.singletonMap(key, value));
+    public RepoResource save(String key, Object value) {
+        save(Collections.singletonMap(key, value));
+        return this;
     }
 
-    public Resource save(Map<String, Object> values) {
+    public RepoResource save(Map<String, Object> values) {
         Resource result = resolve();
         if (result == null) {
             String parentPath = StringUtils.substringBeforeLast(path, "/");
@@ -134,7 +135,7 @@ public Resource save(Map<String, Object> values) {
                 result = repo.getResourceResolver().create(parent, name, values);
                 repo.commit(String.format("creating resource at path '%s'", path));
                 LOG.info("Created resource at path '{}'", path);
-                return result;
+                return this;
             } catch (PersistenceException e) {
                 throw new RepoException(String.format("Cannot save resource at path '%s'!", path), e);
             }
@@ -144,7 +145,7 @@ public Resource save(Map<String, Object> values) {
             repo.commit(String.format("updating resource at path '%s'", path));
             LOG.info("Updated resource at path '{}'", path);
         }
-        return result;
+        return this;
     }
 
     public ValueMap properties() {
@@ -491,22 +492,25 @@ public RepoResourceState state() {
         return new RepoResourceState(path, true, resource.getValueMap());
     }
 
-    public void saveFile(String mimeType, Consumer<OutputStream> dataWriter) {
+    public RepoResource saveFile(String mimeType, Consumer<OutputStream> dataWriter) {
         saveFileInternal(mimeType, null, dataWriter);
+        return this;
     }
 
-    public void saveFile(String mimeType, File file) {
+    public RepoResource saveFile(String mimeType, File file) {
         saveFile(mimeType, (OutputStream os) -> {
             try (InputStream is = Files.newInputStream(file.toPath())) {
                 IOUtils.copy(is, os);
             } catch (IOException e) {
                 throw new RepoException(String.format("Cannot write file '%s' to path '%s'!", file.getPath(), path), e);
             }
         });
+        return this;
     }
 
-    public void saveFile(String mimeType, Object data) {
+    public RepoResource saveFile(String mimeType, Object data) {
         saveFileInternal(mimeType, data, null);
+        return this;
     }
 
     private void saveFileInternal(String mimeType, Object data, Consumer<OutputStream> dataWriter) {

ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/repo/demo.yml

@@ -26,8 +26,7 @@ content: |
       println "Creating a folder structure in the temporary directory of the repository."
       def dataFolder = repo.get("/tmp/acm/demo/data").ensureFolder()
       for (int i = 0; i < 5; i++) {
-        def child = dataFolder.child("child-\${i+1}")
-        child.save(["foo": "bar"])
+        def child = dataFolder.child("child-\${i+1}").save(["foo": "bar"])
         child.updateProperty("foo") { v -> v.toUpperCase() }
       }
       println "Folder '${dataFolder.path}' has now ${dataFolder.descendants().count()} descendant(s)."
@@ -38,8 +37,7 @@ content: |
     
       println "Creating a post in the temporary directory of the repository."
       def postFolder = repo.get("/tmp/acm/demo/posts").ensureFolder()
-      def post = postFolder.child("hello-world.yml")
-      post.saveFile("application/x-yaml") { output ->
+      def post = postFolder.child("hello-world.yml").saveFile("application/x-yaml") { output ->
         formatter.yml.write(output, [
             title: "Hello World",
             description: "This is a sample post.",