Merge branch 'feature/5.x/rest-api' into feature/5.x/swagger-docs Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/2c1f8689 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/2c1f8689 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/2c1f8689
Branch: refs/heads/feature/5.x/swagger-docs Commit: 2c1f86897f46868d7b5b8818baf614e0edf1498a Parents: 3ac879e 11d9a9e Author: Kasper Sørensen <[email protected]> Authored: Sun Jul 10 22:11:53 2016 -0700 Committer: Kasper Sørensen <[email protected]> Committed: Sun Jul 10 22:11:53 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 | 307 +++++++++++++++++++ .../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 ++ .../apache/metamodel/pojo/PojoDataContext.java | 4 +- .../metamodel/pojo/PojoDataContextFactory.java | 71 +++++ ....apache.metamodel.factory.DataContextFactory | 1 + pom.xml | 1 + .../app/CachedDataSourceRegistryWrapper.java | 109 +++++++ .../service/app/DataContextSupplier.java | 59 +--- .../service/app/DataSourceDefinition.java | 8 +- .../service/app/DataSourceRegistry.java | 3 +- .../service/app/InMemoryDataSourceRegistry.java | 5 +- .../service/app/InMemoryTenantContext.java | 2 +- .../controllers/DataSourceController.java | 17 +- .../model/RestDataSourceDefinition.java | 27 +- .../TenantInteractionScenarioTest.java | 2 +- 66 files changed, 2273 insertions(+), 231 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/2c1f8689/service-webapp/src/main/java/org/apache/metamodel/service/controllers/DataSourceController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/2c1f8689/service-webapp/src/test/java/org/apache/metamodel/service/controllers/TenantInteractionScenarioTest.java ----------------------------------------------------------------------
