Update master after release 4.3.1

.github/workflows/createerelease.yml

@@ -25,8 +25,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 3
 
     - name: print configuration
       run: |
@@ -177,6 +175,16 @@ jobs:
         pwd
         $MVNCMD nexus-staging:drop
 
+    - name: Set master branch to released version
+      if: ${{ github.event.inputs.dryrun == 'false' }}
+      run: |
+        # we are now at the "prepare for next development iteration" commit, the commit with the release is the previous one.
+        # We need to set the master branch to that commit, and then push it.
+        git fetch --all
+        git branch temp develop~1
+        git push origin temp:master
+        git branch -d temp
+
     - name: List target files even if recipe fails
       if: always()
       run: |

.gitignore

@@ -16,8 +16,6 @@ Servers
 build
 # Maven
 target
-# Groovy
-.groovy
 # some source repos
 .svn
 # File Vault

commons/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>4.2.3</version>
+        <version>4.3.1</version>
     </parent>
 
     <artifactId>composum-nodes-commons</artifactId>

commons/src/main/java/com/composum/sling/core/ResourceHandle.java

@@ -22,12 +22,15 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -544,4 +547,17 @@ public Calendar getLastModified() {
         return lastModified;
     }
 
+    /**
+     * Returns the children as immutable list - sometimes better for iteration.
+     */
+    @Nonnull
+    public List<Resource> getChildrenList() {
+        List<Resource> children = new ArrayList<>();
+        Iterable<Resource> rawChildren = super.getChildren();
+        if (rawChildren != null) {
+            rawChildren.forEach(children::add);
+        }
+        return Collections.unmodifiableList(children);
+    }
+
 }

commons/src/main/java/com/composum/sling/core/servlet/NodeTreeServlet.java

@@ -401,7 +401,7 @@ public NodeParameters getFormParameters(SlingHttpServletRequest request) {
         params.path = XSS.filter(request.getParameter(PARAM_PATH));
         params.before = XSS.filter(request.getParameter(PARAM_BEFORE));
         params.index = XSS.filter(request.getParameter(PARAM_INDEX));
-        params.type = XSS.filter(request.getParameter(PARAM_TYPE));
+        params.type = StringUtils.trim(XSS.filter(request.getParameter(PARAM_TYPE)));
         params.title = XSS.filter(request.getParameter(PARAM_TITLE));
         params.mimeType = XSS.filter(request.getParameter(PARAM_MIME_TYPE));
         params.resourceType = XSS.filter(request.getParameter(PARAM_RESOURCE_TYPE));

commons/src/main/java/com/composum/sling/core/util/JsonUtil.java

@@ -858,18 +858,12 @@ public static String getValueTarget(@Nullable final Resource resource,
                     return target.getPath();
                 }
             }
+            boolean checkAsRelativePath = false;
             if (StringUtils.isNotBlank(name)) {
                 switch (name) {
                     case PROP_RESOURCE_TYPE:
                     case PROP_RESOURCE_SUPER_TYPE:
-                        if (!value.startsWith("/")) {
-                            for (String root : resolver.getSearchPath()) {
-                                target = resolver.getResource(root + value);
-                                if (target != null) {
-                                    return target.getPath();
-                                }
-                            }
-                        }
+                        checkAsRelativePath = true;
                         break;
                     case PROP_UUID:
                         break;
@@ -888,9 +882,19 @@ public static String getValueTarget(@Nullable final Resource resource,
                             } catch (Exception ignore) {
                             }
                         }
+                        // heuristics whether it could be a path: it should contain at least a slash but no whitespace
+                        checkAsRelativePath = value.contains("/") && !value.matches(".*\\s+.*");
                         break;
                 }
             }
+            if (checkAsRelativePath) {
+                for (String root : resolver.getSearchPath()) {
+                    target = resolver.getResource(root + value);
+                    if (target != null) {
+                        return target.getPath();
+                    }
+                }
+            }
         }
         return null;
     }

commons/src/main/java/com/composum/sling/core/util/SlingResourceUtil.java

@@ -5,14 +5,15 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 
 /**
  * A set of utility functions related to the handling of Sling Resources, without going down to JCR specifics.
@@ -173,7 +174,7 @@ public static Stream<Resource> descendantsStream(@Nullable Resource resource) {
      * @param leafFilter if this returns true, this assumes the resource is a leaf and does not return it's descendants.
      * @return a stream running through the resource and it's the descendants, not null
      */
-    @NotNull
+    @Nonnull
     public static Stream<Resource> descendantsStream(@Nullable Resource resource,
                                                      @Nullable Function<Resource, Boolean> leafFilter) {
         if (resource == null) {

commons/src/main/resources/root/libs/composum/nodes/commons/components/js/codeEditor.js

@@ -33,6 +33,7 @@
                     this.ace.navigateFileStart();
                 }, this));
                 this.$el.resize(_.bind(this.resize, this));
+                this.$el.on('splitpaneresize', _.bind(this.resize, this));
 
                 this.$('.editor-toolbar .start-editing').click(_.bind(this.openEditDialog, this));
 

commons/src/main/resources/root/libs/composum/nodes/commons/components/richtext/richtext.js

@@ -9,6 +9,8 @@
                 editorSelector: '.rich-editor',
                 defaultOptions: {
                     semantic: true,
+                    autogrowOnEnter: true,
+                    urlProtocol: true,
                     btns: [
                         ['bold', 'italic', 'underline', 'strikethrough', 'code'],
                         ['superscript', 'subscript'], ['removeformat'],

console/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>4.2.3</version>
+        <version>4.3.1</version>
     </parent>
 
     <artifactId>composum-nodes-console</artifactId>
@@ -85,6 +85,7 @@
                         <Import-Package>
                             org.apache.sling.api.resource.*;version="[2.10,3)",
                             org.apache.sling.spi.resource.*;version="[1.1,2]",
+                            javax.annotation.*;version="[0,4)",
                             *
                         </Import-Package>
                         <Export-Package>
@@ -222,6 +223,18 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.discovery.api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.caconfig.api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.caconfig.spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.caconfig.impl</artifactId>
+        </dependency>
 
         <!-- JCR API, Jackrabbit -->
         <dependency>
@@ -324,6 +337,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
 
     </dependencies>
     <profiles>

console/src/main/java/com/composum/sling/nodes/ai/AIService.java

@@ -0,0 +1,56 @@
+package com.composum.sling.nodes.ai;
+
+import java.io.IOException;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * AI related services.
+ */
+public interface AIService {
+
+    public static enum ResponseFormat {
+        TEXT,
+        /**
+         * Returns only json; important: the prompt must contain a request to return JSON!
+         */
+        JSON
+    }
+
+    /**
+     * Whether the service is configured.
+     */
+    boolean isAvailable();
+
+    /**
+     * Simplest AI related service: execute a prompt and return the response of the AI.
+     *
+     * @param systemprompt   a system prompt to be used in addition to the prompt
+     * @param prompt         the prompt to be used
+     * @param responseFormat the format of the response, default {@link ResponseFormat#TEXT}.
+     * @return the response of the AI
+     */
+    @Nonnull
+    String prompt(@Nullable String systemprompt, @Nonnull String prompt, @Nullable ResponseFormat responseFormat) throws AIServiceException;
+
+    /**
+     * Something went wrong.
+     */
+    public class AIServiceException extends Exception {
+        public AIServiceException(String message) {
+            super(message);
+        }
+
+        public AIServiceException(String message, IOException e) {
+            super(message, e);
+        }
+    }
+
+    public class AIServiceNotAvailableException extends AIServiceException {
+        public AIServiceNotAvailableException() {
+            super("AI Service not available");
+        }
+    }
+
+}