Merge pull request #449 from wttech/remove-guava

removed guava dependency

Author: dprzybyl

app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java

@@ -27,14 +27,14 @@
 import com.cognifide.apm.checks.utils.ActionUtils;
 import com.cognifide.apm.checks.utils.MessagingUtils;
 import com.day.cq.security.util.CqActions;
-import com.google.common.collect.Lists;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
@@ -172,6 +172,6 @@ private static Set<Principal> getAuthorizablesToCheck(Authorizable authorizable,
   }
 
   private List<String> preparePrivilegesToCheck() {
-    return Lists.transform(permissions, String::toLowerCase);
+    return permissions.stream().map(String::toLowerCase).collect(Collectors.toList());
   }
 }

app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java

@@ -25,11 +25,10 @@
 import com.cognifide.apm.core.Property;
 import com.cognifide.apm.core.actions.scanner.AnnotatedClassRegistry;
 import com.cognifide.apm.core.actions.scanner.RegistryChangedListener;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -38,7 +37,6 @@
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
 import org.scribe.utils.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,7 +75,7 @@ public void deactivate() {
 
   @Override
   public void registryChanged(List<Class<?>> registeredClasses) {
-    this.mappers.set(ImmutableMap.copyOf(createActionMappers(registeredClasses)));
+    this.mappers.set(Collections.unmodifiableMap(createActionMappers(registeredClasses)));
   }
 
   @Override
@@ -93,7 +91,7 @@ public Collection<MapperDescriptor> getMappers() {
 
   private static Map<String, MapperDescriptor> createActionMappers(List<Class<?>> classes) {
     MapperDescriptorFactory mapperDescriptorFactory = new MapperDescriptorFactory();
-    Map<String, MapperDescriptor> mappers = Maps.newHashMapWithExpectedSize(classes.size());
+    Map<String, MapperDescriptor> mappers = new HashMap<>(classes.size());
     for (Class<?> clazz : classes) {
       try {
         MapperDescriptor mapperDescriptor = mapperDescriptorFactory.create(clazz);

app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionResultImpl.java

@@ -22,8 +22,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Message;
 import com.cognifide.apm.api.status.Status;
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
@@ -53,12 +53,12 @@ public void setAuthorizable(String authorizable) {
 
   @Override
   public ActionResult merge(ActionResult... actionResults) {
-    return merge(Lists.newArrayList(actionResults));
+    return merge(Arrays.asList(actionResults));
   }
 
   @Override
   public ActionResult merge(List<ActionResult> actionResults) {
-    List<ActionResult> all = Lists.newArrayList();
+    List<ActionResult> all = new ArrayList<>();
     all.add(this);
     all.addAll(actionResults);
     ActionResultImpl result = new ActionResultImpl();

app/aem/core/src/main/java/com/cognifide/apm/core/actions/MapperDescriptorFactory.java

@@ -37,12 +37,12 @@
 import com.cognifide.apm.core.grammar.ApmType.ApmList;
 import com.cognifide.apm.core.grammar.ApmType.ApmMap;
 import com.cognifide.apm.core.grammar.ApmType.ApmString;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -58,11 +58,11 @@ public MapperDescriptor create(Class<?> mapperClass) {
     Object mapper = createInstance(mapperClass);
     String name = mapperAnnotation.value();
     String group = mapperAnnotation.group();
-    List<MappingDescriptor> mappingDescriptors = Lists.newArrayList();
+    List<MappingDescriptor> mappingDescriptors = new ArrayList<>();
     for (Method method : mapperClass.getDeclaredMethods()) {
       create(mapperAnnotation, method).ifPresent(mappingDescriptors::add);
     }
-    return new MapperDescriptor(mapper, name, group, ImmutableList.copyOf(mappingDescriptors));
+    return new MapperDescriptor(mapper, name, group, Collections.unmodifiableList(mappingDescriptors));
   }
 
   @SuppressWarnings("deprecation")
@@ -85,7 +85,7 @@ private Optional<MappingDescriptor> create(Mapper mapper, Method method) {
       throw new InvalidActionMapperException("Mapping method must have return type " + Action.class.getName());
     }
 
-    List<ParameterDescriptor> parameterDescriptors = Lists.newArrayList();
+    List<ParameterDescriptor> parameterDescriptors = new ArrayList<>();
     Type[] types = method.getGenericParameterTypes();
     Annotation[][] annotations = method.getParameterAnnotations();
     int requiredIndex = 0;
@@ -111,7 +111,7 @@ private Optional<MappingDescriptor> create(Mapper mapper, Method method) {
       parameterDescriptors.add(parameterDescriptor);
     }
 
-    return Optional.of(new MappingDescriptor(method, mapper, mapping, ImmutableList.copyOf(parameterDescriptors)));
+    return Optional.of(new MappingDescriptor(method, mapper, mapping, Collections.unmodifiableList(parameterDescriptors)));
   }
 
   private <T extends Annotation> T getAnnotation(Annotation[] annotations, Class<T> type) {

app/aem/core/src/main/java/com/cognifide/apm/core/actions/MappingDescriptor.java

@@ -26,9 +26,9 @@
 import com.cognifide.apm.core.actions.ParameterDescriptor.NamedParameterDescriptor;
 import com.cognifide.apm.core.actions.ParameterDescriptor.RequiredParameterDescriptor;
 import com.cognifide.apm.core.grammar.argument.Arguments;
-import com.google.common.collect.ImmutableList;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -51,7 +51,7 @@ public MappingDescriptor(Method method, Mapper mapper, Mapping mapping, List<Par
     this.name = mapper.value();
     this.group = mapper.group();
     this.description = mapping.reference();
-    this.examples = ImmutableList.copyOf(mapping.examples());
+    this.examples = Arrays.asList(mapping.examples());
     this.method = method;
     this.parameterDescriptors = parameterDescriptors;
   }

app/aem/core/src/main/java/com/cognifide/apm/core/actions/scanner/AnnotatedClassRegistry.java

@@ -19,9 +19,9 @@
  */
 package com.cognifide.apm.core.actions.scanner;
 
-import com.google.common.collect.ImmutableList;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -96,7 +96,7 @@ public List<Class<?>> getClasses() {
       flattened.addAll(entry.getValue());
     }
 
-    return ImmutableList.copyOf(flattened);
+    return Collections.unmodifiableList(flattened);
   }
 
   private void registerClasses(Bundle bundle) {

app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/utils/RequestProcessor.java

@@ -22,9 +22,11 @@
 import com.cognifide.apm.core.endpoints.params.RequestParameter;
 import com.cognifide.apm.core.endpoints.response.ResponseEntity;
 import com.cognifide.apm.core.utils.ServletUtils;
-import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
@@ -52,13 +54,13 @@ public static <T> void process(ModelFactory modelFactory, Class<T> formClass, Sl
       ServletUtils.writeJson(httpResponse, response.getBody());
     } catch (MissingElementsException e) {
       httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-      ServletUtils.writeJson(httpResponse, ImmutableMap.of(
-          "message", "Bad request",
-          "errors", toErrors(e)
-      ));
+      Map<String, Object> params = new HashMap<>();
+      params.put("message", "Bad request");
+      params.put("errors", toErrors(e));
+      ServletUtils.writeJson(httpResponse, params);
     } catch (Exception e) {
       httpResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      ServletUtils.writeJson(httpResponse, ImmutableMap.of(
+      ServletUtils.writeJson(httpResponse, Collections.singletonMap(
           "message", StringUtils.defaultString(e.getMessage())
       ));
     }

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

@@ -31,8 +31,8 @@
 import com.cognifide.apm.core.grammar.executioncontext.ExecutionContext;
 import com.cognifide.apm.core.grammar.parsedscript.ParsedScript;
 import com.cognifide.apm.core.progress.ProgressImpl;
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -86,7 +86,7 @@ private void fillReferenceGraph(ReferenceGraph refGraph, Script script) {
     if (refGraph.getNode(script) == null) {
       ApmLangParser.ApmContext apmContext = ParsedScript.create(script).getApm();
       ExecutionContext executionContext = ExecutionContext.create(scriptFinder, resourceResolver, dataSourceInvoker, script, new ProgressImpl(resourceResolver.getUserID()));
-      findReferences(refGraph, refGraph.addNode(script), ImmutableList.of(script.getPath()), executionContext, apmContext);
+      findReferences(refGraph, refGraph.addNode(script), Collections.singletonList(script.getPath()), executionContext, apmContext);
     }
   }
 

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

@@ -47,7 +47,6 @@
 import com.cognifide.apm.core.grammar.utils.RequiredVariablesChecker;
 import com.cognifide.apm.core.logger.Position;
 import com.cognifide.apm.core.logger.Progress;
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -285,7 +284,7 @@ private List<ApmPair> readValues(ForEachContext ctx) {
       } else if (variableValue instanceof ApmList) {
         values = variableValue.getList();
       } else {
-        values = ImmutableList.of(variableValue);
+        values = Collections.singletonList(variableValue);
       }
       return values.stream()
           .map(value -> new ApmPair(key, value))
@@ -297,7 +296,7 @@ private void progress(ParserRuleContext ctx, Status status, String command, Stri
     }
 
     private void progress(ParserRuleContext ctx, Status status, String command, String detail, Arguments arguments) {
-      progress(ctx, status, command, ImmutableList.of(detail), arguments);
+      progress(ctx, status, command, Collections.singletonList(detail), arguments);
     }
 
     private void progress(ParserRuleContext ctx, Status status, String command, List<String> details) {

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

@@ -25,7 +25,6 @@
 import com.cognifide.apm.core.grammar.ApmType.ApmMap;
 import com.cognifide.apm.core.grammar.ApmType.ApmString;
 import com.day.cq.wcm.api.NameConstants;
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -70,10 +69,9 @@ private ApmType traverseTree(Resource root, int depth, List<Config> configs) {
     List<ApmType> list = new ArrayList<>();
     for (Resource resource : root.getChildren()) {
       if (config.isValid(resource)) {
-        Map<String, ApmType> map = new HashMap<>(ImmutableMap.of(
-            "path", new ApmString(resource.getPath()),
-            "name", new ApmString(resource.getName())
-        ));
+        Map<String, ApmType> map = new HashMap<>();
+        map.put("path", new ApmString(resource.getPath()));
+        map.put("name", new ApmString(resource.getName()));
         map.putAll(config.determineParams(resource));
         ApmType items = traverseTree(resource, depth + 1, configs);
         if (items instanceof ApmList) {

app/aem/core/src/main/java/com/cognifide/apm/core/grammar/parsedscript/InvalidSyntaxMessageFactory.java

@@ -20,7 +20,8 @@
 
 package com.cognifide.apm.core.grammar.parsedscript;
 
-import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.antlr.v4.runtime.CharStream;
@@ -45,9 +46,9 @@ private static List<String> underlineError(Recognizer<?, ?> recognizer, Token of
     String errorLine = getErrorLine(recognizer, line);
     String invalidLine = String.format("Invalid line [%d:%d]: %s", line, charPositionInLine, errorLine);
     if (offendingToken != null && StringUtils.isNotBlank(offendingToken.getText())) {
-      return ImmutableList.of(invalidLine, String.format("Invalid sequence: %s", offendingToken.getText()));
+      return Arrays.asList(invalidLine, String.format("Invalid sequence: %s", offendingToken.getText()));
     } else {
-      return ImmutableList.of(invalidLine);
+      return Collections.singletonList(invalidLine);
     }
   }
 

app/aem/core/src/main/java/com/cognifide/apm/core/grammar/utils/ImportScript.java

@@ -31,7 +31,7 @@
 import com.cognifide.apm.core.grammar.executioncontext.ExecutionContext;
 import com.cognifide.apm.core.grammar.executioncontext.VariableHolder;
 import com.cognifide.apm.core.grammar.parsedscript.ParsedScript;
-import com.google.common.collect.ImmutableList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -127,7 +127,7 @@ public VariableHolder getVariableHolder() {
     }
 
     public List<String> toMessages() {
-      List<String> resultMessagesPrefix = ImmutableList.of(String.format("Import from script %s. Notice, only DEFINE actions were processed!", path));
+      List<String> resultMessagesPrefix = Collections.singletonList(String.format("Import from script %s. Notice, only DEFINE actions were processed!", path));
       List<String> importedVariables = variableHolder.toMap()
           .entrySet()
           .stream()

app/aem/core/src/main/java/com/cognifide/apm/core/jobs/JobResultsCache.java

@@ -21,10 +21,9 @@
 
 import com.cognifide.apm.api.services.ExecutionResult;
 import com.cognifide.apm.core.Property;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
+import java.util.HashMap;
+import java.util.Map;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 
@@ -37,33 +36,46 @@
 )
 public class JobResultsCache {
 
-  private static final long DEFAULT_EXPIRATION_TIME = 10;
+  private static final long DEFAULT_TTL = 10 * 60 * 1000;
 
-  private Cache<String, ExecutionSummary> cache;
+  private Map<String, ExecutionSummary> cache;
 
   @Activate
   public void activate() {
-    cache = CacheBuilder.newBuilder().expireAfterWrite(DEFAULT_EXPIRATION_TIME, TimeUnit.MINUTES).build();
+    cache = new HashMap<>();
   }
 
   public void put(String id, ExecutionSummary executionSummary) {
+    invalidate();
     cache.put(id, executionSummary);
   }
 
   public ExecutionSummary get(String id) {
-    return cache.getIfPresent(id);
+    invalidate();
+    return cache.get(id);
+  }
+
+  private void invalidate() {
+    long now = System.currentTimeMillis();
+    cache.forEach((key, value) -> {
+      if (value.timestamp + DEFAULT_TTL < now) {
+        cache.remove(key);
+      }
+    });
   }
 
   public static class ExecutionSummary implements Serializable {
 
     private final boolean finished;
     private final ExecutionResult result;
     private final String path;
+    private final long timestamp;
 
     private ExecutionSummary(boolean finished, ExecutionResult result, String path) {
       this.finished = finished;
       this.result = result;
       this.path = path;
+      this.timestamp = System.currentTimeMillis();
     }
 
     public static ExecutionSummary running() {

app/aem/core/src/main/java/com/cognifide/apm/core/logger/ProgressEntry.java

@@ -21,7 +21,6 @@
 
 import com.cognifide.apm.api.services.ExecutionResult.Entry;
 import com.cognifide.apm.api.status.Status;
-import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
@@ -45,8 +44,8 @@ public ProgressEntry(Status status, List<String> messages, String command, Strin
     this.status = status != null ? status : Status.SUCCESS;
     this.command = StringUtils.defaultString(command);
     this.position = position;
-    this.messages = messages != null ? ImmutableList.copyOf(messages) : Collections.emptyList();
-    this.parameters = parameters != null ? ImmutableList.copyOf(parameters) : Collections.emptyList();
+    this.messages = messages != null ? Collections.unmodifiableList(messages) : Collections.emptyList();
+    this.parameters = parameters != null ? Collections.unmodifiableList(parameters) : Collections.emptyList();
     this.authorizable = StringUtils.defaultString(authorizable);
   }