You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2017/07/22 16:57:32 UTC
[17/33] metamodel git commit: Merge branch 'master' into 5.x
Merge branch 'master' into 5.x
Conflicts:
CHANGES.md
cassandra/pom.xml
core/pom.xml
couchdb/pom.xml
csv/pom.xml
elasticsearch/common/pom.xml
elasticsearch/native/pom.xml
elasticsearch/pom.xml
elasticsearch/rest/pom.xml
excel/pom.xml
fixedwidth/pom.xml
full/pom.xml
hadoop/pom.xml
hbase/pom.xml
jdbc/pom.xml
json/pom.xml
mongodb/common/pom.xml
mongodb/mongo2/pom.xml
mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
mongodb/mongo3/pom.xml
mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
mongodb/pom.xml
neo4j/pom.xml
openoffice/pom.xml
pojo/pom.xml
pom.xml
salesforce/pom.xml
spring/pom.xml
sugarcrm/pom.xml
xml/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/02397db0
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/02397db0
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/02397db0
Branch: refs/heads/master
Commit: 02397db0a15ef50ae3135143b4f60be75921fbd9
Parents: dd0cff7 52c3daf
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jul 10 21:27:21 2016 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jul 10 21:27:21 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/02397db0/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index 8e47adf,3ff4ca0..bb64682
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -1,10 -1,12 +1,18 @@@
+### Apache MetaModel 5.0
+
+ * [METAMODEL-6] - Added update summary containing information about changes on returning UpdateableDataContext.executeUpdate(..)
+ * [METAMODEL-222] - Added support for Java 8 lambdas, removed support for Java 7.
+ * [METAMODEL-1087] - Removed deprecated APIs from MetaModel's codebase.
+
- ### Apache MetaModel 4.5.3 (work in progress)
+ ### Apache MetaModel 4.5.4 (work in progress)
+
+ * [METAMODEL-1099] - Created a new DataContextFactory SPI and a extensible registry of implementations based on ServiceLoader.
+ * [METAMODEL-1088] - Add support for aliases in MongoDB.
+ * [METAMODEL-1086] - Fixed encoding issue when CsvDataContext is instantiated with InputStream.
+ * [METAMODEL-1094] - Added support for Apache Cassandra version 3.x.
+ * [METAMODEL-1093] - Close compiled ResultSets.
+
+ ### Apache MetaModel 4.5.3
* [METAMODEL-235] - Fixed a bug related to handling of null or missing values in ElasticSearch using REST client.
* [METAMODEL-225] - Fixed support for nested objects and arrays in ElasticSearch using REST client.
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/cassandra/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --cc fixedwidth/pom.xml
index 7cae86b,7461e86..24e2451
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@@ -1,52 -1,52 +1,52 @@@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>MetaModel</artifactId>
- <groupId>org.apache.metamodel</groupId>
- <version>4.5.4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>MetaModel-fixedwidth</artifactId>
- <name>MetaModel module for fixed width value files</name>
- <dependencies>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>MetaModel</artifactId>
+ <groupId>org.apache.metamodel</groupId>
+ <version>5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>MetaModel-fixedwidth</artifactId>
+ <name>MetaModel module for fixed width value files</name>
+ <dependencies>
- <dependency>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel-csv</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </project>
+ <dependency>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel-csv</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </project>
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/jdbc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUpdateCallback.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/02397db0/pom.xml
----------------------------------------------------------------------