[1/7] metamodel git commit: First attempts at making the API change for METAMODEL-6

2015-12-16 Thread kaspersor 
Repository: metamodel
Updated Branches:
  refs/heads/5.x c5cc9febd -> c51994c1f


First attempts at making the API change for METAMODEL-6

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/a15ca724
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/a15ca724
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/a15ca724

Branch: refs/heads/5.x
Commit: a15ca724b5c4556ebb65700b4d50db878b6b159c
Parents: 2d291f4
Author: Kasper Sørensen 
Authored: Wed Dec 9 13:14:07 2015 +0100
Committer: Kasper Sørensen 
Committed: Wed Dec 9 16:06:59 2015 +0100

--
 .../metamodel/AbstractUpdateCallback.java   | 10 ++-
 .../apache/metamodel/DefaultUpdateSummary.java  | 72 
 .../org/apache/metamodel/UpdateSummary.java | 48 +
 .../apache/metamodel/UpdateableDataContext.java | 25 +++
 .../intercept/InterceptableDataContext.java | 10 +--
 .../metamodel/MockUpdateableDataContext.java| 10 ++-
 .../metamodel/couchdb/CouchDbDataContext.java   |  6 +-
 .../apache/metamodel/csv/CsvDataContext.java|  7 +-
 .../nativeclient/ElasticSearchDataContext.java  | 18 +++--
 .../rest/ElasticSearchRestDataContext.java  | 58 +---
 .../metamodel/excel/ExcelDataContext.java   |  6 +-
 .../apache/metamodel/jdbc/JdbcDataContext.java  |  5 +-
 .../metamodel/mongodb/MongoDbDataContext.java   | 11 +--
 .../apache/metamodel/pojo/PojoDataContext.java  |  6 +-
 .../salesforce/SalesforceDataContext.java   |  5 +-
 15 files changed, 227 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metamodel/blob/a15ca724/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
--
diff --git 
a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java 
b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
index 472fb6f..20842a6 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
@@ -43,21 +43,21 @@ public abstract class AbstractUpdateCallback implements 
UpdateCallback {
 @Override
 public TableCreationBuilder createTable(String schemaName, String 
tableName) throws IllegalArgumentException,
 IllegalStateException {
-Schema schema = getSchema(schemaName);
+final Schema schema = getSchema(schemaName);
 return createTable(schema, tableName);
 }
 
 @Override
 public TableDropBuilder dropTable(String schemaName, String tableName) 
throws IllegalArgumentException,
 IllegalStateException, UnsupportedOperationException {
-Table table = getTable(schemaName, tableName);
+final Table table = getTable(schemaName, tableName);
 return dropTable(table);
 }
 
 @Override
 public TableDropBuilder dropTable(Schema schema, String tableName) throws 
IllegalArgumentException,
 IllegalStateException, UnsupportedOperationException {
-Table table = schema.getTableByName(tableName);
+final Table table = schema.getTableByName(tableName);
 if (table == null) {
 throw new IllegalArgumentException("Nu such table '" + tableName + 
"' found in schema: " + schema
 + ". Available tables are: " + 
Arrays.toString(schema.getTableNames()));
@@ -159,4 +159,8 @@ public abstract class AbstractUpdateCallback implements 
UpdateCallback {
 UnsupportedOperationException {
 return new DeleteAndInsertBuilder(this, table);
 }
+
+public UpdateSummary getUpdateSummary() {
+return DefaultUpdateSummary.unknownUpdates();
+}
 }

http://git-wip-us.apache.org/repos/asf/metamodel/blob/a15ca724/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
--
diff --git a/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java 
b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
new file mode 100644
index 000..9b02f22
--- /dev/null
+++ b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
@@ -0,0 +1,72 @@
+/**
+ * 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

[2/7] metamodel git commit: Added javadoc for METAMODEL-6

2015-12-16 Thread kaspersor 
Added javadoc for METAMODEL-6

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/774cb596
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/774cb596
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/774cb596

Branch: refs/heads/5.x
Commit: 774cb596e70ab939b262218f7d908cd5164161ba
Parents: a15ca72
Author: Kasper Sørensen 
Authored: Fri Dec 11 11:28:33 2015 +0100
Committer: Kasper Sørensen 
Committed: Fri Dec 11 11:28:33 2015 +0100

--
 .../java/org/apache/metamodel/UpdateSummary.java | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/metamodel/blob/774cb596/core/src/main/java/org/apache/metamodel/UpdateSummary.java
--
diff --git a/core/src/main/java/org/apache/metamodel/UpdateSummary.java 
b/core/src/main/java/org/apache/metamodel/UpdateSummary.java
index 57ca52f..4124b0a 100644
--- a/core/src/main/java/org/apache/metamodel/UpdateSummary.java
+++ b/core/src/main/java/org/apache/metamodel/UpdateSummary.java
@@ -31,10 +31,25 @@ package org.apache.metamodel;
  */
 public interface UpdateSummary {
 
+/**
+ * Gets the number of inserted rows, or null if this number is unknown.
+ * 
+ * @return a row count or null if the number is unknown.
+ */
 public Integer getInsertedRows();
 
+/**
+ * Gets the number of updated rows, or null if this number is unknown.
+ * 
+ * @return a row count or null if the number is unknown.
+ */
 public Integer getUpdatedRows();
 
+/**
+ * Gets the number of deleted rows, or null if this number is unknown.
+ * 
+ * @return a row count or null if the number is unknown.
+ */
 public Integer getDeletedRows();
 
 /**

[4/7] metamodel git commit: Merge branch '5.x' into METAMODEL-6/execute-update-return-value

2015-12-16 Thread kaspersor 
Merge branch '5.x' into METAMODEL-6/execute-update-return-value

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/d6ab0bed
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/d6ab0bed
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/d6ab0bed

Branch: refs/heads/5.x
Commit: d6ab0bed337fcfc3dd673ed0f9ef4d6e447217af
Parents: 774cb59 c5cc9fe
Author: Kasper Sørensen 
Authored: Mon Dec 14 21:54:11 2015 +0100
Committer: Kasper Sørensen 
Committed: Mon Dec 14 21:54:11 2015 +0100

--
 CHANGES.md  |   5 +-
 cassandra/pom.xml   |   2 +-
 core/pom.xml|   2 +-
 .../org/apache/metamodel/util/FileHelper.java   |  36 +--
 couchdb/pom.xml |   2 +-
 csv/pom.xml |   2 +-
 elasticsearch/common/pom.xml|   6 +-
 elasticsearch/native/pom.xml|   6 +-
 elasticsearch/pom.xml   |   2 +-
 elasticsearch/rest/pom.xml  |   6 +-
 excel/pom.xml   |   2 +-
 fixedwidth/pom.xml  |   2 +-
 full/pom.xml|   2 +-
 hadoop/pom.xml  |   2 +-
 .../util/HdfsDirectoryInputStream.java  |  74 +
 .../metamodel/util/HdfsFileInputStream.java |  88 +
 .../metamodel/util/HdfsFileOutputStream.java|  68 
 .../org/apache/metamodel/util/HdfsResource.java | 324 +--
 .../apache/metamodel/util/HdfsResourceTest.java |  15 +
 hbase/pom.xml   |   2 +-
 jdbc/pom.xml|   2 +-
 .../jdbc/dialects/DefaultQueryRewriter.java |   4 +-
 .../metamodel/jdbc/JdbcTestTemplates.java   |   2 +-
 json/pom.xml|   2 +-
 mongodb/pom.xml |   2 +-
 neo4j/pom.xml   |   5 +-
 openoffice/pom.xml  |   2 +-
 pojo/pom.xml|   2 +-
 pom.xml |   8 +-
 salesforce/pom.xml  |   2 +-
 spring/pom.xml  |   2 +-
 sugarcrm/pom.xml|   2 +-
 xml/pom.xml |   2 +-
 33 files changed, 435 insertions(+), 250 deletions(-)
--

[5/7] metamodel git commit: Merge branch 'METAMODEL-222/java8-only' into METAMODEL-6/execute-update-return-value

2015-12-16 Thread kaspersor 
Merge branch 'METAMODEL-222/java8-only' into 
METAMODEL-6/execute-update-return-value

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/58f8c2a2
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/58f8c2a2
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/58f8c2a2

Branch: refs/heads/5.x
Commit: 58f8c2a297911cc591469d24ca14140185a04e13
Parents: d6ab0be 1bc6b6b
Author: Kasper Sørensen 
Authored: Mon Dec 14 21:54:36 2015 +0100
Committer: Kasper Sørensen 
Committed: Mon Dec 14 21:54:36 2015 +0100

--
 .travis.yml | 1 -
 pom.xml | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)
--

[6/7] metamodel git commit: METAMODEL-6: Changed API to use the Java 8 Optional interface

2015-12-16 Thread kaspersor 
METAMODEL-6: Changed API to use the Java 8 Optional interface

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/5f478328
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/5f478328
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/5f478328

Branch: refs/heads/5.x
Commit: 5f478328f697437d6883b8adc95a12122bdf3cc4
Parents: 58f8c2a
Author: Kasper Sørensen 
Authored: Mon Dec 14 21:58:34 2015 +0100
Committer: Kasper Sørensen 
Committed: Mon Dec 14 21:59:31 2015 +0100

--
 .../apache/metamodel/DefaultUpdateSummary.java| 18 ++
 .../java/org/apache/metamodel/UpdateSummary.java  | 18 ++
 2 files changed, 20 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f478328/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
--
diff --git a/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java 
b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
index 9b02f22..bc8ec27 100644
--- a/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
+++ b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java
@@ -18,6 +18,8 @@
  */
 package org.apache.metamodel;
 
+import java.util.Optional;
+
 /**
  * Default implementation of {@link UpdateSummary}.
  */
@@ -50,23 +52,23 @@ public class DefaultUpdateSummary implements UpdateSummary {
 }
 
 @Override
-public Integer getInsertedRows() {
-return _insertedRows;
+public Optional getInsertedRows() {
+return Optional.ofNullable(_insertedRows);
 }
 
 @Override
-public Integer getUpdatedRows() {
-return _updatedRows;
+public Optional getUpdatedRows() {
+return Optional.ofNullable(_updatedRows);
 }
 
 @Override
-public Integer getDeletedRows() {
-return _deletedRows;
+public Optional getDeletedRows() {
+return Optional.ofNullable(_deletedRows);
 }
 
 @Override
-public Iterable getGeneratedKeys() {
-return _generatedKeys;
+public Optional getGeneratedKeys() {
+return Optional.ofNullable(_generatedKeys);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f478328/core/src/main/java/org/apache/metamodel/UpdateSummary.java
--
diff --git a/core/src/main/java/org/apache/metamodel/UpdateSummary.java 
b/core/src/main/java/org/apache/metamodel/UpdateSummary.java
index 4124b0a..fc7239b 100644
--- a/core/src/main/java/org/apache/metamodel/UpdateSummary.java
+++ b/core/src/main/java/org/apache/metamodel/UpdateSummary.java
@@ -18,6 +18,8 @@
  */
 package org.apache.metamodel;
 
+import java.util.Optional;
+
 /**
  * Represents a summary of changes made in a given
  * {@link UpdateableDataContext#executeUpdate(UpdateScript)} call.
@@ -34,30 +36,30 @@ public interface UpdateSummary {
 /**
  * Gets the number of inserted rows, or null if this number is unknown.
  * 
- * @return a row count or null if the number is unknown.
+ * @return an optional row count.
  */
-public Integer getInsertedRows();
+public Optional getInsertedRows();
 
 /**
  * Gets the number of updated rows, or null if this number is unknown.
  * 
- * @return a row count or null if the number is unknown.
+ * @return an optional row count.
  */
-public Integer getUpdatedRows();
+public Optional getUpdatedRows();
 
 /**
  * Gets the number of deleted rows, or null if this number is unknown.
  * 
- * @return a row count or null if the number is unknown.
+ * @return an optional row count.
  */
-public Integer getDeletedRows();
+public Optional getDeletedRows();
 
 /**
  * Gets a collection of keys that was generated as part of the update -
  * typically because INSERTs where executed on an underlying database which
  * generated record IDs for each insert.
  * 
- * @return a collection of generated keys, or null if not available.
+ * @return an optional collection of generated keys.
  */
-public Iterable getGeneratedKeys();
+public Optional getGeneratedKeys();
 }

[7/7] metamodel git commit: METAMODEL-6: Added API for UpdateSummary. Fixes #81

2015-12-16 Thread kaspersor 
METAMODEL-6: Added API for UpdateSummary. Fixes #81


Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/c51994c1
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/c51994c1
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/c51994c1

Branch: refs/heads/5.x
Commit: c51994c1f1484722e74ea9ffd8821ce9d7002a52
Parents: 5f47832
Author: Kasper Sørensen 
Authored: Wed Dec 16 21:15:58 2015 +0100
Committer: Kasper Sørensen 
Committed: Wed Dec 16 21:15:58 2015 +0100

--

--