Bring Quarkus Scaffolding up to date with master

README.md

@@ -210,7 +210,7 @@ Please refer to [the contributing.md file](CONTRIBUTING.md) for information abou
 
 If you are contributing to Elide using an IDE, such as IntelliJ, make sure to install the [Lombok](https://projectlombok.org/) plugin.
 
-Community chat is now on [discord](https://discord.com/widget?id=869678398241398854&theme=dark).
+Community chat is now on [discord](https://discord.com/widget?id=869678398241398854&theme=dark).  Join by clicking [here](https://discord.gg/3vh8ac57cc).
 Legacy discussion is archived on [spectrum](https://spectrum.chat/elide).
 
 ## License

elide-async/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-parent-pom</artifactId>
-        <version>6.0.0-pr1-SNAPSHOT</version>
+        <version>6.1.10-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-graphql</artifactId>
-            <version>6.0.0-pr1-SNAPSHOT</version>
+            <version>6.1.10-SNAPSHOT</version>
         </dependency>
 
         <!-- JPA -->
@@ -80,7 +80,19 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>${jedis.version}</version>
+        </dependency>
+
         <!-- Test -->
+        <dependency>
+            <groupId>com.github.codemonstur</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>${embedded-redis.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- For Export End-Point Test -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -90,7 +102,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>2.33</version>
+            <version>${version.jersey}</version>
             <scope>test</scope>
         </dependency>
         <!-- JUnit -->

elide-async/src/main/java/com/yahoo/elide/async/export/formatter/CSVExportFormatter.java

@@ -8,10 +8,10 @@
 import com.yahoo.elide.Elide;
 import com.yahoo.elide.async.models.TableExport;
 import com.yahoo.elide.core.PersistentResource;
+import com.yahoo.elide.core.request.Attribute;
 import com.yahoo.elide.core.request.EntityProjection;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.opendevl.JFlat;
-import org.apache.commons.lang3.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Arrays;
@@ -84,20 +84,8 @@ private String generateCSVHeader(EntityProjection projection) {
         }
 
         return projection.getAttributes().stream()
-        .map(attr -> {
-            StringBuilder column = new StringBuilder();
-            String alias = attr.getAlias();
-            column.append(StringUtils.isNotEmpty(alias) ? alias : attr.getName());
-            return column;
-        })
-        .map(quotable -> {
-            // Quotes at the beginning
-            quotable.insert(0, DOUBLE_QUOTES);
-            // Quotes at the end
-            quotable.append(DOUBLE_QUOTES);
-            return quotable;
-        })
-        .collect(Collectors.joining(COMMA));
+                .map(this::toHeader)
+                .collect(Collectors.joining(COMMA));
     }
 
     @Override
@@ -113,4 +101,26 @@ public String preFormat(EntityProjection projection, TableExport query) {
     public String postFormat(EntityProjection projection, TableExport query) {
         return null;
     }
+
+    private String toHeader(Attribute attribute) {
+        if (attribute.getArguments() == null || attribute.getArguments().size() == 0) {
+            return quote(attribute.getName());
+        }
+
+        StringBuilder header = new StringBuilder();
+        header.append(attribute.getName());
+        header.append("(");
+
+        header.append(attribute.getArguments().stream()
+                .map((arg) -> arg.getName() + "=" + arg.getValue())
+                .collect(Collectors.joining(" ")));
+
+        header.append(")");
+
+        return quote(header.toString());
+    }
+
+    private String quote(String toQuote) {
+        return "\"" + toQuote + "\"";
+    }
 }

elide-async/src/main/java/com/yahoo/elide/async/hooks/AsyncAPIHook.java

@@ -6,8 +6,8 @@
 package com.yahoo.elide.async.hooks;
 
 import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.CREATE;
-import static com.yahoo.elide.annotation.LifeCycleHookBinding.Operation.READ;
 import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.POSTCOMMIT;
+import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PREFLUSH;
 import static com.yahoo.elide.annotation.LifeCycleHookBinding.TransactionPhase.PRESECURITY;
 import com.yahoo.elide.annotation.LifeCycleHookBinding;
 import com.yahoo.elide.async.models.AsyncAPI;
@@ -58,16 +58,12 @@ protected void validateOptions(AsyncAPI query, RequestScope requestScope) {
      */
     protected void executeHook(LifeCycleHookBinding.Operation operation, LifeCycleHookBinding.TransactionPhase phase,
             AsyncAPI query, RequestScope requestScope, Callable<AsyncAPIResult> queryWorker) {
-        if (operation.equals(READ) && phase.equals(PRESECURITY)) {
-            validateOptions(query, requestScope);
-            //We populate the result object when the initial mutation is executed, and then even after executing
-            //the hooks we return the same object back. QueryRunner.java#L190.
-            //In GraphQL, the only part of the body that is lazily returned is the ID.
-            //ReadPreSecurityHook - Those hooks get evaluated in line with the request processing.
-            executeAsync(query, queryWorker);
-            return;
-        }
         if (operation.equals(CREATE)) {
+            if (phase.equals(PREFLUSH)) {
+                validateOptions(query, requestScope);
+                executeAsync(query, queryWorker);
+                return;
+            }
             if (phase.equals(POSTCOMMIT)) {
                 completeAsync(query, requestScope);
                 return;

elide-async/src/main/java/com/yahoo/elide/async/models/FileExtensionType.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+
+package com.yahoo.elide.async.models;
+
+/**
+ * ENUM of supported file extension types.
+ */
+public enum FileExtensionType {
+    JSON(".json"),
+    CSV(".csv"),
+    NONE("");
+
+    private final String extension;
+
+    FileExtensionType(String extension) {
+        this.extension = extension;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+}

elide-async/src/main/java/com/yahoo/elide/async/models/ResultType.java

@@ -9,6 +9,16 @@
  * ENUM of supported result types.
  */
 public enum ResultType {
-    JSON,
-    CSV
+    JSON(FileExtensionType.JSON),
+    CSV(FileExtensionType.CSV);
+
+    private final FileExtensionType fileExtensionType;
+
+    ResultType(FileExtensionType fileExtensionType) {
+        this.fileExtensionType = fileExtensionType;
+    }
+
+    public FileExtensionType getFileExtensionType() {
+        return fileExtensionType;
+    }
 }

elide-async/src/main/java/com/yahoo/elide/async/operation/AsyncQueryOperation.java

@@ -97,7 +97,9 @@ public static Integer safeJsonPathLength(String json, String path) {
         }
 
         if (List.class.isAssignableFrom(result.getClass())) {
-            result = ((List) result).get(0);
+            List resultList = ((List) result);
+
+            result = resultList.isEmpty() ? 0 : resultList.get(0);
             if (Integer.class.isAssignableFrom(result.getClass())) {
                 return (Integer) result;
             }

elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java

@@ -27,7 +27,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -44,12 +44,13 @@ public GraphQLTableExportOperation(TableExportFormatter formatter, AsyncExecutor
     }
 
     @Override
-    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx) {
+    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx,
+            Map<String, List<String>> additionalRequestHeaders) {
         UUID requestId = UUID.fromString(export.getRequestId());
         User user = scope.getUser();
         String apiVersion = scope.getApiVersion();
         return new GraphQLRequestScope("", tx, user, apiVersion, getService().getElide().getElideSettings(),
-                null, requestId, Collections.emptyMap());
+                null, requestId, additionalRequestHeaders);
     }
 
     @Override

elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java

@@ -25,6 +25,9 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import javax.ws.rs.core.MultivaluedMap;
 
@@ -41,7 +44,8 @@ public JSONAPITableExportOperation(TableExportFormatter formatter, AsyncExecutor
     }
 
     @Override
-    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx) {
+    public RequestScope getRequestScope(TableExport export, RequestScope scope, DataStoreTransaction tx,
+            Map<String, List<String>> additionalRequestHeaders) {
         UUID requestId = UUID.fromString(export.getRequestId());
         User user = scope.getUser();
         String apiVersion = scope.getApiVersion();
@@ -51,7 +55,22 @@ public RequestScope getRequestScope(TableExport export, RequestScope scope, Data
         } catch (URISyntaxException e) {
             throw new BadRequestException(e.getMessage());
         }
+
         MultivaluedMap<String, String> queryParams = JSONAPIAsyncQueryOperation.getQueryParams(uri);
+
+        // Call with additionalHeader alone
+        if (scope.getRequestHeaders().isEmpty()) {
+            return new RequestScope("", JSONAPIAsyncQueryOperation.getPath(uri), apiVersion, null, tx, user,
+                    queryParams, additionalRequestHeaders, requestId, getService().getElide().getElideSettings());
+        }
+
+        // Combine additionalRequestHeaders and existing scope's request headers
+        Map<String, List<String>> finalRequestHeaders = new HashMap<String, List<String>>();
+        scope.getRequestHeaders().forEach((entry, value) -> finalRequestHeaders.put(entry, value));
+
+        //additionalRequestHeaders will override any headers in scope.getRequestHeaders()
+        additionalRequestHeaders.forEach((entry, value) -> finalRequestHeaders.put(entry, value));
+
         return new RequestScope("", JSONAPIAsyncQueryOperation.getPath(uri), apiVersion, null, tx, user, queryParams,
                 scope.getRequestHeaders(), requestId, getService().getElide().getElideSettings());
     }