Merge pull request #2 from merkle-open/develop

Merge develop to main
merkle-open · Feb 9, 2024 · af911f6 · af911f6
2 parents 0594e07 + 993fb9e
commit af911f6
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/.github/workflows/release-and-deploy-release.yml b/.github/workflows/release-and-deploy-release.yml
@@ -21,6 +21,11 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
+      - name: Maven setup
+        uses: ./.github/actions/mvn-setup
+        with:
+          mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}}
+          mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
       # Install xmllint
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install libxml2-utils

diff --git a/blossom-reference-generator/pom.xml b/blossom-reference-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-handlebars-renderer-parent</artifactId>
-        <version>0.0.12</version>
+        <version>0.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-handlebars-blossom-reference-generator</artifactId>

diff --git a/blossom/pom.xml b/blossom/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-handlebars-renderer-parent</artifactId>
-        <version>0.0.12</version>
+        <version>0.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-handlebars-renderer-blossom</artifactId>

diff --git a/light-development/pom.xml b/light-development/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-handlebars-renderer-parent</artifactId>
-        <version>0.0.12</version>
+        <version>0.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-handlebars-renderer</artifactId>

diff --git a/...a/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java b/...a/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java
@@ -27,6 +27,7 @@
 import info.magnolia.templating.module.TemplatingModule;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.jcr.*;
@@ -67,27 +68,32 @@ public Optional<CharSequence> applySafe(final Object ignored, final Options opti
 		final Node templateNode = Optional.ofNullable((Node)options.hash("templateNode")).orElseGet(model::getNode);
 
 		final AreaDefinition areaDefinition = getAreaDefinition(area, templateNode);
-		final Node areaNode = getOrCreateAreaNode(area, templateNode, areaDefinition);
-		final String workspace = areaNode.getSession().getWorkspace().getName();
-		final String nodeIdentifier = areaNode.getIdentifier();
-		final String path = areaNode.getPath();
-
-		//Magnolia's AreaElement.begin calls render with empty HashMap --> use ContextObjectsRenderingEngineWrapper
-		final AreaElement areaElement = Components.getComponentProvider().newInstance(
-				CustomAvailableComponentsAreaElement.class,
-				new ContextObjectsRenderingEngineWrapper(renderingEngine, options.hash)
-		);
-		areaElement.setContent(areaNode);
-		areaElement.setWorkspace(workspace);
-		areaElement.setNodeIdentifier(nodeIdentifier);
-		areaElement.setPath(path);
-		areaElement.setArea(areaDefinition);
-		areaElement.setName(name);
-		areaElement.setContextAttributes(options.hash);
 
-		areaElement.setEditable(editable);
+		@Nullable
+		final Node areaNode = getOrCreateAreaNode(area, templateNode, areaDefinition).orElse(null);
+		if(areaNode != null) {
+			final String workspace = areaNode.getSession().getWorkspace().getName();
+			final String nodeIdentifier = areaNode.getIdentifier();
+			final String path = areaNode.getPath();
+
+			//Magnolia's AreaElement.begin calls render with empty HashMap --> use ContextObjectsRenderingEngineWrapper
+			final AreaElement areaElement = Components.getComponentProvider().newInstance(
+					CustomAvailableComponentsAreaElement.class,
+					new ContextObjectsRenderingEngineWrapper(renderingEngine, options.hash)
+			);
+			areaElement.setContent(areaNode);
+			areaElement.setWorkspace(workspace);
+			areaElement.setNodeIdentifier(nodeIdentifier);
+			areaElement.setPath(path);
+			areaElement.setArea(areaDefinition);
+			areaElement.setName(name);
+			areaElement.setContextAttributes(options.hash);
+
+			areaElement.setEditable(editable);
 
-		return Optional.of(render(areaElement));
+			return Optional.of(render(areaElement));
+		}
+		return Optional.empty();
 	}
 
 	@SuppressWarnings("rawtypes")
@@ -136,16 +142,14 @@ private Optional<AreaDefinition> getAreaDefinition(final String name, final Map<
 				.findFirst();
 	}
 
-	private Node getOrCreateAreaNode(final String name, final Node node, final AreaDefinition areaDefinition) throws RenderException {
+	private Optional<Node> getOrCreateAreaNode(final String name, final Node node, final AreaDefinition areaDefinition) throws RenderException {
 		try {
 			if(Boolean.FALSE.equals(areaDefinition.getCreateAreaNode())) {
-				return node;
+				return Optional.of(node);
 			}
-			return node.getNode(name);
+			return Optional.of(node.getNode(name));
 		} catch (PathNotFoundException e) {
-			return createAreaNode(name, node, areaDefinition).orElseThrow(() ->
-				new RenderException("Couldn't create area node " + name + " " + NodeUtil.getPathIfPossible(node))
-			);
+			return createAreaNode(name, node, areaDefinition);
 		} catch (RepositoryException e) {
 			throw Exceptions.sneak().handle(e);
 		}

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.namics.oss.magnolia</groupId>
 	<artifactId>magnolia-handlebars-renderer-parent</artifactId>
-	<version>0.0.12</version>
+	<version>0.0.13-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>${project.artifactId}</name>