From 65fd06fad8afb5d3960e835fee1c87c6b5fca37c Mon Sep 17 00:00:00 2001 From: hchen04 Date: Fri, 14 Feb 2020 14:43:37 -0600 Subject: [PATCH] remove ant --- elide-datastore/elide-datastore-aggregation/pom.xml | 7 ------- .../integration/AggregationDataStoreIntegrationTest.java | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/elide-datastore/elide-datastore-aggregation/pom.xml b/elide-datastore/elide-datastore-aggregation/pom.xml index ec275df729..c2da5362a9 100644 --- a/elide-datastore/elide-datastore-aggregation/pom.xml +++ b/elide-datastore/elide-datastore-aggregation/pom.xml @@ -178,13 +178,6 @@ 2.5.0 test - - - org.apache.ant - ant - 1.10.7 - test - diff --git a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java index 9486c3c9c3..6c64bafd1a 100644 --- a/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java +++ b/elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java @@ -28,16 +28,17 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.tools.ant.util.FileUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.restassured.response.ValidatableResponse; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Map; +import java.util.stream.Collectors; import javax.persistence.Persistence; import javax.ws.rs.core.MediaType; @@ -972,7 +973,7 @@ private JsonNode toJsonNode(String query, Map variables) { public String loadGraphQLResponse(String fileName) throws IOException { try (InputStream in = AggregationDataStoreIntegrationTest.class.getResourceAsStream("/graphql/responses/" + fileName)) { - return FileUtils.readFully(new InputStreamReader(in)); + return new BufferedReader(new InputStreamReader(in)).lines().collect(Collectors.joining("\n")); } } }