Merge branch '5.x' into feature/5.x/rest-api Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/ba9b4cc4 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/ba9b4cc4 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/ba9b4cc4
Branch: refs/heads/feature/5.x/swagger-docs Commit: ba9b4cc4f4453ff0ceb020453b84cbab45ed05ad Parents: 79af7dd 02397db Author: Kasper Sørensen <[email protected]> Authored: Sun Jul 10 21:29:02 2016 -0700 Committer: Kasper Sørensen <[email protected]> Committed: Sun Jul 10 21:29:02 2016 -0700 ---------------------------------------------------------------------- CHANGES.md | 11 +- cassandra/pom.xml | 12 +- .../metamodel/cassandra/CassandraUtils.java | 2 +- .../apache/metamodel/ConnectionException.java | 44 +++ .../factory/ClasspathResourceFactory.java | 36 +++ .../metamodel/factory/DataContextFactory.java | 30 ++ .../factory/DataContextFactoryRegistry.java | 41 +++ .../factory/DataContextFactoryRegistryImpl.java | 84 +++++ .../factory/DataContextProperties.java | 92 ++++++ .../factory/DataContextPropertiesImpl.java | 304 +++++++++++++++++++ .../metamodel/factory/FileResourceFactory.java | 38 +++ .../factory/InMemoryResourceFactory.java | 36 +++ .../metamodel/factory/ResourceFactory.java | 28 ++ .../factory/ResourceFactoryRegistry.java | 34 +++ .../factory/ResourceFactoryRegistryImpl.java | 80 +++++ .../metamodel/factory/ResourceProperties.java | 46 +++ .../factory/ResourcePropertiesImpl.java | 74 +++++ .../factory/SimpleResourceProperties.java | 60 ++++ ...supportedDataContextPropertiesException.java | 47 +++ .../UnsupportedResourcePropertiesException.java | 43 +++ .../metamodel/factory/UrlResourceFactory.java | 48 +++ .../LegacyDeserializationObjectInputStream.java | 26 ++ .../apache/metamodel/util/ResourceUtils.java | 45 +++ ...org.apache.metamodel.factory.ResourceFactory | 4 + .../ResourceFactoryRegistryImplTest.java | 72 +++++ .../apache/metamodel/util/UrlResourceTest.java | 8 +- .../apache/metamodel/csv/CsvDataContext.java | 2 +- .../metamodel/csv/CsvDataContextFactory.java | 73 +++++ ....apache.metamodel.factory.DataContextFactory | 1 + .../csv/CsvDataContextFactoryTest.java | 57 ++++ fixedwidth/pom.xml | 46 +-- .../metamodel/fixedwidth/FixedWidthReader.java | 20 +- .../fixedwidth/FixedWidthReaderTest.java | 57 ++++ .../apache/metamodel/DataContextFactory.java | 15 + .../metamodel/hadoop/HdfsResourceFactory.java | 46 +++ ...org.apache.metamodel.factory.ResourceFactory | 1 + jdbc/pom.xml | 2 +- .../jdbc/JdbcCompiledQueryLeaseFactory.java | 5 +- .../apache/metamodel/jdbc/JdbcDataContext.java | 40 +-- .../metamodel/jdbc/JdbcDataContextFactory.java | 86 ++++++ .../org/apache/metamodel/jdbc/JdbcDataSet.java | 6 +- .../metamodel/jdbc/JdbcMetadataLoader.java | 100 +++--- .../metamodel/jdbc/JdbcUpdateCallback.java | 2 +- ....apache.metamodel.factory.DataContextFactory | 1 + .../apache/metamodel/jdbc/H2databaseTest.java | 11 +- .../jdbc/JdbcDataContextFactoryTest.java | 45 +++ .../jdbc/integrationtests/MysqlTest.java | 61 +++- .../mongodb/mongo2/MongoDbDataContext.java | 41 ++- .../mongodb/mongo2/MongoDbDataSet.java | 8 + .../mongodb/mongo2/MongoDbDataContextTest.java | 35 +++ .../mongodb/mongo3/MongoDbDataContext.java | 44 ++- .../mongodb/mongo3/MongoDbDataSet.java | 8 + .../mongodb/mongo3/MongoDbDataContextTest.java | 34 +++ pom.xml | 1 + 54 files changed, 2036 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/ba9b4cc4/pom.xml ----------------------------------------------------------------------
