added data source support

Author: dprzybyl

app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java

@@ -33,7 +33,7 @@ public class LevelsMapper {
   @Mapping(
       examples = "LEVELS('/content', [\n" +
           "\t{regex: '(.+)_(.+)',paramNames: ['param1', 'param2']}, # 1st level\n" +
-          "\t{excludeRegex: '[^:]+'}, # 2nd level\n" +
+          "\t{excludeRegex: '.+:.+'}, # 2nd level\n" +
           "\t{template: '/apps/test/pageTemplate', resourceType: 'test/pageRenderer'}, # 3rd level\n" +
           "\t{properties: [ # 4th level\n" +
           "\t\t{name: 'jcr:primaryType', regex: 'cq:Page'},\n" +

app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java

@@ -24,6 +24,7 @@
 import com.cognifide.apm.api.actions.annotations.Mapping;
 import com.cognifide.apm.api.actions.annotations.Required;
 import com.cognifide.apm.main.actions.ActionGroup;
+import java.util.Map;
 import org.apache.commons.lang3.NotImplementedException;
 
 @Mapper(value = "VALUEMAP", group = ActionGroup.DATASOURCE)
@@ -39,12 +40,15 @@ public Action mapAction(
   }
 
   @Mapping(
-      examples = "VALUEMAP('/content/dam', '[^:]+')",
-      reference = "Provides value map with properties which matching given regex for given resource path"
+      examples = "VALUEMAP('/content/dam', {\n" +
+          "\tregex: 'prop.+',\n" +
+          "\texcludeRegex: '.+:.+'\n" +
+          "})",
+      reference = "Provides value map with properties which matching given regex expressions for given resource path"
   )
   public Action mapAction(
       @Required(value = "path", description = "Resource path") String path,
-      @Required(value = "regex", description = "Regex expression") String regex) {
+      @Required(value = "regexMap", description = "Map of regex expressions") Map<String, String> regex) {
     throw new NotImplementedException("");
   }
 }

app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ValueMapDataSource.java

@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -50,8 +51,11 @@ public String getName() {
   @Override
   public ApmType determine(ResourceResolver resolver, List<Object> parameters) {
     String path = (String) parameters.get(0);
-    String regex = parameters.size() > 1 ? (String) parameters.get(1) : null;
+    Map<String, String> regexMap = parameters.size() > 1 ? (Map<String, String>) parameters.get(1) : Collections.emptyMap();
+    String regex = regexMap.get("regex");
     Pattern pattern = StringUtils.isNotEmpty(regex) ? Pattern.compile(regex) : null;
+    String excludeRegex = regexMap.get("excludeRegex");
+    Pattern excludePattern = StringUtils.isNotEmpty(excludeRegex) ? Pattern.compile(excludeRegex) : null;
     Resource resource = resolver.getResource(path);
     if (resource == null) {
       return new ApmEmpty();
@@ -60,6 +64,7 @@ public ApmType determine(ResourceResolver resolver, List<Object> parameters) {
     Map<String, ApmType> map = valueMap.entrySet()
         .stream()
         .filter(entry -> pattern == null || pattern.matcher(entry.getKey()).matches())
+        .filter(entry -> excludePattern == null || !excludePattern.matcher(entry.getKey()).matches())
         .map(entry -> new ApmPair(entry.getKey(), determineValue(entry.getValue())))
         .collect(Collectors.toMap(ApmPair::getKey, ApmPair::getValue));
     return new ApmMap(map);