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/05/11 02:17:37 UTC
[5/6] metamodel git commit: Merge branch '5.x' into java-8-functions
Merge branch '5.x' into java-8-functions
# Conflicts:
# core/src/main/java/org/apache/metamodel/MetaModelHelper.java
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e5381fd4
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e5381fd4
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e5381fd4
Branch: refs/heads/5.x
Commit: e5381fd47763968bce63057627e31de4e1f7b01e
Parents: 400fc73 c4788a2
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue May 9 20:56:44 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue May 9 20:56:44 2017 -0700
----------------------------------------------------------------------
CHANGES.md | 6 +
cassandra/pom.xml | 2 +-
core/pom.xml | 2 +-
.../metamodel/AbstractUpdateCallback.java | 22 ++--
.../apache/metamodel/DefaultUpdateSummary.java | 74 +++++++++++
.../org/apache/metamodel/MetaModelHelper.java | 21 +--
.../metamodel/QueryPostprocessDataContext.java | 25 +---
.../org/apache/metamodel/UpdateSummary.java | 65 ++++++++++
.../apache/metamodel/UpdateSummaryBuilder.java | 130 +++++++++++++++++++
.../apache/metamodel/UpdateableDataContext.java | 25 ++--
.../apache/metamodel/data/AbstractDataSet.java | 20 ---
.../org/apache/metamodel/data/AbstractRow.java | 6 -
.../java/org/apache/metamodel/data/DataSet.java | 10 --
.../org/apache/metamodel/data/DefaultRow.java | 73 -----------
.../java/org/apache/metamodel/data/Row.java | 11 --
.../intercept/InterceptableDataContext.java | 10 +-
.../org/apache/metamodel/query/FilterItem.java | 21 ---
.../org/apache/metamodel/query/OrderByItem.java | 20 ---
.../java/org/apache/metamodel/query/Query.java | 12 --
.../org/apache/metamodel/query/SelectItem.java | 23 +---
.../query/builder/AbstractFilterBuilder.java | 54 --------
.../builder/AbstractQueryFilterBuilder.java | 54 --------
.../metamodel/query/builder/FilterBuilder.java | 70 ----------
.../apache/metamodel/util/ImmutableDate.java | 61 ---------
.../metamodel/MockUpdateableDataContext.java | 10 +-
.../QueryPostprocessDataContextTest.java | 6 +-
.../metamodel/data/DataSetTableModelTest.java | 3 +-
couchdb/pom.xml | 2 +-
.../metamodel/couchdb/CouchDbDataContext.java | 6 +-
csv/pom.xml | 2 +-
.../apache/metamodel/csv/CsvDataContext.java | 85 +-----------
dynamodb/pom.xml | 2 +-
elasticsearch/common/pom.xml | 2 +-
elasticsearch/native/pom.xml | 2 +-
.../nativeclient/ElasticSearchDataContext.java | 14 +-
elasticsearch/pom.xml | 2 +-
elasticsearch/rest/pom.xml | 2 +-
.../rest/ElasticSearchRestDataContext.java | 11 +-
excel/pom.xml | 2 +-
.../metamodel/excel/ExcelDataContext.java | 20 +--
.../metamodel/excel/ExcelDataContextTest.java | 8 +-
fixedwidth/pom.xml | 2 +-
.../fixedwidth/FixedWidthColumnSpec.java | 2 +-
.../fixedwidth/FixedWidthDataContext.java | 35 -----
full/pom.xml | 2 +-
hadoop/pom.xml | 2 +-
hbase/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
.../metamodel/jdbc/JdbcBatchUpdateCallback.java | 8 +-
.../apache/metamodel/jdbc/JdbcDataContext.java | 5 +-
.../metamodel/jdbc/JdbcDeleteBuilder.java | 4 +-
.../metamodel/jdbc/JdbcDropTableBuilder.java | 4 +-
.../metamodel/jdbc/JdbcInsertBuilder.java | 4 +-
.../jdbc/JdbcSimpleUpdateCallback.java | 11 +-
.../metamodel/jdbc/JdbcUpdateBuilder.java | 4 +-
.../metamodel/jdbc/JdbcUpdateCallback.java | 108 +++++++++++----
.../metamodel/jdbc/JdbcTestTemplates.java | 14 +-
.../jdbc/integrationtests/PostgresqlTest.java | 39 ++++++
json/pom.xml | 2 +-
mongodb/common/pom.xml | 2 +-
.../mongodb/common/MongoDbTableDef.java | 46 -------
mongodb/mongo2/pom.xml | 2 +-
.../mongodb/mongo2/MongoDbDataContext.java | 28 ++--
mongodb/mongo3/pom.xml | 2 +-
.../mongodb/mongo3/MongoDbDataContext.java | 16 +--
mongodb/pom.xml | 2 +-
neo4j/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
.../apache/metamodel/pojo/PojoDataContext.java | 6 +-
pom.xml | 4 +-
salesforce/pom.xml | 2 +-
.../salesforce/SalesforceDataContext.java | 7 +-
.../salesforce/SalesforceUpdateCallback.java | 2 +-
spring/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
.../apache/metamodel/xml/XmlDataContext.java | 59 ---------
78 files changed, 571 insertions(+), 865 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/metamodel/MetaModelHelper.java
index 435e9a7,db95a64..ab38a96
--- a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
+++ b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
@@@ -505,26 -508,12 +505,9 @@@ public final class MetaModelHelper
return new InMemoryDataSet(header, resultRows);
}
- /**
- *
- * @param selectItems
- * @return
- *
- * @deprecated use {@link #getAggregateFunctionSelectItems(Iterable)} or
- * {@link #getScalarFunctionSelectItems(Iterable)} instead
- */
- @Deprecated
- public static List<SelectItem> getFunctionSelectItems(Iterable<SelectItem> selectItems) {
- return CollectionUtils.filter(selectItems, selectItem -> {
- @SuppressWarnings("deprecation")
- final FunctionType function = selectItem.getFunction();
- return function != null;
- });
- }
-
public static List<SelectItem> getAggregateFunctionSelectItems(Iterable<SelectItem> selectItems) {
- return CollectionUtils.filter(selectItems, new Predicate<SelectItem>() {
- @Override
- public Boolean eval(SelectItem arg) {
- return arg.getAggregateFunction() != null;
- }
+ return CollectionUtils.filter(selectItems, arg -> {
+ return arg.getAggregateFunction() != null;
});
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
----------------------------------------------------------------------
diff --cc salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
index 4032150,08faf12..f49751f
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
@@@ -345,9 -347,8 +347,9 @@@ public class SalesforceDataContext exte
}
}
+ @SuppressWarnings("deprecation")
private static void validateSoqlSupportedSelectItem(SelectItem selectItem) throws UnsupportedOperationException {
- if (selectItem.getFunction() != null) {
+ if (selectItem.hasFunction()) {
throw new UnsupportedOperationException("Function select items not supported: " + selectItem);
}
if (selectItem.getSubQuerySelectItem() != null) {
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5381fd4/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
----------------------------------------------------------------------