guava now in test scope of core
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/6234fb4a Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/6234fb4a Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/6234fb4a Branch: refs/heads/master Commit: 6234fb4ab7fbf53c58b174e58c2435bb8079b54a Parents: 056d4d1 Author: JoÌrg Unbehauen <jo...@unbehauen.net> Authored: Fri Jul 28 18:27:34 2017 +0200 Committer: JoÌrg Unbehauen <jo...@unbehauen.net> Committed: Fri Jul 28 18:27:34 2017 +0200 ---------------------------------------------------------------------- core/pom.xml | 1 + core/src/main/java/org/apache/metamodel/MetaModelHelper.java | 1 - csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java | 4 ++-- csv/src/main/java/org/apache/metamodel/csv/CsvTable.java | 3 +-- .../java/org/apache/metamodel/csv/SingleLineCsvRowTest.java | 6 ++++-- .../apache/metamodel/salesforce/SalesforceDataSetTest.java | 7 ++----- 6 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 4add6ad..390f5f8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -30,6 +30,7 @@ under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java index ae87083..4f0a8dd 100644 --- a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java +++ b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java @@ -31,7 +31,6 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.collect.Lists; import org.apache.metamodel.data.CachingDataSetHeader; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.DataSetHeader; http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java ---------------------------------------------------------------------- diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java b/csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java index 6c9a01e..28a9812 100644 --- a/csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java +++ b/csv/src/main/java/org/apache/metamodel/csv/CsvSchema.java @@ -18,11 +18,11 @@ */ package org.apache.metamodel.csv; -import com.google.common.collect.Lists; import org.apache.metamodel.schema.AbstractSchema; import org.apache.metamodel.schema.Table; import java.util.ArrayList; +import java.util.Collections; import java.util.List; final class CsvSchema extends AbstractSchema { @@ -62,6 +62,6 @@ final class CsvSchema extends AbstractSchema { if (_table == null) { return new ArrayList<>(); } - return Lists.newArrayList(_table); + return Collections.singletonList(_table); } } http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/csv/src/main/java/org/apache/metamodel/csv/CsvTable.java ---------------------------------------------------------------------- diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvTable.java b/csv/src/main/java/org/apache/metamodel/csv/CsvTable.java index c786e70..41b7593 100644 --- a/csv/src/main/java/org/apache/metamodel/csv/CsvTable.java +++ b/csv/src/main/java/org/apache/metamodel/csv/CsvTable.java @@ -21,7 +21,6 @@ package org.apache.metamodel.csv; import java.io.IOException; import java.util.*; -import com.google.common.collect.Lists; import org.apache.metamodel.schema.AbstractTable; import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.ColumnType; @@ -147,7 +146,7 @@ final class CsvTable extends AbstractTable { @Override public Collection<Relationship> getRelationships() { - return Lists.newArrayList(); + return Collections.emptyList(); } @Override http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/csv/src/test/java/org/apache/metamodel/csv/SingleLineCsvRowTest.java ---------------------------------------------------------------------- diff --git a/csv/src/test/java/org/apache/metamodel/csv/SingleLineCsvRowTest.java b/csv/src/test/java/org/apache/metamodel/csv/SingleLineCsvRowTest.java index 0686cab..28c640f 100644 --- a/csv/src/test/java/org/apache/metamodel/csv/SingleLineCsvRowTest.java +++ b/csv/src/test/java/org/apache/metamodel/csv/SingleLineCsvRowTest.java @@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; import org.apache.metamodel.data.Row; import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.MutableColumn; @@ -37,7 +37,9 @@ public class SingleLineCsvRowTest { @Test public void testSerialize() throws Exception { - final List<Column> columns = Lists.newArrayList( new MutableColumn("1"), new MutableColumn("2")); + final List<Column> columns = new ArrayList<>(); + columns.add(new MutableColumn("1")); + columns.add(new MutableColumn("2")); CSVParser csvParser = new CSVParser(); final SingleLineCsvDataSet dataSet = new SingleLineCsvDataSet(null, csvParser, columns, null, 2, false); final SingleLineCsvRow originalRow = new SingleLineCsvRow(dataSet, "foo,bar", 2, false, 1); http://git-wip-us.apache.org/repos/asf/metamodel/blob/6234fb4a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataSetTest.java ---------------------------------------------------------------------- diff --git a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataSetTest.java b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataSetTest.java index a16cf13..2e4c2c6 100644 --- a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataSetTest.java +++ b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataSetTest.java @@ -18,21 +18,18 @@ */ package org.apache.metamodel.salesforce; -import com.google.common.collect.Lists; import com.sforce.soap.partner.QueryResult; import com.sforce.ws.ConnectionException; import com.sforce.ws.bind.TypeMapper; import com.sforce.ws.parser.PullParserException; import com.sforce.ws.parser.XmlInputStream; import org.apache.metamodel.data.Row; -import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.schema.MutableColumn; import org.junit.Test; import java.io.IOException; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; @@ -44,7 +41,7 @@ public class SalesforceDataSetTest { QueryResult qr = queryResult("/result/double-value.xml"); MutableColumn version = new MutableColumn("Version", ColumnType.DOUBLE); - SalesforceDataSet dataSet = new SalesforceDataSet(Lists.newArrayList(version), qr, null); + SalesforceDataSet dataSet = new SalesforceDataSet(Collections.singletonList(version), qr, null); List<Row> rows = dataSet.toRows(); assertEquals(5386.21, rows.get(0).getValue(version));
