Merge branch 'master' into METAMODEL-1151-data-context-factories
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/23c44880 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/23c44880 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/23c44880 Branch: refs/heads/master Commit: 23c448801c7f90e1779897ba2c1a3c9309c1e76b Parents: aac3e2b 57e48be Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Sun Aug 6 21:44:15 2017 -0700 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Sun Aug 6 21:44:15 2017 -0700 ---------------------------------------------------------------------- CHANGES.md | 1 + .../cassandra/CassandraDataContext.java | 3 +- .../metamodel/cassandra/CassandraDataSet.java | 7 +- .../cassandra/CassandraDataContextTest.java | 2 +- core/pom.xml | 5 + .../apache/metamodel/AbstractDataContext.java | 49 ++++---- .../metamodel/AbstractUpdateCallback.java | 4 +- .../apache/metamodel/CompositeDataContext.java | 12 +- .../metamodel/CompositeQueryDelegate.java | 3 +- .../java/org/apache/metamodel/DataContext.java | 6 +- .../metamodel/DeleteAndInsertBuilder.java | 13 +- .../org/apache/metamodel/MetaModelHelper.java | 55 ++++---- .../metamodel/QueryPostprocessDataContext.java | 55 ++++---- .../convert/ConvertedDataSetInterceptor.java | 9 +- .../apache/metamodel/convert/Converters.java | 29 +++-- .../create/AbstractTableCreationBuilder.java | 18 +-- .../apache/metamodel/data/AbstractDataSet.java | 11 +- .../org/apache/metamodel/data/AbstractRow.java | 3 +- .../metamodel/data/AbstractRowBuilder.java | 9 +- .../metamodel/data/CachingDataSetHeader.java | 4 - .../java/org/apache/metamodel/data/DataSet.java | 2 +- .../apache/metamodel/data/DataSetHeader.java | 3 +- .../metamodel/data/DataSetTableModel.java | 9 +- .../org/apache/metamodel/data/EmptyDataSet.java | 13 +- .../apache/metamodel/data/InMemoryDataSet.java | 2 +- .../java/org/apache/metamodel/data/Row.java | 3 +- .../metamodel/data/ScalarFunctionDataSet.java | 3 +- .../metamodel/data/SimpleDataSetHeader.java | 13 +- .../org/apache/metamodel/data/UnionDataSet.java | 2 +- .../insert/AbstractRowInsertionBuilder.java | 8 +- .../intercept/InterceptableDataContext.java | 34 ++--- .../org/apache/metamodel/query/FromItem.java | 14 +-- .../java/org/apache/metamodel/query/Query.java | 14 ++- .../query/builder/GroupedQueryBuilderImpl.java | 2 +- .../query/builder/InitFromBuilderImpl.java | 2 +- .../query/builder/SatisfiedFromBuilder.java | 6 +- .../builder/SatisfiedFromBuilderCallback.java | 5 + .../metamodel/schema/AbstractRelationship.java | 32 ++--- .../apache/metamodel/schema/AbstractSchema.java | 43 +++---- .../apache/metamodel/schema/AbstractTable.java | 123 ++++++++---------- .../metamodel/schema/CompositeSchema.java | 23 ++-- .../metamodel/schema/ImmutableRelationship.java | 30 ++--- .../metamodel/schema/ImmutableSchema.java | 10 +- .../apache/metamodel/schema/ImmutableTable.java | 12 +- .../metamodel/schema/MutableRelationship.java | 25 ++-- .../apache/metamodel/schema/MutableSchema.java | 7 +- .../apache/metamodel/schema/MutableTable.java | 12 +- .../apache/metamodel/schema/Relationship.java | 5 +- .../org/apache/metamodel/schema/Schema.java | 10 +- .../java/org/apache/metamodel/schema/Table.java | 32 ++--- .../metamodel/AbstractDataContextTest.java | 23 ++-- .../metamodel/CompositeDataContextTest.java | 17 ++- .../apache/metamodel/MetaModelHelperTest.java | 61 +++++---- .../org/apache/metamodel/MetaModelTestCase.java | 14 +-- .../org/apache/metamodel/MockDataContext.java | 9 +- .../metamodel/MockUpdateableDataContext.java | 13 +- .../QueryPostprocessDataContextTest.java | 124 +++++++++---------- .../metamodel/convert/ConvertersTest.java | 4 +- .../create/AbstractCreateTableBuilderTest.java | 14 +-- .../metamodel/data/DataSetTableModelTest.java | 3 +- .../apache/metamodel/data/DefaultRowTest.java | 9 +- .../java/org/apache/metamodel/data/RowTest.java | 17 ++- .../apache/metamodel/data/UnionDataSetTest.java | 21 +++- .../delete/AbstractRowDeletionCallbackTest.java | 2 +- .../intercept/InterceptableDataContextTest.java | 29 ++--- .../apache/metamodel/query/FilterItemTest.java | 30 ++--- .../apache/metamodel/query/FromItemTest.java | 11 +- .../org/apache/metamodel/query/QueryTest.java | 2 +- .../apache/metamodel/query/SelectItemTest.java | 14 ++- .../builder/GroupedQueryBuilderImplTest.java | 4 +- .../query/builder/SyntaxExamplesTest.java | 6 +- .../metamodel/schema/MutableTableTest.java | 19 +-- .../metamodel/schema/SchemaModelTest.java | 40 +++--- ...acyDeserializationObjectInputStreamTest.java | 10 +- .../metamodel/couchdb/CouchDbDataContext.java | 8 +- .../metamodel/couchdb/CouchDbDataSet.java | 3 +- .../CouchDbSimpleTableDefSchemaBuilder.java | 5 +- .../apache/metamodel/couchdb/CouchDbUtils.java | 8 +- .../couchdb/CouchDbDataContextTest.java | 10 +- .../metamodel/csv/CsvCreateTableBuilder.java | 6 +- .../apache/metamodel/csv/CsvDataContext.java | 4 +- .../org/apache/metamodel/csv/CsvDataSet.java | 9 +- .../org/apache/metamodel/csv/CsvSchema.java | 10 +- .../java/org/apache/metamodel/csv/CsvTable.java | 28 +++-- .../metamodel/csv/SingleLineCsvDataSet.java | 9 +- .../metamodel/csv/CsvBigFileMemoryTest.java | 4 +- .../metamodel/csv/CsvDataContextTest.java | 74 ++++++----- .../metamodel/csv/SingleLineCsvRowTest.java | 6 +- .../InterceptionCsvIntegrationTest.java | 6 +- .../metamodel/dynamodb/DynamoDbDataContext.java | 8 +- .../metamodel/dynamodb/DynamoDbDataSet.java | 7 +- .../dynamodb/DynamoDbTableCreationBuilder.java | 3 +- .../DynamoDbDataContextIntegrationTest.java | 2 +- .../nativeclient/ElasticSearchDataContext.java | 7 +- .../nativeclient/ElasticSearchDataSet.java | 10 +- .../ElasticSearchDataContextTest.java | 16 +-- .../rest/ElasticSearchRestDataContext.java | 7 +- .../rest/JestElasticSearchDataSet.java | 25 ++-- .../rest/JestElasticSearchUpdateCallback.java | 1 - .../rest/JestElasticSearchDataContextTest.java | 16 +-- .../rest/JestElasticSearchUtilsTest.java | 14 ++- .../excel/DefaultSpreadsheetReaderDelegate.java | 7 +- .../metamodel/excel/ExcelDataContext.java | 24 ++-- .../metamodel/excel/ExcelDeleteBuilder.java | 10 +- .../excel/ExcelTableCreationBuilder.java | 4 +- .../org/apache/metamodel/excel/ExcelUtils.java | 61 +++++---- .../excel/SpreadsheetReaderDelegate.java | 4 +- .../org/apache/metamodel/excel/XlsDataSet.java | 5 +- .../metamodel/excel/XlsxRowPublisherAction.java | 12 +- .../excel/XlsxSpreadsheetReaderDelegate.java | 11 +- .../DefaultSpreadsheetReaderDelegateTest.java | 27 ++-- .../metamodel/excel/ExcelDataContextTest.java | 82 ++++++------ .../excel/ExcelUpdateCallbackTest.java | 4 +- .../fixedwidth/EbcdicConfiguration.java | 2 + .../fixedwidth/FixedWidthDataContext.java | 3 +- .../metamodel/fixedwidth/FixedWidthDataSet.java | 8 +- .../FixedWidthConfigurationReaderTest.java | 2 +- .../fixedwidth/FixedWidthDataContextTest.java | 26 ++-- .../metamodel/hbase/HBaseDataContext.java | 2 +- .../apache/metamodel/hbase/HBaseDataSet.java | 7 +- .../metamodel/hbase/HBaseDataContextTest.java | 2 +- .../metamodel/jdbc/JdbcCreateTableBuilder.java | 15 +-- .../apache/metamodel/jdbc/JdbcDataContext.java | 29 +++-- .../metamodel/jdbc/JdbcMetadataLoader.java | 5 +- .../org/apache/metamodel/jdbc/JdbcSchema.java | 5 +- .../apache/metamodel/jdbc/QuerySplitter.java | 4 +- .../org/apache/metamodel/jdbc/DerbyTest.java | 16 +-- .../apache/metamodel/jdbc/H2databaseTest.java | 40 +++--- .../org/apache/metamodel/jdbc/HsqldbTest.java | 15 +-- .../metamodel/jdbc/JdbcDataContextTest.java | 34 +++-- .../metamodel/jdbc/JdbcDeleteBuilderTest.java | 4 +- .../metamodel/jdbc/JdbcInsertBuilderTest.java | 6 +- .../apache/metamodel/jdbc/JdbcSchemaTest.java | 10 +- .../metamodel/jdbc/JdbcTestTemplates.java | 2 +- .../metamodel/jdbc/JdbcUpdateBuilderTest.java | 8 +- .../metamodel/jdbc/QuerySplitterTest.java | 15 ++- .../org/apache/metamodel/jdbc/SqliteTest.java | 11 +- .../jdbc/integrationtests/DB2Test.java | 6 +- .../jdbc/integrationtests/FirebirdTest.java | 54 ++++---- .../jdbc/integrationtests/MysqlTest.java | 18 +-- .../jdbc/integrationtests/OracleTest.java | 43 ++++--- .../jdbc/integrationtests/PostgresqlTest.java | 52 ++++---- .../SQLServerJtdsDriverTest.java | 8 +- .../SQLServerMicrosoftDriverTest.java | 6 +- .../apache/metamodel/json/JsonDataContext.java | 7 +- .../metamodel/json/JsonDataContextTest.java | 16 ++- .../mongodb/mongo2/MongoDbDataContext.java | 41 +++--- .../mongodb/mongo2/MongoDbDataSet.java | 12 +- .../mongodb/mongo2/MongoDbDataContextTest.java | 17 ++- .../mongodb/mongo2/MongoDbDataCopyer.java | 3 +- .../mongodb/mongo3/MongoDbDataContext.java | 42 ++++--- .../mongodb/mongo3/MongoDbDataSet.java | 11 +- .../mongodb/mongo3/MongoDbDataContextTest.java | 22 ++-- .../mongodb/mongo3/MongoDbDataCopyer.java | 2 +- .../neo4j/Neo4jCypherQueryBuilder.java | 12 +- .../metamodel/neo4j/Neo4jDataContext.java | 10 +- .../apache/metamodel/neo4j/Neo4jDataSet.java | 4 +- .../metamodel/neo4j/Neo4jDataContextTest.java | 11 +- .../openoffice/OpenOfficeDataContext.java | 3 +- .../openoffice/OpenOfficeDataContextTest.java | 6 +- .../apache/metamodel/pojo/PojoDataContext.java | 6 +- .../org/apache/metamodel/pojo/PojoDataSet.java | 3 +- .../metamodel/pojo/PojoDataContextTest.java | 4 +- .../salesforce/SalesforceDataContext.java | 17 ++- .../metamodel/salesforce/SalesforceDataSet.java | 7 +- .../metamodel/salesforce/SalesforceSchema.java | 6 +- .../metamodel/salesforce/SalesforceTable.java | 11 +- .../salesforce/SalesforceDataContextTest.java | 14 +-- .../salesforce/SalesforceDataSetTest.java | 4 +- ...CsvDefaultConfigurationFromResourceTest.java | 2 +- ...vSpecifiedConfigurationFromFilenameTest.java | 2 +- ...lSpecifiedConfigurationFromFilenameTest.java | 2 +- .../PojoDataContextFactoryBeanDelegateTest.java | 6 +- .../metamodel/sugarcrm/SugarCrmDataContext.java | 2 +- .../metamodel/sugarcrm/SugarCrmDataSet.java | 14 +-- .../metamodel/sugarcrm/SugarCrmSchema.java | 5 +- .../metamodel/sugarcrm/SugarCrmTable.java | 13 +- .../metamodel/sugarcrm/SugarCrmXmlHelper.java | 2 +- .../sugarcrm/SugarCrmDataContextTest.java | 31 +++-- .../apache/metamodel/xml/XmlDomDataContext.java | 47 ++++--- .../apache/metamodel/xml/XmlSaxDataContext.java | 11 +- .../metamodel/xml/XmlDomDataContextTest.java | 53 ++++---- .../metamodel/xml/XmlSaxDataContextTest.java | 10 +- 183 files changed, 1425 insertions(+), 1374 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/23c44880/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java ---------------------------------------------------------------------- diff --cc salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java index 0fc4257,7e3a73e..671693e --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java @@@ -19,11 -19,10 +19,8 @@@ package org.apache.metamodel.salesforce; import java.text.SimpleDateFormat; - import java.util.Date; - import java.util.List; - import java.util.Locale; - import java.util.TimeZone; + import java.util.*; -import com.sforce.ws.ConnectorConfig; - import org.apache.metamodel.MetaModelException; import org.apache.metamodel.QueryPostprocessDataContext; import org.apache.metamodel.UpdateScript;
