Fixed unused import and deprecation warnings Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/d24c3e58 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/d24c3e58 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/d24c3e58
Branch: refs/heads/master Commit: d24c3e5849052560e69241c4d4db3f9a99a65f78 Parents: 840aea4 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Thu Aug 3 20:32:36 2017 -0700 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Thu Aug 3 20:32:36 2017 -0700 ---------------------------------------------------------------------- .../apache/metamodel/data/UnionDataSetTest.java | 4 +- .../metamodel/couchdb/CouchDbDataContext.java | 1 - .../apache/metamodel/couchdb/CouchDbUtils.java | 8 +-- .../nativeclient/ElasticSearchDataSet.java | 1 - .../rest/JestElasticSearchDataSet.java | 19 ++++--- .../rest/JestElasticSearchUpdateCallback.java | 1 - .../metamodel/excel/ExcelDataContext.java | 21 +++---- .../metamodel/excel/ExcelDeleteBuilder.java | 7 +-- .../org/apache/metamodel/excel/ExcelUtils.java | 59 +++++++++----------- .../excel/XlsxSpreadsheetReaderDelegate.java | 1 - .../fixedwidth/EbcdicConfiguration.java | 2 + .../apache/metamodel/jdbc/JdbcDataContext.java | 1 - .../org/apache/metamodel/jdbc/JdbcSchema.java | 1 - .../metamodel/jdbc/JdbcDataContextTest.java | 3 +- .../jdbc/integrationtests/FirebirdTest.java | 4 +- .../jdbc/integrationtests/OracleTest.java | 4 +- .../apache/metamodel/json/JsonDataContext.java | 1 - .../metamodel/json/JsonDataContextTest.java | 5 +- .../mongodb/mongo2/MongoDbDataSet.java | 5 +- .../mongodb/mongo3/MongoDbDataSet.java | 5 +- .../mongodb/mongo3/MongoDbDataContextTest.java | 5 +- .../metamodel/neo4j/Neo4jDataContext.java | 1 - .../metamodel/neo4j/Neo4jDataContextTest.java | 1 - .../apache/metamodel/pojo/PojoDataContext.java | 1 - .../salesforce/SalesforceDataContext.java | 3 +- .../salesforce/SalesforceUpdateCallback.java | 1 - .../apache/metamodel/xml/XmlDomDataContext.java | 1 - 27 files changed, 69 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/core/src/test/java/org/apache/metamodel/data/UnionDataSetTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/metamodel/data/UnionDataSetTest.java b/core/src/test/java/org/apache/metamodel/data/UnionDataSetTest.java index cce8b18..d6707e4 100644 --- a/core/src/test/java/org/apache/metamodel/data/UnionDataSetTest.java +++ b/core/src/test/java/org/apache/metamodel/data/UnionDataSetTest.java @@ -25,12 +25,12 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.stream.Collectors; -import com.google.common.collect.Lists; import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.MutableColumn; import org.junit.Test; +import com.google.common.collect.Lists; + public class UnionDataSetTest { @Test http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java ---------------------------------------------------------------------- diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java index bc0a19d..9da47b9 100644 --- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java +++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.UpdateScript; import org.apache.metamodel.UpdateSummary; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java ---------------------------------------------------------------------- diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java index d29c95d..c1d5b4f 100644 --- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java +++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java @@ -36,6 +36,8 @@ import com.fasterxml.jackson.databind.ObjectReader; * Convenience and utility methods for MetaModel's CouchDB adaptor */ final class CouchDbUtils { + + private static final ObjectReader OBJECT_READER = new ObjectMapper().readerFor(Map.class);; /** * Safely calls hasNext on a row iterator @@ -89,8 +91,7 @@ final class CouchDbUtils { return null; } try { - final ObjectReader reader = new ObjectMapper().reader(Map.class); - return reader.readValue(valueNode); + return OBJECT_READER.readValue(valueNode); } catch (Exception e) { throw new IllegalStateException(e); } @@ -108,8 +109,7 @@ final class CouchDbUtils { return null; } try { - ObjectReader reader = new ObjectMapper().reader(List.class); - return reader.readValue(valueNode); + return OBJECT_READER.readValue(valueNode); } catch (Exception e) { throw new IllegalStateException(e); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataSet.java ---------------------------------------------------------------------- diff --git a/elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataSet.java b/elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataSet.java index 1a04bc8..4ced2c8 100644 --- a/elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataSet.java +++ b/elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataSet.java @@ -26,7 +26,6 @@ import org.apache.metamodel.data.AbstractDataSet; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.Row; import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.elasticsearch.action.search.ClearScrollRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchDataSet.java ---------------------------------------------------------------------- diff --git a/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchDataSet.java b/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchDataSet.java index 0414358..37e06dc 100644 --- a/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchDataSet.java +++ b/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchDataSet.java @@ -18,22 +18,23 @@ */ package org.apache.metamodel.elasticsearch.rest; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; -import io.searchbox.client.JestClient; -import io.searchbox.client.JestResult; -import io.searchbox.core.SearchScroll; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.metamodel.data.AbstractDataSet; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.Row; import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; + +import io.searchbox.client.JestClient; +import io.searchbox.client.JestResult; +import io.searchbox.core.SearchScroll; /** * {@link DataSet} implementation for ElasticSearch http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java ---------------------------------------------------------------------- diff --git a/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java b/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java index 94e557c..a61280a 100644 --- a/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java +++ b/elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java @@ -29,7 +29,6 @@ import org.apache.metamodel.drop.TableDropBuilder; import org.apache.metamodel.insert.RowInsertionBuilder; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; -import org.elasticsearch.action.bulk.BulkRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java index 1ce4244..713fbe8 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java +++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java @@ -20,7 +20,6 @@ package org.apache.metamodel.excel; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.util.List; import org.apache.metamodel.DataContext; @@ -35,7 +34,6 @@ import org.apache.metamodel.schema.MutableSchema; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.util.FileResource; -import org.apache.metamodel.util.Func; import org.apache.metamodel.util.Resource; import org.apache.poi.POIXMLDocument; import org.slf4j.Logger; @@ -187,19 +185,16 @@ public final class ExcelDataContext extends QueryPostprocessDataContext implemen if (_spreadsheetReaderDelegate == null) { synchronized (this) { if (_spreadsheetReaderDelegate == null) { - _spreadsheetReaderDelegate = _resource.read(new Func<InputStream, SpreadsheetReaderDelegate>() { - @Override - public SpreadsheetReaderDelegate eval(InputStream in) { - try { - if (POIXMLDocument.hasOOXMLHeader(in)) { - return new XlsxSpreadsheetReaderDelegate(_resource, _configuration); - } else { - return new DefaultSpreadsheetReaderDelegate(_resource, _configuration); - } - } catch (IOException e) { - logger.warn("Could not identify spreadsheet type, using default", e); + _spreadsheetReaderDelegate = _resource.read(in -> { + try { + if (POIXMLDocument.hasOOXMLHeader(in)) { + return new XlsxSpreadsheetReaderDelegate(_resource, _configuration); + } else { return new DefaultSpreadsheetReaderDelegate(_resource, _configuration); } + } catch (IOException e) { + logger.warn("Could not identify spreadsheet type, using default", e); + return new DefaultSpreadsheetReaderDelegate(_resource, _configuration); } }); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/excel/src/main/java/org/apache/metamodel/excel/ExcelDeleteBuilder.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelDeleteBuilder.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelDeleteBuilder.java index e4731b3..82eb5b6 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/ExcelDeleteBuilder.java +++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelDeleteBuilder.java @@ -24,17 +24,16 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.data.DataSetHeader; import org.apache.metamodel.data.DefaultRow; import org.apache.metamodel.data.SimpleDataSetHeader; import org.apache.metamodel.delete.AbstractRowDeletionBuilder; import org.apache.metamodel.query.SelectItem; import org.apache.metamodel.schema.Table; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; final class ExcelDeleteBuilder extends AbstractRowDeletionBuilder { http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/excel/src/main/java/org/apache/metamodel/excel/ExcelUtils.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelUtils.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelUtils.java index 1f424d6..85cc79b 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/ExcelUtils.java +++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelUtils.java @@ -19,7 +19,6 @@ package org.apache.metamodel.excel; import java.io.File; -import java.io.InputStream; import java.io.OutputStream; import java.text.NumberFormat; import java.util.Date; @@ -30,6 +29,23 @@ import java.util.stream.Collectors; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.apache.metamodel.MetaModelException; +import org.apache.metamodel.data.DataSet; +import org.apache.metamodel.data.DataSetHeader; +import org.apache.metamodel.data.DefaultRow; +import org.apache.metamodel.data.EmptyDataSet; +import org.apache.metamodel.data.Style; +import org.apache.metamodel.data.Style.SizeUnit; +import org.apache.metamodel.data.StyleBuilder; +import org.apache.metamodel.query.SelectItem; +import org.apache.metamodel.schema.Table; +import org.apache.metamodel.util.Action; +import org.apache.metamodel.util.DateUtils; +import org.apache.metamodel.util.FileHelper; +import org.apache.metamodel.util.FileResource; +import org.apache.metamodel.util.FormatHelper; +import org.apache.metamodel.util.InMemoryResource; +import org.apache.metamodel.util.Resource; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -50,25 +66,6 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFColor; import org.apache.poi.xssf.usermodel.XSSFFont; -import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; -import org.apache.metamodel.data.DataSet; -import org.apache.metamodel.data.DataSetHeader; -import org.apache.metamodel.data.DefaultRow; -import org.apache.metamodel.data.EmptyDataSet; -import org.apache.metamodel.data.Style; -import org.apache.metamodel.data.Style.SizeUnit; -import org.apache.metamodel.data.StyleBuilder; -import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Table; -import org.apache.metamodel.util.Action; -import org.apache.metamodel.util.DateUtils; -import org.apache.metamodel.util.FileHelper; -import org.apache.metamodel.util.FileResource; -import org.apache.metamodel.util.FormatHelper; -import org.apache.metamodel.util.Func; -import org.apache.metamodel.util.InMemoryResource; -import org.apache.metamodel.util.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.XMLReader; @@ -117,15 +114,12 @@ final class ExcelUtils { } } - return resource.read(new Func<InputStream, Workbook>() { - @Override - public Workbook eval(InputStream inputStream) { - try { - return WorkbookFactory.create(inputStream); - } catch (Exception e) { - logger.error("Could not open workbook", e); - throw new IllegalStateException("Could not open workbook", e); - } + return resource.read(inputStream -> { + try { + return WorkbookFactory.create(inputStream); + } catch (Exception e) { + logger.error("Could not open workbook", e); + throw new IllegalStateException("Could not open workbook", e); } }); } @@ -277,8 +271,8 @@ final class ExcelUtils { return getCellValue(wb, evaluatedCell); } catch (RuntimeException e) { - logger.warn("Exception occurred while evaluating formula at position ({},{}): {}", - new Object[] { cell.getRowIndex(), cell.getColumnIndex(), e.getMessage() }); + logger.warn("Exception occurred while evaluating formula at position ({},{}): {}", new Object[] { cell + .getRowIndex(), cell.getColumnIndex(), e.getMessage() }); // Some exceptions we simply log - result will be then be the // actual formula if (e instanceof FormulaParseException) { @@ -442,7 +436,8 @@ final class ExcelUtils { } public static DataSet getDataSet(Workbook workbook, Sheet sheet, Table table, ExcelConfiguration configuration) { - final List<SelectItem> selectItems = table.getColumns().stream().map(SelectItem::new).collect(Collectors.toList()); + final List<SelectItem> selectItems = table.getColumns().stream().map(SelectItem::new).collect(Collectors + .toList()); final Iterator<Row> rowIterator = getRowIterator(sheet, configuration, true); if (!rowIterator.hasNext()) { // no more rows! http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java ---------------------------------------------------------------------- diff --git a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java index 0436a2a..81214fe 100644 --- a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java +++ b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java @@ -22,7 +22,6 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/EbcdicConfiguration.java ---------------------------------------------------------------------- diff --git a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/EbcdicConfiguration.java b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/EbcdicConfiguration.java index e4bff94..c2002de 100644 --- a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/EbcdicConfiguration.java +++ b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/EbcdicConfiguration.java @@ -25,6 +25,8 @@ import org.apache.metamodel.schema.naming.ColumnNamingStrategy; */ public final class EbcdicConfiguration extends FixedWidthConfiguration { + private static final long serialVersionUID = 1L; + private final boolean _skipEbcdicHeader; private final boolean _eolPresent; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java index 3f4a0ad..fbe45e0 100644 --- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java +++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java @@ -25,7 +25,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java index ccac3f8..55ac4f0 100644 --- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java +++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcSchema.java @@ -22,7 +22,6 @@ import java.io.ObjectStreamException; import java.sql.Connection; import org.apache.metamodel.schema.MutableSchema; -import org.apache.metamodel.schema.MutableTable; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcDataContextTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcDataContextTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcDataContextTest.java index c0f1b4e..64a31a6 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcDataContextTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcDataContextTest.java @@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit; import javax.sql.DataSource; import javax.swing.table.TableModel; -import org.easymock.EasyMock; import org.apache.commons.dbcp.BasicDataSource; import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelException; @@ -54,10 +53,10 @@ import org.apache.metamodel.query.Query; import org.apache.metamodel.query.QueryParameter; import org.apache.metamodel.query.SelectItem; import org.apache.metamodel.schema.Column; -import org.apache.metamodel.schema.Relationship; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.TableType; +import org.easymock.EasyMock; public class JdbcDataContextTest extends JdbcTestCase { http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/FirebirdTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/FirebirdTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/FirebirdTest.java index 9857ea5..30c6dd2 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/FirebirdTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/FirebirdTest.java @@ -24,10 +24,8 @@ import java.util.Date; import java.util.Set; import java.util.stream.Collectors; -import javax.management.relation.Relation; import javax.swing.table.TableModel; -import com.google.common.collect.Sets; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.DataSetTableModel; import org.apache.metamodel.jdbc.JdbcDataContext; @@ -38,6 +36,8 @@ import org.apache.metamodel.query.SelectItem; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; +import com.google.common.collect.Sets; + /** * Integrationtests for Firebird SQL. * http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java index 826bc81..75baff4 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java @@ -28,9 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import javax.swing.table.TableModel; -import javax.swing.text.html.Option; -import com.google.common.collect.Sets; import org.apache.metamodel.DataContext; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.DataSetTableModel; @@ -46,6 +44,8 @@ import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.TableType; +import com.google.common.collect.Sets; + /** * Test case that tests oracle interaction. An express edition of the oracle * database can be used to run these tests. http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java ---------------------------------------------------------------------- diff --git a/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java b/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java index 6578d7c..b0e923f 100644 --- a/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java +++ b/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.convert.DocumentConverter; import org.apache.metamodel.data.CachingDataSetHeader; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/json/src/test/java/org/apache/metamodel/json/JsonDataContextTest.java ---------------------------------------------------------------------- diff --git a/json/src/test/java/org/apache/metamodel/json/JsonDataContextTest.java b/json/src/test/java/org/apache/metamodel/json/JsonDataContextTest.java index bfc1283..b27fc3d 100644 --- a/json/src/test/java/org/apache/metamodel/json/JsonDataContextTest.java +++ b/json/src/test/java/org/apache/metamodel/json/JsonDataContextTest.java @@ -21,11 +21,8 @@ package org.apache.metamodel.json; import java.io.File; import java.util.Arrays; -import junit.framework.TestCase; - import org.apache.metamodel.data.DataSet; import org.apache.metamodel.query.FunctionType; -import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.builder.SchemaBuilder; @@ -35,6 +32,8 @@ import org.apache.metamodel.util.FileResource; import org.apache.metamodel.util.Resource; import org.apache.metamodel.util.SimpleTableDef; +import junit.framework.TestCase; + public class JsonDataContextTest extends TestCase { public void testReadArrayWithDocumentsFile() throws Exception { http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataSet.java ---------------------------------------------------------------------- diff --git a/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataSet.java b/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataSet.java index 3197945..cffd0de 100644 --- a/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataSet.java +++ b/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataSet.java @@ -18,19 +18,18 @@ */ package org.apache.metamodel.mongodb.mongo2; +import java.util.List; + import org.apache.metamodel.data.AbstractDataSet; import org.apache.metamodel.data.Row; import org.apache.metamodel.mongodb.common.MongoDBUtils; import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.mongodb.DBCursor; import com.mongodb.DBObject; -import java.util.List; - final class MongoDbDataSet extends AbstractDataSet { private static final Logger logger = LoggerFactory.getLogger(MongoDbDataSet.class); http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataSet.java ---------------------------------------------------------------------- diff --git a/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataSet.java b/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataSet.java index 76a7636..3846b4a 100644 --- a/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataSet.java +++ b/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataSet.java @@ -18,19 +18,18 @@ */ package org.apache.metamodel.mongodb.mongo3; +import java.util.List; + import org.apache.metamodel.data.AbstractDataSet; import org.apache.metamodel.data.Row; import org.apache.metamodel.mongodb.common.MongoDBUtils; import org.apache.metamodel.query.SelectItem; -import org.apache.metamodel.schema.Column; import org.bson.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.mongodb.client.MongoCursor; -import java.util.List; - final class MongoDbDataSet extends AbstractDataSet { private static final Logger logger = LoggerFactory.getLogger(MongoDbDataSet.class); http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/mongodb/mongo3/src/test/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContextTest.java ---------------------------------------------------------------------- diff --git a/mongodb/mongo3/src/test/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContextTest.java b/mongodb/mongo3/src/test/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContextTest.java index 9751719..78fbddc 100644 --- a/mongodb/mongo3/src/test/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContextTest.java +++ b/mongodb/mongo3/src/test/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContextTest.java @@ -24,10 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.mongodb.BasicDBObject; -import com.mongodb.DBCollection; -import com.mongodb.WriteConcern; - import org.apache.metamodel.DataContext; import org.apache.metamodel.UpdateCallback; import org.apache.metamodel.UpdateScript; @@ -43,6 +39,7 @@ import org.bson.Document; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; +import com.mongodb.WriteConcern; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/neo4j/src/main/java/org/apache/metamodel/neo4j/Neo4jDataContext.java ---------------------------------------------------------------------- diff --git a/neo4j/src/main/java/org/apache/metamodel/neo4j/Neo4jDataContext.java b/neo4j/src/main/java/org/apache/metamodel/neo4j/Neo4jDataContext.java index 82f710d..2a598b5 100644 --- a/neo4j/src/main/java/org/apache/metamodel/neo4j/Neo4jDataContext.java +++ b/neo4j/src/main/java/org/apache/metamodel/neo4j/Neo4jDataContext.java @@ -30,7 +30,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.data.DataSet; import org.apache.metamodel.data.DocumentSource; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/neo4j/src/test/java/org/apache/metamodel/neo4j/Neo4jDataContextTest.java ---------------------------------------------------------------------- diff --git a/neo4j/src/test/java/org/apache/metamodel/neo4j/Neo4jDataContextTest.java b/neo4j/src/test/java/org/apache/metamodel/neo4j/Neo4jDataContextTest.java index 89bf977..1ac7fa2 100644 --- a/neo4j/src/test/java/org/apache/metamodel/neo4j/Neo4jDataContextTest.java +++ b/neo4j/src/test/java/org/apache/metamodel/neo4j/Neo4jDataContextTest.java @@ -19,7 +19,6 @@ package org.apache.metamodel.neo4j; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContext.java ---------------------------------------------------------------------- diff --git a/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContext.java b/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContext.java index f694202..97828df 100644 --- a/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContext.java +++ b/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContext.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.UpdateScript; import org.apache.metamodel.UpdateSummary; http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java ---------------------------------------------------------------------- diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java index 8d25bf4..7e3a73e 100644 --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java @@ -164,7 +164,7 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement try { sb.append("SELECT "); int i = 0; - final List<Column> columns = new ArrayList(selectItems.size()); + final List<Column> columns = new ArrayList<>(selectItems.size()); for (SelectItem selectItem : selectItems) { validateSoqlSupportedSelectItem(selectItem); columns.set(i,selectItem.getColumn()); @@ -352,7 +352,6 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement } } - @SuppressWarnings("deprecation") private static void validateSoqlSupportedSelectItem(SelectItem selectItem) throws UnsupportedOperationException { if (selectItem.hasFunction()) { throw new UnsupportedOperationException("Function select items not supported: " + selectItem); http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java ---------------------------------------------------------------------- diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java index bf9b43b..5db2264 100644 --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java @@ -215,7 +215,6 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C * @param idList * @param whereItem */ - @SuppressWarnings("deprecation") protected void buildIdList(List<String> idList, FilterItem whereItem) { if (whereItem.isCompoundFilter()) { final LogicalOperator logicalOperator = whereItem.getLogicalOperator(); http://git-wip-us.apache.org/repos/asf/metamodel/blob/d24c3e58/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java ---------------------------------------------------------------------- diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java index cfc3686..aab6fca 100644 --- a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java +++ b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java @@ -34,7 +34,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.metamodel.MetaModelException; -import org.apache.metamodel.MetaModelHelper; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.data.CachingDataSetHeader; import org.apache.metamodel.data.DataSet;
