added data source support

wttech · Oct 2, 2023 · 8252e8a · 8252e8a
1 parent d64f086
commit 8252e8a
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 38 deletions.
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ContentDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ContentDataSource.java
@@ -19,17 +19,23 @@
  */
 package com.cognifide.apm.core.grammar.datasource;
 
-import com.cognifide.apm.core.grammar.*;
+import com.cognifide.apm.core.grammar.ApmEmpty;
+import com.cognifide.apm.core.grammar.ApmList;
+import com.cognifide.apm.core.grammar.ApmMap;
+import com.cognifide.apm.core.grammar.ApmString;
+import com.cognifide.apm.core.grammar.ApmType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.component.annotations.Component;
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 @Component
 public class ContentDataSource implements DataSource {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSource.java
@@ -20,9 +20,8 @@
 package com.cognifide.apm.core.grammar.datasource;
 
 import com.cognifide.apm.core.grammar.ApmType;
-import org.apache.sling.api.resource.ResourceResolver;
-
 import java.util.List;
+import org.apache.sling.api.resource.ResourceResolver;
 
 public interface DataSource {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSourceInvoker.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSourceInvoker.java
@@ -20,16 +20,15 @@
 package com.cognifide.apm.core.grammar.datasource;
 
 import com.cognifide.apm.core.grammar.ApmType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Component(service = DataSourceInvoker.class)
 public class DataSourceInvoker {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/GroupsDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/GroupsDataSource.java
@@ -1,16 +1,14 @@
 package com.cognifide.apm.core.grammar.datasource;
 
-import com.cognifide.apm.core.grammar.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.osgi.service.component.annotations.Component;
-
+import com.cognifide.apm.core.grammar.ApmList;
+import com.cognifide.apm.core.grammar.ApmString;
+import com.cognifide.apm.core.grammar.ApmType;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Component;
 
 @Component
 public class GroupsDataSource implements DataSource {

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/LowerDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/LowerDataSource.java
@@ -21,11 +21,10 @@
 
 import com.cognifide.apm.core.grammar.ApmString;
 import com.cognifide.apm.core.grammar.ApmType;
+import java.util.List;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.component.annotations.Component;
 
-import java.util.List;
-
 @Component
 public class LowerDataSource implements DataSource {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/NodesDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/NodesDataSource.java
@@ -23,16 +23,15 @@
 import com.cognifide.apm.core.grammar.ApmMap;
 import com.cognifide.apm.core.grammar.ApmString;
 import com.cognifide.apm.core.grammar.ApmType;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.osgi.service.component.annotations.Component;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Component;
 
 @Component
 public class NodesDataSource implements DataSource {

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/UpperDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/UpperDataSource.java
@@ -21,11 +21,10 @@
 
 import com.cognifide.apm.core.grammar.ApmString;
 import com.cognifide.apm.core.grammar.ApmType;
+import java.util.List;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.component.annotations.Component;
 
-import java.util.List;
-
 @Component
 public class UpperDataSource implements DataSource {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ValueMapDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ValueMapDataSource.java
@@ -19,16 +19,22 @@
  */
 package com.cognifide.apm.core.grammar.datasource;
 
-import com.cognifide.apm.core.grammar.*;
+import com.cognifide.apm.core.grammar.ApmInteger;
+import com.cognifide.apm.core.grammar.ApmList;
+import com.cognifide.apm.core.grammar.ApmMap;
+import com.cognifide.apm.core.grammar.ApmString;
+import com.cognifide.apm.core.grammar.ApmType;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
 import org.osgi.service.component.annotations.Component;
 
-import java.io.InputStream;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
 @Component
 public class ValueMapDataSource implements DataSource {
 

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/logger/ProgressEntry.java b/app/aem/core/src/main/java/com/cognifide/apm/core/logger/ProgressEntry.java
@@ -74,7 +74,7 @@ public List<String> getMessages() {
   @Override
   public List<String> getPrettyMessages() {
     return messages.stream()
-        .map(message ->  message.replaceAll("\n", "<br>").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"))
+        .map(message -> message.replaceAll("\n", "<br>").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"))
         .collect(Collectors.toList());
   }
 

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ApmType.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ApmType.kt
@@ -82,7 +82,7 @@ data class ApmList(val value: List<ApmType>) : ApmType() {
     }
 
     override fun prettyPrint(depth: Int, prefixDepth: Int): String {
-        return if (value.all { it is ApmString || it is ApmInteger }) {
+        return if (value.isEmpty() || value.all { it is ApmString || it is ApmInteger }) {
             value.joinToString(
                 prefix = "\t".repeat(prefixDepth) + "[",
                 postfix = "]"
@@ -109,9 +109,9 @@ data class ApmMap(val value: Map<String, ApmType>) : ApmType() {
     }
 
     override fun prettyPrint(depth: Int, prefixDepth: Int): String {
-        return if (value.size == 1
+        return if (value.isEmpty() || value.size == 1
             && (value.values.all { it is ApmString || it is ApmInteger }
-                || value.values.filterIsInstance<ApmList>().first().value.all { it is ApmString || it is ApmInteger })
+                    || value.values.first { it is ApmList }.list!!.all { it is ApmString || it is ApmInteger })
         ) {
             value.entries.joinToString(
                 prefix = "\t".repeat(prefixDepth) + "{",

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt
@@ -20,8 +20,30 @@
 
 package com.cognifide.apm.core.grammar.argument
 
-import com.cognifide.apm.core.grammar.*
-import com.cognifide.apm.core.grammar.antlr.ApmLangParser.*
+import com.cognifide.apm.core.grammar.ApmEmpty
+import com.cognifide.apm.core.grammar.ApmInteger
+import com.cognifide.apm.core.grammar.ApmList
+import com.cognifide.apm.core.grammar.ApmMap
+import com.cognifide.apm.core.grammar.ApmPair
+import com.cognifide.apm.core.grammar.ApmString
+import com.cognifide.apm.core.grammar.ApmType
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.ArgumentContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.ArrayContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.ComplexArgumentsContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.DataSourceContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.ExpressionContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.FlagContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.NameContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.NamedArgumentContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.NamedArgumentsContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.NumberValueContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.PathContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.PrivilegeNameContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.RequiredArgumentContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.StringValueContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.StructureContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.StructureEntryContext
+import com.cognifide.apm.core.grammar.antlr.ApmLangParser.VariableContext
 import com.cognifide.apm.core.grammar.common.getIdentifier
 import com.cognifide.apm.core.grammar.common.getKey
 import com.cognifide.apm.core.grammar.common.getPath